From b8adf9c61ef89a486ad02c6d5c89431c7e74b239 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 12 Jul 2017 10:09:08 +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

---
 .../operate/web/controller/FollowUpController.java | 23 +++++--
 .../operate/web/result/FollowUpOneResult.java      | 73 ++++++++++++++++++++--
 2 files changed, 86 insertions(+), 10 deletions(-)

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 3a320ad..9fac529 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
@@ -93,7 +93,7 @@ public class FollowUpController extends BaseController {
     }
 
     /**
-     * 获取随访记录
+     * 编辑：获取随访记录详情
      *
      * @param fuId   随访记录id
      * @return
@@ -115,6 +115,21 @@ public class FollowUpController extends BaseController {
             fuResult.setOperation(followUp.getOperation());
             fuResult.setArtifiCochlea(followUp.getArtifiCochlea());
             fuResult.setGuideOpinion(followUp.getGuideOpinion());
+            fuResult.setMonthAge(followUp.getMonthAge());
+
+
+            if(followUp.getAudiphone()!=null){
+                //1-左耳，2-右耳，3-全部
+                fuResult.setAudiphoneStr(followUp.getAudiphone()==1?"左耳":followUp.getAudiphone()==2?"右耳":"全部");
+            }
+            if(followUp.getOperation()!=null){
+                //1-左耳，2-右耳，3-全部
+                fuResult.setOperationStr(followUp.getOperation()==1?"左耳":followUp.getOperation()==2?"右耳":"全部");
+            }
+            if(followUp.getArtifiCochlea()!=null){
+                //1-左耳，2-右耳，3-全部
+                fuResult.setArtifiCochleaStr(followUp.getArtifiCochlea()==1?"左耳":followUp.getArtifiCochlea()==2?"右耳":"全部");
+            }
 
             if(StringUtils.isNotEmpty(followUp.getFollowDoctorId())){
                 fuResult.setFollowDoctorId(followUp.getFollowDoctorId());
@@ -129,10 +144,6 @@ public class FollowUpController extends BaseController {
             if(followUp.getFollowTime()!=null){
                 fuResult.setFollowTime(followUp.getFollowTime());
                 fuResult.setFollowTimeStr(DateUtil.getyyyy_MM_dd(followUp.getFollowTime()));
-                BabyModel babyModel = babyService.getOneBabyById(followUp.getBabyId());
-                if (babyModel != null) {
-                    fuResult.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), followUp.getFollowTime()));
-                }
             }
             if(followUp.getMarkTime()!=null){
                 fuResult.setMarkTime(followUp.getMarkTime());
@@ -168,7 +179,7 @@ public class FollowUpController extends BaseController {
 
 
     /**
-     * 获取随访记录
+     * 获取随访记录列表
      *
      * @param fur   随访记录对象
      * @param request
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 230fc0d..31369d6 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
@@ -52,14 +52,29 @@ public class FollowUpOneResult {
      * 助听器(0-左耳，2-右耳，3-全部)
      */
     private Integer audiphone;
+    private String audiphoneStr;
     /**
      * 手术(0-左耳，2-右耳，3-全部)
      */
     private Integer operation;
+    private String operationStr;
     /**
      * 人工耳蜗(0-左耳，2-右耳，3-全部)
      */
     private Integer artifiCochlea;
+    private String artifiCochleaStr;
+    /**
+     * 是否选择助听器(0-未选择，1-选择)
+     */
+    private Integer isAudiphone;
+    /**
+     * 是否选择手术(0-未选择，1-选择)
+     */
+    private Integer isOperation;
+    /**
+     * 是否选择人工耳蜗(0-未选择，1-选择)
+     */
+    private Integer isArtifiCochlea;
     /**
      * 指导意见
      */
@@ -96,8 +111,34 @@ public class FollowUpOneResult {
      * 医院名称
      */
     private String hospitalStr;
-    //月龄
-    private String monthAge;
+    /**
+     * 月龄
+     */
+    private Integer monthAge;
+
+    public String getAudiphoneStr() {
+        return audiphoneStr;
+    }
+
+    public void setAudiphoneStr(String audiphoneStr) {
+        this.audiphoneStr = audiphoneStr;
+    }
+
+    public String getOperationStr() {
+        return operationStr;
+    }
+
+    public void setOperationStr(String operationStr) {
+        this.operationStr = operationStr;
+    }
+
+    public String getArtifiCochleaStr() {
+        return artifiCochleaStr;
+    }
+
+    public void setArtifiCochleaStr(String artifiCochleaStr) {
+        this.artifiCochleaStr = artifiCochleaStr;
+    }
 
     public String getId() {
         return id;
@@ -275,11 +316,35 @@ public class FollowUpOneResult {
         this.hospitalStr = hospitalStr;
     }
 
-    public String getMonthAge() {
+    public Integer getIsAudiphone() {
+        return isAudiphone;
+    }
+
+    public void setIsAudiphone(Integer isAudiphone) {
+        this.isAudiphone = isAudiphone;
+    }
+
+    public Integer getIsOperation() {
+        return isOperation;
+    }
+
+    public void setIsOperation(Integer isOperation) {
+        this.isOperation = isOperation;
+    }
+
+    public Integer getIsArtifiCochlea() {
+        return isArtifiCochlea;
+    }
+
+    public void setIsArtifiCochlea(Integer isArtifiCochlea) {
+        this.isArtifiCochlea = isArtifiCochlea;
+    }
+
+    public Integer getMonthAge() {
         return monthAge;
     }
 
-    public void setMonthAge(String monthAge) {
+    public void setMonthAge(Integer monthAge) {
         this.monthAge = monthAge;
     }
 }
-- 
1.8.3.1