Commit 909eea984725630c5fad95bc046c391c66f08a1b
1 parent
e28c8ed890
Exists in
master
and in
6 other branches
产检列表高危因数显示问题修复
Showing 3 changed files with 14 additions and 11 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommonService.java
View file @
909eea9
... | ... | @@ -181,20 +181,25 @@ |
181 | 181 | if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { |
182 | 182 | BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); |
183 | 183 | if (null != basicConfig) { |
184 | - // String name = basicConfig.getName(); | |
185 | - // if (name.indexOf("预警") > -1) { | |
186 | - // name = name.replace("预警", ""); | |
187 | - // } | |
188 | - // map.put("levelId", idObj1.toString()); | |
189 | - // map.put("level", name); | |
190 | - basicConfig.replenRisk(map); | |
184 | + String name = basicConfig.getName(); | |
185 | + if (name.indexOf("黄色") > -1) { | |
186 | + name = "黄色"; | |
187 | + }else if (name.indexOf("橙色") > -1) { | |
188 | + name = "橙色"; | |
189 | + }else if (name.indexOf("红色") > -1) { | |
190 | + name = "红色"; | |
191 | + }else if (name.indexOf("紫色") > -1) { | |
192 | + name = "紫色"; | |
193 | + } | |
194 | + map.put("levelId", idObj1.toString()); | |
195 | + map.put("level", name); | |
191 | 196 | } |
192 | 197 | } |
193 | 198 | //风险评分 |
194 | 199 | Object idObj = map.get("fxpf"); |
195 | 200 | if (null != idObj && !"null".equals(idObj.toString()) && !"".equals(idObj.toString())) { |
196 | 201 | BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); |
197 | - map.put("score", NumberUtils.toInt(basicConfig.getName(), 0)); | |
202 | + map.put("score", NumberUtils.toInt(basicConfig.getName())); | |
198 | 203 | } |
199 | 204 | listMap.add(map); |
200 | 205 | } |
platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
View file @
909eea9
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
909eea9