From 4e1df448acfb9d25835bda0bb149121fe52ba8fa Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 1 Mar 2024 16:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E5=9B=AD=E5=8C=BA=E7=A7=91?= =?UTF-8?q?=E5=AE=A4=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/agency/AgencyController.java | 10 +++++++++- .../controller/department/DepartmentController.java | 6 ++++++ .../xinelu/manage/service/agency/IAgencyService.java | 2 +- .../manage/service/agency/impl/AgencyServiceImpl.java | 10 +++++----- .../manage/service/department/IDepartmentService.java | 2 +- .../service/department/impl/DepartmentServiceImpl.java | 3 +-- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java index 64d18f87..89ac0944 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/agency/AgencyController.java @@ -42,14 +42,22 @@ public class AgencyController extends BaseController { return getDataTable(list); } + /** + * 查询机构信息列表 - 不分页 + */ @GetMapping("/selectAgencyList") public AjaxResult selectAgencyByIdList(Agency agency) { return agencyService.selectAgencyByIdList(agency); } - + /** + * 查询院区机构信息列表 + */ @GetMapping("/subordinateAgencyList") public AjaxResult subordinateAgencyList(Agency agency) { + if (Objects.isNull(agency) || Objects.isNull(agency.getParentId())) { + return AjaxResult.success(); + } return agencyService.subordinateAgencyList(agency); } 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 321d4709..6dc4d1a3 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 @@ -44,11 +44,17 @@ public class DepartmentController extends BaseController { return getDataTable(list); } + /** + * 查询科室信息列表 不分页 + */ @GetMapping("/getDepartmentList") public AjaxResult getDepartmentList(Department department) { return AjaxResult.success(departmentService.selectDepartmentList(department)); } + /** + * 查询科室或病区信息列表 不分页 + */ @GetMapping("/selectDepartmentList") public AjaxResult selectDepartmentByAgencyIdList(Department department) { return departmentService.selectDepartmentByAgencyIdList(department); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java index 1385becc..5e19e885 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/IAgencyService.java @@ -40,7 +40,7 @@ public interface IAgencyService { AjaxResult selectAgencyByIdList(Agency agency); /** - * 查询机构信息列表 + * 查询院区机构信息列表 * * @param agency 机构信息 * @return 机构信息集合 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java index 62d86383..2a2c7edb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java @@ -20,7 +20,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.List; import java.util.stream.Collectors; @@ -88,16 +91,13 @@ public class AgencyServiceImpl implements IAgencyService { /** - * 查询机构信息列表 + * 查询院区机构信息列表 * * @param agency 机构信息 * @return 机构信息 */ @Override public AjaxResult subordinateAgencyList(Agency agency) { - if (Objects.isNull(agency) || Objects.isNull(agency.getParentId())) { - return AjaxResult.success(); - } return AjaxResult.success(agencyMapper.selectAgencyList(agency)); } 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 9af6a4e7..fbc3fdfb 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 @@ -33,7 +33,7 @@ public interface IDepartmentService { List selectDepartmentList(Department department); /** - * 查询科室信息列表 + * 查询科室或病区信息列表 不分页 * * @param department 科室信息 * @return 科室信息集合 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 0b58821e..067919c7 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 @@ -62,7 +62,7 @@ public class DepartmentServiceImpl implements IDepartmentService { } /** - * 查询科室信息列表 + * 查询科室或病区信息列表 不分页 * * @param department 科室信息 * @return 科室信息 @@ -75,7 +75,6 @@ public class DepartmentServiceImpl implements IDepartmentService { return AjaxResult.success(departmentMapper.selectDepartmentList(department)); } - /** * 新增科室信息 *