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 list = highScoreResult.filter(highScoreResult.getLevel()); + for(Map 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 map = (java.util.Map) 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) {