From f8502f91c7680c3caf5ad94aba6c0880f4a0d477 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 31 Aug 2017 00:07:54 +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 | 43 +++++-----------------
 1 file changed, 9 insertions(+), 34 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 de3c776..c7dc95a 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
@@ -300,25 +300,13 @@ public class BabyEarFacade {
                 babyModel.setBuildDoctor(null);
                 babyModel.setBuildDate(new Date());
                 newBabyId = babyService.addOneBaby(babyModel).getId();
-            }
 
-            BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
-            earQuery.setBabyPatientId(babyId);
-            // earQuery.setCreateHospitalId(hospitalId);
-            List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
-            BabyPatientExtendEar ear = null;
-            boolean isPass = false;
-            if (CollectionUtils.isNotEmpty(ears)) {
-                for (BabyPatientExtendEar er : ears) {
-                    if (hospitalId.equals(er.getCreateHospitalId())) {//相同
-                        isPass = true;
-                        break;
-                    } else {
-                        ear = er;
-                    }
-                }
-            }
-            if (!isPass) {
+
+                BabyPatientExtendEarQuery earQuery = new BabyPatientExtendEarQuery();
+                earQuery.setBabyPatientId(babyId);
+                // earQuery.setCreateHospitalId(hospitalId);
+                List<BabyPatientExtendEar> ears = babyPatientExtendEarService.queryBabyPatientExtendEar(earQuery);
+                BabyPatientExtendEar ear = ears.get(0);
                 //如果不相同转诊档案
                 if (!hospitalId.equals(ear.getCreateHospitalId())) {
                     ear.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -366,22 +354,9 @@ public class BabyEarFacade {
                         babyPatientExtendEarMotherService.addBabyPatientExtendEarMother(mother);
                     }
                 }
-            }
-
-            BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery();
-            query.setBabyPatientId(babyId);
-            List<BabyPatientExtendEarBaby> babyPatientExtendEarBabies = babyPatientExtendEarBabyService.queryBabyPatientExtendEarBaby(query);
-            isPass = false;
-            if (CollectionUtils.isNotEmpty(babyPatientExtendEarBabies)) {
-                for (BabyPatientExtendEarBaby earBabys : babyPatientExtendEarBabies) {
-                    if (hospitalId.equals(earBabys.getHospitalId())) {//相同
-                        isPass = true;
-                        break;
-                    }
-                }
-            }
 
-            if (!isPass) {
+                BabyPatientExtendEarBabyQuery query = new BabyPatientExtendEarBabyQuery();
+                query.setBabyPatientId(babyId);
                 BabyPatientExtendEarBaby babyPatientExtendEarBaby = new BabyPatientExtendEarBaby();
                 babyModel = babyService.getOneBabyById(newBabyId);
                 babyPatientExtendEarBaby.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -404,8 +379,8 @@ public class BabyEarFacade {
                 babyPatientExtendEarBaby.setBabyEarId(ear.getId());
                 babyPatientExtendEarBaby.setPersonId(babyModel.getPid());
                 babyPatientExtendEarBabyService.addBabyPatientExtendEarBaby(babyPatientExtendEarBaby);
+                return true;
             }
-            return true;
         }
         return true;
     }
-- 
1.8.3.1