From 15089a960e37bae5b5d3e46b45fc41e77e5f62e6 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 30 Mar 2018 11:33:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E5=A4=8D=E6=9F=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=8A=E6=96=AD=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/pojo/PostReviewModel.java | 10 ++++++++++
 .../com/lyms/platform/operate/web/facade/ViewFacade.java  |  6 ++++++
 .../platform/operate/web/request/PostReviewRequest.java   | 14 ++++++++++++--
 .../platform/operate/web/result/PostReviewResult.java     | 15 +++++++++++----
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
index de61ca4..eb19b56 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java
@@ -80,6 +80,8 @@ public class PostReviewModel extends BaseModel {
     private String ultrasonicExamination;
     // 诊断
     private String diagnosis;
+    // 诊断其他
+    private String diagOther;
     //处理意见
     private String treatOpinion;
 
@@ -100,6 +102,14 @@ public class PostReviewModel extends BaseModel {
     //操作人
     private Integer operator;
 
+    public String getDiagOther() {
+        return diagOther;
+    }
+
+    public void setDiagOther(String diagOther) {
+        this.diagOther = diagOther;
+    }
+
     public Integer getOperator() {
         return operator;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 0081b64..265f4bf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -2779,6 +2779,12 @@ public class ViewFacade {
             diagnosis = "-";
         }
         map.put("diagnosis", diagnosis);
+        map.put("diagOther", data.getDiagOther());
+        if(StringUtils.isEmpty(data.getDiagOther())){
+            map.put("diagOther", diagnosis);
+        }
+
+
         map.put("treatOpinion", data.getTreatOpinion());
         map.put("dirOpinion", data.getDirOpinion());
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
index b4d0240..4152ba3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
@@ -1,14 +1,13 @@
 package com.lyms.platform.operate.web.request;
 
 import com.lyms.platform.common.base.IBasicRequestConvert;
-import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.core.annotation.form.Form;
+import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.PostReviewModel;
 import org.hibernate.validator.constraints.NotEmpty;
 
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -83,6 +82,8 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
     private String ultrasonicExamination;
     // 诊断
     private List diagnosis;
+    // 诊断其他
+    private String diagOther;
     //处理意见
     private String treatOpinion;
 
@@ -101,6 +102,14 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
 
     private Integer couponType;
 
+    public String getDiagOther() {
+        return diagOther;
+    }
+
+    public void setDiagOther(String diagOther) {
+        this.diagOther = diagOther;
+    }
+
     public String getCouponCode() {
         return couponCode;
     }
@@ -353,6 +362,7 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
     public PostReviewModel convertToDataModel() {
         PostReviewModel postReviewModel=new PostReviewModel();
         postReviewModel.setId(id);
+        postReviewModel.setDiagOther(diagOther);
         postReviewModel.setParentId(parentId);
         postReviewModel.setDay(day);
         postReviewModel.setHealthStatus(healthStatus);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
index 7a7f715..b8dd2d5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
@@ -2,12 +2,9 @@ package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
-import com.lyms.platform.pojo.MaternalDeliverModel;
-import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.PostReviewModel;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -76,6 +73,8 @@ public class PostReviewResult implements Serializable{
     private String ultrasonicExamination;
     // 诊断
     private List diagnosis;
+    //诊断其他
+    private String diagOther;
     //处理意见
     private String treatOpinion;
 
@@ -98,6 +97,14 @@ public class PostReviewResult implements Serializable{
         this.yl = yl;
     }
 
+    public String getDiagOther() {
+        return diagOther;
+    }
+
+    public void setDiagOther(String diagOther) {
+        this.diagOther = diagOther;
+    }
+
     public PostReviewResult convertToResult(PostReviewModel postReviewModel) {
         setId(postReviewModel.getId());
         setParentId(postReviewModel.getParentId());
@@ -119,7 +126,7 @@ public class PostReviewResult implements Serializable{
         setTraceElement(postReviewModel.getTraceElement());
         setBoneDensity(postReviewModel.getBoneDensity());
         setUltrasonicExamination(postReviewModel.getUltrasonicExamination());
-
+        setDiagOther(postReviewModel.getDiagOther());
         setTreatOpinion(postReviewModel.getTreatOpinion());
         setDirOpinion(postReviewModel.getDirOpinion());
 
-- 
1.8.3.1