From 890003ac53ec663e56b5cc70a0165c139d88bd21 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 30 Aug 2017 11:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/BabyEarFacade.java | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 31a4403..00c98bd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -100,16 +100,6 @@ public class BabyEarFacade {
 
     //处理儿童person信息
     private PersonModel handBabyPerson(BabyModel baby) {
-        //跟距母親的證件號查詢兒童person信息
-        PersonModelQuery personModelQuery = new PersonModelQuery();
-        personModelQuery.setYn(YnEnums.YES.getId());
-        personModelQuery.setCardNo(baby.getMcertNo());
-        personModelQuery.setType(2);
-        personModelQuery.setName(baby.getName());
-        List<PersonModel> babyP = personService.queryPersons(personModelQuery);
-        if (CollectionUtils.isNotEmpty(babyP)) {
-            return babyP.get(0);
-        }
         PersonModel babyPerson = new PersonModel();
         babyPerson.setName(baby.getName());
         babyPerson.setBirth(baby.getBirth());
@@ -379,8 +369,28 @@ public class BabyEarFacade {
         String hId = autoMatchFacade.getHospitalId(userId);
 
         if (null != baby) {
-            //处理儿童person信息
-            String pid = handBabyPerson(baby).getId();
+            String pid = null;
+            if(StringUtils.isNotEmpty(baby.getId())){//修改儿童信息
+                BabyModel babyModel = babyService.getOneBabyById(baby.getId());
+                //跟距母親的證件號查詢兒童person信息
+                PersonModelQuery personModelQuery = new PersonModelQuery();
+                personModelQuery.setId(babyModel.getPid());
+                List<PersonModel> babyP = personService.queryPersons(personModelQuery);
+                if (CollectionUtils.isNotEmpty(babyP)) {
+                    PersonModel personModel = babyP.get(0);
+                    personModel.setName(baby.getName());
+                    personModel.setBirth(baby.getBirth());
+                    personModel.setPhone(baby.getName());
+                    personModel.setCardNo(baby.getMcertNo());
+                    personModel.setModified(new Date());
+                    pid =  personModel.getId();
+                    personService.updatePerson(personModel,personModel.getId());
+                }
+            }else{//新增儿童信息
+                //处理儿童person信息
+                pid = handBabyPerson(baby).getId();
+            }
+
             babyEarAddResult.setpId(pid);
             String babyPatientId = "";
 
-- 
1.8.3.1