Commit 9d33e5ff15e7d64059bfef55bdaf138c4409ee2a
1 parent
8eb13dee05
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 7 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
9d33e5f
| ... | ... | @@ -510,7 +510,7 @@ |
| 510 | 510 | } |
| 511 | 511 | if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) { |
| 512 | 512 | List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); |
| 513 | - highScoreResult = queryRisk(list2, true); | |
| 513 | + highScoreResult = queryRisk(list2, needLevel); | |
| 514 | 514 | next = false; |
| 515 | 515 | } |
| 516 | 516 | if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) { |
| ... | ... | @@ -549,7 +549,12 @@ |
| 549 | 549 | if (null != basicConfig) { |
| 550 | 550 | Map<String, Object> map2 = new HashMap<>(); |
| 551 | 551 | map2.put("id", basicConfig.getId()); |
| 552 | - map2.put("name", basicConfig.getName()); | |
| 552 | + String name = basicConfig.getName(); | |
| 553 | + map2.put("name", name); | |
| 554 | + if (name.indexOf("预警") > -1) { | |
| 555 | + name = name.replace("预警", ""); | |
| 556 | + } | |
| 557 | + map2.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); | |
| 553 | 558 | highScoreResult.getLevel().add(map2); |
| 554 | 559 | } |
| 555 | 560 | } |