jiangjiazhi / regional-platform

Authored by wtt about 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 5 deletions

...	...	@@ -230,7 +230,11 @@
230	230	List<Map<String,String>> list = getRiskName(diagnose.getRiskIds());
231	231	dr.setRiskIds(list);
232	232	}
233		-
	233	+ if (CollectionUtils.isNotEmpty(diagnose.getRiskFactorIds()))
	234	+ {
	235	+ List<Map<String,String>> list = getRiskName(diagnose.getRiskFactorIds());
	236	+ dr.setRiskFactorIds(list);
	237	+ }
234	238	itemModels.add(dr);
235	239	}
236	240	}

...	...	@@ -28,7 +28,7 @@
28	28	//畸形详情,在转换成MaternalDeliverModel.Baby判断使用
29	29	private Map<String,Object> tejx;
30	30	//母亲存在的高危因素
31		- private List<String> riskFactorIds;
	31	+ private List<Map<String, String>> riskFactorIds;
32	32	//20200827新增儿童的，“高危儿详情项”
33	33	private List<String> riskBabyInfoIds;
34	34	@Override
...	...	@@ -41,7 +41,6 @@
41	41	setValueSix(model.getValueSix());
42	42	setValueSeven(model.getValueSeven());
43	43	setTejx(model.getTejx());
44		- setRiskFactorIds(model.getRiskFactorIds());
45	44	setRiskBabyInfoIds(model.getRiskBabyInfoIds());
46	45	return this;
47	46	}
48	47
...	...	@@ -54,11 +53,11 @@
54	53	this.tejx = tejx;
55	54	}
56	55
57		- public List <String> getRiskFactorIds() {
	56	+ public List <Map <String, String>> getRiskFactorIds() {
58	57	return riskFactorIds;
59	58	}
60	59
61		- public void setRiskFactorIds(List <String> riskFactorIds) {
	60	+ public void setRiskFactorIds(List <Map <String, String>> riskFactorIds) {
62	61	this.riskFactorIds = riskFactorIds;
63	62	}
64	63