From 90c5ab009a0c9cc81b467d031d616528226ed85f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 16 Aug 2016 15:32:28 +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 --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 8 ++++---- .../main/java/com/lyms/platform/operate/web/result/AntData.java | 2 +- 2 files changed, 5 insertions(+), 5 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 8840b4e..3e6dc0b 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 @@ -435,8 +435,8 @@ public class AntenatalExaminationFacade { //初诊记录 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setStart(patients.getBookbuildingDate()); - antExChuQuery.setEnd(new Date(date.getTime() + 86398000)); +// antExChuQuery.setStart(patients.getBookbuildingDate()); +// antExChuQuery.setEnd(new Date(date.getTime() + 86398000)); antExChuQuery.setParentId(patients.getId()); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { @@ -452,8 +452,8 @@ public class AntenatalExaminationFacade { AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setParentId(patients.getId()); - antExQuery.setStart(patients.getBookbuildingDate()); - antExQuery.setEnd(new Date(date.getTime() + 86398000)); +// antExQuery.setStart(patients.getBookbuildingDate()); +// antExQuery.setEnd(new Date(date.getTime() + 86398000)); List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(list1)) { for (AntenatalExaminationModel an : list1) { 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 a6c1573..3bc7783 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 @@ -78,7 +78,7 @@ public class AntData { public AntData(Patients model,String hospitalName) { this.id = model.getId(); - int days = DateUtil.daysBetween(model.getLastMenses(), model.getCreated()); + int days = DateUtil.daysBetween(model.getLastMenses(), model.getBookbuildingDate()); this.dueWeek = StringUtils.dueWeek(days); this.checkTime = DateUtil.getyyyy_MM_dd(model.getBookbuildingDate()); this.title="孕妇建档"; -- 1.8.3.1