From fd8a89e66dc24d548cb27d6d14137ac42b683794 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 29 Aug 2017 20:19:39 +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

---
 .../operate/web/controller/FollowUpController.java         |  8 +++++++-
 .../platform/operate/web/result/FollowUpOneResult.java     | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
index 1778378..43b70ab 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.lyms.platform.biz.service.BabyBookbuildingService;
 import com.lyms.platform.biz.service.BabyService;
 import com.lyms.platform.common.annotation.TokenRequired;
@@ -125,13 +126,18 @@ public class FollowUpController extends BaseController {
             if (followUp.getMarkResult() != null) {
                 String cr[] = followUp.getMarkResult().split(",");
                 StringBuffer mrSb = new StringBuffer();
+                List highArr = new ArrayList();
                 for (int b = 0; b < cr.length; b++) {
                     if (StringUtils.isNotEmpty(cr[b])) {
-                        Map<Integer, String> map = new HashMap<>();
                         String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
                         mrSb.append(title+"、");
+                        JSONObject confiJo = new JSONObject();
+                        confiJo.put("id", cr[b]);
+                        confiJo.put("name", title);
+                        highArr.add(confiJo);
                     }
                 }
+                fuResult.setMarkResults(highArr);
                 String hfString = null;
                 if (mrSb.toString().endsWith("、")) {
                     hfString = mrSb.substring(0, mrSb.length() - 1);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java
index b1553a7..88d1d7d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/FollowUpOneResult.java
@@ -1,5 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
+import java.util.List;
+
 /**
  * @auther yangfei
  * @createTime 2017年05月25日 09时29分
@@ -35,6 +37,10 @@ public class FollowUpOneResult {
      */
     private String markResultStr;
     /**
+     * 确诊结果
+     */
+    private List markResults;
+    /**
      * 确诊详情
      */
     private String markDetail;
@@ -135,6 +141,14 @@ public class FollowUpOneResult {
         this.audiphoneStr = audiphoneStr;
     }
 
+    public List getMarkResults() {
+        return markResults;
+    }
+
+    public void setMarkResults(List markResults) {
+        this.markResults = markResults;
+    }
+
     public String getInterStrate() {
         return interStrate;
     }
-- 
1.8.3.1