From 2ce3bb67d4ffa4b356f214a1d800c9a84d8f82c8 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 23 Aug 2017 09:51:30 +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   | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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 2cba3a6..8998ba7 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
@@ -485,6 +485,19 @@ public class BabyEarFacade {
             List<BabyPatientExtendEarMother> babyPatientExtendEarMothers = babyPatientExtendEarMotherService.queryBabyPatientExtendEarMother(babyPatientExtendEarMotherQuery);
             if (CollectionUtils.isNotEmpty(babyPatientExtendEarMothers)) {
                 babyEarResult.setPatientExtendEarMother(babyPatientExtendEarMothers.get(0));
+            }else{
+                BabyPatientExtendEarMother babyPatientExtendEarMother = new BabyPatientExtendEarMother();
+                babyPatientExtendEarMother.setAbortionHistoryType("{}");
+                babyPatientExtendEarMother.setViralInfectionHistoryType("{}");
+                babyPatientExtendEarMother.setGenitalInfectionHistoryType("{}");
+                babyPatientExtendEarMother.setDrugAppName("{}");
+                babyPatientExtendEarMother.setHarmfulSubstanceType("{}");
+                babyPatientExtendEarMother.setRadiationHistoryType("{}");
+                babyPatientExtendEarMother.setBadLifeHistoryType("{}");
+                babyPatientExtendEarMother.setMedicalHistoryType("{}");
+                babyPatientExtendEarMother.setBnormalPregnancyHistoryType("{}");
+                babyPatientExtendEarMother.setBadLifeHistoryType("{}");
+                babyEarResult.setPatientExtendEarMother(babyPatientExtendEarMother);
             }
 
             //查詢家庭信息
@@ -494,6 +507,11 @@ public class BabyEarFacade {
             List<BabyPatientExtendEarFamily> babyPatientExtendEarFamilies = babyPatientExtendEarFamilyService.queryBabyPatientExtendEarFamily(babyPatientExtendEarFamilyQuery);
             if (CollectionUtils.isNotEmpty(babyPatientExtendEarFamilies)) {
                 babyEarResult.setPatientExtendEarFamily(babyPatientExtendEarFamilies.get(0));
+            }else{
+                BabyPatientExtendEarFamily family = new BabyPatientExtendEarFamily();
+                family.setBadLifeHistory("{}");
+                family.setDeatRelationship("{}");
+                babyEarResult.setPatientExtendEarFamily(family);
             }
 
             BabyPatientExtendEarBirthQuery babyPatientExtendEarBirthQuery = new BabyPatientExtendEarBirthQuery();
@@ -502,6 +520,8 @@ public class BabyEarFacade {
 
             if (CollectionUtils.isNotEmpty(babyPatientExtendEarBirths)) {
                 babyEarResult.setBabyBirth(babyPatientExtendEarBirths.get(0));
+            }else{
+                babyEarResult.setBabyBirth(new BabyPatientExtendEarBirth());
             }
             objectResponse.setData(babyEarResult);
             objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
-- 
1.8.3.1