From 85b8eef07db02b0387c4ef614212c11c0eb9cf4e Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 27 Mar 2018 16:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/biz/service/PatientsService.java   | 14 ++++++++------
 .../operate/web/facade/AntenatalExaminationFacade.java   | 16 ++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index 47d548c..ddd9e8a 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -408,12 +408,14 @@ public class PatientsService {
      * @param patients
      */
     public void validata(Patients patients) {
-        //修改产筛s
-        updateSieve(patients);
-        //修改转诊
-        updateRefer(patients);
-        //修改产检管理信息
-        updateExRecord(patients);
+        if(patients!=null){
+            //修改产筛s
+            updateSieve(patients);
+            //修改转诊
+            updateRefer(patients);
+            //修改产检管理信息
+            updateExRecord(patients);
+        }
     }
 
     /**
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 551cc49..decf6d0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -457,17 +457,13 @@ public class AntenatalExaminationFacade {
         //表示区域的
         if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
             String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId, 1);
-            if (StringUtils.isEmpty(parentId)) {
-                //打印日志
+            if (StringUtils.isNotEmpty(parentId)) {
+                antExChuModel.setParentId(parentId);
+                excAddRequest.setParentId(parentId);
+                Patients p = patientsService.findOnePatientById(parentId);
+                //加入产筛
+                patientsService.validata(p);
             }
-            antExChuModel.setParentId(parentId);
-            excAddRequest.setParentId(parentId);
-
-            Patients p = patientsService.findOnePatientById(parentId);
-
-            //加入产筛
-            patientsService.validata(p);
-
         }
         antExChuModel.setOperator(userId);
         antExChuModel.setHospitalId(hospitalId);
-- 
1.8.3.1