shiyang / regional-platform

Download as
Browse Code »

Commit 27dd6eb770f3eda493574cb82fdff7dea165c4a6

Authored by liquanyu
1 parent fc0d9900bc
Exists in master and in 1 other branch nobuildprocess

配置接口修改

Showing 2 changed files with 38 additions and 34 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java View file @ 27dd6eb
... ... @@ -94,7 +94,7 @@
94 94 preMap.put("hospitalId", hid);
95 95 list.add(preMap);
96 96 model.setDeptPrefix(JsonUtil.array2JsonString(list));
97   -
  97 + addSmsConfig(model);
98 98 }
99 99  
100 100 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ 27dd6eb
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.result.BaseObjectResponse;
9 9 import com.lyms.platform.common.result.BaseResponse;
10 10 import com.lyms.platform.common.utils.JsonUtil;
  11 +import com.lyms.platform.common.utils.StringUtils;
11 12 import com.lyms.platform.operate.web.request.SmsConfigRequest;
12 13 import com.lyms.platform.operate.web.result.*;
13 14 import com.lyms.platform.permission.model.Departments;
14 15  
15 16  
16 17  
17 18  
18 19  
19 20  
20 21  
21 22  
22 23  
23 24  
24 25  
25 26  
26 27  
... ... @@ -230,54 +231,57 @@
230 231 SmsConfigModel model = smsmodels.get(0);
231 232  
232 233  
233   - List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class);
234   - if (CollectionUtils.isNotEmpty(deptsPrefixs))
  234 + if (StringUtils.isNotEmpty(model.getDeptPrefix()))
235 235 {
236   - for (Map dept : deptsPrefixs)
  236 + List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class);
  237 + if (CollectionUtils.isNotEmpty(deptsPrefixs))
237 238 {
238   - //查询科室 并设置名称
239   - Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId"))));
240   - if (qdetp != null)
  239 + for (Map dept : deptsPrefixs)
241 240 {
242   - dept.put("deptName",qdetp.getName());
  241 + //查询科室 并设置名称
  242 + Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId"))));
  243 + if (qdetp != null)
  244 + {
  245 + dept.put("deptName",qdetp.getName());
  246 + }
243 247 }
  248 +
244 249 }
245 250  
246   - }
247   -
248   - DepartmentsQuery departmentsQuery = new DepartmentsQuery();
249   - departmentsQuery.setSort("modified desc");
250   - departmentsQuery.setYn(YnEnums.YES.getId());
251   - departmentsQuery.setOrgId(Integer.valueOf(model.getHospitalId()));
252   - List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
253   - for(Departments dept : departmentses)
254   - {
255   - boolean isExist = false;
256   - if (CollectionUtils.isNotEmpty(deptsPrefixs))
  251 + DepartmentsQuery departmentsQuery = new DepartmentsQuery();
  252 + departmentsQuery.setSort("modified desc");
  253 + departmentsQuery.setYn(YnEnums.YES.getId());
  254 + departmentsQuery.setOrgId(Integer.valueOf(model.getHospitalId()));
  255 + List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery);
  256 + for(Departments dept : departmentses)
257 257 {
258   - for (Map deptsPrefix : deptsPrefixs)
  258 + boolean isExist = false;
  259 + if (CollectionUtils.isNotEmpty(deptsPrefixs))
259 260 {
260   - if (dept != null && deptsPrefix.get("deptId") != null)
  261 + for (Map deptsPrefix : deptsPrefixs)
261 262 {
262   - if (Integer.valueOf(String.valueOf(deptsPrefix.get("deptId"))) == dept.getId())
  263 + if (dept != null && deptsPrefix.get("deptId") != null)
263 264 {
264   - isExist = true;
  265 + if (Integer.valueOf(String.valueOf(deptsPrefix.get("deptId"))) == dept.getId())
  266 + {
  267 + isExist = true;
  268 + }
265 269 }
266 270 }
267   - }
268 271  
  272 + }
  273 + if (!isExist)
  274 + {
  275 + Map<String,String> map = new HashMap<>();
  276 + map.put("deptId",String.valueOf(dept.getId()));
  277 + map.put("hospitalId",String.valueOf(dept.getOrgId()));
  278 + map.put("deptName",dept.getName());
  279 + map.put("deptPrefix", "");
  280 + deptsPrefixs.add(map);
  281 + }
269 282 }
270   - if (!isExist)
271   - {
272   - Map<String,String> map = new HashMap<>();
273   - map.put("deptId",String.valueOf(dept.getId()));
274   - map.put("hospitalId",String.valueOf(dept.getOrgId()));
275   - map.put("deptName",dept.getName());
276   - map.put("deptPrefix", "");
277   - deptsPrefixs.add(map);
278   - }
  283 + sr.setDeptPrefix(deptsPrefixs);
279 284 }
280   - sr.setDeptPrefix(deptsPrefixs);
281 285 }
282 286 else
283 287 {