From b11ea18f348c1e3dee6a1eb6e5fd537a03a02208 Mon Sep 17 00:00:00 2001
From: "[wangbo]" <www.184677810@qq.com>
Date: Fri, 9 Aug 2019 17:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

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 52867c8..2c13dce 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
@@ -2054,8 +2054,6 @@ public class ViewFacade {
         map.put("secondaryDiagnosisId", secondaryDiagnosisId);
 
 
-
-
         map.put("treatOpinion", data.getTreatOpinion());
         map.put("dirOpinion", data.getDirOpinion());
         map.put("quicken", QuickenEnums.getName(data.getQuicken()));
@@ -2182,6 +2180,8 @@ public class ViewFacade {
         //孕妇基本信息
         map.put("id", data.getId());
         map.put("diagnosisOther", data.getDiagnosisOther());
+        map.put("secondaryDiagnosis", data.getSecondaryDiagnosis());
+
         map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL));
         map.put("bloodSugar2", UnitUtils.unitSplice(data.getBloodSugar2(), UnitConstants.MMOLL));
         map.put("bloodSugar3", UnitUtils.unitSplice(data.getBloodSugar3(), UnitConstants.MMOLL));
@@ -2396,6 +2396,28 @@ public class ViewFacade {
             }
         }
         map.put("diagnosis", diagnosis);
+
+        /*  次要诊断次要  */
+        String secondaryDiagnosisId = "";
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getSecondaryDiagnosisId())) {
+            List<String> temp = JsonUtil.toList(data.getSecondaryDiagnosisId(), 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(",")) {
+                    secondaryDiagnosisId = sb.substring(0, sb.length() - 1);
+                } else {
+                    secondaryDiagnosisId = sb.toString();
+                }
+            }
+        }
+        map.put("secondaryDiagnosisId", secondaryDiagnosisId);
+
+
         map.put("treatmentOpinion", data.getTreatmentOpinion());
         map.put("guide", data.getGuide());
         map.put("mHighRiskReason", mongoUtil.findPlatValueList(data.getmHighRiskReason()));
@@ -6002,6 +6024,6 @@ public class ViewFacade {
         map.put("developmentQuotient", developmentQuotient);
         BaseResponse response = new BaseResponse();
         response.setObject(map);
-        return  response;
+        return response;
     }
 }
-- 
1.8.3.1