From 2c2bb1adb0983ecfe5d7812b7f169dcc3ba91b5f Mon Sep 17 00:00:00 2001
From: HuangShun <148689675+huabuweixin@users.noreply.github.com>
Date: Wed, 4 Feb 2026 16:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=9C=80=E6=B1=8256=20?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE-?=
 =?UTF-8?q?=E3=80=8B=E6=A3=80=E6=9F=A5=E7=B1=BB=E5=9E=8B=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../check/controller/CheckTypeController.java |  60 ++++++-
 .../checkprojectSettings/index.vue            | 169 ++++++++++++------
 2 files changed, 167 insertions(+), 62 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java
index 24f17067..3dd4a911 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java
@@ -1,6 +1,8 @@
 package com.openhis.web.check.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
 import com.core.common.core.domain.R;
@@ -20,7 +22,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.time.LocalDate;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 检查类型管理Controller
@@ -42,14 +45,59 @@ public class CheckTypeController extends BaseController {
     private final ICheckPackageAppService checkPackageAppService;
 
     /**
-     * 获取检查类型列表
+     * 获取检查类型列表（支持分页）
      */
     @GetMapping("/list")
-    public AjaxResult list() {
-        List<CheckType> list = checkTypeService.list();
-        return AjaxResult.success(list);
-    }
+    public AjaxResult list(
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "10") Integer pageSize) {
 
+        if (pageSize > 10) pageSize = 10;
+
+        // 1. 分页查询父节点（NULL + 0 都算父）
+        Page<CheckType> parentPage = checkTypeService.page(
+                new Page<>(pageNo, pageSize),
+                new QueryWrapper<CheckType>()
+                        .and(w -> w.isNull("parent_id").or().eq("parent_id", 0))
+                        .orderByAsc("id")
+        );
+
+        if (parentPage.getRecords().isEmpty()) {
+            return AjaxResult.success(parentPage);
+        }
+
+        // 2. 父ID列表（注意类型）
+        List<Long> parentIds = parentPage.getRecords()
+                .stream()
+                .map(CheckType::getId)
+                .collect(Collectors.toList());
+
+        // 3. 查询子节点
+        List<CheckType> children = checkTypeService.list(
+                new QueryWrapper<CheckType>().in("parent_id", parentIds)
+        );
+
+        // 4. 分组
+        Map<Long, List<CheckType>> childMap =
+                children.stream().collect(Collectors.groupingBy(CheckType::getParentId));
+
+        // 5. 拼接父 + 子
+        List<CheckType> result = new ArrayList<>();
+        for (CheckType parent : parentPage.getRecords()) {
+            result.add(parent);
+            List<CheckType> list = childMap.get(parent.getId());
+            if (list != null && !list.isEmpty()) {
+                result.addAll(list);
+            }
+        }
+
+        // 6. 返回（total 是父节点总数）
+        Page<CheckType> page =
+                new Page<>(pageNo, pageSize, parentPage.getTotal());
+        page.setRecords(result);
+
+        return AjaxResult.success(page);
+    }
     /**
      * 获取检查方法列表
      */
diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
index a3c676dd..2d04d308 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
@@ -554,7 +554,26 @@
         </div>
       </template>
       <!-- 分页区域 -->
-      <div class="pagination">
+      <div class="pagination" v-if="activeMenu === '检查类型'">
+        <button 
+          class="pagination-btn" 
+          :disabled="checkTypePagination.currentPage <= 1"
+          @click="handleCheckTypePageChange(checkTypePagination.currentPage - 1)"
+        >
+          ‹
+        </button>
+        <span>
+          第 {{ checkTypePagination.currentPage }} 页
+        </span>
+        <button 
+          class="pagination-btn" 
+          :disabled="checkTypePagination.currentPage >= checkTypePagination.totalPages"
+          @click="handleCheckTypePageChange(checkTypePagination.currentPage + 1)"
+        >
+          ›
+        </button>
+      </div>
+      <div class="pagination" v-else>
         <button class="pagination-btn">‹</button>
         <span>1</span>
         <button class="pagination-btn">›</button>
@@ -630,6 +649,14 @@ const checkMethodData = reactive([]);
 const checkPartData = reactive([]);
 const packageData = reactive([]);
 
