diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index aa72cf9..0e40b59 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -390,7 +390,7 @@ public class AntenatalExaminationFacade { List patientses = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patientses)) { for (Patients patients : patientses) { - listDate.add(new SortIn(patients, 1)); + listDate.add(new SortIn(patients, "1")); } } //ζŽ’εΊι›†εˆ @@ -404,7 +404,7 @@ public class AntenatalExaminationFacade { Date min = null; if (CollectionUtils.isNotEmpty(patientses1)) { - min = patientses1.get(0).getBookbuildingDate(); + min = patientses1.get(0).getLastMenses(); } Date max = null; @@ -997,6 +997,12 @@ public class AntenatalExaminationFacade { this.type = 2; } + public SortIn(Patients patients, String i) { + this.id = patients.getId(); + this.date = patients.getLastMenses(); + this.type = 2; + } + public SortIn(StopPregModel stopPregModel) { this.id = stopPregModel.getId(); this.date = stopPregModel.getStopDate();