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 @@
-
@@ -107,6 +106,7 @@
+
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> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
+ Map>> restTreatmentOpinion2 = new HashMap<>();
+ if(MapUtils.isNotEmpty(treatmentOpinion2)) {
+ Iterator>> iterator = treatmentOpinion2.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Map.Entry> map = iterator.next();
+ restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList3(map.getValue()));
+ }
+ }
+ antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
+
+ /* antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
Map> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
Map>> 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());