From 30b4de5b58e30f57f4a372cc8344968ffd8e8a45 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 23 Sep 2016 11:06:34 +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 --- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 96c2a6a..6fa2615 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -285,13 +285,16 @@ public class MatDeliverFacade { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(type); patientsQuery.setDueStatus(0); + patientsQuery.setBuildType(1); List patientsList = patientsService.queryPatient(patientsQuery); for (Patients patients : patientsList) { //判断分娩日期是否大于24孕周 - if (fmDate.getTime() >= DateUtil.addDay(patients.getLastMenses(), 168).getTime()) { - patients.setFmDate(fmDate); - patients.setType(3); - patientsService.updatePatient(patients); + if(null!=patients.getLastMenses()){ + if (fmDate.getTime() >= DateUtil.addDay(patients.getLastMenses(), 168).getTime()) { + patients.setFmDate(fmDate); + patients.setType(3); + patientsService.updatePatient(patients); + } } } } -- 1.8.3.1