From 94a49db1260b329e2e66b53a8f9ffd43669866fb Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 1 Aug 2016 14:54:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 48 ++++++++++++++++------
 1 file changed, 35 insertions(+), 13 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 345b844..3ee6549 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
@@ -92,7 +92,7 @@ public class MatDeliverFacade {
                     }
                 }
 
-                handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName);
+                handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName,patients1);
             }
             List list1 = autoMatchFacade.matchOrgId(userId);
             if (CollectionUtils.isNotEmpty(list1)) {
@@ -136,15 +136,33 @@ public class MatDeliverFacade {
 
     private BabyModel fillBaby(Patients patients){
         BabyModel babyModel=new BabyModel();
-        babyModel.setAreaId(patients.getAreaId());
-        babyModel.setProvinceId(patients.getProvinceId());
-        babyModel.setCityId(patients.getCityId());
-        babyModel.setMname(patients.getUsername());
-        babyModel.setMjob(patients.getPworkUnit());
-        babyModel.setMphone(patients.getPhone());
-        babyModel.setMbirth(patients.getBirth());
-        babyModel.setFjob(patients.getHworkUnit());
-        babyModel.setFphone(patients.getHusbandPhone());
+        if(null!=patients){
+            babyModel.setAreaId(patients.getAreaId());
+            babyModel.setProvinceId(patients.getProvinceId());
+            babyModel.setCityId(patients.getCityId());
+            babyModel.setStreetId(patients.getStreetId());
+            babyModel.setAddress(patients.getAddress());
+            //母亲信息
+            babyModel.setMname(patients.getUsername());
+            babyModel.setMjob(patients.getPworkUnit());
+            babyModel.setMphone(patients.getPhone());
+            babyModel.setMbirth(patients.getBirth());
+            //父亲信息
+            babyModel.setFjob(patients.getHworkUnit());
+            babyModel.setFname(patients.getHusbandName());
+            babyModel.setFphone(patients.getHusbandPhone());
+            babyModel.setFproTypeId(patients.getHprofessionTypeId());
+            babyModel.setfLevelId(patients.getHlevelTypeId());
+            babyModel.setFcertNo(patients.getHcertificateNum());
+            babyModel.setFcertTypeId(patients.getPcerteTypeId());
+            babyModel.setDeliverOrg(patients.getDeliverOrg());
+            babyModel.setHospitalId(patients.getHospitalId());
+            babyModel.setDueDate(patients.getDueDate());
+            babyModel.setDueType(patients.getDueType());
+        }
+
+        //没有父亲生日
+//        babyModel.setFbirth(patients.geth);
         return babyModel;
     }
     /**
@@ -158,19 +176,23 @@ public class MatDeliverFacade {
      * @param parentId
      * @param userName
      */
-    private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName) {
+    private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName,Patients patients) {
         for (MatDeliverAddRequest.Baby baby : list) {
             MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
             babyList.add(baby1);
-            BabyModel babyModel = new BabyModel();
+            //填充小孩基本信息
+            BabyModel babyModel = fillBaby(patients);
+
             baby.setId(baby1.getId());
-            babyModel.setBirth(new Date());
+            babyModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
             babyModel.setYn(YnEnums.YES.getId());
             babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
             babyModel.setAsphyxiaM(baby1.getAsphyxiaM());
+            babyModel.setFetusCount(deliverAddRequest.getTireNumber()+"");
             if (null != baby1.getBabyGender()) {
                 babyModel.setSex(Integer.valueOf(baby1.getBabyGender()));
             }
+            babyModel.setBuildDate(new Date());
             babyModel.setApgarScore(baby1.getApgarScore());
             babyModel.setModified(new Date());
             babyModel.setBabyHealthy(baby1.getBabyHealthy());
-- 
1.8.3.1