From 4b3a360408e0b59392d3b96deece4999bef3bba9 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Thu, 3 Sep 2020 10:29:39 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java  | 6 +++++-
 .../com/lyms/platform/operate/web/result/DiagnoseItemResult.java   | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java
index 9df588c..3a54f95 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnoseConfigFacde.java
@@ -230,7 +230,11 @@ public class DiagnoseConfigFacde {
                                 List<Map<String,String>> list = getRiskName(diagnose.getRiskIds());
                                 dr.setRiskIds(list);
                             }
-
+                            if (CollectionUtils.isNotEmpty(diagnose.getRiskFactorIds()))
+                            {
+                                List<Map<String,String>> list = getRiskName(diagnose.getRiskFactorIds());
+                                dr.setRiskFactorIds(list);
+                            }
                             itemModels.add(dr);
                         }
                     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java
index 5b8569d..da8c5c5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnoseItemResult.java
@@ -28,7 +28,7 @@ public class DiagnoseItemResult implements IBasicResultConvert<DiagnoseItemResul
     //畸形详情,在转换成MaternalDeliverModel.Baby判断使用
     private Map<String,Object> tejx;
     //母亲存在的高危因素
-    private List<String> riskFactorIds;
+    private List<Map<String, String>> riskFactorIds;
     //20200827新增儿童的，“高危儿详情项”
     private List<String> riskBabyInfoIds;
     @Override
@@ -41,7 +41,6 @@ public class DiagnoseItemResult implements IBasicResultConvert<DiagnoseItemResul
         setValueSix(model.getValueSix());
         setValueSeven(model.getValueSeven());
         setTejx(model.getTejx());
-        setRiskFactorIds(model.getRiskFactorIds());
         setRiskBabyInfoIds(model.getRiskBabyInfoIds());
         return this;
     }
@@ -54,11 +53,11 @@ public class DiagnoseItemResult implements IBasicResultConvert<DiagnoseItemResul
         this.tejx = tejx;
     }
 
-    public List <String> getRiskFactorIds() {
+    public List <Map <String, String>> getRiskFactorIds() {
         return riskFactorIds;
     }
 
-    public void setRiskFactorIds(List <String> riskFactorIds) {
+    public void setRiskFactorIds(List <Map <String, String>> riskFactorIds) {
         this.riskFactorIds = riskFactorIds;
     }
 
-- 
1.8.3.1