diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index be5a190..d18dfb0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -115,13 +115,13 @@ public class AntenatalExaminationFacade {
         patientsQuery.setCardNo(exListQueryRequest.getCardNo());
         patientsQuery.setYn(YnEnums.YES.getId());
         patientsQuery.setPhone(exListQueryRequest.getPhone());
-        AntexListResult antexListResult=new AntexListResult();
+        AntexListResult antexListResult = new AntexListResult();
         //获取所有的建档记录
         List<Patients> list = patientsService.queryPatient(patientsQuery);
-        List  listDate = new ArrayList();
+        List listDate = new ArrayList();
         int i = 0;
         if (CollectionUtils.isNotEmpty(list)) {
-            antexListResult.convertToResult(null,list.get(0),null);
+            antexListResult.convertToResult(null, list.get(0), null);
             for (Patients patients : list) {
                 List<AntData> data = new ArrayList<>();
                 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
@@ -173,12 +173,12 @@ public class AntenatalExaminationFacade {
                 i++;
                 //分娩记录
                 if (CollectionUtils.isNotEmpty(modelList)) {
-                    data.add(new AntData(modelList.get(0),patients.getLastMenses()));
+                    data.add(new AntData(modelList.get(0), patients.getLastMenses()));
                 }
                 //产后复查记录
-                List<PostReviewModel> reviewModels=postReviewService.findWithList(postReviewQuery);
-                if(CollectionUtils.isNotEmpty(reviewModels)){
-                    for(PostReviewModel postReviewModel:reviewModels){
+                List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
+                if (CollectionUtils.isNotEmpty(reviewModels)) {
+                    for (PostReviewModel postReviewModel : reviewModels) {
                         data.add(new AntData(postReviewModel));
                     }
                 }
@@ -318,7 +318,12 @@ public class AntenatalExaminationFacade {
             antenatalExaminationResult.convertToResult(examinationModel);
             try {
                 List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class);
-                antenatalExaminationResult.setRiskFactor(list1);
+                antenatalExaminationResult.setRiskFactor(queryRisk(list1));
+            } catch (Exception e) {
+            }
+            try {
+                List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class);
+                antenatalExaminationResult.setDiagnosis(queryRisk(list));
             } catch (Exception e) {
             }
             object = antenatalExaminationResult;
@@ -334,12 +339,44 @@ public class AntenatalExaminationFacade {
                 antExChuModel = antExChuModels.get(0);
             }
             antexChuResult.convertToResult(antExChuModel);
+            try {
+                List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class);
+                antexChuResult.setDiagnosis(queryRisk(list));
+            } catch (Exception e) {
+            }
+            try {
+                List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
+                antexChuResult.setHighrisk(queryRisk(list1));
+            } catch (Exception e) {
+
+            }
             object = antexChuResult;
         }
 
         return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
+    private List queryRisk(List<String> id) {
+        BasicConfigQuery
+                basicConfigQuery = new BasicConfigQuery();
+        List data = new ArrayList();
+        if (CollectionUtils.isNotEmpty(id)) {
+            for (String i : id) {
+                basicConfigQuery.setId(i);
+                List<BasicConfig> basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery);
+                if (CollectionUtils.isNotEmpty(basicConfigs)) {
+                    for (BasicConfig basicConfig : basicConfigs) {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("id", basicConfig.getId());
+                        map.put("name", basicConfig.getName());
+                        data.add(map);
+                    }
+                }
+            }
+        }
+        return data;
+    }
+
     public BaseResponse getEnums() {
         Map<String, Object> map = new HashMap<>();
         map.put("getFetPosition", getFetPosition());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index a753757..b36d38a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -54,7 +54,7 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     //其他高危
     private Map otherRisk;
     //诊断
-    private String diagnosis;
+    private List diagnosis;
     //分类
     private String type;
     //异常
@@ -72,7 +72,6 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
 
     @Override
     public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
-        setDiagnosis(destModel.getDiagnosis());
         setEdema(destModel.getEdema());
         setParentId(destModel.getParentId());
         setNextCheckDate(destModel.getNextCheckDate());
@@ -179,11 +178,11 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
         this.currentDueDate = currentDueDate;
     }
 
-    public String getDiagnosis() {
+    public List getDiagnosis() {
         return diagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
+    public void setDiagnosis(List diagnosis) {
         this.diagnosis = diagnosis;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index eb0f969..030e4ef 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -123,7 +123,7 @@ public class AntexChuResult {
     // 其他高危
     private Map otherHighRisk;
     // 诊断
-    private String diagnosis;
+    private List diagnosis;
     //处理意见
     private String treatOpinion;
     //指导意见
@@ -346,12 +346,11 @@ public class AntexChuResult {
         this.chgOther = chgOther;
     }
 
-
-    public String getDiagnosis() {
+    public List getDiagnosis() {
         return diagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
+    public void setDiagnosis(List diagnosis) {
         this.diagnosis = diagnosis;
     }
 
@@ -869,7 +868,7 @@ public class AntexChuResult {
             setPlacentas(antExChuModel.getPlacentas());
             setHighriskSocre(antExChuModel.getHighriskSocre());
             setOtherHighRisk(JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class));
-            setDiagnosis(antExChuModel.getDiagnosis());
+//            setDiagnosis(antExChuModel.getDiagnosis());
             setTreatOpinion(antExChuModel.getTreatOpinion());
             setDirOpinion(antExChuModel.getDirOpinion());
             setProdDoctor(antExChuModel.getProdDoctor());