jiangjiazhi / regional-platform

Commit 7b5eae1c7da3e4b73fc1e58bcef70e3ce50cf9d2

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

配置接口修改

Showing 4 changed files with 108 additions and 15 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java
platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsConfigResult.java

...	...	@@ -10,6 +10,8 @@
10	10	import org.springframework.beans.factory.annotation.Autowired;
11	11	import org.springframework.stereotype.Service;
12	12
	13	+import java.util.ArrayList;
	14	+import java.util.HashMap;
13	15	import java.util.List;
14	16	import java.util.Map;
15	17
16	18
17	19
18	20
19	21
20	22
21	23
...	...	@@ -46,17 +48,55 @@
46	48	if (CollectionUtils.isNotEmpty(configs))
47	49	{
48	50	List<Map> list = JsonUtil.toList(configs.get(0).getDeptPrefix(), Map.class);
49		-
50		- for (Map dept : list)
	51	+ if (CollectionUtils.isNotEmpty(list))
51	52	{
52		- if (deptId != null && String.valueOf(deptId).equals(String.valueOf(dept.get("deptId"))))
	53	+ for (Map dept : list)
53	54	{
54		- dept.put("deptPrefix",deptPrefix);
	55	+ if (deptId != null && String.valueOf(deptId).equals(String.valueOf(dept.get("deptId"))))
	56	+ {
	57	+ dept.put("deptPrefix",deptPrefix);
	58	+ }
	59	+ else
	60	+ {
	61	+ Map preMap = new HashMap();
	62	+ preMap.put("deptPrefix",deptPrefix);
	63	+ preMap.put("deptId",deptId);
	64	+ preMap.put("hospitalId",hid);
	65	+ list.add(preMap);
	66	+ break;
	67	+ }
55	68	}
	69	+
56	70	}
	71	+ else
	72	+ {
	73	+ Map preMap = new HashMap();
	74	+ preMap.put("deptPrefix",deptPrefix);
	75	+ preMap.put("deptId",deptId);
	76	+ preMap.put("hospitalId",hid);
	77	+ list.add(preMap);
	78	+ }
57	79	updateModel.setDeptPrefix(JsonUtil.array2JsonString(list));
	80	+ smsConfigDao.updateDeptPrefix(hid, updateModel);
58	81	}
59		- smsConfigDao.updateDeptPrefix(hid,updateModel);
	82	+ else
	83	+ {
	84	+ List<Map> list = new ArrayList<>();
	85	+ SmsConfigModel model = new SmsConfigModel();
	86	+ model.setHospitalId(hid);
	87	+ model.setYn(YnEnums.YES.getId());
	88	+
	89	+ model.setPrefixType(0);
	90	+
	91	+ Map preMap = new HashMap();
	92	+ preMap.put("deptPrefix",deptPrefix);
	93	+ preMap.put("deptId", deptId);
	94	+ preMap.put("hospitalId", hid);
	95	+ list.add(preMap);
	96	+ model.setDeptPrefix(JsonUtil.array2JsonString(list));
	97	+
	98	+ }
	99	+
60	100	}
61	101	}

...	...	@@ -49,6 +49,25 @@
49	49	return list;
50	50	}
51	51
	52	+ public static List<Map> getWeekEnums(List<String> weeks) {
	53	+ List<Map> list = new ArrayList<>();
	54	+ for (String week : weeks)
	55	+ {
	56	+ for (WeekEnums e : WeekEnums.values()) {
	57	+ if (e.getName().equals(week))
	58	+ {
	59	+ Map rootMap = new HashMap();
	60	+ rootMap.put("id", e.getId());
	61	+ rootMap.put("name", e.getName());
	62	+ list.add(rootMap);
	63	+ }
	64	+
	65	+ }
	66	+ }
	67	+
	68	+ return list;
	69	+ }
	70	+
52	71
53	72	private int id;
54	73

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.biz.service.*;
4	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
	5	+import com.lyms.platform.common.enums.WeekEnums;
