Commit 759d77f9ddae2e17c778eb1337dfdcd62b68945c
1 parent
0bad3f5ba6
Exists in
master
and in
6 other branches
新增终止妊娠接口
Showing 2 changed files with 6 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
759d77f
| ... | ... | @@ -540,20 +540,6 @@ |
| 540 | 540 | |
| 541 | 541 | getRisk(data.getRiskFactor(),data.getOtherRisk(),map); |
| 542 | 542 | |
| 543 | -/* HighScoreResult highScoreResult = null; | |
| 544 | - if (StringUtils.isNotEmpty(data.getRiskFactor())){ | |
| 545 | - List<String> ids = JsonUtil.toList(data.getRiskFactor(), String.class); | |
| 546 | - if (CollectionUtils.isNotEmpty(ids)){ | |
| 547 | - highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService); | |
| 548 | - } | |
| 549 | - } | |
| 550 | - map.put("highRisk",highScoreResult); | |
| 551 | - | |
| 552 | - Map<String,Object> otherRisk = new HashMap<>(); | |
| 553 | - if (StringUtils.isNotEmpty(data.getOtherRisk()) && !"{}".equals(data.getOtherRisk())){ | |
| 554 | - ResolveUtils.queryOtherRisk(data.getOtherRisk(),otherRisk,basicConfigService); | |
| 555 | - } | |
| 556 | - map.put("otherHighRisk",otherRisk);*/ | |
| 557 | 543 | //产检基本信息 |
| 558 | 544 | map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckDate())); |
| 559 | 545 | map.put("currentDueDate",data.getCurrentDueDate()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java
View file @
759d77f
| ... | ... | @@ -48,6 +48,7 @@ |
| 48 | 48 | return ""; |
| 49 | 49 | } |
| 50 | 50 | StringBuilder sb = new StringBuilder(); |
| 51 | + StringBuilder xsb = new StringBuilder(); | |
| 51 | 52 | try { |
| 52 | 53 | Set<Map.Entry<String, Object>> m = map.entrySet(); |
| 53 | 54 | Iterator<Map.Entry<String, Object>> it = m.iterator(); |
| 54 | 55 | |
| ... | ... | @@ -55,11 +56,15 @@ |
| 55 | 56 | Map.Entry<String, Object> ma = it.next(); |
| 56 | 57 | if ("true".equals(ma.getValue() + "")) { |
| 57 | 58 | if (content.containsKey(ma.getKey())) { |
| 59 | + if ("qt".equals(ma.getKey())){ | |
| 60 | + xsb.append(content.get(ma.getKey())).append(','); | |
| 61 | + continue; | |
| 62 | + } | |
| 58 | 63 | sb.append(content.get(ma.getKey())).append(','); |
| 59 | 64 | } |
| 60 | 65 | } |
| 61 | 66 | } |
| 62 | - String bigSB = sb.toString(); | |
| 67 | + String bigSB = (sb.append(xsb)).toString(); | |
| 63 | 68 | |
| 64 | 69 | if (bigSB.contains("其他,")){ |
| 65 | 70 | if (map.containsKey("qtText")){ |