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 3f4eec8..c0a83fe 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 @@ -2171,7 +2171,7 @@ public class AntenatalExaminationFacade { Iterator>> iterator = treatmentOpinion2.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry> map = iterator.next(); - restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList(map.getValue())); + restTreatmentOpinion2.put(map.getKey(), CollectionUtils.isNotEmpty(map.getValue()) ? mongoUtil.findPlatValueList(map.getValue()) : new ArrayList>()); } } antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2); 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 0d8a8a1..e6d028e 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 @@ -1804,17 +1804,7 @@ public class ViewFacade { map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查"); map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查"); - map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types()); - StringBuilder restTreatmentOpinion2 = new StringBuilder(); - Map> treatmentOpinion2 = data.getTreatmentOpinion2(); - if(MapUtils.isNotEmpty(treatmentOpinion2)) { - Iterator>> iterator = treatmentOpinion2.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry> iter = iterator.next(); - restTreatmentOpinion2.append(mongoUtil.findPlatValue(iter.getKey())).append(": ").append(mongoUtil.findPlatValues(iter.getValue())).append("0"); - } - } - map.put("treatmentOpinion2", restTreatmentOpinion2.toString()); + map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2())); map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); //早孕期病毒检测 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 80a93d3..20b84ae 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 @@ -349,6 +349,7 @@ public class MongoUtil { Map.Entry> next = iterator.next(); StringBuilder sb = new StringBuilder(); sb.append(findPlatValue(next.getKey())).append(": ").append(findPlatValues(next.getValue())); + list.add(sb.toString()); } return list; }