5	6	import com.lyms.platform.common.enums.YnEnums;
6	7	import com.lyms.platform.common.result.BaseObjectResponse;
7	8	import com.lyms.platform.common.result.BaseResponse;
8	9
9	10
10	11
11	12
12	13
...	...	@@ -160,23 +161,56 @@
160	161	sr.setHospitalPrefix(model.getHospitalPrefix());
161	162	sr.setHospitalId(model.getHospitalId());
162	163	sr.setPrefixType(model.getPrefixType());
163		- sr.setGuideTime(JsonUtil.toList(model.getGuideTime(),String.class));
164		- List<Map> deptsPrefix = JsonUtil.toList(model.getDeptPrefix(), Map.class);
165		- if (CollectionUtils.isNotEmpty(deptsPrefix))
	164	+ List<String> weeks = JsonUtil.toList(model.getGuideTime(), String.class);
	165	+ sr.setGuideTime(WeekEnums.getWeekEnums(weeks));
	166	+ List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class);
	167	+ if (CollectionUtils.isNotEmpty(deptsPrefixs))
166	168	{
167		- for (Map detp : deptsPrefix)
	169	+ for (Map dept : deptsPrefixs)
168	170	{
169	171	//查询科室并设置名称
170		- Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(detp.get("deptId"))));
	172	+ Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId"))));
171	173	if (qdetp != null)
172	174	{
173		- detp.put("deptName",qdetp.getName());
	175	+ dept.put("deptName",qdetp.getName());
174	176	}
175	177	}
176	178
177	179	}
178		- sr.setDeptPrefix(deptsPrefix);
179	180
	181	+ DepartmentsQuery departmentsQuery = new DepartmentsQuery();
	182	+ departmentsQuery.setSort("modified desc");
	183	+ departmentsQuery.setYn(YnEnums.YES.getId());
	184	+ departmentsQuery.setOrgId(Integer.valueOf(model.getHospitalId()));
	185	+ List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
	186	+ for(Departments dept : departmentses)
	187	+ {
	188	+ boolean isExist = false;
	189	+ if (CollectionUtils.isNotEmpty(deptsPrefixs))
	190	+ {
	191	+ for (Map deptsPrefix : deptsPrefixs)
	192	+ {
	193	+ if (dept != null && deptsPrefix.get("deptId") != null)
	194	+ {
	195	+ if (Integer.valueOf(String.valueOf(deptsPrefix.get("deptId"))) == dept.getId())
	196	+ {
	197	+ isExist = true;
	198	+ }
	199	+ }
	200	+ }
	201	+
	202	+ }
	203	+ if (!isExist)
	204	+ {
	205	+ Map<String,String> map = new HashMap<>();
	206	+ map.put("deptId",String.valueOf(dept.getId()));
	207	+ map.put("hospitalId",String.valueOf(dept.getOrgId()));
	208	+ map.put("deptName",dept.getName());
	209	+ map.put("deptPrefix", "");
	210	+ deptsPrefixs.add(map);
	211	+ }
	212	+ }
	213	+ sr.setDeptPrefix(deptsPrefixs);
180	214	List<Map> smsService = JsonUtil.toList(model.getSmsService(), Map.class);
181	215	sr.setSmsService(smsService);
182	216	return sr;

...	...	@@ -20,7 +20,7 @@
20	20	private List<Map> deptPrefix;
21	21
22	22	//指导发送时间
23		- private List<String> guideTime;
	23	+ private List<Map> guideTime;
24	24
25	25	//消息服务启动
26	26	private List<Map> smsService;
27	27
...	...	@@ -67,11 +67,11 @@
67	67	this.deptPrefix = deptPrefix;
68	68	}
69	69
70		- public List<String> getGuideTime() {
	70	+ public List<Map> getGuideTime() {
71	71	return guideTime;
72	72	}
73	73
74		- public void setGuideTime(List<String> guideTime) {
	74	+ public void setGuideTime(List<Map> guideTime) {
75	75	this.guideTime = guideTime;
76	76	}
77	77