From f3dee266108a86305c86c876959e08d2f23e167f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Sep 2016 11:06:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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); -- 1.8.3.1