diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java
index d6eae30..20e6cfc 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java
@@ -59,11 +59,11 @@ public class BabyKindergartenCheckModel extends BaseModel {
     private String bjId;
 
     // 既往史 "yeaOrNo", "yes" "no"  ,内容：content
-    private Map pastHistory;
+    private Map<String,Object> pastHistory;
     //传染病史
-    private Map infectDiseases;
+    private Map<String,Object> infectDiseases;
     //过敏史
-    private Map ywgmHistory;
+    private Map<String,Object> ywgmHistory;
     //家长确认签字
     private String qurenqianzi;
 
@@ -280,27 +280,27 @@ public class BabyKindergartenCheckModel extends BaseModel {
         this.bjId = bjId;
     }
 
-    public Map getPastHistory() {
+    public Map <String, Object> getPastHistory() {
         return pastHistory;
     }
 
-    public void setPastHistory(Map pastHistory) {
+    public void setPastHistory(Map <String, Object> pastHistory) {
         this.pastHistory = pastHistory;
     }
 
-    public Map getInfectDiseases() {
+    public Map <String, Object> getInfectDiseases() {
         return infectDiseases;
     }
 
-    public void setInfectDiseases(Map infectDiseases) {
+    public void setInfectDiseases(Map <String, Object> infectDiseases) {
         this.infectDiseases = infectDiseases;
     }
 
-    public Map getYwgmHistory() {
+    public Map <String, Object> getYwgmHistory() {
         return ywgmHistory;
     }
 
-    public void setYwgmHistory(Map ywgmHistory) {
+    public void setYwgmHistory(Map <String, Object> ywgmHistory) {
         this.ywgmHistory = ywgmHistory;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
index f9ec361..4f4cb03 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
@@ -15,6 +15,7 @@ import com.lyms.platform.operate.web.result.BabyHighRiskBabyResult;
 import com.lyms.platform.operate.web.result.BabyKindergartenCheckResult;
 import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
+import com.lyms.platform.operate.web.utils.FunvCommonUtil;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
@@ -242,6 +243,37 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl {
             BabyKindergartenCheckModel babyKindergartenCheckModel = babyKindergartenCheckService.queryById(id);
             BabyKindergartenCheckResult babyKindergartenCheckResult = new BabyKindergartenCheckResult();
             babyKindergartenCheckResult.convertToResult(babyKindergartenCheckModel);
+            Map map = babyKindergartenCheckModel.getPastHistory();
+            Map mm = new HashMap();
+            String mapStr = "";
+            if(map!=null){
+                boolean dx = map.get("dx") == null ? false : (boolean) map.get("dx");
+                if (dx) {
+                    mapStr += " 癫痫,";
+                }
+                boolean xtxxz = map.get("xtxxz") == null ? false : (boolean) map.get("xtxxz");
+                if (xtxxz) {
+                    mapStr += " 先天性心脏病,";
+                }
+                boolean gr = map.get("gr") == null ? false : (boolean) map.get("gr");
+                if (gr) {
+                    mapStr += " 高热,";
+                }
+                boolean xc = map.get("xc") == null ? false : (boolean) map.get("xc");
+                if (xc) {
+                    mapStr += " 哮喘,";
+                }
+                boolean qt = map.get("qt") == null ? false : (boolean) map.get("qt");
+                if (qt) {
+                    mapStr += " 其它,";
+                    if (map.containsKey("qtc")) {
+                        mapStr += map.get("qtc")+",";
+                    }
+                }
+                mapStr = FunvCommonUtil.spitd(mapStr);
+                mm.put("pastHistory", mapStr);
+            }
+            babyKindergartenCheckResult.setPastHistory(mm);
 
             if (StringUtils.isNotEmpty(babyKindergartenCheckModel.getCheckDoctor())) {
                 Users users = usersService.getUsers(NumberUtils.toInt(babyKindergartenCheckModel.getCheckDoctor()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java
index 2a070ce..3cb5ede 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java
@@ -62,11 +62,11 @@ public class BabyKindergartenCheckRequest {
     private Map bjIdMap;//不传
 
     // 既往史 "yeaOrNo", "yes" "no"  , xtxxz:true 先天性心脏病，dx:true  癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容
-    private Map pastHistory;
+    private Map<String,Object> pastHistory;
     //传染病史
-    private Map infectDiseases;
+    private Map<String,Object> infectDiseases;
     //过敏史
-    private Map ywgmHistory;
+    private Map<String,Object> ywgmHistory;
     //家长确认签字
     private String qurenqianzi;
 
@@ -307,27 +307,28 @@ public class BabyKindergartenCheckRequest {
         this.bjId = bjId;
     }
 
-    public Map getPastHistory() {
+
+    public Map <String, Object> getPastHistory() {
         return pastHistory;
     }
 
-    public void setPastHistory(Map pastHistory) {
+    public void setPastHistory(Map <String, Object> pastHistory) {
         this.pastHistory = pastHistory;
     }
 
-    public Map getInfectDiseases() {
+    public Map <String, Object> getInfectDiseases() {
         return infectDiseases;
     }
 
-    public void setInfectDiseases(Map infectDiseases) {
+    public void setInfectDiseases(Map <String, Object> infectDiseases) {
         this.infectDiseases = infectDiseases;
     }
 
-    public Map getYwgmHistory() {
+    public Map <String, Object> getYwgmHistory() {
         return ywgmHistory;
     }
 
-    public void setYwgmHistory(Map ywgmHistory) {
+    public void setYwgmHistory(Map <String, Object> ywgmHistory) {
         this.ywgmHistory = ywgmHistory;
     }