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);