+// 检查类型分页状态
+const checkTypePagination = reactive({
+  currentPage: 1,
+  pageSize: 10,
+  totalItems: 0,
+  totalPages: 0
+});
+
 // 当前显示的表格数据
 const tableData = computed(() => {
   switch(activeMenu.value) {
@@ -734,7 +761,7 @@ function sortTableDataByParentChild(data) {
 // 从数据库获取所有检查相关数据
 onMounted(async () => {
   try {
-    // 1. 获取科室分类字典，找到“医学影像科”对应的 value
+    // 1. 获取科室分类字典，找到"医学影像科"对应的 value
     let imageClassValues = [];
     try {
       const dictRes = await getDicts('organization_class');
@@ -800,31 +827,8 @@ onMounted(async () => {
       serviceScopeDicts.value = [];
     }
     
-    // 获取检查类型表格数据（仍然从API获取）
-    const typeTableResponse = await listCheckType();
-    if (typeTableResponse && typeTableResponse.data) {
-      // 构建检查类型表格数据
-      checkTypeData.splice(0, checkTypeData.length);
-      const tempData = typeTableResponse.data.map((item) => ({
-        id: item.id, // 保存id字段，用于判断是新增还是修改
-        row: '',  // 行号将在排序后重新分配
-        code: item.code,
-        name: item.name,
-        type: item.type,
-        selected: item.selected ?? true,
-        department: item.department || '',
-        number: item.number || '999999',
-        remark: item.remark || '',
-        parentId: item.parentId || null,  // 父行的 parentId 保持为 null
-        actions: true
-      }));
-
-      // 排序数据，确保父行在前，子行在父行后
-      const sortedData = sortTableDataByParentChild(tempData);
-      sortedData.forEach(item => {
-        checkTypeData.push(item);
-      });
-    }
+    // 获取检查类型表格数据（分页获取）
+    await loadCheckTypeDataWithPagination();
     
     // 获取检查方法数据
     const methodResponse = await listCheckMethod();
@@ -915,35 +919,8 @@ async function loadMenuData(menu) {
   try {
     switch(menu) {
       case '检查类型':
-        // 清空检查类型数据
-        checkTypeData.splice(0, checkTypeData.length);
-        const typeResponse = await listCheckType();
-        if (typeResponse && typeResponse.data) {
-          // 确保data是数组类型
-          const typeData = Array.isArray(typeResponse.data) ? typeResponse.data : [];
-          // 获取所有不重复的检查类型值
-          checkTypes.value = [...new Set(typeData.map(item => item.type))];
-          // 构建临时数据
-          const tempData = typeData.map((item) => ({
-            id: item.id, // 保存id字段，用于判断是新增还是修改
-            row: '',  // 行号将在排序后重新分配
-            code: item.code,
-            name: item.name,
-            type: item.type,
-            selected: item.selected ?? true,
-            department: item.department || '',
-            number: item.number || '999999',
-            remark: item.remark || '',
-            parentId: item.parentId || null,  // 父行的 parentId 保持为 null
-            actions: true
-          }));
-
-          // 排序数据，确保父行在前，子行在父行后
-          const sortedData = sortTableDataByParentChild(tempData);
-          sortedData.forEach(item => {
-            checkTypeData.push(item);
-          });
-        }
+        // 使用分页加载检查类型数据
+        await loadCheckTypeDataWithPagination();
         break;
         
       case '检查方法':
@@ -1067,6 +1044,86 @@ async function loadMenuData(menu) {
   }
 }
 
+// 加载检查类型数据（支持分页）
+async function loadCheckTypeDataWithPagination(pageNo = 1, pageSize = 10) {
+  try {
+    // 清空检查类型数据
+    checkTypeData.splice(0, checkTypeData.length);
+    
+    const params = {
+      pageNo: pageNo,
+      pageSize: pageSize
+    };
+    
+    const response = await listCheckType(params);
+    
+    // 适配后端分页返回格式
+    let records = [];
+    let total = 0;
+    
+    if (response && response.data) {
+      // 标准分页格式：records(数据列表)、total(总记录数)
+      if (response.data.records) {
+        records = response.data.records;
+        total = response.data.total || 0;
+        checkTypePagination.currentPage = response.data.current || pageNo;
+        checkTypePagination.pageSize = response.data.size || pageSize;
+        checkTypePagination.totalPages = response.data.pages || Math.ceil(total / pageSize);
+      } 
+      // 兼容直接返回数组的格式
+      else if (Array.isArray(response.data)) {
+        records = response.data;
+        total = records.length;
+        checkTypePagination.currentPage = pageNo;
+        checkTypePagination.pageSize = pageSize;
+        checkTypePagination.totalPages = Math.ceil(total / pageSize);
+      }
+    }
+    
+    checkTypePagination.totalItems = total;
+    
+    // 构建检查类型表格数据
+    if (records.length > 0) {
+      const tempData = records.map((item) => ({
+        id: item.id, // 保存id字段，用于判断是新增还是修改
+        row: '',  // 行号将在排序后重新分配
+        code: item.code,
+        name: item.name,
+        type: item.type,
+        selected: item.selected ?? true,
+        department: item.department || '',
+        number: item.number || '999999',
+        remark: item.remark || '',
+        parentId: item.parentId || null,  // 父行的 parentId 保持为 null
+        actions: true
+      }));
+
+      // 排序数据，确保父行在前，子行在父行后
+      const sortedData = sortTableDataByParentChild(tempData);
+      sortedData.forEach(item => {
+        checkTypeData.push(item);
+      });      
+    } 
+    
+  } catch (error) {
+    console.error('加载检查类型数据失败:', error);
+    ElMessage.error('加载检查类型数据失败，请检查网络或服务状态');
+  }
+}
+
+// 处理检查类型分页变化
+async function handleCheckTypePageChange(pageNo) {
+  checkTypePagination.currentPage = pageNo;
+  await loadCheckTypeDataWithPagination(pageNo, checkTypePagination.pageSize);
+}
+
+// 处理检查类型每页大小变化
+async function handleCheckTypePageSizeChange(pageSize) {
+  checkTypePagination.pageSize = pageSize;
+  checkTypePagination.currentPage = 1; // 重置到第一页
+  await loadCheckTypeDataWithPagination(1, pageSize);
+}
+
 // 处理行点击进入编辑状态
 function handleRowClick(index) {
   const item = tableData.value[index];