diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index a2fca3d..193caf7 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -623,11 +623,9 @@ public class TempleteMsgGenerateWorker implements Runnable { BabyPatientExtendEarScreenQuery screenQuery = new BabyPatientExtendEarScreenQuery(); screenQuery.setNextStartTime(DateUtils.getDateStr(orderDate, DateUtils.Y_M_D)); - screenQuery.setNextEndTime(DateUtils.getDateStr(orderDate,DateUtils.Y_M_D)); + screenQuery.setNextEndTime(DateUtils.getDateStr(orderDate, DateUtils.Y_M_D)); screenQuery.setCheckHospitalId(tempHid); screenQuery.setStatus(0); - screenQuery.setSort("screen_date"); - screenQuery.setNeed("y"); List babyPatientExtendEarScreens = babyPatientExtendEarScreenService.queryEarScreenList(screenQuery); if (CollectionUtils.isNotEmpty(babyPatientExtendEarScreens)) @@ -678,10 +676,10 @@ public class TempleteMsgGenerateWorker implements Runnable { orderDate = DateUtils.formatDate(orderDate,DateUtils.Y_M_D); BabyPatientExtendEarHearingDiagnoseQuery diagnoseQuery = new BabyPatientExtendEarHearingDiagnoseQuery(); +// diagnoseQuery.setIfdel(0); diagnoseQuery.setDiagnNextStartTime(orderDate); diagnoseQuery.setDiagnNextEndTime(orderDate); diagnoseQuery.setHospitalId(tempHid); - diagnoseQuery.setSort("diagnose_time desc"); //已经诊断的数据 List hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(diagnoseQuery);