From d38df26c5612d407862604b9621fa475e41ecbb2 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Tue, 5 Sep 2017 20:23:57 +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

---
 .idea/artifacts/platform_sync_data_war_exploded.xml        |  2 +-
 .../operate/web/facade/AntenatalExaminationFacade.java     | 14 +++++++++++++-
 .../com/lyms/platform/operate/web/facade/ViewFacade.java   |  4 +++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.idea/artifacts/platform_sync_data_war_exploded.xml b/.idea/artifacts/platform_sync_data_war_exploded.xml
index 449aea2..cd8e1d1 100644
--- a/.idea/artifacts/platform_sync_data_war_exploded.xml
+++ b/.idea/artifacts/platform_sync_data_war_exploded.xml
@@ -13,7 +13,6 @@
           </element>
           <element id="library" level="project" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" />
           <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
-          <element id="library" level="project" name="Maven: com.oracle:ojdbc14:11.2.0.1.0" />
           <element id="archive" name="platform-dal-1.0.1.jar">
             <element id="module-output" name="platform-dal" />
           </element>
@@ -107,6 +106,7 @@
           <element id="library" level="project" name="Maven: antlr:antlr:2.7.2" />
           <element id="library" level="project" name="Maven: org.apache.struts:struts-taglib:1.3.8" />
           <element id="library" level="project" name="Maven: org.apache.struts:struts-tiles:1.3.8" />
+          <element id="library" level="project" name="Maven: com.oracle:ojdbc14:11.2.0.1.0" />
           <element id="library" level="project" name="Maven: commons-dbutils:commons-dbutils:1.6" />
           <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.8" />
         </element>
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 d2b064d..05b31d4 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
@@ -2130,7 +2130,19 @@ public class AntenatalExaminationFacade {
                 antenatalExaminationResult.setCheckDoctor(map1);
             }
 
+            Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
+            Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
+            if(MapUtils.isNotEmpty(treatmentOpinion2)) {
+                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(), mongoUtil.findPlatValueList3(map.getValue()));
+                }
+            }
+            antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
             antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
+
+           /* antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
             Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
             Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
             if(MapUtils.isNotEmpty(treatmentOpinion2)) {
@@ -2141,7 +2153,7 @@ public class AntenatalExaminationFacade {
                 }
             }
             antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
-            antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
+            antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());*/
             antenatalExaminationResult.setQuicken(examinationModel.getQuicken());
             antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark());
             antenatalExaminationResult.setmHighRiskReason(mHighRiskReason);
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 0de9d3c..02e6c12 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
@@ -1805,8 +1805,10 @@ public class ViewFacade {
         map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
         map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
 
-        map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
+//        map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
+//        map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
         map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
+        map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2()));
         map.put("quicken", QuickenEnums.getName(data.getQuicken()));
         map.put("quickenRemark", data.getQuickenRemark());
 
-- 
1.8.3.1