医院园区科室联动

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);
     }
 

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);

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 机构信息集合

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));
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java

@@ -33,7 +33,7 @@ public interface IDepartmentService {
     List<Department> selectDepartmentList(Department department);
 
     /**
-     * 查询科室信息列表
+     * 查询科室或病区信息列表 不分页
      *
      * @param department 科室信息
      * @return 科室信息集合

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));
     }
 
-
     /**
      * 新增科室信息
      *