From a351fe2b3b53ca2724a28b7439b13c1533265169 Mon Sep 17 00:00:00 2001 From: wzqgit <568275241@qq.com> Date: Fri, 29 Oct 2021 11:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=9C=80=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=9F=A5=E8=AF=A2Oracle=E8=A7=86=E5=9B=BE=E6=97=B6?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=8F=82=E6=95=B0=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=2010/29=20wzq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/emr/controller/PdfFileIsErrorController.java | 2 -- src/main/java/com/emr/controller/signListController.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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护士最后完成时间