From 91d446820eadc61bb9537deedb4e7ba223d8a3c7 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 25 Jan 2018 16:43:48 +0800
Subject: [PATCH] 1

---
 .../operate/web/controller/TestController.java     | 11 ++---------
 .../operate/web/facade/ApplyOrderFacade.java       | 23 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index a4965ef..62bf170 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -15,6 +15,7 @@ import com.lyms.platform.common.utils.ExceptionUtils;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
 import com.lyms.platform.operate.web.facade.BabyCheckFacade;
+import com.lyms.platform.operate.web.facade.HosptialHighRiskFacade;
 import com.lyms.platform.operate.web.facade.SieveFacade;
 import com.lyms.platform.operate.web.result.HighScoreResult;
 import com.lyms.platform.operate.web.service.IBloodPressureService;
@@ -1614,15 +1615,7 @@ public class TestController {
                                         if (applyOrderService.queryCount(applyOrderQuery) > 0) {
                                             ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel();
                                             referralApplyOrderModel.setrRisk(Arrays.asList(commonService.resloveFactor(loa.getRiskFactorId()).split(",")));
-                                            List lsit = new ArrayList();
-                                            List<Map> list = commonService.findRiskLevel(loa.getRiskLevelId());
-                                            for (Map<String, String> map : list) {
-                                                String name = map.get("name");
-                                                if (!lsit.contains(name)) {
-                                                    lsit.add(name);
-                                                }
-                                            }
-                                            referralApplyOrderModel.setrLevel(lsit);
+                                            referralApplyOrderModel.setrLevel(StringUtils.isNotEmpty(loa.getRiskLevelId())&&!"[]".equals(loa.getRiskLevelId())?JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class):Collections.emptyList());
                                             applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel);
                                         }
                                     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index 4d25036..978f674 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -7,9 +7,7 @@ import com.lyms.platform.common.exception.BusinessException;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.common.utils.ExcelUtil;
-import com.lyms.platform.common.utils.SystemConfig;
+import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest;
 import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest;
 import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest;
@@ -818,7 +816,7 @@ public class ApplyOrderFacade {
                 applyOrderResult.setScore(orderModel.getScore());
 
 
-                List rLevel = new ArrayList();
+                /*
                 if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) {
                     for (String str : orderModel.getrLevel()) {
                         Map map1 = new HashMap();
@@ -830,6 +828,23 @@ public class ApplyOrderFacade {
                         map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(str));
                         rLevel.add(map1);
                     }
+                }*/
+                List rLevel = new ArrayList();
+                if (CollectionUtils.isNotEmpty(orderModel.getrLevel())) {
+                    try {
+                        List<String> list = orderModel.getrLevel();
+                        for (String str : list) {
+                            BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
+                            if (null != basicConfig) {
+                                Map map = new HashMap();
+                                basicConfig.replenRisk(map);
+                                rLevel.add(map);
+                            }
+                        }
+                    } catch (Exception e) {
+                        ExceptionUtils.catchException(e, "patients.getRiskLevelId error.");
+                    }
+                    applyOrderResult.setrLevel(HighScoreResult.filter(rLevel));
                 }
                 applyOrderResult.setrLevel(rLevel);
                 Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
-- 
1.8.3.1