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 da5a9bb..fcabffe 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 @@ -656,7 +656,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(patientses)) { count = count + patientses.size(); //TODO 处理自动分娩的情况 - updateAutoMatdel(patientses,list,i,dueDate,sortList,listDate); + updateAutoMatdel(patientses,list,i,dueDate,sortList,listDate,map); listData = new ArrayList(); } @@ -757,7 +757,7 @@ public class AntenatalExaminationFacade { if (!tmp.isEmpty()) { min = tmp.get(tmp.size() - 1).getDate(); } - updateAutoMatdel(list,list,0,dueDate,sortList,null); + updateAutoMatdel(list,list,0,dueDate,sortList,null,null); if(size!=list.size()){ list1 = new ArrayList(); } @@ -779,7 +779,7 @@ public class AntenatalExaminationFacade { /** * 处理自动分娩的情况 */ - private void updateAutoMatdel(List patientses,List list,int i,Date dueDate,List sortList,List listDate ){ + private void updateAutoMatdel(List patientses,List list,int i,Date dueDate,List sortList,List listDate, Map map ){ Iterator iterator = patientses.iterator(); Organization organization=null; String pid=""; @@ -801,6 +801,18 @@ public class AntenatalExaminationFacade { if(null==dueDate &&null!=patients.getFmDate()){ dueDate=patients.getFmDate(); } + + if(null!=map){ + Object obj = map.get(listDate.get(i).getId()); + if (obj instanceof MaternalDeliverModel) { + MaternalDeliverModel model= (MaternalDeliverModel)obj; + if (null != model.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); + } + listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); + } + } + PostReviewQuery postReviewQuery = new PostReviewQuery(); if (list.size() - 1 > i) { postReviewQuery.setStart(dueDate);