jiangjiazhi / regional-platform | GitLab

Commit 6c7de1d132c6aeee46d911992364a25a935a0a7a

Authored by litao@lymsh.com almost 8 years ago

1 parent 3905412ad6

Exists in master and in 6 other branches

改字段

Showing 2 changed files with 4 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java

...	...	@@ -2103,6 +2103,8 @@
2103	2103	antenatalExaminationResult.setCheckDoctor(map1);
2104	2104	}
2105	2105
	2106	+
	2107	+ antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
2106	2108	Map<String, List<String>> treatmentOpinion2 = examinationModel.getTreatmentOpinion2();
2107	2109	Map<String, List<Map<String, Object>>> restTreatmentOpinion2 = new HashMap<>();
2108	2110	if(MapUtils.isNotEmpty(treatmentOpinion2)) {
...	...	@@ -2171,7 +2173,7 @@
2171	2173	Iterator<Map.Entry<String, List<String>>> iterator = treatmentOpinion2.entrySet().iterator();
2172	2174	while (iterator.hasNext()) {
2173	2175	Map.Entry<String, List<String>> map = iterator.next();
2174		- restTreatmentOpinion2.put(map.getKey(), CollectionUtils.isNotEmpty(map.getValue()) ? mongoUtil.findPlatValueList(map.getValue()) : new ArrayList<Map<String, Object>>());
	2176	+ restTreatmentOpinion2.put(map.getKey(), mongoUtil.findPlatValueList(map.getValue()));
2175	2177	}
2176	2178	}
2177	2179	antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2);

...	...	@@ -301,7 +301,7 @@
301	301
302	302	public List<Map<String, Object>> findPlatValueList(List<String> ids) {
303	303	if(CollectionUtils.isEmpty(ids)) {
304		- return null;
	304	+ return new ArrayList<>();
305	305	}
306	306	List<Map<String, Object>> rest = new ArrayList<>();
307	307	for (String id : ids) {