diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index e0cc1d6..32f4cb2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -787,7 +787,7 @@ public class AntenatalExaminationFacade { } score+=NumberUtils.toInt(map.get("score").toString(),0); - highScoreResult.getLevelId().add(map.get("fyyse").toString()); + highScoreResult.getLevel().add(map); } if(StringUtils.isNotEmpty(otherRisk.toString())){ highScoreResult.setOtherRisk(otherRisk.substring(0, otherRisk.length() - 1)); @@ -837,7 +837,7 @@ public class AntenatalExaminationFacade { } score+=NumberUtils.toInt(map.get("score").toString(),0); - highScoreResult.getLevelId().add(map.get("fyyse").toString()); + highScoreResult.getLevel().add(map); } highScoreResult.setScore(highScoreResult.getScore()+score); if(StringUtils.isNotEmpty(otherRisk.toString())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java index 8b53712..74205c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java @@ -307,6 +307,7 @@ public class ResolveUtils { map.put("name", map.get("fxysu").toString()); if (map.get("fyyse") != null) { String id = map.get("fyyse").toString(); + map.put("id", id); map.put("color", HosptialHighRiskFacade.colorMap.get(id)); } if (map.get("fxpf") != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java index 45fdb5b..8e78172 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java @@ -79,6 +79,7 @@ public class AntexOtherHighRiskWorker implements Runnable { otherMap.remove("name"); otherMap.remove("color"); otherMap.remove("score"); + otherMap.remove("id"); String color = ""; String pingfen = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java index d50eec1..cc80f21 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java @@ -72,6 +72,7 @@ public class AntexcOtherHighRiskWorker implements Runnable { ResolveUtils.queryOtherRisk(otherHighRisk, listMap); for (Map otherMap : listMap) { otherMap.remove("name"); + otherMap.remove("id"); otherMap.remove("color"); otherMap.remove("score"); String color = "";