From 10338fcf874c829489ae123ac9c7e9b69bffe5c5 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 19 Jul 2016 08:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/PostReviewFacade.java    | 11 ++++++++++-
 .../lyms/platform/operate/web/request/PostReviewRequest.java  | 11 +++++++----
 .../lyms/platform/operate/web/result/PostReviewResult.java    |  8 ++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
index cccb309..481dccf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
@@ -8,6 +8,7 @@ import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.Assert;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.request.PostReviewQueryRequest;
 import com.lyms.platform.operate.web.request.PostReviewRequest;
 import com.lyms.platform.operate.web.result.PostReviewListResult;
@@ -41,6 +42,8 @@ public class PostReviewFacade {
     private MatDeliverService matDeliverService;
     @Autowired
     private AutoMatchFacade autoMatchFacade;
+    @Autowired
+    private AntenatalExaminationFacade examinationFacade;
 
     public BaseResponse addPostReview(PostReviewRequest postReviewRequest,Integer userId) {
         if (StringUtils.isEmpty(postReviewRequest.getId())) {
@@ -93,10 +96,16 @@ public class PostReviewFacade {
     public BaseResponse findById(String id) {
         PostReviewModel postReviewModel = postReviewService.findOneById(id);
 
-
         Assert.notNull(postReviewModel, "没有对应的数据.");
         PostReviewResult postReviewResult = new PostReviewResult();
         postReviewResult.convertToResult(postReviewModel);
+        try {
+            if(StringUtils.isNotEmpty(postReviewModel.getDiagnosis())){
+                List list = JsonUtil.toList(postReviewModel.getDiagnosis(), List.class);
+                postReviewResult.setDiagnosis(examinationFacade.queryRisk(list));
+            }
+        } catch (Exception e) {
+        }
         return new BaseObjectResponse().setData(postReviewResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 }
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 cb26008..0a96cfa 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
@@ -8,6 +8,7 @@ import com.lyms.platform.pojo.PostReviewModel;
 import org.hibernate.validator.constraints.NotEmpty;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -77,7 +78,7 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
     //超声检查
     private String ultrasonicExamination;
     // 诊断
-    private String diagnosis;
+    private List diagnosis;
     //处理意见
     private String treatOpinion;
 
@@ -125,11 +126,11 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
         this.checkTime = checkTime;
     }
 
-    public String getDiagnosis() {
+    public List getDiagnosis() {
         return diagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
+    public void setDiagnosis(List diagnosis) {
         this.diagnosis = diagnosis;
     }
 
@@ -324,7 +325,9 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
         postReviewModel.setTraceElement(traceElement);
         postReviewModel.setBoneDensity(boneDensity);
         postReviewModel.setUltrasonicExamination(ultrasonicExamination);
-        postReviewModel.setDiagnosis(diagnosis);
+        if(null!=diagnosis){
+            postReviewModel.setDiagnosis(JsonUtil.obj2JsonString(diagnosis));
+        }
         postReviewModel.setTreatOpinion(treatOpinion);
         postReviewModel.setDirOpinion(dirOpinion);
         postReviewModel.setProdDoctor(prodDoctor);
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 00e4d0a..c626b6a 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
@@ -74,7 +74,7 @@ public class PostReviewResult implements Serializable{
     //超声检查
     private String ultrasonicExamination;
     // 诊断
-    private String diagnosis;
+    private List diagnosis;
     //处理意见
     private String treatOpinion;
 
@@ -109,7 +109,7 @@ public class PostReviewResult implements Serializable{
         setTraceElement(postReviewModel.getTraceElement());
         setBoneDensity(postReviewModel.getBoneDensity());
         setUltrasonicExamination(postReviewModel.getUltrasonicExamination());
-        setDiagnosis(postReviewModel.getDiagnosis());
+
         setTreatOpinion(postReviewModel.getTreatOpinion());
         setDirOpinion(postReviewModel.getDirOpinion());
         setProdDoctor(postReviewModel.getProdDoctor());
@@ -151,11 +151,11 @@ public class PostReviewResult implements Serializable{
         this.checkTime = checkTime;
     }
 
-    public String getDiagnosis() {
+    public List getDiagnosis() {
         return diagnosis;
     }
 
-    public void setDiagnosis(String diagnosis) {
+    public void setDiagnosis(List diagnosis) {
         this.diagnosis = diagnosis;
     }
 
-- 
1.8.3.1