jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 19d0759862b73a7fa225b6b67436dfeaa58362a4

Authored by litao@lymsh.com
1 parent d8bf0d105c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

改字段

Showing 3 changed files with 3 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 19d0759
... ... @@ -2171,7 +2171,7 @@
2171 2171 Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
2172 2172 while (iterator.hasNext()) {
2173 2173 Map.Entry<String, List<String>> map = iterator.next();
2174   - restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList(map.getValue()));
  2174 + restTreatmentOpinion2.put(map.getKey(), CollectionUtils.isNotEmpty(map.getValue()) ? mongoUtil.findPlatValueList(map.getValue()) : new ArrayList<Map<String, Object>>());
2175 2175 }
2176 2176 }
2177 2177 antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 19d0759
... ... @@ -1804,17 +1804,7 @@
1804 1804 map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
1805 1805 map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
1806 1806  
1807   - map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types());
1808   - StringBuilder restTreatmentOpinion2 = new StringBuilder();
1809   - Map<String, List<String>> treatmentOpinion2 = data.getTreatmentOpinion2();
1810   - if(MapUtils.isNotEmpty(treatmentOpinion2)) {
1811   - Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
1812   - while (iterator.hasNext()) {
1813   - Map.Entry<String, List<String>> iter = iterator.next();
1814   - restTreatmentOpinion2.append(mongoUtil.findPlatValue(iter.getKey())).append(": ").append(mongoUtil.findPlatValues(iter.getValue())).append("0");
1815   - }
1816   - }
1817   - map.put("treatmentOpinion2", restTreatmentOpinion2.toString());
  1807 + map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
1818 1808 map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
1819 1809  
1820 1810 //早孕期病毒检测
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 19d0759
... ... @@ -349,6 +349,7 @@
349 349 Map.Entry<String, List<String>> next = iterator.next();
350 350 StringBuilder sb = new StringBuilder();
351 351 sb.append(findPlatValue(next.getKey())).append(": ").append(findPlatValues(next.getValue()));
  352 + list.add(sb.toString());
352 353 }
353 354 return list;
354 355 }