From 43e19d1c1b8b1d52d6e2e94f99df02a41cb74bc9 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Mon, 13 Jul 2020 21:19:55 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/BabyBookbuildingFacade.java   |  2 +-
 .../java/com/lyms/platform/operate/web/facade/ViewFacade.java | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 79bc4ab..8e5482a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -2984,7 +2984,7 @@ public class BabyBookbuildingFacade {
         BaseObjectResponse objectResponse = new BaseObjectResponse();
         if ("4".equals(HIS_VERSION)) {
             Map<String, Object> results = qhdfyHisService.queryHisBabyDiagnosis(blNo);
-            results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！");
+            //results.put("diagnosisItem", "用于测试，暂时固定，测试完成后通知修改恢复！");
             objectResponse.setData(results);
             objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
             objectResponse.setErrormsg("成功");
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 c30bf4f..4692492 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
@@ -4969,12 +4969,15 @@ public class ViewFacade {
             String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(model.getHighRiskInfo());
             result.setHighRiskInfo(highRiskInfos);
             if(StringUtils.isEmpty(highRiskInfos)){//秦皇岛高危手动输入需要处理
-                List getHighRiskInfo = model.getHighRiskInfo();
-                for (Object s : getHighRiskInfo) {
-                    if( s!=null && StringUtils.isNotEmpty(s.toString())){
-                        result.setHighRiskInfo(s.toString());
+                if(CollectionUtils.isNotEmpty(model.getHighRiskInfo())){
+                    List getHighRiskInfo = model.getHighRiskInfo();
+                    for (Object s : getHighRiskInfo) {
+                        if( s!=null && StringUtils.isNotEmpty(s.toString())){
+                            result.setHighRiskInfo(s.toString());
+                        }
                     }
                 }
+
             }
             result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否");
 
-- 
1.8.3.1