diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
index 93a0aab..a541df9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
@@ -3,15 +3,13 @@ package com.lyms.platform.operate.web.facade;
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.RenShenJieJuEnums;
+import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.utils.BeanUtils;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest;
 import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest;
-import com.lyms.platform.operate.web.result.DischargeAbstractBabyQueryModel;
-import com.lyms.platform.operate.web.result.DischargeAbstractMotherQueryModel;
-import com.lyms.platform.operate.web.result.DischargeAbstractQueryResult;
-import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult;
+import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.pojo.DischargeAbstractBabyModel;
 import com.lyms.platform.pojo.DischargeAbstractMotherModel;
 import com.lyms.platform.pojo.Patients;
@@ -119,7 +117,8 @@ public class DischargeAbstractFacade {
         dischargeAbstractQueryResult.setUserName(patients.getUsername());
         dischargeAbstractQueryResult.setAge(DateUtil.getAge(patients.getBirth(), new Date()));
         dischargeAbstractQueryResult.setFmDate(DateUtil.getyyyy_MM_dd(patients.getFmDate()));
-        dischargeAbstractQueryResult.setRiskFactor(getRiskFactor(patients.getRiskFactorId()));
+        List<RiskFactoryResultModel> riskFactoryResultModelList = getRiskFactory(patients.getRiskFactorId());
+        dischargeAbstractQueryResult.setRiskFactoryResultModelList(riskFactoryResultModelList);
         dischargeAbstractQueryResult.setGestationalWeeks(PredictedStatisticsFacade.getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus()));
         dischargeAbstractQueryResult.setDueDate(new SimpleDateFormat("yyyy年MM月dd日").format(patients.getDueDate()));
 
@@ -173,22 +172,34 @@ public class DischargeAbstractFacade {
         return dischargeAbstractQueryResult;
     }
 
-    private String getRiskFactor(List<String> list) {
-        String riskFactor = "";
-        if (list != null && list.size() > 0) {
-            for (String s : list) {
+    private List<RiskFactoryResultModel> getRiskFactory(List<String> riskFactorIdList) {
+
+        List<RiskFactoryResultModel> riskFactoryResultModelList = new ArrayList<>();
+
+        if (riskFactorIdList != null && riskFactorIdList.size() > 0) {
+            for (String riskFactoryId : riskFactorIdList) {
+                RiskFactoryResultModel riskFactoryResultModel = new RiskFactoryResultModel();
                 try {
-                    riskFactor += basicConfigService.getOneBasicConfigById(s).getName();
-                    riskFactor += ",";
+                    String name = basicConfigService.getOneBasicConfigById(riskFactoryId).getName();
+                    boolean flag = true;
+                    if (riskFactoryResultModelList.size() > 0) {
+                        for (RiskFactoryResultModel factoryResultModel : riskFactoryResultModelList) {
+                            if (factoryResultModel.getName().equals(name)) {
+                                flag = false;
+                            }
+                        }
+                    }
+                    if (flag) {
+                        riskFactoryResultModel.setName(name);
+                        riskFactoryResultModel.setColor("risk_" + RiskDefaultTypeEnum.getColor(name));
+                        riskFactoryResultModelList.add(riskFactoryResultModel);
+                    }
                 } catch (Exception e) {
-                    riskFactor += "";
+                    // 什么都不干
                 }
             }
         }
-        if (riskFactor.length() > 0) {
-            return riskFactor.substring(0, riskFactor.length() - 1);
-        }
-        return riskFactor;
+        return riskFactoryResultModelList;
     }
 
 }