From 37fcbf87062874b5dd8098ce48fcf0bdb33fe37c Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 23 Aug 2016 10:54:38 +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, 6 insertions(+), 5 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 b4fc828..ff0fdc8 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
@@ -102,6 +102,7 @@ public class MatDeliverFacade {
      */
     public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest, Integer userId) {
         List<MaternalDeliverModel.Baby> babyList = new ArrayList<>();
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
         //增加
         if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
             MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
@@ -150,7 +151,7 @@ public class MatDeliverFacade {
                 babyModelQuery.setBirthEnd(patients1.getFmDate());
                 List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
                 if (CollectionUtils.isEmpty(babyModels)) {
-                    handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1);
+                    handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1,hospitalId);
                 } else {
                     List<MaternalDeliverModel.Baby> babies = new ArrayList<>();
                     for (BabyModel babyModel : babyModels) {
@@ -160,7 +161,7 @@ public class MatDeliverFacade {
                     maternalDeliverModel.setBaby(babies);
                 }
             }
-            String hospitalId = autoMatchFacade.getHospitalId(userId);
+
             maternalDeliverModel.setHospitalId(hospitalId);
             //做分娩的时候需要删除产筛数据
             SieveQuery sieveQuery = new SieveQuery();
@@ -259,7 +260,7 @@ public class MatDeliverFacade {
             babyModel.setfLevelId(patients.getHlevelTypeId());
             babyModel.setFcertNo(patients.getHcertificateNum());
             babyModel.setFcertTypeId(patients.getPcerteTypeId());
-            babyModel.setDeliverOrg(patients.getDeliverOrg());
+//            babyModel.setDeliverOrg(patients.getDeliverOrg());
             babyModel.setHospitalId(patients.getHospitalId());
             babyModel.setDueDate(patients.getDueDate());
             babyModel.setDueType(patients.getDueType());
@@ -345,7 +346,7 @@ 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, Patients patients) {
+    private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients,String hospital) {
 
 
         List babyName = buildBabyName(list);
@@ -355,7 +356,7 @@ public class MatDeliverFacade {
             babyList.add(baby1);
             //填充小孩基本信息
             BabyModel babyModel = fillBaby(patients);
-
+            babyModel.setDeliverOrg(hospital);
             baby.setId(baby1.getId());
             babyModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
             babyModel.setYn(YnEnums.YES.getId());
-- 
1.8.3.1