From 775be8d8efb593c4854b83f519d299576ddeda49 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 2 Aug 2016 16:35:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 bdc6585..dc73c71 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 @@ -253,7 +253,7 @@ public class AntenatalExaminationFacade { } } PostReviewQuery postReviewQuery = new PostReviewQuery(); - ; + ;postReviewQuery.setYn(YnEnums.YES.getId()); if (StringUtils.isNotEmpty(dueDate)) { Date date = DateUtil.parseYMD(dueDate); //初诊记录 @@ -287,16 +287,15 @@ public class AntenatalExaminationFacade { } } - postReviewQuery.setYn(YnEnums.YES.getId()); + if (list.size() - 1 > i) { postReviewQuery.setStart(date); //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 // postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/); postReviewQuery.setEnd(list.get(i).getCreated()); } - - postReviewQuery.setParentId(patients.getId()); } + postReviewQuery.setParentId(patients.getId()); i++; //分娩记录 if (CollectionUtils.isNotEmpty(modelList)) { -- 1.8.3.1