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 a33a4d1..f6fd93e 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 @@ -563,10 +563,12 @@ public class AntenatalExaminationFacade { List listData = new ArrayList(); Organization organization = null; PatientsQuery patientsQuery1 = new PatientsQuery(); - patientsQuery1.setBookbuildingDateEnd(end); +// patientsQuery1.setBookbuildingDateEnd(end); + patientsQuery1.setLastMensesEnd(end); patientsQuery1.setBuildType(1); if (listDate.size() > i + 1) { - patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000)); +// patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000)); + patientsQuery1.setLastMensesStart(new Date(listDate.get(i + 1).getDate().getTime() + 86398000)); } pid = list.get(0).getPid(); patientsQuery1.setPid(pid); @@ -636,15 +638,9 @@ public class AntenatalExaminationFacade { postReviewQuery.setPid(pid); Object obj = map.get(listDate.get(i).getId()); if (obj instanceof MaternalDeliverModel) { - MaternalDeliverModel model = (MaternalDeliverModel) obj; - if(model.getYn() == YnEnums.YES.getId()){ listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); - } } else if (obj instanceof StopPregModel) { - StopPregModel model=(StopPregModel)obj; - if(model.getYn() == YnEnums.YES.getId()) { listData.add(new AntData(stopPregs.get(0), patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); - } } //产后复查记录 @@ -669,7 +665,8 @@ public class AntenatalExaminationFacade { PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); patientsQuery1.setPid(pid); - patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(0).getDate().getTime())); +// patientsQuery1.setBookbuildingDateStart(new Date(listDate.get(0).getDate().getTime())); + patientsQuery1.setLastMensesStart(new Date(listDate.get(0).getDate().getTime())); patientsQuery1.setType(1); patientsQuery1.setBuildType(1); List patientsList = patientsService.queryPatient(patientsQuery1);