Commit 7aad119e5b3f5fe294dbfa35e42592a967d1afcf
1 parent
85fa6cbd08
Exists in
master
and in
1 other branch
配置接口修改
Showing 2 changed files with 106 additions and 48 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java
View file @
7aad119
| ... | ... | @@ -81,6 +81,17 @@ |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
| 84 | + * 查询医院前缀配置 | |
| 85 | + * @param hid | |
| 86 | + * @return | |
| 87 | + */ | |
| 88 | + @RequestMapping(method = RequestMethod.GET, value = "/getDeptPrefix/{hid}") | |
| 89 | + @ResponseBody | |
| 90 | + public BaseResponse getDeptPrefix(@PathVariable("hid") String hid) { | |
| 91 | + return smsConfigFacade.getDeptPrefix(hid); | |
| 92 | + } | |
| 93 | + | |
| 94 | + /** | |
| 84 | 95 | * 获取服务树结构 |
| 85 | 96 | * @return |
| 86 | 97 | */ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
View file @
7aad119
| ... | ... | @@ -164,54 +164,6 @@ |
| 164 | 164 | sr.setPrefixType(model.getPrefixType()); |
| 165 | 165 | List<String> weeks = JsonUtil.toList(model.getGuideTime(), String.class); |
| 166 | 166 | sr.setGuideTime(WeekEnums.getWeekEnums(weeks)); |
| 167 | - List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class); | |
| 168 | - if (CollectionUtils.isNotEmpty(deptsPrefixs)) | |
| 169 | - { | |
| 170 | - for (Map dept : deptsPrefixs) | |
| 171 | - { | |
| 172 | - //查询科室 并设置名称 | |
| 173 | - Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId")))); | |
| 174 | - if (qdetp != null) | |
| 175 | - { | |
| 176 | - dept.put("deptName",qdetp.getName()); | |
| 177 | - } | |
| 178 | - } | |
| 179 | - | |
| 180 | - } | |
| 181 | - | |
| 182 | - DepartmentsQuery departmentsQuery = new DepartmentsQuery(); | |
| 183 | - departmentsQuery.setSort("modified desc"); | |
| 184 | - departmentsQuery.setYn(YnEnums.YES.getId()); | |
| 185 | - departmentsQuery.setOrgId(Integer.valueOf(model.getHospitalId())); | |
| 186 | - List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery); | |
| 187 | - for(Departments dept : departmentses) | |
| 188 | - { | |
| 189 | - boolean isExist = false; | |
| 190 | - if (CollectionUtils.isNotEmpty(deptsPrefixs)) | |
| 191 | - { | |
| 192 | - for (Map deptsPrefix : deptsPrefixs) | |
| 193 | - { | |
| 194 | - if (dept != null && deptsPrefix.get("deptId") != null) | |
| 195 | - { | |
| 196 | - if (Integer.valueOf(String.valueOf(deptsPrefix.get("deptId"))) == dept.getId()) | |
| 197 | - { | |
| 198 | - isExist = true; | |
| 199 | - } | |
| 200 | - } | |
| 201 | - } | |
| 202 | - | |
| 203 | - } | |
| 204 | - if (!isExist) | |
| 205 | - { | |
| 206 | - Map<String,String> map = new HashMap<>(); | |
| 207 | - map.put("deptId",String.valueOf(dept.getId())); | |
| 208 | - map.put("hospitalId",String.valueOf(dept.getOrgId())); | |
| 209 | - map.put("deptName",dept.getName()); | |
| 210 | - map.put("deptPrefix", ""); | |
| 211 | - deptsPrefixs.add(map); | |
| 212 | - } | |
| 213 | - } | |
| 214 | - sr.setDeptPrefix(deptsPrefixs); | |
| 215 | 167 | List<Map> smsService = JsonUtil.toList(model.getSmsService(), Map.class); |
| 216 | 168 | sr.setSmsService(getSelectedNode(smsService)); |
| 217 | 169 | return sr; |
| ... | ... | @@ -247,6 +199,101 @@ |
| 247 | 199 | BaseResponse objectResponse = new BaseResponse(); |
| 248 | 200 | objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); |
| 249 | 201 | objectResponse.setErrormsg("成功"); |
| 202 | + return objectResponse; | |
| 203 | + } | |
| 204 | + | |
| 205 | + /** | |
| 206 | + * 查询科室前缀 | |
| 207 | + * @param hid | |
| 208 | + * @return | |
| 209 | + */ | |
| 210 | + public BaseResponse getDeptPrefix(String hid) { | |
| 211 | + SmsConfigQuery query = new SmsConfigQuery(); | |
| 212 | + query.setYn(YnEnums.YES.getId()); | |
| 213 | + query.setHospitalId(hid); | |
| 214 | + SmsConfigResult result = new SmsConfigResult(); | |
| 215 | + | |
| 216 | + List<SmsConfigModel> smsmodels = smsConfigService.querySmsConfigByHid(query); | |
| 217 | + if (CollectionUtils.isNotEmpty(smsmodels)) | |
| 218 | + { | |
| 219 | + SmsConfigModel model = smsmodels.get(0); | |
| 220 | + SmsConfigResult sr = new SmsConfigResult(); | |
| 221 | + | |
| 222 | + List<Map> deptsPrefixs = JsonUtil.toList(model.getDeptPrefix(), Map.class); | |
| 223 | + if (CollectionUtils.isNotEmpty(deptsPrefixs)) | |
| 224 | + { | |
| 225 | + for (Map dept : deptsPrefixs) | |
| 226 | + { | |
| 227 | + //查询科室 并设置名称 | |
| 228 | + Departments qdetp = departmentsService.getDepartments(Integer.valueOf(String.valueOf(dept.get("deptId")))); | |
| 229 | + if (qdetp != null) | |
| 230 | + { | |
| 231 | + dept.put("deptName",qdetp.getName()); | |
| 232 | + } | |
| 233 | + } | |
| 234 | + | |
| 235 | + } | |
| 236 | + | |
| 237 | + DepartmentsQuery departmentsQuery = new DepartmentsQuery(); | |
| 238 | + departmentsQuery.setSort("modified desc"); | |
| 239 | + departmentsQuery.setYn(YnEnums.YES.getId()); | |
| 240 | + departmentsQuery.setOrgId(Integer.valueOf(model.getHospitalId())); | |
| 241 | + List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery); | |
| 242 | + for(Departments dept : departmentses) | |
| 243 | + { | |
| 244 | + boolean isExist = false; | |
| 245 | + if (CollectionUtils.isNotEmpty(deptsPrefixs)) | |
| 246 | + { | |
| 247 | + for (Map deptsPrefix : deptsPrefixs) | |
| 248 | + { | |
| 249 | + if (dept != null && deptsPrefix.get("deptId") != null) | |
| 250 | + { | |
| 251 | + if (Integer.valueOf(String.valueOf(deptsPrefix.get("deptId"))) == dept.getId()) | |
| 252 | + { | |
| 253 | + isExist = true; | |
| 254 | + } | |
| 255 | + } | |
| 256 | + } | |
| 257 | + | |
| 258 | + } | |
| 259 | + if (!isExist) | |
| 260 | + { | |
| 261 | + Map<String,String> map = new HashMap<>(); | |
| 262 | + map.put("deptId",String.valueOf(dept.getId())); | |
| 263 | + map.put("hospitalId",String.valueOf(dept.getOrgId())); | |
| 264 | + map.put("deptName",dept.getName()); | |
| 265 | + map.put("deptPrefix", ""); | |
| 266 | + deptsPrefixs.add(map); | |
| 267 | + } | |
| 268 | + } | |
| 269 | + sr.setDeptPrefix(deptsPrefixs); | |
| 270 | + } | |
| 271 | + else | |
| 272 | + { | |
| 273 | + List<Map> list = new ArrayList<>(); | |
| 274 | + DepartmentsQuery departmentsQuery = new DepartmentsQuery(); | |
| 275 | + departmentsQuery.setSort("modified desc"); | |
| 276 | + departmentsQuery.setYn(YnEnums.YES.getId()); | |
| 277 | + departmentsQuery.setOrgId(Integer.valueOf(hid)); | |
| 278 | + List<Departments> departmentses = departmentsService.queryDepartments(departmentsQuery); | |
| 279 | + for(Departments dept : departmentses) | |
| 280 | + { | |
| 281 | + Map<String,String> map = new HashMap<>(); | |
| 282 | + map.put("deptId",String.valueOf(dept.getId())); | |
| 283 | + map.put("hospitalId",String.valueOf(dept.getOrgId())); | |
| 284 | + map.put("deptName",dept.getName()); | |
| 285 | + map.put("deptPrefix",""); | |
| 286 | + list.add(map); | |
| 287 | + } | |
| 288 | + | |
| 289 | + result.setDeptPrefix(list); | |
| 290 | + } | |
| 291 | + | |
| 292 | + BaseObjectResponse objectResponse = new BaseObjectResponse(); | |
| 293 | + objectResponse.setData(result); | |
| 294 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
| 295 | + objectResponse.setErrormsg("成功"); | |
| 296 | + | |
| 250 | 297 | return objectResponse; |
| 251 | 298 | } |
| 252 | 299 | } |