From b75b4e43f3e79846e3060b27cab67bffda0752a2 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 25 Aug 2017 15:50:43 +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 | 28 ++++++++++++++++------
 1 file changed, 21 insertions(+), 7 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 c32e572..aa62a0d 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
@@ -684,17 +684,20 @@ public class BabyEarFacade {
             if (historyJson.containsKey("yesOrNo")) {
                 int yesOrNo = historyJson.getIntValue("yesOrNo");
                 if (yesOrNo == 1) {
-                    historyStr.append("有、");
+                    historyStr.append("有(");
                     if (historyJson.containsKey("type")) {
                         String type = historyJson.getString("type");
                         if ("yinJiu".equals(type)) {
                             historyStr.append("饮酒、");
-                        } else if ("xiYan".equals(type)) {
+                        }
+                        if ("xiYan".equals(type)) {
                             historyStr.append("吸烟、");
-                        } else if ("xiDu".equals(type)) {
+                        }
+                        if ("xiDu".equals(type)) {
                             historyStr.append("吸毒");
                         }
                     }
+                    historyStr.append(")");
                 } else {
                     historyStr.append("无");
                 }
@@ -919,7 +922,7 @@ public class BabyEarFacade {
             if (historyJson.containsKey("yesOrNo")) {
                 int yesOrNo = historyJson.getIntValue("yesOrNo");
                 if (1 == yesOrNo) {
-                    historyStr.append("有、");
+                    historyStr.append("有(");
                 } else {
                     historyStr.append("无");
                 }
@@ -928,11 +931,14 @@ public class BabyEarFacade {
                 String type = historyJson.getString("type");
                 if ("yinJiu".equals(type)) {
                     historyStr.append("饮酒、");
-                } else if ("xiYan".equals(type)) {
+                }
+                if ("xiYan".equals(type)) {
                     historyStr.append("吸烟、");
-                } else if ("xiDu".equals(type)) {
+                }
+                if ("xiDu".equals(type)) {
                     historyStr.append("吸毒");
                 }
+                historyStr.append(")");
             }
             babyEarMotherView.setBadLifeHistoryType(historyStr.toString());
         }
@@ -1042,10 +1048,18 @@ public class BabyEarFacade {
             String parturitionType = CZFmTypeEnums.getTitle(babyPatientExtendEarBirth.getParturitionType());
             babyEarBirthView.setParturitionType(parturitionType);
         }
+        if(babyPatientExtendEarBirth.getAmnioticFluidType()!=null){
+            if(babyPatientExtendEarBirth.getAmnioticFluidType() == 1){ //1= I度 2=II度 3=III度
+                babyEarBirthView.setAmnioticFluid("I度");
+            }else if(babyPatientExtendEarBirth.getAmnioticFluidType() == 2){ //1= I度 2=II度 3=III度
+                babyEarBirthView.setAmnioticFluid("II度");
+            }else if(babyPatientExtendEarBirth.getAmnioticFluidType() == 2){ //1= I度 2=II度 3=III度
+                babyEarBirthView.setAmnioticFluid("III度");
+            }
+        }
         babyEarBirthView.setTireNumber(babyPatientExtendEarBirth.getTireNumber());
         babyEarBirthView.setBirthDefectDesc(babyPatientExtendEarBirth.getBirthDefectDesc());
         babyEarBirthView.setBirthInjuryPosition(babyPatientExtendEarBirth.getBirthInjuryPosition());
-        babyEarBirthView.setAmnioticFluid(babyPatientExtendEarBirth.getAmnioticFluidType() == null ? "" : babyPatientExtendEarBirth.getAmnioticFluidType() + "");
         String parturitType = "无";
         if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) {
             if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有
-- 
1.8.3.1