diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
index 86988f5..f31b5fd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java
@@ -140,7 +140,7 @@ public class HearDiagnManageController extends BaseController {
             fuMap.put("id", fu.getId());
             fuMap.put("name", "随访");
             fuMap.put("type", "3");
-            if (fu.getIfclose() == 1) {//0-未结案，1-结案
+            if (fu.getIfclose()!=null&&fu.getIfclose() == 1) {//0-未结案，1-结案
                 fuMap.put("close", "结案");
             }
             fuMap.put("time", DateUtil.getyyyy_MM_dd(fu.getFollowTime()));
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 eb62399..6b2fb69 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
@@ -731,30 +731,35 @@ public class BabyEarFacade {
             if (historyJson.containsKey("yesOrNo")) {
                 int yesOrNo = historyJson.getIntValue("yesOrNo");
                 if (yesOrNo == 1) {
-                    historyStr.append("有(");
+                    historyStr.append("有,");
                     if (historyJson.containsKey("yinJiu")) {
                         boolean yinJiu = historyJson.getBoolean("yinJiu");
                         if (yinJiu) {
-                            historyStr.append("饮酒、");
+                            historyStr.append("饮酒,");
                         }
                     }
                     if (historyJson.containsKey("xiYan")) {
                         boolean xiYan = historyJson.getBoolean("xiYan");
                         if (xiYan) {
-                            historyStr.append("吸烟、");
+                            historyStr.append("吸烟,");
                         }
                     }
                     if (historyJson.containsKey("xiDu")) {
                         boolean xiDu = historyJson.getBoolean("xiDu");
                         if (xiDu) {
-                            historyStr.append("吸毒、");
+                            historyStr.append("吸毒,");
                         }
                     }
-                    historyStr.append(")");
                 } else {
                     historyStr.append("无");
                 }
-                babyEarFamilyView.setBadLifeHistory(historyStr.toString());
+                String hfString = null;
+                if (historyStr.toString().endsWith(",")) {
+                    hfString = historyStr.substring(0, historyStr.length() - 1);
+                }else{
+                    hfString = historyStr.toString();
+                }
+                babyEarFamilyView.setBadLifeHistory(hfString);
             }
         }
 
@@ -987,7 +992,7 @@ public class BabyEarFacade {
             if (historyJson.containsKey("yesOrNo")) {
                 int yesOrNo = historyJson.getIntValue("yesOrNo");
                 if (1 == yesOrNo) {
-                    historyStr.append("有(");
+                    historyStr.append("有,");
                 } else {
                     historyStr.append("无");
                 }
@@ -995,25 +1000,29 @@ public class BabyEarFacade {
             if (historyJson.containsKey("yinJiu")) {
                 boolean yinJiu = historyJson.getBoolean("yinJiu");
                 if (yinJiu) {
-                    historyStr.append("饮酒、");
+                    historyStr.append("饮酒,");
                 }
             }
             if (historyJson.containsKey("xiYan")) {
                 boolean xiYan = historyJson.getBoolean("xiYan");
                 if (xiYan) {
-                    historyStr.append("吸烟、");
+                    historyStr.append("吸烟,");
                 }
             }
             if (historyJson.containsKey("xiDu")) {
                 boolean xiDu = historyJson.getBoolean("xiDu");
                 if (xiDu) {
-                    historyStr.append("吸毒、");
+                    historyStr.append("吸毒,");
                 }
             }
-            if(StringUtils.isNotEmpty(historyStr.toString())){
-                historyStr.append(")");
+
+            String hfString = null;
+            if (historyStr.toString().endsWith(",")) {
+                hfString = historyStr.substring(0, historyStr.length() - 1);
+            } else {
+                hfString = historyStr.toString();
             }
-            babyEarMotherView.setBadLifeHistoryType(historyStr.toString());
+            babyEarMotherView.setBadLifeHistoryType(hfString);
         }
 
         if (StringUtils.isNotEmpty(babyPatientExtendEarMother.getMedicalHistoryType())) {