jiangjiazhi / regional-platform

Commit 0b34594197e577a17b0dccb9f4fe8b540708cfb1

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

儿童服务

Showing 3 changed files with 18 additions and 11 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java

...	...	@@ -14,12 +14,14 @@
14	14	//服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
15	15	public enum SerTypeEnums {
16	16	bzfw(6, "标准服务"),
17		- yqjzzd(1, "精准医疗指导"),
	17	+ yqjzzd(1, "孕期精准医疗指导"),
18	18	tz(2, "体重管理"),
19	19	xt(3, "血糖管理"),
20	20	xy(4, "血压管理"),
21	21	zjzx(5, "专家咨询"),
22		- tw(7, "体温管理");
	22	+ tw(7, "体温管理"),
	23	+ babyjzzz(10,"精准医疗指导"),
	24	+ babyBzfw(11,"标准服务");
23	25	private Integer id;
24	26	private String title;
25	27
...	...	@@ -54,6 +56,7 @@
54	56	}
55	57	}
56	58
	59	+
57	60	//服务状态(1-开通、2-退订、3-过期、4-暂停)
58	61	public enum SerStatusEnums {
59	62	kt(1, "开通"),
60	63
61	64
62	65
...	...	@@ -98,24 +101,26 @@
98	101	public static List getBabySerType() {
99	102	List<Object> list = new ArrayList<>();
100	103	Map<String, Object> resultMap = new HashMap<>();
101		- resultMap.put("id", SerTypeEnums.bzfw.id);
102		- resultMap.put("name", SerTypeEnums.bzfw.getTitle());
	104	+ resultMap.put("id", SerTypeEnums.babyBzfw.id);
	105	+ resultMap.put("name", SerTypeEnums.babyBzfw.getTitle());
103	106	list.add(resultMap);
104	107	Map<String, Object> resultMap2 = new HashMap<>();
105		- resultMap2.put("id", SerTypeEnums.yqjzzd.id);
106		- resultMap2.put("name", SerTypeEnums.yqjzzd.getTitle());
	108	+ resultMap2.put("id", SerTypeEnums.babyjzzz.id);
	109	+ resultMap2.put("name", SerTypeEnums.babyjzzz.getTitle());
107	110	list.add(resultMap2);
108	111	return list;
109	112	}
110	113
111		- //全部服务类型
	114	+ //孕妇服务类型
112	115	public static List getSerType() {
113	116	List<Object> list = new ArrayList<>();
114	117	for (SerTypeEnums enums : SerTypeEnums.values()) {
115		- Map<String, Object> resultMap = new HashMap<>();
116		- resultMap.put("id", enums.getId());
117		- resultMap.put("name", enums.getTitle());
118		- list.add(resultMap);
	118	+ if(enums.getId()<10){
	119	+ Map<String, Object> resultMap = new HashMap<>();
	120	+ resultMap.put("id", enums.getId());
	121	+ resultMap.put("name", enums.getTitle());
	122	+ list.add(resultMap);
	123	+ }
119	124	}
120	125	return list;
121	126	}

...	...	@@ -147,6 +147,7 @@
147	147	}
148	148
149	149	/**
	150	+ * 儿童建档服务数据处理
150	151	* @param isSkip 是否增量添加 true:增量添加
151	152	* @return
152	153	*/

...	...	@@ -2945,6 +2945,7 @@
2945	2945	if (models != null && models.size() > 0) {
2946	2946	BabyModel model = models.get(0);
2947	2947
	2948	+ //获取儿童服务开通信息
2948	2949	BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id);
2949	2950	List<PatientSerResult> patientSerResults = (List<PatientSerResult>) baseResponse.getObject();
2950	2951	result.setPatientSerResults(patientSerResults);