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 c0a83fe..5582ca0 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 @@ -2103,6 +2103,8 @@ public class AntenatalExaminationFacade { antenatalExaminationResult.setCheckDoctor(map1); } + + antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types()); Map> treatmentOpinion2 = examinationModel.getTreatmentOpinion2(); Map>> restTreatmentOpinion2 = new HashMap<>(); if(MapUtils.isNotEmpty(treatmentOpinion2)) { @@ -2171,7 +2173,7 @@ public class AntenatalExaminationFacade { Iterator>> iterator = treatmentOpinion2.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry> map = iterator.next(); - restTreatmentOpinion2.put(map.getKey(), CollectionUtils.isNotEmpty(map.getValue()) ? mongoUtil.findPlatValueList(map.getValue()) : new ArrayList>()); + restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList(map.getValue())); } } antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2); 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 20b84ae..56d3480 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 @@ -301,7 +301,7 @@ public class MongoUtil { public List> findPlatValueList(List ids) { if(CollectionUtils.isEmpty(ids)) { - return null; + return new ArrayList<>(); } List> rest = new ArrayList<>(); for (String id : ids) {