From 13524c6ecd8e09fdcf9f7442e3f01664daada7be Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 31 May 2018 14:21:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=8A=E5=8D=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ApplyOrderFacade.java        | 21 +++++++++++++++++++++
 .../operate/web/result/ApplyOrderOutResult.java     | 10 ++++++++++
 2 files changed, 31 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index 15048be..1eaffb4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -10,6 +10,7 @@ import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.request.*;
 import com.lyms.platform.operate.web.result.*;
+import com.lyms.platform.operate.web.utils.FunvCommonUtil;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.model.Users;
@@ -881,6 +882,26 @@ public class ApplyOrderFacade {
                 }
 
                 applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname);
+
+
+                /*  诊断指导  */
+                String diagnosis = "";
+                if (org.apache.commons.lang.StringUtils.isNotEmpty(orderModel.getDiagnosis())) {
+                    List<String> temp = JsonUtil.toList(orderModel.getDiagnosis(), String.class);
+                    if (CollectionUtils.isNotEmpty(temp)) {
+                        StringBuilder sb = new StringBuilder();
+                        for (String sId : temp) {
+                            sb.append(FunvCommonUtil.getBaseicConfigByid(sId, basicConfigService)).append(",");
+                        }
+                        if (sb.toString().endsWith(",")) {
+                            diagnosis = sb.substring(0, sb.length() - 1);
+                        } else {
+                            diagnosis = sb.toString();
+                        }
+                    }
+                }
+                applyOrderResult.setDiagnosis(diagnosis);
+
                 applyOrderResult.setrRisk(stringBuilder.toString());
                 applyOrderResult.setScore(orderModel.getScore());
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
index a9f0637..8769e6b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
@@ -69,6 +69,16 @@ public class ApplyOrderOutResult {
     //1 孕妇 0  产妇
     private String isGravida;
 
+    private String diagnosis;
+
+    public String getDiagnosis() {
+        return diagnosis;
+    }
+
+    public void setDiagnosis(String diagnosis) {
+        this.diagnosis = diagnosis;
+    }
+
     public String getScreenResult() {
         return screenResult;
     }
-- 
1.8.3.1