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 e92eb2b..a35ab3b 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 @@ -450,7 +450,9 @@ public class AntenatalExaminationFacade { List modelList = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(modelList)) { for (MaternalDeliverModel model : modelList) { - listDate.add(new SortIn(model)); + if(null!=model.getDueDate()){ + listDate.add(new SortIn(model)); + } } } @@ -461,7 +463,9 @@ public class AntenatalExaminationFacade { List stopPregs = stopPregnancyService.queryStopPreg(query); if (CollectionUtils.isNotEmpty(stopPregs)) { for (StopPregModel stopPregModel : stopPregs) { - listDate.add(new SortIn(stopPregModel)); + if(null!=stopPregModel.getStopDate()){ + listDate.add(new SortIn(stopPregModel)); + } } } PatientsQuery patientsQuery = new PatientsQuery();