From 57deb29f38c228528399d5c3ca24bf515b14c4e8 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 13 Dec 2017 09:42:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/PatientServiceSysFacade.java        | 27 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
index b76a20b..f76f79e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.biz.service.BabyService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.PatientSerEnums;
@@ -8,6 +9,7 @@ import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.permission.model.PatientService;
 import com.lyms.platform.permission.model.PatientServiceQuery;
 import com.lyms.platform.permission.service.PatientServiceService;
+import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.Patients;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -30,6 +32,8 @@ public class PatientServiceSysFacade implements SysBaseFacade {
     private PatientServiceService patientServiceService;
     @Autowired
     private PatientsService patientsService;
+    @Autowired
+    private BabyService babyService;
 
     @Override
     public BaseResponse execute(String synForm) {
@@ -44,12 +48,23 @@ public class PatientServiceSysFacade implements SysBaseFacade {
                 return baseResponse;
             }
 
-            //查询档案信息
-            Patients patients = patientsService.findOnePatientById(patientService.getParentid());
-            if(patients!=null){
-                //如果有数据源id，取主档案id
-                if(StringUtils.isNotEmpty(patients.getSource())){
-                    patientService.setParentid(patients.getSource());
+            if (patientService.getPerType() != null && patientService.getPerType() == 2) {//儿童
+                BabyModel babyModel = babyService.getOneBabyById(patientService.getParentid());
+                if (babyModel != null) {
+                    patientService.setPid(babyModel.getPid());
+                    //如果有数据源id，取主档案id
+                    if (StringUtils.isNotEmpty(babyModel.getSource())) {
+                        patientService.setParentid(babyModel.getSource());
+                    }
+                }
+            } else {
+                Patients patients = patientsService.findOnePatientById(patientService.getParentid());
+                if (patients != null) {
+                    patientService.setPid(patients.getPid());
+                    //如果有数据源id，取主档案id
+                    if (StringUtils.isNotEmpty(patients.getSource())) {
+                        patientService.setParentid(patients.getSource());
+                    }
                 }
             }
 
-- 
1.8.3.1