From 78f81dbbfa3ad23ad72bfdf08609104a7f5e2040 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 12 Jul 2017 16:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/model/BabyPatientExtendEarFollowUp.java       |  1 +
 .../platform/operate/web/controller/FollowUpController.java  |  3 ++-
 .../lyms/platform/operate/web/result/FollowUpOneResult.java  | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
index 08faa21..5702aba 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFollowUp.java
@@ -130,6 +130,7 @@ public class BabyPatientExtendEarFollowUp extends AbstracUuidEntity{
      */
     private Integer enalble;
 
+
     public Integer getIsAudiphone() {
         return isAudiphone;
     }
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 ece5e9e..a7d3dce 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
@@ -119,8 +119,9 @@ public class FollowUpController extends BaseController {
                     }
                 }
                 //设置确诊结果
-                fuResult.setMarkResult(mrSb.toString());
+                fuResult.setMarkResultStr(mrSb.toString());
             }
+            fuResult.setMarkResult(followUp.getMarkResult());
             fuResult.setMarkDetail(followUp.getMarkDetail());
             fuResult.setFollowInfo(followUp.getFollowInfo());
             fuResult.setAudiphone(followUp.getAudiphone());
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 6f32be5..b1553a7 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
@@ -31,6 +31,10 @@ public class FollowUpOneResult {
      */
     private String markResult;
     /**
+     * 确诊结果
+     */
+    private String markResultStr;
+    /**
      * 确诊详情
      */
     private String markDetail;
@@ -107,6 +111,14 @@ public class FollowUpOneResult {
      */
     private String cMonthAge;
 
+    public String getMarkResultStr() {
+        return markResultStr;
+    }
+
+    public void setMarkResultStr(String markResultStr) {
+        this.markResultStr = markResultStr;
+    }
+
     public String getcMonthAge() {
         return cMonthAge;
     }
-- 
1.8.3.1