From 3526eeb36062fed57f91993d37b3678496464e38 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 6 Sep 2016 11:29:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ApplyOrderFacade.java   | 11 ++++++-----
 .../platform/operate/web/result/HighScoreResult.java    | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

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 889b6c1..34e770f 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
@@ -121,13 +121,14 @@ public class ApplyOrderFacade {
                 referralApplyOrderModel.setrRisk(highScoreResult.gethighRiskList());
                 referralApplyOrderModel.setScore(highScoreResult.getScore());
                 List  lsit =  new ArrayList();
-                for(String str : highScoreResult.getLevelId()){
-                    BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
-                    if(null!=basicConfig &&!lsit.contains(basicConfig.getName())){
-                        lsit.add(basicConfig.getName());
+               List<Map> list = highScoreResult.filter(highScoreResult.getLevel());
+                for(Map<String,String> map :list){
+                    String name =  map.get("name");
+                    if(!lsit.contains(name)){
+                        lsit.add(name);
                     }
                 }
-                referralApplyOrderModel.setrLevel(highScoreResult.filter(lsit));
+                referralApplyOrderModel.setrLevel(lsit);
 //                referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh());
                 referralApplyOrderModel.setPid(patients.getPid());
                 referralApplyOrderModel.setDueWeek(new Date());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
index 8f01e4c..7b6733c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
@@ -131,6 +131,23 @@ public class HighScoreResult {
         return stringBuilder.toString();
     }
 
+    public String getLevelStr(List levelList) {
+        StringBuilder stringBuilder = new StringBuilder();
+        if (null == levelList) {
+            return "";
+        }
+        for (int i1 = 0; i1 < levelList.size(); i1++) {
+            java.util.Map<String, String> map = (java.util.Map<String, String>) levelList.get(i1);
+            String name = map.get("name");
+            if (stringBuilder.indexOf(name) == -1) {
+                stringBuilder.append(map.get("name")).append(", ");
+            }
+        }
+        if (stringBuilder.length() >= 2) {
+            stringBuilder.setLength(stringBuilder.length() - 2);
+        }
+        return stringBuilder.toString();
+    }
     public String gethighRiskStr() {
         StringBuilder stringBuilder = new StringBuilder();
         if (null == highRisk) {
-- 
1.8.3.1