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 05fb06d..8c65a17 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 @@ -779,7 +779,7 @@ public class AntenatalExaminationFacade { Patients patients = iterator.next(); //处理建档就分娩的情况 Date date = DateUtil.addWeek(patients.getLastMenses(), 42); - Date currentDate = DateUtil.formatDate(patients.getBookbuildingDate()); + Date currentDate = DateUtil.formatDate(patients.getCreated()); if (date.getTime() <= currentDate.getTime()||patients.getBuildType()==2) { //建档记录 if (null != patients.getHospitalId()) { @@ -787,7 +787,7 @@ public class AntenatalExaminationFacade { } pid = patients.getPid(); listData.add(new AntData(patients, null != organization ? organization.getName() : "")); - iterator.remove(); + if(null==dueDate &&null!=patients.getFmDate()){ dueDate=patients.getFmDate(); @@ -811,13 +811,13 @@ public class AntenatalExaminationFacade { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } - int size = patientses.size(); - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(size>1?size-1:size).getFmDate())); + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", dueDate)); } } } + iterator.remove(); updateEditEnable(listData, sortList); sortList.add(listData); listData=new ArrayList();