jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit b4b5d6c93ea8f9e401913c600acf85e82f3239f3

Authored by jiangjiazhi
2 parents bcba973a0c ed43684277
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ b4b5d6c
... ... @@ -787,7 +787,7 @@
787 787 }
788 788 score+=NumberUtils.toInt(map.get("score").toString(),0);
789 789  
790   - highScoreResult.getLevelId().add(map.get("fyyse").toString());
  790 + highScoreResult.getLevel().add(map);
791 791 }
792 792 if(StringUtils.isNotEmpty(otherRisk.toString())){
793 793 highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1));
... ... @@ -837,7 +837,7 @@
837 837 }
838 838 score+=NumberUtils.toInt(map.get("score").toString(),0);
839 839  
840   - highScoreResult.getLevelId().add(map.get("fyyse").toString());
  840 + highScoreResult.getLevel().add(map);
841 841 }
842 842 highScoreResult.setScore(highScoreResult.getScore()+score);
843 843 if(StringUtils.isNotEmpty(otherRisk.toString())){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ b4b5d6c
... ... @@ -510,7 +510,7 @@
510 510 if (addrType < 3) {
511 511 totalList.add(String.valueOf(orgNumTotal));
512 512 }
513   - totalList.add(level.getName());
  513 + totalList.add(HighLevelMap.get(level.getName()));
514 514  
515 515 int index = addrType < 3 ? 4 : 3;
516 516  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java View file @ b4b5d6c
... ... @@ -307,6 +307,7 @@
307 307 map.put("name", map.get("fxysu").toString());
308 308 if (map.get("fyyse") != null) {
309 309 String id = map.get("fyyse").toString();
  310 + map.put("id", id);
310 311 map.put("color", HosptialHighRiskFacade.colorMap.get(id));
311 312 }
312 313 if (map.get("fxpf") != null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java View file @ b4b5d6c
... ... @@ -79,6 +79,7 @@
79 79 otherMap.remove("name");
80 80 otherMap.remove("color");
81 81 otherMap.remove("score");
  82 + otherMap.remove("id");
82 83  
83 84 String color = "";
84 85 String pingfen = "";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java View file @ b4b5d6c
... ... @@ -72,6 +72,7 @@
72 72 ResolveUtils.queryOtherRisk(otherHighRisk, listMap);
73 73 for (Map<String, Object> otherMap : listMap) {
74 74 otherMap.remove("name");
  75 + otherMap.remove("id");
75 76 otherMap.remove("color");
76 77 otherMap.remove("score");
77 78 String color = "";