From 900f14b62d53d34c33fa2a473141c5e2511ad04d Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 9 Sep 2016 18:16:01 +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 --- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 10 ++++++---- 1 file changed, 6 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 43c55f9..d425ede 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 @@ -282,7 +282,7 @@ public class MatDeliverFacade { } - private BabyModel fillBaby(Patients patients) { + private BabyModel fillBaby(Patients patients,MatDeliverAddRequest deliverAddRequest) { BabyModel babyModel = new BabyModel(); if (null != patients) { babyModel.setAreaId(patients.getAreaId()); @@ -312,8 +312,10 @@ public class MatDeliverFacade { babyModel.setBuildDoctor("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29"); babyModel.setServiceStatus(patients.getServiceStatus()); babyModel.setServiceType(patients.getServiceType()); - int day=DateUtil.getDays(patients.getLastMenses(),patients.getFmDate()); - babyModel.setDueWeek(day/7); + if(null!=deliverAddRequest.getDueDate()){ + int day=DateUtil.getDays(patients.getLastMenses(),DateUtil.parseYMD(deliverAddRequest.getDueDate())); + babyModel.setDueWeek(day/7); + } } // 产妇分娩建档 babyModel.setBuildType(2); @@ -410,7 +412,7 @@ public class MatDeliverFacade { MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); babyList.add(baby1); //填充小孩基本信息 - BabyModel babyModel = fillBaby(patients); + BabyModel babyModel = fillBaby(patients,deliverAddRequest); babyModel.setDeliverOrg(hospital); baby.setId(baby1.getId()); babyModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); -- 1.8.3.1