From e6a6fae4e04e51e07697df14abccb818fa3c0bac Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 3 Aug 2017 09:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/common/enums/HdEnums.java | 15 +++++++++++++++
 .../platform/operate/web/controller/EarController.java    |  2 +-
 .../platform/operate/web/result/InitHearingDiagnose.java  |  6 +++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
index ec80b26..7307717 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HdEnums.java
@@ -1,5 +1,10 @@
 package com.lyms.platform.common.enums;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @auther yangfei
  * @createTime 2017年07月14日 16时24分
@@ -35,6 +40,16 @@ public class HdEnums {
             this.name = name;
         }
     }
+    public static List<Map> getHandlingSuggestionEnums() {
+        List<Map> list = new ArrayList<>();
+        for (HandlingSuggestionEnums e : HandlingSuggestionEnums.values()) {
+            Map rootMap = new HashMap();
+            rootMap.put("id", e.getId());
+            rootMap.put("name", e.getName());
+            list.add(rootMap);
+        }
+        return list;
+    }
     public static String getHsTitle(int id) {
         if (id == 0) {
             return "";
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
index d72df61..8954842 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
@@ -170,7 +170,7 @@ public class EarController extends BaseController {
         initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class));
         initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class));
         initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class));
-        initHearingDiagnose.setHandlingSuggestion(EnumUtil.toJson(HdEnums.HandlingSuggestionEnums.class));
+        initHearingDiagnose.setHandlingSuggestion(HdEnums.getHandlingSuggestionEnums());
         return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java
index f5d38df..bbe5711 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/InitHearingDiagnose.java
@@ -18,13 +18,13 @@ public class InitHearingDiagnose extends BaseResponse{
     //确诊结果
     private List<Map<String,Object>>  confirmResult;
     //处理意见
-    private List<Map<String,Object>> handlingSuggestion;
+    private List<Map> handlingSuggestion;
 
-    public List<Map<String, Object>> getHandlingSuggestion() {
+    public List<Map> getHandlingSuggestion() {
         return handlingSuggestion;
     }
 
-    public void setHandlingSuggestion(List<Map<String, Object>> handlingSuggestion) {
+    public void setHandlingSuggestion(List<Map> handlingSuggestion) {
         this.handlingSuggestion = handlingSuggestion;
     }
 
-- 
1.8.3.1