diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java
index ab394a0..40567d6 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java
@@ -25,9 +25,6 @@ public enum HighRiskEnum {
     private String name;
 
     public static String getTitle(int id){
-        if (id==0){
-            return "";
-        }
         for (HighRiskEnum cfEnums:HighRiskEnum.values()){
             if (id == cfEnums.getId()){
                 return cfEnums.getName();
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 0df0115..c3ecbef 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
@@ -792,6 +792,8 @@ public class BabyEarFacade {
                     hfString = historyStr.toString();
                 }
                 babyEarFamilyView.setBadLifeHistory(hfString);
+            }else{
+                babyEarFamilyView.setBadLifeHistory("无");
             }
         }
 
@@ -886,7 +888,12 @@ public class BabyEarFacade {
             } else {
                 hfString = historyStr.toString();
             }
-            babyEarMotherView.setViralInfectionHistoryType(hfString);
+
+            if(StringUtils.isNotEmpty(hfString)){
+                babyEarMotherView.setViralInfectionHistoryType(hfString);
+            }else{
+                babyEarMotherView.setViralInfectionHistoryType("无");
+            }
         }
 
 
@@ -951,7 +958,12 @@ public class BabyEarFacade {
             } else {
                 hfString = historyStr.toString();
             }
-            babyEarMotherView.setGenitalInfectionHistoryType(hfString);
+
+            if(StringUtils.isNotEmpty(hfString)){
+                babyEarMotherView.setGenitalInfectionHistoryType(hfString);
+            }else{
+                babyEarMotherView.setGenitalInfectionHistoryType("无");
+            }
         }
 
 
@@ -969,6 +981,8 @@ public class BabyEarFacade {
                 } else {
                     historyStr.append("无");
                 }
+            }else{
+                historyStr.append("无");
             }
             babyEarMotherView.setRadiationHistoryType(historyStr.toString());
         }
@@ -1055,6 +1069,8 @@ public class BabyEarFacade {
                 hfString = historyStr.toString();
             }
             babyEarMotherView.setBadLifeHistoryType(hfString);
+        }else{
+            babyEarMotherView.setBadLifeHistoryType("无");
         }
 
         if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getMedicalHistoryType())) {
@@ -1173,7 +1189,7 @@ public class BabyEarFacade {
      */
     public BabyEarBirthView convertToBabyEarBirthView(BabyPatientExtendEarBirth babyPatientExtendEarBirth) {
         BabyEarBirthView babyEarBirthView = new BabyEarBirthView();
-        babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : babyPatientExtendEarBirth.getFetuNumber() + "次");
+        babyEarBirthView.setFetuNumber(babyPatientExtendEarBirth.getFetuNumber() == null ? "" : "第"+babyPatientExtendEarBirth.getFetuNumber() + "胎");
         babyEarBirthView.setProductNumber(babyPatientExtendEarBirth.getProductNumber() == null ? "" : babyPatientExtendEarBirth.getProductNumber() + "次");
         babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
         babyEarBirthView.setBirthWeight(babyPatientExtendEarBirth.getBirthWeight());
@@ -1190,9 +1206,30 @@ public class BabyEarFacade {
                 babyEarBirthView.setAmnioticFluid("III度");
             }
         }
+
         babyEarBirthView.setTireNumber(babyPatientExtendEarBirth.getTireNumber());
-        babyEarBirthView.setBirthDefectDesc(babyPatientExtendEarBirth.getBirthDefectDesc());
-        babyEarBirthView.setBirthInjuryPosition(babyPatientExtendEarBirth.getBirthInjuryPosition());
+        String birthDefectType = "无";
+        if(babyPatientExtendEarBirth.getBirthDefectType()!=null){
+            if (babyPatientExtendEarBirth.getBirthDefectType() == 1) {//有
+                birthDefectType = "有";
+                if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){
+                    birthDefectType = "有,"+babyPatientExtendEarBirth.getBirthDefectDesc();
+                }
+            }
+        }
+        babyEarBirthView.setBirthDefectDesc(birthDefectType);
+
+        String birthInjuryType = "无";
+        if(babyPatientExtendEarBirth.getBirthInjuryType()!=null){
+            if (babyPatientExtendEarBirth.getBirthInjuryType() == 1) {//有
+                birthInjuryType = "有";
+                if(StringUtils.isNotEmpty(babyPatientExtendEarBirth.getBirthDefectDesc())){
+                    birthInjuryType = "有,"+babyPatientExtendEarBirth.getBirthInjuryPosition();
+                }
+            }
+        }
+        babyEarBirthView.setBirthInjuryPosition(birthInjuryType);
+
         String parturitType = "无";
         if (babyPatientExtendEarBirth.getAbnormalParturitionType() != null) {
             if (babyPatientExtendEarBirth.getAbnormalParturitionType() == 1) {//有