liquanyu / regional-platform

Download as
Browse Code »

Commit d38df26c5612d407862604b9621fa475e41ecbb2

Authored by litao@lymsh.com
1 parent ae001f34fa
Exists in master and in 1 other branch dev

改字段

Showing 3 changed files with 17 additions and 3 deletions

.idea/artifacts/platform_sync_data_war_exploded.xml View file @ d38df26
... ... @@ -13,7 +13,6 @@
13 13 </element>
14 14 <element id="library" level="project" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.12" />
15 15 <element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
16   - <element id="library" level="project" name="Maven: com.oracle:ojdbc14:11.2.0.1.0" />
17 16 <element id="archive" name="platform-dal-1.0.1.jar">
18 17 <element id="module-output" name="platform-dal" />
19 18 </element>
... ... @@ -107,6 +106,7 @@
107 106 <element id="library" level="project" name="Maven: antlr:antlr:2.7.2" />
108 107 <element id="library" level="project" name="Maven: org.apache.struts:struts-taglib:1.3.8" />
109 108 <element id="library" level="project" name="Maven: org.apache.struts:struts-tiles:1.3.8" />
  109 + <element id="library" level="project" name="Maven: com.oracle:ojdbc14:11.2.0.1.0" />
110 110 <element id="library" level="project" name="Maven: commons-dbutils:commons-dbutils:1.6" />
111 111 <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.8" />
112 112 </element>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ d38df26
... ... @@ -2130,7 +2130,19 @@
2130 2130 antenatalExaminationResult.setCheckDoctor(map1);
2131 2131 }
2132 2132  
  2133 + Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
  2134 + Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
  2135 + if(MapUtils.isNotEmpty(treatmentOpinion2)) {
  2136 + Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
  2137 + while (iterator.hasNext()) {
  2138 + Map.Entry<String, List<String>> map = iterator.next();
  2139 + restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList3(map.getValue()));
  2140 + }
  2141 + }
  2142 + antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
2133 2143 antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
  2144 +
  2145 + /* antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
2134 2146 Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
2135 2147 Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
2136 2148 if(MapUtils.isNotEmpty(treatmentOpinion2)) {
... ... @@ -2141,7 +2153,7 @@
2141 2153 }
2142 2154 }
2143 2155 antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
2144   - antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
  2156 + antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());*/
2145 2157 antenatalExaminationResult.setQuicken(examinationModel.getQuicken());
2146 2158 antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark());
2147 2159 antenatalExaminationResult.setmHighRiskReason(mHighRiskReason);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ d38df26
... ... @@ -1805,8 +1805,10 @@
1805 1805 map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
1806 1806 map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
1807 1807  
1808   - map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
  1808 +// map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
  1809 +// map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
1809 1810 map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
  1811 + map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2()));
1810 1812 map.put("quicken", QuickenEnums.getName(data.getQuicken()));
1811 1813 map.put("quickenRemark", data.getQuickenRemark());
1812 1814