Commit 3a697927714d9f35042d4b246366519e3debca16
1 parent
58f3f0e0ca
Exists in
master
and in
6 other branches
修改初诊高危因素
Showing 1 changed file with 27 additions and 26 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
3a69792
| ... | ... | @@ -160,38 +160,39 @@ |
| 160 | 160 | } |
| 161 | 161 | } |
| 162 | 162 | Integer score = 0; |
| 163 | - if (highScoreResult.getScore()!=null){ | |
| 164 | - score = highScoreResult.getScore(); | |
| 165 | - } | |
| 163 | + if (highScoreResult!=null){ | |
| 164 | + if (highScoreResult.getScore()!=null){ | |
| 165 | + score = highScoreResult.getScore(); | |
| 166 | + } | |
| 167 | + List<Map<String, Object>> list = ResolveUtils.queryHighRisk(highScoreResult); | |
| 166 | 168 | |
| 167 | - List<Map<String, Object>> list = ResolveUtils.queryHighRisk(highScoreResult); | |
| 169 | + Map<String,Object> otherRisk = null; | |
| 170 | + if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk)){ | |
| 171 | + otherRisk = new HashMap<>(); | |
| 172 | + ResolveUtils.queryOtherRisk(oRisk,otherRisk,basicConfigService); | |
| 173 | + } | |
| 168 | 174 | |
| 169 | - Map<String,Object> otherRisk = null; | |
| 170 | - if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk)){ | |
| 171 | - otherRisk = new HashMap<>(); | |
| 172 | - ResolveUtils.queryOtherRisk(oRisk,otherRisk,basicConfigService); | |
| 173 | - } | |
| 175 | + Map<String,Object> otherMap = new HashMap<>(); | |
| 174 | 176 | |
| 175 | - Map<String,Object> otherMap = new HashMap<>(); | |
| 176 | - | |
| 177 | - if (otherRisk!=null){ | |
| 178 | - if (otherRisk.get("name")!=null){ | |
| 179 | - otherMap.put("name",otherRisk.get("name")); | |
| 180 | - } | |
| 181 | - if (otherRisk.get("color")!=null){ | |
| 182 | - otherMap.put("color",otherRisk.get("color")); | |
| 183 | - } | |
| 184 | - if (otherRisk.get("score")!=null){ | |
| 185 | - String s = (String)otherRisk.get("score"); | |
| 186 | - if (FunvCommonUtil.isNumeric(s)){ | |
| 187 | - score = score + Integer.parseInt(s); | |
| 177 | + if (otherRisk!=null){ | |
| 178 | + if (otherRisk.get("name")!=null){ | |
| 179 | + otherMap.put("name",otherRisk.get("name")); | |
| 188 | 180 | } |
| 181 | + if (otherRisk.get("color")!=null){ | |
| 182 | + otherMap.put("color",otherRisk.get("color")); | |
| 183 | + } | |
| 184 | + if (otherRisk.get("score")!=null){ | |
| 185 | + String s = (String)otherRisk.get("score"); | |
| 186 | + if (FunvCommonUtil.isNumeric(s)){ | |
| 187 | + score = score + Integer.parseInt(s); | |
| 188 | + } | |
| 189 | + } | |
| 190 | + list.add(otherMap); | |
| 189 | 191 | } |
| 190 | - list.add(otherMap); | |
| 191 | - } | |
| 192 | 192 | |
| 193 | - map.put("score",UnitUtils.unitSplice(score,UnitConstants.FEN)); | |
| 194 | - map.put("highRisk",list); | |
| 193 | + map.put("score",UnitUtils.unitSplice(score,UnitConstants.FEN)); | |
| 194 | + map.put("highRisk",list); | |
| 195 | + } | |
| 195 | 196 | } |
| 196 | 197 | |
| 197 | 198 |