From 6bfe551e4fd175aeea3dfe2383ac828452081946 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 11 Jul 2017 16:24:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E5=A8=A9=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 28 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 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 ec44cb1..ef8d06a 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 @@ -1109,7 +1109,7 @@ public class AntenatalExaminationFacade { Date currentDate = DateUtil.formatDate(new Date()); - if ((date.getTime() <= currentDate.getTime() || patients.getBuildType() == 2) || patients.getType() == 3 && patients.getFmDate() != null) { + if ((date.getTime() <= currentDate.getTime() || patients.getBuildType() == 2|| patients.getIsAutoFm() == 1) || patients.getType() == 3 && patients.getFmDate() != null) { //建档记录 if (null != patients.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())); @@ -1170,8 +1170,7 @@ public class AntenatalExaminationFacade { } } - - if (null != map) { + /*if (null != map) { Object obj = map.get(listDate.get(i).getId()); if (obj instanceof MaternalDeliverModel) { MaternalDeliverModel model = (MaternalDeliverModel) obj; @@ -1181,6 +1180,29 @@ public class AntenatalExaminationFacade { listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); } + }*/ + if (null != map) { + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setPid(pid); + matDeliverQuery.setNeStart(true); + matDeliverQuery.setNeEnd(true); + matDeliverQuery.setCreatedStart(dueDate); + if (CollectionUtils.isNotEmpty(listDate)) { + //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 + if (listDate.size() > 1 && i > 1) { + matDeliverQuery.setEndStart(listDate.get(i - 1).getDate()); + } + } + List l= matDeliverService.query(matDeliverQuery); + if (CollectionUtils.isNotEmpty(l)) { + MaternalDeliverModel model = l.get(0); + if (null != model.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); + } + + listData.add(new AntData((MaternalDeliverModel) model, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + } } DischargeAbstractMotherQuery dischargeAbstractMotherQuery = new DischargeAbstractMotherQuery(); -- 1.8.3.1