diff --git a/src/main/java/com/emr/controller/PdfFileIsErrorController.java b/src/main/java/com/emr/controller/PdfFileIsErrorController.java index d0ac86ef..02b46516 100644 --- a/src/main/java/com/emr/controller/PdfFileIsErrorController.java +++ b/src/main/java/com/emr/controller/PdfFileIsErrorController.java @@ -4,8 +4,6 @@ import com.emr.entity.Archive_Detail; import com.emr.entity.Archive_Detail_Vo; import com.emr.entity.OffsetLimitPage; import com.emr.service.Archive_DetailService; -import com.emr.util.PDFCheck; -import com.emr.util.PdfFileFilter; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.lowagie.text.Document; diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index cca9cf38..27cc01e7 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -711,7 +711,7 @@ public class signListController { archiveOtherExtService.updateByPrimaryKeySelective(extList.get(0)); }else { //无任务,则新增 - OracleDateVo doctorNurseFinishedDatetime = finishedDateTimeService.findByID(Long.valueOf(archive_master.getInpNo()), Long.valueOf(archive_master.getVisitId())); + OracleDateVo doctorNurseFinishedDatetime = finishedDateTimeService.findByID(archive_master.getInpNo(), archive_master.getVisitId()); //V6医生最后完成时间 String doctorFinishedDateTime = sdf.format(doctorNurseFinishedDatetime.getFinishedDateTime()); //V6护士最后完成时间