From 64ab69548c1608fa310f7ccc24f9fa30499ef5a7 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 29 Sep 2016 18:05:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/AntenatalExaminationFacade.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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(); -- 1.8.3.1