From 3779d17a4c3952c42f5f3af500b13f207df30748 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 23 Aug 2016 11:04:47 +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 --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 9 +++++---- 1 file changed, 5 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 e412d38..5d29656 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 @@ -423,7 +423,7 @@ public class AntenatalExaminationFacade { //排序集合 sortList(listDate); - //TODO 需要过滤掉建档就分娩的情况 + //需要过滤掉建档就分娩的情况 Date dueDate = new Date(); if (CollectionUtils.isNotEmpty(listDate)) { String pid=""; @@ -432,16 +432,17 @@ public class AntenatalExaminationFacade { List listData = new ArrayList(); Organization organization = null; PatientsQuery patientsQuery1 = new PatientsQuery(); - patientsQuery1.setBookbuildingDateEnd(new Date(listDate.get(i).getDate().getTime()+i)); + patientsQuery1.setBookbuildingDateEnd(new Date(listDate.get(i).getDate().getTime()+i*2200)); if (listDate.size() > i + 1) { patientsQuery1.setBookbuildingDateStart(listDate.get(i + 1).getDate()); }else if(listDate.size()>1){ patientsQuery1.setBookbuildingDateStart(new Date()); - }else{ + } + /* else{ Date end = patientsQuery1.getBookbuildingDateEnd(); patientsQuery1.setBookbuildingDateEnd(new Date()); patientsQuery1.setBookbuildingDateStart(end); - } + }*/ pid=list.get(0).getPid(); patientsQuery1.setPid(pid); List patientses = patientsService.queryPatient1(patientsQuery1); -- 1.8.3.1