diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java index 870994f2..49f17832 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java @@ -99,18 +99,26 @@ public class DepartmentController extends BaseController { * 查询科室信息列表及包含话术数量 */ @GetMapping("/listScriptNum") - public R> listScriptNum(Department department) { + public AjaxResult listScriptNum(Department department) { List list = departmentService.selectDepartmentListScriptNum(department); - return R.ok(list); + return AjaxResult.success(list); } /** * 查询科室信息列表及包含手术数量 */ @GetMapping("/listOperationNum") - public R> listOperationNum(Department department) { + public AjaxResult listOperationNum(Department department) { List list = departmentService.selectDepartmentListOperationNum(department); - return R.ok(list); + return AjaxResult.success(list); } + /** + * 查询科室信息列表及包含微信库数量 + */ + @GetMapping("/listWechatTemplateNum") + public AjaxResult listWechatTemplateNum(Department department) { + List list = departmentService.selectDepartmentListWechatTemplateNum(department); + return AjaxResult.success(list); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java index 150738dd..a0a6f072 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java @@ -73,4 +73,12 @@ public interface DepartmentMapper { * @return */ List selectDepartmentListOperationNum(Department department); + + /** + * 查询科室信息列表及包含微信库数量 + * @param department + * @return + */ + List selectDepartmentListWechatTemplateNum(Department department); + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java index 45c3405a..f4133ebe 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java @@ -73,4 +73,11 @@ public interface IDepartmentService { * @return */ List selectDepartmentListOperationNum(Department department); + + /** + * 查询科室信息列表及包含微信库数量 + * @param department + * @return + */ + List selectDepartmentListWechatTemplateNum(Department department); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java index 2d8a55b4..336b9c72 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java @@ -110,4 +110,15 @@ public class DepartmentServiceImpl implements IDepartmentService { public List selectDepartmentListOperationNum(Department department) { return departmentMapper.selectDepartmentListOperationNum(department); } + + /** + * 查询科室信息列表及包含微信库数量 + * + * @param department + * @return + */ + @Override + public List selectDepartmentListWechatTemplateNum(Department department) { + return departmentMapper.selectDepartmentListWechatTemplateNum(department); + } } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml index 0354e172..241f5090 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml @@ -165,136 +165,59 @@ +