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 7a485c6..05fb06d 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 @@ -627,7 +627,7 @@ public class AntenatalExaminationFacade { sortList(listDate); //需要过滤掉建档就分娩的情况 - Date dueDate = new Date(); + Date dueDate =null; if (CollectionUtils.isNotEmpty(listDate)) { String pid = ""; int count = 0; @@ -789,7 +789,9 @@ public class AntenatalExaminationFacade { listData.add(new AntData(patients, null != organization ? organization.getName() : "")); iterator.remove(); - + if(null==dueDate &&null!=patients.getFmDate()){ + dueDate=patients.getFmDate(); + } PostReviewQuery postReviewQuery = new PostReviewQuery(); if (list.size() - 1 > i) { postReviewQuery.setStart(dueDate);