jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 13 additions and 12 deletions

...	...	@@ -6,13 +6,14 @@
6	6	* 处理意见
7	7	*/
8	8	public enum HandleOpinionsQhdEnums {
9		- ONE(7, "请于1周后复查"),
10		- TWO(14, "请于2周后复查"),
11		- THREE(1, "请于1月后复查"),
12		- FOUR(2, "请于2月后复查"),
13		- FIVE(3, "请于3月后复查"),
14		- SIX(6, "请于6月后复查"),
15		- SEVEN(12, "请于1年后复查");
	9	+ //避免历史数据重复导致会显混乱才加的0 70
	10	+ ONE(70, "请于1周后复查"),
	11	+ TWO(140, "请于2周后复查"),
	12	+ THREE(10, "请于1月后复查"),
	13	+ FOUR(20, "请于2月后复查"),
	14	+ FIVE(30, "请于3月后复查"),
	15	+ SIX(60, "请于6月后复查"),
	16	+ SEVEN(120, "请于1年后复查");
16	17
17	18
18	19	private Integer id;

...	...	@@ -6,6 +6,7 @@
6	6
7	7	import java.util.Date;
8	8	import java.util.List;
	9	+import java.util.Map;
9	10
10	11	/**
11	12	* 儿童眼保健检查
...	...	@@ -81,7 +82,7 @@
81	82	*/
82	83	private String other;
83	84	//秦皇岛处理医生自定义处理意见
84		- private List<String> handleOpinionsIdList;
	85	+ private List<Map> handleOpinionsIdList;
85	86
86	87	/* end 秦皇岛新增的眼保健字段 */
87	88
88	89
...	...	@@ -392,11 +393,11 @@
392	393	//合作 0欠合作 1不合作
393	394	private String cooperation;
394	395
395		- public List<String> getHandleOpinionsIdList() {
	396	+ public List<Map> getHandleOpinionsIdList() {
396	397	return handleOpinionsIdList;
397	398	}
398	399
399		- public void setHandleOpinionsIdList(List<String> handleOpinionsIdList) {
	400	+ public void setHandleOpinionsIdList(List<Map> handleOpinionsIdList) {
400	401	this.handleOpinionsIdList = handleOpinionsIdList;
401	402	}
402	403

...	...	@@ -431,14 +431,13 @@
431	431	if (StringUtils.isNotEmpty(doctor)) {
432	432	map.put("doctor", couponMapper.getUserName(doctor));
433	433	}
434		- map.put("handleOpinionsId", HandleOpinionsEnums.getName(babyEyeCheck.getHandleOpinionsId()));
435	434	/**
436	435	* start 秦皇岛眼保健新增的
437	436	* @Author: 武涛涛
438	437	* @Date: 2020/7/20 13:40
439	438	*/
440	439	map.put("handleOpinionsIdList", babyEyeCheck.getHandleOpinionsIdList());//医生自定义处理意见 id
441		- map.put("handleOpinionsId", babyEyeCheck.getHandleOpinionsId());//处理意见 id
	440	+ map.put("handleOpinionsId", HandleOpinionsQhdEnums.getName(babyEyeCheck.getHandleOpinionsId()));//处理意见 id,历史数据不做匹配
442	441	map.put("eyeAppearance", babyEyeCheck.getEyeAppearance());//眼外观 1通过 2不通过
443	442	map.put("redReflexQhd", babyEyeCheck.getRedReflexQhd());//红光反射
444	443	map.put("redReflexQhdOther", babyEyeCheck.getRedReflexQhdOther());