From bf7babce3e27bbe376e92ff6340a94c0d7cc0202 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 3 May 2018 16:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=AB=E8=AE=A1=E5=A7=94=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=86=E5=A8=A9=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 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 cfd6cc7..e19778c 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
@@ -2,7 +2,6 @@ package com.lyms.platform.operate.web.facade;
 
 import com.lyms.hospitalapi.lcdcf.LcdcfHisModel;
 import com.lyms.hospitalapi.lcdcf.LcdcfHisService;
-import com.lyms.platform.biz.RemoteService;
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.*;
@@ -167,14 +166,17 @@ public class MatDeliverFacade {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
 
-        //表示区域的
-        if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) {
-            String parentId = antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId, -1);
-            if (StringUtils.isEmpty(parentId)) {
-                logger.warn("get handHideBuild parentId is null.");
+        //非卫计委出修改做区域隐藏建档
+        if (deliverAddRequest.getPatient() == null) {
+            //表示区域的
+            if (StringUtils.isNotEmpty(organizationGroupsFacade.findByCurrentUserId(hospitalId))) {
+                String parentId = antenatalExaminationFacade.handHideBuild(deliverAddRequest.getPid(), deliverAddRequest.getParentId(), userId, -1);
+                if (StringUtils.isEmpty(parentId)) {
+                    logger.warn("get handHideBuild parentId is null.");
+                }
+                maternalDeliverModel.setParentId(parentId);
+                deliverAddRequest.setParentId(parentId);
             }
-            maternalDeliverModel.setParentId(parentId);
-            deliverAddRequest.setParentId(parentId);
         }
 
         //增加
@@ -275,8 +277,9 @@ public class MatDeliverFacade {
                     maternalDeliverModel.setBaby(updateBaby(deliverAddRequest, list, patients1.getLastMenses()));
                 }
             }
-
-            maternalDeliverModel.setHospitalId(hospitalId);
+            if (deliverAddRequest.getPatient() == null) {
+                maternalDeliverModel.setHospitalId(hospitalId);
+            }
             //做分娩的时候需要删除产筛数据
 
             sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null);
-- 
1.8.3.1