From b26ecdbef450d48eb1d962d8226df8c4c5324785 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 22 Jan 2018 17:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E&=E4=BF=AE=E6=94=B9=E5=88=9D?=
 =?UTF-8?q?=E8=AF=8A=E5=92=8C=E5=A4=8D=E8=AF=8A=E8=AE=B0=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=87=AA=E5=AE=9A=E4=B9=89=E9=AB=98=E5=8D=B1?=
 =?UTF-8?q?=E5=88=B0patient=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java  | 4 ++--
 .../main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java   | 1 +
 .../lyms/platform/operate/web/worker/AntexOtherHighRiskWorker.java    | 1 +
 .../lyms/platform/operate/web/worker/AntexcOtherHighRiskWorker.java   | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

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<String, Object> otherMap : listMap) {
                         otherMap.remove("name");
+                        otherMap.remove("id");
                         otherMap.remove("color");
                         otherMap.remove("score");
                         String color = "";
-- 
1.8.3.1