From 6c7de1d132c6aeee46d911992364a25a935a0a7a Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Thu, 24 Aug 2017 16:43:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/AntenatalExaminationFacade.java  | 4 +++-
 .../src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index c0a83fe..5582ca0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -2103,6 +2103,8 @@ public class AntenatalExaminationFacade {
                 antenatalExaminationResult.setCheckDoctor(map1);
             }
 
+
+            antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
             Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
             Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
             if(MapUtils.isNotEmpty(treatmentOpinion2)) {
@@ -2171,7 +2173,7 @@ public class AntenatalExaminationFacade {
                     Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
                     while (iterator.hasNext()) {
                         Map.Entry<String, List<String>> map = iterator.next();
-                        restTreatmentOpinion2.put(map.getKey(), CollectionUtils.isNotEmpty(map.getValue()) ? mongoUtil.findPlatValueList(map.getValue()) : new ArrayList<Map<String, Object>>());
+                        restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList(map.getValue()));
                     }
                 }
                 antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
index 20b84ae..56d3480 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java
@@ -301,7 +301,7 @@ public class MongoUtil {
 
     public List<Map<String, Object>> findPlatValueList(List<String> ids) {
         if(CollectionUtils.isEmpty(ids)) {
-            return null;
+            return new ArrayList<>();
         }
         List<Map<String, Object>> rest = new ArrayList<>();
         for (String id : ids) {
-- 
1.8.3.1