Commit 3526eeb36062fed57f91993d37b3678496464e38
1 parent
67cde5d274
Exists in
master
and in
1 other branch
修改新电子病历
Showing 2 changed files with 23 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
3526eeb
| ... | ... | @@ -121,13 +121,14 @@ |
| 121 | 121 | referralApplyOrderModel.setrRisk(highScoreResult.gethighRiskList()); |
| 122 | 122 | referralApplyOrderModel.setScore(highScoreResult.getScore()); |
| 123 | 123 | List lsit = new ArrayList(); |
| 124 | - for(String str : highScoreResult.getLevelId()){ | |
| 125 | - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str); | |
| 126 | - if(null!=basicConfig &&!lsit.contains(basicConfig.getName())){ | |
| 127 | - lsit.add(basicConfig.getName()); | |
| 124 | + List<Map> list = highScoreResult.filter(highScoreResult.getLevel()); | |
| 125 | + for(Map<String,String> map :list){ | |
| 126 | + String name = map.get("name"); | |
| 127 | + if(!lsit.contains(name)){ | |
| 128 | + lsit.add(name); | |
| 128 | 129 | } |
| 129 | 130 | } |
| 130 | - referralApplyOrderModel.setrLevel(highScoreResult.filter(lsit)); | |
| 131 | + referralApplyOrderModel.setrLevel(lsit); | |
| 131 | 132 | // referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); |
| 132 | 133 | referralApplyOrderModel.setPid(patients.getPid()); |
| 133 | 134 | referralApplyOrderModel.setDueWeek(new Date()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
View file @
3526eeb
| ... | ... | @@ -131,6 +131,23 @@ |
| 131 | 131 | return stringBuilder.toString(); |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | + public String getLevelStr(List levelList) { | |
| 135 | + StringBuilder stringBuilder = new StringBuilder(); | |
| 136 | + if (null == levelList) { | |
| 137 | + return ""; | |
| 138 | + } | |
| 139 | + for (int i1 = 0; i1 < levelList.size(); i1++) { | |
| 140 | + java.util.Map<String, String> map = (java.util.Map<String, String>) levelList.get(i1); | |
| 141 | + String name = map.get("name"); | |
| 142 | + if (stringBuilder.indexOf(name) == -1) { | |
| 143 | + stringBuilder.append(map.get("name")).append(", "); | |
| 144 | + } | |
| 145 | + } | |
| 146 | + if (stringBuilder.length() >= 2) { | |
| 147 | + stringBuilder.setLength(stringBuilder.length() - 2); | |
| 148 | + } | |
| 149 | + return stringBuilder.toString(); | |
| 150 | + } | |
| 134 | 151 | public String gethighRiskStr() { |
| 135 | 152 | StringBuilder stringBuilder = new StringBuilder(); |
| 136 | 153 | if (null == highRisk) { |