From fbd55dc84cba9b6e64c0c821ca41df8f17ad1426 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 17 Aug 2016 11:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java | 5 +++-- .../src/main/java/com/lyms/platform/operate/web/result/AntData.java | 2 +- 2 files changed, 4 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 8ad18d6..6419097 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 @@ -445,7 +445,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - data.add(new AntData(an, null != organization ? organization.getName() : "")); + data.add(new AntData(an, null != organization ? organization.getName() : "",patients.getLastMenses())); } } @@ -660,10 +660,11 @@ public class AntenatalExaminationFacade { Organization organization = null; if (CollectionUtils.isNotEmpty(antExChulist)) { for (AntExChuModel antExChuModel1 : antExChulist) { + Patients patients =patientsService.findOnePatientById(antExChuModel1.getParentId()); if (null != antExChuModel1.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); } - dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "")); + dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "",patients.getLastMenses())); } } if (CollectionUtils.isNotEmpty(list)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java index 34b7eb0..26441a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java @@ -62,7 +62,7 @@ public class AntData { this.hospitalId=model.getHospitalId(); } - public AntData(AntExChuModel model,String hospitalName) { + public AntData(AntExChuModel model,String hospitalName,Date lastMenses) { this.id = model.getId(); int days = DateUtil.daysBetween(model.getLastMenses(), model.getCheckTime()); this.dueWeek = StringUtils.dueWeek(days); -- 1.8.3.1