diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
index 8f863e5e..709ceb88 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/appservice/impl/DiagTreatMAppServiceImpl.java
@@ -193,6 +193,13 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
             DiagnosisTreatmentSelParam.setYbType(null); // 临时移除，防止HisQueryUtils处理
         }
 
+        // 临时保存inspectionTypeId值，手动添加带表别名的条件
+        Long inspectionTypeIdValue = null;
+        if (DiagnosisTreatmentSelParam != null && DiagnosisTreatmentSelParam.getInspectionTypeId() != null) {
+            inspectionTypeIdValue = DiagnosisTreatmentSelParam.getInspectionTypeId();
+            DiagnosisTreatmentSelParam.setInspectionTypeId(null); // 临时移除，防止HisQueryUtils处理
+        }
+
         // 构建查询条件
         QueryWrapper<DiagnosisTreatmentDto> queryWrapper = HisQueryUtils.buildQueryWrapper(DiagnosisTreatmentSelParam,
                 searchKey, new HashSet<>(Arrays.asList("bus_no", "name", "py_str", "wb_str")), request);
@@ -204,6 +211,13 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
             DiagnosisTreatmentSelParam.setYbType(ybTypeValue);
         }
 
+        // 如果需要按检验类型过滤，添加带表别名的条件
+        if (inspectionTypeIdValue != null) {
+            queryWrapper.eq("T1.inspection_type_id", inspectionTypeIdValue);
+            // 恢复参数对象中的值
+            DiagnosisTreatmentSelParam.setInspectionTypeId(inspectionTypeIdValue);
+        }
+
         // 分页查询
         IPage<DiagnosisTreatmentDto> diseaseTreatmentPage
                 = activityDefinitionManageMapper.getDiseaseTreatmentPage(new Page<DiagnosisTreatmentDto>(pageNo, pageSize), queryWrapper);
@@ -336,6 +350,8 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
         // 显式设置新增的字段
         activityDefinition.setSortOrder(diagnosisTreatmentUpDto.getSortOrder());
         activityDefinition.setServiceRange(diagnosisTreatmentUpDto.getServiceRange());
+        // 显式设置检验类型ID
+        activityDefinition.setInspectionTypeId(diagnosisTreatmentUpDto.getInspectionTypeId());
                 // 显式设置划价标记（避免前端字段/类型差异导致 copyProperties 后仍为默认值）
         activityDefinition.setPricingFlag(diagnosisTreatmentUpDto.getPricingFlag());
         
@@ -479,11 +495,13 @@ public class DiagTreatMAppServiceImpl implements IDiagTreatMAppService {
 
         ActivityDefinition activityDefinition = new ActivityDefinition();
         BeanUtils.copyProperties(diagnosisTreatmentUpDto, activityDefinition);
-        
+
         // 显式设置新增的字段
         activityDefinition.setSortOrder(diagnosisTreatmentUpDto.getSortOrder());
         activityDefinition.setServiceRange(diagnosisTreatmentUpDto.getServiceRange());
-        
+        // 显式设置检验类型ID
+        activityDefinition.setInspectionTypeId(diagnosisTreatmentUpDto.getInspectionTypeId());
+
         // 如果前端没有传入编码，则使用10位数基础采番
         if (StringUtils.isEmpty(activityDefinition.getBusNo())) {
             String code = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_DEFINITION_NUM.getPrefix(), 10);
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
index 86defc5f..03b4e89d 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/controller/DiagnosisTreatmentController.java
@@ -1,6 +1,9 @@
 package com.openhis.web.datadictionary.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.core.common.core.domain.R;
+import com.openhis.lab.domain.InspectionType;
+import com.openhis.lab.service.IInspectionTypeService;
 import com.openhis.web.datadictionary.appservice.IDiagTreatMAppService;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentSelParam;
 import com.openhis.web.datadictionary.dto.DiagnosisTreatmentUpDto;
@@ -30,6 +33,9 @@ public class DiagnosisTreatmentController {
     @Resource
     private IDiagTreatMAppService diagTreatMAppService;
 
+    @Resource
+    private IInspectionTypeService inspectionTypeService;
+
     /**
      * 诊疗目录初期查询
      *
@@ -188,4 +194,17 @@ public class DiagnosisTreatmentController {
     public R<?> updatePricingFlag(@RequestBody List<Long> ids, @RequestParam Integer pricingFlag) {
         return diagTreatMAppService.updatePricingFlag(ids, pricingFlag);
     }
+
+    /**
+     * 获取检验类型列表（用于下拉框）
+     *
+     * @return 检验类型列表
+     */
+    @GetMapping("/inspection-types")
+    public R<?> getInspectionTypes() {
+        LambdaQueryWrapper<InspectionType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(InspectionType::getValidFlag, 1)
+                    .orderByAsc(InspectionType::getSortOrder);
+        return R.ok(inspectionTypeService.list(queryWrapper));
+    }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
index 45103331..bcac163a 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentDto.java
@@ -130,4 +130,13 @@ public class DiagnosisTreatmentDto {
 
     /** 服务范围 */
     private String serviceRange;
+
+    /** 检验类型ID */
+    @Dict(dictTable = "inspection_type", dictCode = "id", dictText = "name", deleteFlag = "valid_flag")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inspectionTypeId;
+    private String inspectionTypeId_dictText;
+
+    /** 检验类型名称（用于前端 testType 字段） */
+    private String testType;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
index 6c4ce563..55d22d4b 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentSelParam.java
@@ -30,4 +30,7 @@ public class DiagnosisTreatmentSelParam {
 
     /** 状态 */
     private Integer statusEnum;
+
+    /** 检验类型ID */
+    private Long inspectionTypeId;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
index 9e5e83ac..92f77c38 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/DiagnosisTreatmentUpDto.java
@@ -128,4 +128,8 @@ public class DiagnosisTreatmentUpDto {
 
     /** 服务范围 */
     private String serviceRange;
+
+    /** 检验类型ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inspectionTypeId;
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java
index 07ba4edd..161024a1 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java
@@ -1,6 +1,7 @@
 package com.openhis.web.lab.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.controller.BaseController;
 import com.core.common.core.domain.AjaxResult;
 import com.openhis.lab.domain.InspectionType;
@@ -29,7 +30,25 @@ public class InspectionTypeController extends BaseController {
     private final TransactionTemplate transactionTemplate;
 
     /**
-     * 获取检验类型列表
+     * 分页获取检验类型列表
+     *
+     * @param pageNo 页码
+     * @param pageSize 每页数量
+     * @param searchKey 搜索关键词
+     */
+    @GetMapping("/page")
+    public AjaxResult getPage(
+            @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(value = "pageSize", defaultValue = "100") Integer pageSize,
+            @RequestParam(value = "searchKey", required = false) String searchKey) {
+        log.info("【检验类型】分页查询请求 - pageNo: {}, pageSize: {}, searchKey: {}", pageNo, pageSize, searchKey);
+        IPage<InspectionType> result = inspectionTypeService.getPage(pageNo, pageSize, searchKey);
+        log.info("【检验类型】分页查询完成 - 总记录数: {}, 当前页记录数: {}", result.getTotal(), result.getRecords().size());
+        return AjaxResult.success(result);
+    }
+
+    /**
+     * 获取检验类型列表（不分页，兼容旧接口）
      */
     @GetMapping("/list")
     public AjaxResult list(InspectionType inspectionType) {
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
index 42b17d8a..c19d1f42 100644
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
@@ -30,16 +30,22 @@
             T1.pricing_flag,
             T1.sort_order,
             T1.service_range,
+            T1.inspection_type_id,
             T2.type_code as item_type_code,
             T2.yb_type,
             T2.price_code,
             T2.price as retail_price,
-            T4.amount as maximum_retail_price
+            T4.amount as maximum_retail_price,
+            T3.name as test_type
         FROM wor_activity_definition T1
         /* 只JOIN必要的价格表，使用INNER JOIN避免笛卡尔积 */
         INNER JOIN adm_charge_item_definition T2
             ON T1.id = T2.instance_id
             AND T2.instance_table = 'wor_activity_definition'
+        /* 检验类型关联 */
+        LEFT JOIN inspection_type T3
+            ON T1.inspection_type_id = T3.id
+            AND T3.valid_flag = 1
         /* 最高零售价使用LEFT JOIN，因为可能不存在 */
         LEFT JOIN adm_charge_item_def_detail T4
             ON T4.definition_id = T2.id
@@ -97,9 +103,13 @@
         T1.children_json,
         T1.pricing_flag,
         T1.sort_order,
-        T1.service_range
+        T1.service_range,
+        T1.inspection_type_id,
+        T3.name as test_type
         FROM wor_activity_definition T1
         LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id
+        /* 检验类型关联 */
+        LEFT JOIN inspection_type T3 ON T1.inspection_type_id = T3.id AND T3.valid_flag = 1
         <where>
             T1.delete_flag = '0'
             AND T2.instance_table = 'wor_activity_definition'
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionTypeService.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionTypeService.java
index 4a57aeb1..d03dc980 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionTypeService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IInspectionTypeService.java
@@ -1,5 +1,7 @@
 package com.openhis.lab.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.lab.domain.InspectionType;
 
@@ -11,4 +13,13 @@ import com.openhis.lab.domain.InspectionType;
  */
 public interface IInspectionTypeService extends IService<InspectionType> {
 
+    /**
+     * 分页查询检验类型列表
+     *
+     * @param pageNo 页码
+     * @param pageSize 每页数量
+     * @param searchKey 搜索关键词（可选）
+     * @return 分页结果
+     */
+    IPage<InspectionType> getPage(Integer pageNo, Integer pageSize, String searchKey);
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionTypeServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionTypeServiceImpl.java
index 27811011..265694f5 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionTypeServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/InspectionTypeServiceImpl.java
@@ -1,10 +1,14 @@
 package com.openhis.lab.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.lab.domain.InspectionType;
 import com.openhis.lab.mapper.InspectionTypeMapper;
 import com.openhis.lab.service.IInspectionTypeService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 /**
  * 检验类型Service实现类
@@ -15,4 +19,22 @@ import org.springframework.stereotype.Service;
 @Service
 public class InspectionTypeServiceImpl extends ServiceImpl<InspectionTypeMapper, InspectionType> implements IInspectionTypeService {
 
+    @Override
+    public IPage<InspectionType> getPage(Integer pageNo, Integer pageSize, String searchKey) {
+        Page<InspectionType> page = new Page<>(pageNo, pageSize);
+        LambdaQueryWrapper<InspectionType> queryWrapper = new LambdaQueryWrapper<>();
+
+        // 搜索关键词（按编码或名称模糊查询）
+        if (StringUtils.hasText(searchKey)) {
+            queryWrapper.and(wrapper -> wrapper
+                    .like(InspectionType::getCode, searchKey)
+                    .or()
+                    .like(InspectionType::getName, searchKey));
+        }
+
+        // 按排序字段升序排列
+        queryWrapper.orderByAsc(InspectionType::getSortOrder);
+
+        return this.page(page, queryWrapper);
+    }
 }
\ No newline at end of file
diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
index 4f35ab0d..a70ec378 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
@@ -89,4 +89,7 @@ public class ActivityDefinition extends HisBaseEntity {
 
     /** 服务范围 */
     private String serviceRange;
+
+    /** 检验类型ID（关联 inspection_type 表） */
+    private Long inspectionTypeId;
 }
\ No newline at end of file
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js
index 3cc69357..1b874af9 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/api.js
+++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js
@@ -949,7 +949,23 @@ export function deleteInspectionApplication(applyNo) {
 }
 
 /**
- * 获取检验类型列表（分类）
+ * 分页获取检验类型列表（分类）
+ * @param {Object} queryParams - 查询参数
+ * @param {number} queryParams.pageNo - 页码
+ * @param {number} queryParams.pageSize - 每页数量
+ * @param {string} queryParams.searchKey - 搜索关键词
+ */
+export function getInspectionTypePage(queryParams) {
+  return request({
+    url: '/system/inspection-type/page',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+/**
+ * 获取检验类型列表（不分页，兼容旧接口）
+ * @deprecated 建议使用 getInspectionTypePage 分页接口
  */
 export function getInspectionTypeList() {
   return request({
@@ -965,6 +981,7 @@ export function getInspectionTypeList() {
  * @param {number} queryParams.pageNo - 页码
  * @param {number} queryParams.pageSize - 每页数量
  * @param {string} queryParams.categoryCode - 目录类别编码（检验）
+ * @param {string} queryParams.inspectionTypeId - 检验类型ID列表，多个用逗号分隔
  */
 export function getInspectionItemList(queryParams) {
   return request({
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
index ac1d2201..7df872fe 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
@@ -490,7 +490,7 @@
 </template>
 
 <script setup>
-import {onMounted, reactive, ref, watch, nextTick} from 'vue'
+import {onMounted, reactive, ref, watch, computed, getCurrentInstance} from 'vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import { DocumentChecked, Plus, Document, Printer, Delete, Check } from '@element-plus/icons-vue'
 import {
@@ -502,9 +502,20 @@ import {
 } from '../api'
 import useUserStore from '@/store/modules/user.js'
 // 迁移到 hiprint
-import { simplePrint, PRINT_TEMPLATE, previewPrint } from '@/utils/printUtils.js'
+import { previewPrint } from '@/utils/printUtils.js'
 import {storeToRefs} from 'pinia'
 
+// 获取当前组件实例和字典
+const { proxy } = getCurrentInstance()
+const { activity_category_code } = proxy.useDict('activity_category_code')
+
+// 获取"检验"分类的字典值（与检验项目设置维护保持一致）
+const inspectionCategoryCode = computed(() => {
+  const dictList = activity_category_code.value
+  const inspectionItem = dictList?.find(item => item.label === '检验')
+  return inspectionItem?.value || '22' // 默认使用数据库中检验的 category_code 值
+})
+
 // Props
 const props = defineProps({
   patientInfo: {
@@ -520,7 +531,6 @@ const props = defineProps({
 const emit = defineEmits(['save'])
 
 // 响应式数据
-const showForm = ref(false)
 const loading = ref(false)
 const total = ref(0)
 const leftActiveTab = ref('application')
@@ -532,11 +542,8 @@ const { id: userId, name: userName, nickName: userNickName } = storeToRefs(userS
 
 // 修改 initData 函数
 async function initData() {
-  console.log('【检验】开始初始化数据，当前patientInfo:', props.patientInfo)
-
   // 先初始化患者信息（如果有）
   if (props.patientInfo && props.patientInfo.encounterId) {
-    console.log('【检验】初始化患者信息')
     queryParams.encounterId = props.patientInfo.encounterId
     formData.visitNo = props.patientInfo.busNo || ''
     formData.patientId = props.patientInfo.patientId || ''
@@ -550,20 +557,10 @@ async function initData() {
     formData.applyOrganizationId = props.patientInfo.orgId || ''
     formData.encounterId = props.patientInfo.encounterId
 
-    console.log('【检验】患者信息初始化完成，formData:', JSON.stringify({
-      patientName: formData.patientName,
-      medicalrecordNumber: formData.medicalrecordNumber,
-      applyDepartment: formData.applyDepartment,
-      applyDocName: formData.applyDocName
-    }, null, 2))
-
     // 生成申请单号
     generateApplicationNo().then((newApplyNo) => {
-      formData.applyNo = newApplyNo;
-      console.log('【检验】申请单号生成:', newApplyNo)
-    });
-  } else {
-    console.log('【检验】没有有效的patientInfo，跳过患者信息初始化')
+      formData.applyNo = newApplyNo
+    })
   }
 }
 
@@ -614,18 +611,6 @@ const formData = reactive({
   encounterId: ''
 })
 
-// 表单验证规则
-const formRules = {
-  natureofCost: [{ required: true, message: '请选择费用性质', trigger: 'change' }],
-  applyTime: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
-  executeDepartment: [{ required: true, message: '请选择执行科室', trigger: 'change' }],
-  clinicDesc: [{ required: true, message: '请输入诊断描述', trigger: 'blur' }],
-  clinicDiag: [{ required: true, message: '请输入临床诊断', trigger: 'blur' }],
-  medicalHistorySummary: [{ required: true, message: '请输入病史摘要', trigger: 'blur' }],
-  purposeofInspection: [{ required: true, message: '请输入检验目的', trigger: 'blur' }],
-  labApplyItemList: [{ required: true, message: '请至少选择一个检验项目', trigger: 'change' }]
-}
-
 // 表单引用
 const formRef = ref()
 
@@ -664,39 +649,30 @@ const inspectionLoading = ref(false)
 async function loadInspectionData() {
   // 如果已经加载过数据，直接返回（避免重复请求）
   if (inspectionCategories.value.length > 0) {
-    console.log('【检验】数据已缓存，跳过重复加载')
     return
   }
 
   inspectionLoading.value = true
-  const startTime = Date.now() // 性能监控开始时间
-  
+
   try {
-    console.log('【检验】开始并行请求数据')
-    
     // 并行请求：同时获取检验类型列表和检验项目列表
     const [typeRes, itemRes] = await Promise.all([
-      // 添加错误处理和重试机制
       getInspectionTypeList().catch(error => {
-        console.error('【检验】获取检验类型失败:', error)
-        return { data: [] } // 返回空数据作为降级方案
+        console.error('获取检验类型失败:', error)
+        return { data: [] }
       }),
-      getInspectionItemList({ 
-        pageNo: 1, 
-        pageSize: 200, // 进一步优化：减少数据量，按需加载
-        searchKey: '', // 添加搜索关键词参数
-        categoryCode: 'inspection' // 明确指定检验类别
+      getInspectionItemList({
+        pageNo: 1,
+        pageSize: 500,
+        searchKey: '',
+        categoryCode: inspectionCategoryCode.value
       }).catch(error => {
-        console.error('【检验】获取检验项目失败:', error)
-        return { data: { records: [] } } // 返回空数据作为降级方案
+        console.error('获取检验项目失败:', error)
+        return { data: { records: [] } }
       })
     ])
 
-    const endTime = Date.now()
-    console.log(`【检验】API请求完成，耗时: ${endTime - startTime}ms`)
-
     const typeList = typeRes.data || []
-    console.log('【检验】获取到检验类型数量:', typeList.length)
 
     // 解析检验项目数据
     let allItems = []
@@ -708,40 +684,39 @@ async function loadInspectionData() {
       allItems = itemRes
     }
 
-    console.log('【检验】获取到检验项目数量:', allItems.length)
-
-    // 按分类组织数据
+    // 按分类组织数据（与检验项目设置维护保持一致的字段映射）
     const categories = typeList
       .filter(type => type.validFlag === 1 || type.validFlag === undefined)
       .map((type, index) => {
         const categoryItems = allItems
           .filter(item => {
-            // 更宽松的过滤条件：如果没有明确的检验类别标识，也认为是检验项目
-            const isInspection = !item.categoryCode_dictText || 
-                                 !item.categoryName ||
-                                 !item.categoryCode ||
-                                 item.categoryCode_dictText === '检验' ||
-                                 item.categoryName === '检验' ||
-                                 item.categoryCode === 'inspection'
-            const matchType = item.typeName === type.name ||
-                             item.inspectionTypeName === type.name ||
-                             item.bigClassName === type.name ||
-                             item.typeCode === type.code
-            return isInspection && (matchType || typeList.length === 1)
+            // 转换为字符串进行比较，避免类型不匹配问题
+            const itemTypeId = String(item.inspectionTypeId || '')
+            const typeId = String(type.id || '')
+            const itemTypeName = String(item.inspectionTypeId_dictText || item.typeName || '').trim()
+            const typeName = String(type.name || '').trim()
+
+            // 按检验类型ID匹配（优先使用 inspectionTypeId）
+            const matchById = itemTypeId && typeId && itemTypeId === typeId
+            const matchByName = itemTypeName && typeName && itemTypeName === typeName
+            const matchByCode = String(item.typeCode || '') === String(type.code || '')
+
+            return matchById || matchByName || matchByCode
           })
           .map(item => ({
-            itemId: item.id || item.activityId || Math.random().toString(36).substr(2, 9),
+            itemId: item.id || item.activityId || Math.random().toString(36).substring(2, 11),
             itemName: item.name || item.itemName || '',
             itemPrice: item.retailPrice || item.price || 0,
             itemAmount: item.retailPrice || item.price || 0,
-            sampleType: item.sampleType || '血液',
+            sampleType: item.specimenCode_dictText || item.sampleType || '血液',
             unit: item.unit || '',
             itemQty: 1,
             serviceFee: 0,
-            type: type.name,
+            type: type.name || item.inspectionTypeId_dictText || '检验',
             isSelfPay: false,
             activityId: item.activityId,
-            code: item.code || item.activityCode
+            code: item.busNo || item.code || item.activityCode,
+            inspectionTypeId: item.inspectionTypeId || null
           }))
 
         return {
@@ -755,41 +730,50 @@ async function loadInspectionData() {
     // 过滤掉没有项目的分类
     const validCategories = categories.filter(cat => cat.items.length > 0)
 
-    // 如果没有有效分类，但有项目数据，创建一个默认分类
+    // 如果没有有效分类，但有项目数据，按项目自带的检验类型文本分组
     if (validCategories.length === 0 && allItems.length > 0) {
-      const defaultItems = allItems
-        .slice(0, 50) // 优化：限制显示数量
-        .map(item => ({
-          itemId: item.id || item.activityId || Math.random().toString(36).substr(2, 9),
+      // 按检验类型文本分组
+      const typeMap = new Map()
+      allItems.forEach(item => {
+        const typeName = item.inspectionTypeId_dictText || '其他检验'
+        if (!typeMap.has(typeName)) {
+          typeMap.set(typeName, [])
+        }
+        typeMap.get(typeName).push(item)
+      })
+
+      // 创建分类
+      typeMap.forEach((items, typeName) => {
+        const mappedItems = items.map(item => ({
+          itemId: item.id || item.activityId || Math.random().toString(36).substring(2, 11),
           itemName: item.name || item.itemName || '',
           itemPrice: item.retailPrice || item.price || 0,
           itemAmount: item.retailPrice || item.price || 0,
-          sampleType: item.sampleType || '血液',
+          sampleType: item.specimenCode_dictText || item.sampleType || '血液',
           unit: item.unit || '',
           itemQty: 1,
           serviceFee: 0,
-          type: '检验',
+          type: typeName,
           isSelfPay: false,
           activityId: item.activityId,
-          code: item.code || item.activityCode
+          code: item.busNo || item.code || item.activityCode,
+          inspectionTypeId: item.inspectionTypeId || null
         }))
 
-      if (defaultItems.length > 0) {
         validCategories.push({
-          key: 'default',
-          label: '检验项目',
-          expanded: true,
-          items: defaultItems
+          key: `type_${typeName}`,
+          label: typeName,
+          expanded: validCategories.length === 0,
+          items: mappedItems
         })
-      }
+      })
     }
 
     if (validCategories.length > 0) {
       inspectionCategories.value = validCategories
       activeCategory.value = validCategories[0].key
-      console.log('【检验】数据加载成功，分类数量:', validCategories.length)
     } else {
-      console.warn('【检验】未获取到有效的检验项目数据，使用备用数据')
+      console.warn('未获取到有效的检验项目数据，使用备用数据')
       // 直接使用备用数据，不抛出错误
       inspectionCategories.value = [
         {
@@ -864,14 +848,11 @@ const getFilteredItems = (categoryKey) => {
 function getInspectionList() {
   // 如果没有encounterId,不调用接口
   if (!queryParams.encounterId) {
-    // console.warn('【检验】encounterId为空,不调用接口')
     return
   }
   
   loading.value = true
 
-  // 调用分页API，传递分页参数和 encounterId
-  // console.log('【检验】调用API,encounterId:', queryParams.encounterId, 'pageNo:', queryParams.pageNo, 'pageSize:', queryParams.pageSize)
   getApplyList({ 
     encounterId: queryParams.encounterId,
     pageNo: queryParams.pageNo,
@@ -885,7 +866,7 @@ function getInspectionList() {
           // 处理数据：将同一个申请单的多个明细合并成一条记录
           inspectionList.value = mergeInspectionApplyRecords(res.data.records)
           total.value = res.data.total || 0
-        } 
+        }
         // 如果返回的是普通数组
         else if (Array.isArray(res.data)) {
           // 处理数据：将同一个申请单的多个明细合并成一条记录
@@ -901,14 +882,12 @@ function getInspectionList() {
         inspectionList.value = []
         total.value = 0
       }
-      // console.log('【检验】获取数据成功,数量:', inspectionList.value.length, '总数:', total.value)
     } else {
       inspectionList.value = []
       total.value = 0
       ElMessage.error(res.message || '获取检验申请单列表失败')
     }
   }).catch((error) => {
-    // console.error('获取检验申请单列表异常:', error)
     inspectionList.value = []
     total.value = 0
     ElMessage.error('获取检验申请单列表异常: ' + (error.message || ''))
@@ -959,7 +938,6 @@ function formatAmount(amount) {
 
 // 新增申请单
 async function handleNewApplication() {
-  // console.log('点击新增按钮')
   resetForm()
   // 生成新的申请单号
   formData.applyNo = await generateApplicationNo()
@@ -977,15 +955,11 @@ const checkApplicationNoExists = async (applyNo) => {
     // 后端返回格式：如果存在返回{applyNo: "..."}，不存在返回null
     return response.code === 200 && response.data && response.data.applyNo;
   } catch (error) {
-    // 隐藏具体的错误信息，仅记录在控制台
-    console.debug('检查申请单号时发生错误:', error.message);
-    // 如果API调用失败，假设单号不存在以避免阻塞
     return false;
   }
 };
 
 // 生成申请单号
-let counter = 0;
 const generateApplicationNo = async () => {
   let applyNo;
   let isUnique = false;
@@ -1028,8 +1002,6 @@ const generateApplicationNo = async () => {
   }
 
   if (!isUnique) {
-    console.warn(`经过${maxAttempts}次尝试仍未生成唯一申请单号，使用备用方案`);
-    // 如果多次尝试后仍无法生成唯一单号，使用UUID的一部分作为备用方案
     const timestamp = Date.now().toString();
     const randomPart = Math.floor(Math.random() * 1000).toString().padStart(3, '0');
     const fallbackNo = 'F' + timestamp.slice(-17) + randomPart; // 使用F开头表示备用方案
@@ -1080,12 +1052,6 @@ async function resetForm() {
   formRef.value?.clearValidate()
 }
 
-// 返回列表
-function handleBack() {
-  showForm.value = false
-  getInspectionList()
-}
-
 // 保存
 function handleSave() {
   // 重置验证错误状态
@@ -1153,8 +1119,6 @@ function handleSave() {
 
 
   // 先检查申请单号是否已存在
-  console.log('查询申请单号:', formData.applyNo)
-  // 如果正在生成新申请单号，则跳过重复检查，直接保存
   if (isGeneratingNewApplyNo.value) {
     // 正在使用新生成的单号，直接保存
     isGeneratingNewApplyNo.value = false; // 重置标志
@@ -1217,10 +1181,8 @@ function handleSave() {
   })
 
 }
-// 执行保存操作
 const executeSave = (saveData) => {
   saveInspectionApplication(saveData).then((res) => {
-    console.log('保存检验申请单结果:', res.code)
     if (res.code === 200) {
       ElMessage.success('保存成功')
       resetForm()
@@ -1253,22 +1215,8 @@ const executeSave = (saveData) => {
 }
 
 
-// 表单保存
-function handleFormSave() {
-  formRef.value?.validate((valid) => {
-    if (valid) {
-      formData.labApplyItemList = selectedInspectionItems.value.map(item => item.itemId)
-      // console.log('保存检验申请单表单数据:', formData)
-      ElMessage.success('保存成功')
-      showForm.value = false
-      getInspectionList()
-    }
-  })
-}
-
 // 查看详情
 function handleView(row) {
-  // console.log('点击查看按钮，数据:', row)
   // 加载表单数据
   Object.assign(formData, row)
 
@@ -1307,8 +1255,7 @@ function switchCategory(category) {
 
 // 处理搜索
 function handleSearch() {
-  // 搜索逻辑已在getFilteredItems中实现，这里可以添加额外的搜索逻辑
-  // console.log('搜索关键词:', searchKeyword.value)
+  // 搜索逻辑已在getFilteredItems中实现
 }
 
 // 处理项目项点击（排除勾选框点击）
@@ -1497,13 +1444,9 @@ watch(() => props.activeTab, async (newVal) => {
 
 // 监听patientInfo变化,确保encounterId及时更新并重新加载数据
 watch(() => props.patientInfo, async (newVal) => {
-  console.log('【检验】patientInfo变化:', newVal)
-  console.log('【检验】接收到的完整patientInfo:', JSON.stringify(newVal, null, 2))
-  
   if (newVal && newVal.encounterId) {
     const oldEncounterId = queryParams.encounterId
     queryParams.encounterId = newVal.encounterId
-    console.log('【检验】更新encounterId:', queryParams.encounterId)
 
     // 初始化数据
     await initData();
@@ -1530,9 +1473,7 @@ watch(() => selectedInspectionItems.value, (newVal) => {
 
 // 组件挂载时预加载检验项目数据（不依赖patientInfo）
 onMounted(async () => {
-  console.log('【检验】组件挂载，开始预加载检验项目数据')
   await loadInspectionData()
-  console.log('【检验】检验项目数据预加载完成')
 })
 
 // 暴露方法
@@ -1604,6 +1545,9 @@ defineExpose({
   height: 650px;
   overflow-y: auto;
   padding: 20px;
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  margin: 10px;
 }
 
 /* 选择区域 */
@@ -1631,6 +1575,7 @@ defineExpose({
   display: flex;
   justify-content: space-between;
   align-items: center;
+  flex-shrink: 0;
 }
 
 .pagination-container {
@@ -1959,6 +1904,8 @@ defineExpose({
   border: 1px solid #ebeef5;
   border-radius: 4px;
   background: #fafafa;
+  max-height: 280px;
+  overflow-y: auto;
 }
 
 .category-tree-item {
@@ -2049,10 +1996,6 @@ defineExpose({
   flex-direction: column;
 }
 
-.selected-header {
-  flex-shrink: 0;
-}
-
 .selected-tree {
   flex: 1;
 }
@@ -2181,39 +2124,8 @@ defineExpose({
   }
 }
 
-/* 优化表单样式 */
-.application-form {
-  padding: 20px;
-  height: 700px;
-  overflow-y: auto;
-  border: 1px solid #e4e7ed;
-  border-radius: 4px;
-  margin: 10px;
-}
-
-/* 优化已选项目区样式 */
-.selected-items-area .selected-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 15px;
-  padding-bottom: 10px;
-  border-bottom: 1px solid #eee;
-}
-
-.selected-items-area .selected-tree {
-  max-height: 270px;
-  overflow-y: auto;
-}
-
 /* 优化搜索框样式 */
 .inspection-selector .el-input {
   margin-bottom: 15px;
 }
-
-/* 优化分类树样式 */
-.category-tree {
-  max-height: 280px;
-  overflow-y: auto;
-}
 </style>
diff --git a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
index 7081346b..2ef2748a 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/Inspection/index.vue
@@ -1,164 +1,160 @@
 <template>
-  <div class="inspection-container">
+  <el-container class="inspection-container">
     <!-- 左侧导航 -->
-    <div class="side-nav">
-      <div 
-        v-for="(navItem, index) in navItems" 
-        :key="index" 
-        class="nav-item"
-        :class="{ active: activeNav === index }"
-        @click="activeNav = index"
+    <el-aside width="200px" class="side-aside">
+      <el-menu
+        :default-active="String(activeNav)"
+        class="side-nav"
+        @select="(index) => activeNav = Number(index)"
       >
-        {{ navItem }}
-      </div>
-    </div>
+        <el-menu-item v-for="(navItem, index) in navItems" :key="index" :index="String(index)">
+          {{ navItem }}
+        </el-menu-item>
+      </el-menu>
+    </el-aside>
 
     <!-- 右侧主内容 -->
-    <div class="main-content">
+    <el-main class="main-content">
       <!-- 检验类型页面 -->
       <template v-if="activeNav === 0">
         <div class="header-actions">
-          <button class="add-new-btn" @click="addNewRow">
-            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-              <line x1="12" y1="5" x2="12" y2="19"></line>
-              <line x1="5" y1="12" x2="19" y2="12"></line>
-            </svg>
+          <el-button type="primary" @click="addNewRow">
+            <el-icon><Plus /></el-icon>
             新增
-          </button>
+          </el-button>
         </div>
         <div class="table-container" @click="handleTableClick">
-          <table class="data-table data-table-type">
-            <thead>
-              <tr>
-                <th style="width: 50px;">行</th>
-                <th style="width: 130px;">*大类编码</th>
-                <th style="width: 200px;">*大类项目名称</th>
-                <th style="width: 160px;">*执行科室</th>
-                <th style="width: 120px;">序号</th>
-                <th style="width: 160px;">备注</th>
-                <th style="width: 200px; text-align: left; padding-left: 60px;">操作</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr 
-                v-for="(row, index) in pagedTypeRows" 
-                :key="row.id"
-                :class="{ 'editing': editingRowId === row.id }"
-              >
-                <td>{{ index + 1 }}</td>
-                <td>
-                  <template v-if="editingRowId === row.id">
-                    <input v-model="row.code" type="text" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ row.code }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === row.id">
-                    <input v-model="row.name" type="text" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ row.name }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === row.id">
-                      <el-tree-select
-                      v-model="row.department"
-                      :data="departments"
-                      :props="{
-                        value: 'name',
-                        label: 'name',
-                        children: 'children',
-                      }"
-                      value-key="name"
-                      placeholder="请选择科室"
-                      check-strictly
-                      :expand-on-click-node="false"
-                      clearable
-                      style="width: 100%;"
-                    />
-                    </template>
-                  <template v-else>
-                    {{ row.department }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === row.id">
-                    <input v-model="row.sortOrder" type="text" :style="inputStyle" :disabled="isChildTypeRow(row)">
-                  </template>
-                  <template v-else>
-                    {{ row.sortOrder }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === row.id">
-                    <input v-model="row.remark" type="text" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ row.remark }}
-                  </template>
-                </td>
-                <td class="action-cell">
-                  <div  
-                    class="action-btn confirm-btn" 
+          <el-table
+            :data="pagedTypeRows"
+            border
+            stripe
+            style="width: 100%"
+            :row-class-name="({ row }) => editingRowId === row.id ? 'editing-row' : ''"
+          >
+            <el-table-column label="行" min-width="50" align="center">
+              <template #default="{ $index }">
+                {{ $index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="*大类编码" min-width="140" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.code" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.code }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="*大类项目名称" min-width="180" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.name" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.name }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="*执行科室" min-width="160" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-tree-select
+                    v-model="row.department"
+                    :data="departments"
+                    :props="{
+                      value: 'name',
+                      label: 'name',
+                      children: 'children',
+                    }"
+                    value-key="name"
+                    placeholder="请选择科室"
+                    check-strictly
+                    :expand-on-click-node="false"
+                    clearable
+                    size="small"
+                    style="width: 100%;"
+                  />
+                </template>
+                <template v-else>
+                  {{ row.department }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" min-width="80" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.sortOrder" size="small" :disabled="isChildTypeRow(row)" />
+                </template>
+                <template v-else>
+                  {{ row.sortOrder }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="150" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.remark" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.remark }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" min-width="160" align="center">
+              <template #default="{ row, $index }">
+                <div class="action-cell" style="display: flex; gap: 5px; justify-content: center;">
+                  <el-button
+                    type="primary"
+                    size="small"
+                    circle
                     @click="handleConfirm(row)"
                   >
-                    <svg v-if="editingRowId === row.id" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                      <polyline points="20 6 9 17 4 12"></polyline>
-                    </svg>
+                    <el-icon v-if="editingRowId === row.id"><Check /></el-icon>
                     <span v-else>✓</span>
-                  </div>
-                  <div 
-                    v-if="editingRowId !== row.id" 
-                    class="action-btn edit-btn" 
+                  </el-button>
+                  <el-button
+                    v-if="editingRowId !== row.id"
+                    type="warning"
+                    size="small"
+                    circle
                     @click="handleEdit(row)"
                   >
-                    <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                      <path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path>
-                      <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path>
-                    </svg>
-                  </div>
-                  <div 
-                    v-if="editingRowId !== row.id" 
-                    class="action-btn add-btn" 
-                    @click="handleAdd(row, index)"
+                    <el-icon><Edit /></el-icon>
+                  </el-button>
+                  <el-button
+                    v-if="editingRowId !== row.id"
+                    type="success"
+                    size="small"
+                    circle
+                    @click="handleAdd(row, $index)"
                   >
-                    <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                      <line x1="12" y1="5" x2="12" y2="19"></line>
-                      <line x1="5" y1="12" x2="19" y2="12"></line>
-                    </svg>
-                  </div>
-                  <div
-                    class="action-btn delete-btn"
+                    <el-icon><Plus /></el-icon>
+                  </el-button>
+                  <el-button
+                    type="danger"
+                    size="small"
+                    circle
                     @click="handleDelete(row.id)"
                   >
-                    <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                      <polyline points="3 6 5 6 21 6"></polyline>
-                      <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
-                      <line x1="10" y1="11" x2="10" y2="17"></line>
-                      <line x1="14" y1="11" x2="14" y2="17"></line>
-                    </svg>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+                    <el-icon><Delete /></el-icon>
+                  </el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
 
         <!-- 页码区域 -->
-        <div class="pagination" v-if="typeTotalPages > 1">
-          <div class="page-btn" :class="{ disabled: typeCurrentPage === 1 }" @click="typePrevPage">上一页</div>
-          <div
-            v-for="p in typePageButtons"
-            :key="p"
-            class="page-btn"
-            :class="{ active: p === typeCurrentPage }"
-            @click="typeGoPage(p)"
-          >{{ p }}</div>
-          <div class="page-btn" :class="{ disabled: typeCurrentPage >= typeTotalPages }" @click="typeNextPage">下一页</div>
-        </div>
+        <el-pagination
+          v-if="tableData.length > typePageSize"
+          :current-page="typeCurrentPage"
+          :page-size="typePageSize"
+          :total="tableData.length"
+          layout="total, prev, pager, next"
+          @current-change="typeGoPage"
+          style="margin-top: 20px; justify-content: center;"
+        />
       </template>
 
       <!-- 检验项目页面 -->
@@ -169,224 +165,216 @@
         <div class="filter-section">
           <div class="filter-item">
             <label>检验类型</label>
-            <select v-model="testTypeFilter" class="filter-select">
-              <option value="">选择检验类型</option>
-              <option v-for="type in testTypes" :key="type.value" :value="type.value">
-                {{ type.label }}
-              </option>
-            </select>
+            <el-select v-model="testTypeFilter" placeholder="选择检验类型" clearable size="default" style="width: 140px;">
+              <el-option
+                v-for="type in testTypes"
+                :key="type.value"
+                :label="type.label"
+                :value="type.value"
+              />
+            </el-select>
           </div>
           <div class="filter-item">
             <label>名称</label>
-            <input v-model="nameFilter" type="text" class="filter-input" placeholder="名称/编码">
+            <el-input v-model="nameFilter" placeholder="名称/编码" clearable size="default" style="width: 160px;" />
           </div>
           <div class="filter-item">
-              <label>费用套餐</label>
-              <select v-model="packageFilter" class="filter-select">
-                <option value="">选择费用套餐</option>
-                <option v-for="pkg in feePackages" :key="pkg.value" :value="pkg.value">
-                  {{ pkg.label }}
-                </option>
-              </select>
-            </div>
+            <label>费用套餐</label>
+            <el-select v-model="packageFilter" placeholder="选择费用套餐" clearable size="default" style="width: 140px;">
+              <el-option
+                v-for="pkg in feePackages"
+                :key="pkg.value"
+                :label="pkg.label"
+                :value="pkg.value"
+              />
+            </el-select>
+          </div>
           <div class="filter-actions">
-            <button class="btn btn-primary add-btn" @click="addNewItem">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <line x1="12" y1="5" x2="12" y2="19"></line>
-                <line x1="5" y1="12" x2="19" y2="12"></line>
-              </svg>
-              新增
-            </button>
-            <button class="btn btn-secondary reset-btn" @click="resetFilters">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <polyline points="3 6 5 6 21 6"></polyline>
-                <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
-                <line x1="10" y1="11" x2="10" y2="17"></line>
-                <line x1="14" y1="11" x2="14" y2="17"></line>
-              </svg>
-              重置
-            </button>
-            <button class="btn btn-primary search-btn" @click="filterItems">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <circle cx="11" cy="11" r="8"></circle>
-                <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-              </svg>
-              查询
-            </button>
-            <button class="btn btn-primary export-btn" @click="exportTable">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"></path>
-                <polyline points="7 10 12 15 17 10"></polyline>
-                <line x1="12" y1="15" x2="12" y2="3"></line>
-              </svg>
-              导出表格
-            </button>
+            <el-button type="primary" :icon="Plus" @click="addNewItem">新增</el-button>
+            <el-button :icon="RefreshRight" @click="resetFilters">重置</el-button>
+            <el-button type="primary" :icon="Search" @click="filterItems">查询</el-button>
+            <el-button type="primary" :icon="Download" @click="exportTable">导出表格</el-button>
           </div>
         </div>
         <div class="table-container">
-          <table class="data-table">
-            <thead>
-              <tr>
-                <th>行</th>
-                <th>小类编码</th>
-                <th>小类项目名称</th>
-                <th>检验类型</th>
-                <th>费用套餐</th>
-                <th>样本类型</th>
-                <th>金额</th>
-                <th>序号</th>
-                <th>服务范围</th>
-                <th>下级医技类型</th>
-                <th>备注</th>
-                <th style="padding-left: 40px;">操作</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr 
-                v-for="(item, index) in pagedInspectionItems" 
-                :key="item.id"
-                :class="{ 'editing': editingRowId === item.id }"
-              >
-                <td>{{ index + 1 }}</td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <input v-model="item.code" type="text" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.code }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <input v-model="item.name" type="text" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.name }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <select v-model="item.testType" :style="inputStyle">
-                      <option value="">选择检验类型</option>
-                      <option v-for="type in testTypes" :key="type.value" :value="type.value">
-                        {{ type.label }}
-                      </option>
-                    </select>
-                  </template>
-                  <template v-else>
-                    {{ item.testType }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <select v-model="item.package" :style="inputStyle" @change="updateAmountFromPackage(item)">
-                      <option value="">选择费用套餐</option>
-                      <option v-for="pkg in feePackages" :key="pkg.value" :value="pkg.value">
-                        {{ pkg.label }}
-                      </option>
-                    </select>
-                  </template>
-                  <template v-else>
-                    {{ item.package }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <select v-model="item.sampleType" :style="inputStyle">
-                      <option value="">选择样本类型</option>
-                      <option v-for="type in sampleTypes" :key="type.value" :value="type.value">
-                        {{ type.label }}
-                      </option>
-                    </select>
-                  </template>
-                  <template v-else>
-                    {{ item.sampleType }}
-                  </template>
-                </td>
-                <td>{{ item.amount }}</td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <input v-model="item.sortOrder" type="number" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.sortOrder || 999999 }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <select v-model="item.serviceRange" :style="inputStyle">
-                      <option v-for="range in serviceRanges" :key="range.value" :value="range.value">
-                        {{ range.label }}
-                      </option>
-                    </select>
-                  </template>
-                  <template v-else>
-                    {{ item.serviceRange || '全部' }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <input v-model="item.sub医技Type" type="text" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.sub医技Type || '-' }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === item.id">
-                    <input v-model="item.remark" type="text" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.remark || '-' }}
-                  </template>
-                </td>
-                <td class="action-cell">
-                  <template v-if="editingRowId === item.id">
-                    <div class="action-btn save-btn" @click="saveItem(item)" title="保存">
-                      <span style="font-size: 12px;">✓</span>
-                    </div>
-                    <div class="action-btn cancel-btn" @click="cancelEdit(item)" title="取消">
-                      <span style="font-size: 12px;">✕</span>
-                    </div>
-                  </template>
-                  <template v-else-if="!editingRowId">
-                    <div class="action-btn edit-btn" @click="editItem(item)">
-                      <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                        <path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path>
-                        <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path>
-                      </svg>
-                    </div>
-                  </template>
-                  <div
-                    class="action-btn delete-btn"
-                    @click="deleteItem(item.id)"
-                    v-if="!editingRowId || editingRowId === item.id"
-                  >
-                    <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                      <polyline points="3 6 5 6 21 6"></polyline>
-                      <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
-                      <line x1="10" y1="11" x2="10" y2="17"></line>
-                      <line x1="14" y1="11" x2="14" y2="17"></line>
-                    </svg>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+          <el-table
+            :data="pagedInspectionItems"
+            border
+            stripe
+            style="width: 100%"
+            :row-class-name="({ row }) => editingRowId === row.id ? 'editing-row' : ''"
+          >
+            <el-table-column label="行" min-width="50" align="center">
+              <template #default="{ $index }">
+                {{ (inspectionCurrentPage - 1) * inspectionPageSize + $index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="小类编码" min-width="100" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.code" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.code }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="小类项目名称" min-width="140" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.name" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.name }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="检验类型" min-width="120" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-select v-model="row.inspectionTypeId" placeholder="选择检验类型" size="small" style="width: 100%;" @change="(val) => { const selected = testTypes.find(t => t.id === val); row.testType = selected ? selected.label : ''; }">
+                    <el-option label="选择检验类型" value="" />
+                    <el-option
+                      v-for="type in testTypes"
+                      :key="type.id"
+                      :label="type.label"
+                      :value="type.id"
+                    />
+                  </el-select>
+                </template>
+                <template v-else>
+                  {{ row.testType }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="费用套餐" min-width="120" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-select v-model="row.package" placeholder="选择费用套餐" size="small" style="width: 100%;" @change="updateAmountFromPackage(row)">
+                    <el-option label="选择费用套餐" value="" />
+                    <el-option
+                      v-for="pkg in feePackages"
+                      :key="pkg.value"
+                      :label="pkg.label"
+                      :value="pkg.value"
+                    />
+                  </el-select>
+                </template>
+                <template v-else>
+                  {{ row.package }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="样本类型" min-width="100" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-select v-model="row.sampleType" placeholder="选择样本类型" size="small" style="width: 100%;">
+                    <el-option label="选择样本类型" value="" />
+                    <el-option
+                      v-for="type in sampleTypes"
+                      :key="type.value"
+                      :label="type.label"
+                      :value="type.value"
+                    />
+                  </el-select>
+                </template>
+                <template v-else>
+                  {{ row.sampleType }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" min-width="70" align="center">
+              <template #default="{ row }">
+                {{ row.amount }}
+              </template>
+            </el-table-column>
+            <el-table-column label="序号" min-width="70" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input-number v-model="row.sortOrder" size="small" :controls="false" style="width: 100%;" />
+                </template>
+                <template v-else>
+                  {{ row.sortOrder || 999999 }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="服务范围" min-width="90" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-select v-model="row.serviceRange" size="small" style="width: 100%;">
+                    <el-option
+                      v-for="range in serviceRanges"
+                      :key="range.value"
+                      :label="range.label"
+                      :value="range.value"
+                    />
+                  </el-select>
+                </template>
+                <template v-else>
+                  {{ row.serviceRange || '全部' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="下级医技类型" min-width="100" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.subType" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.sub医技Type || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" min-width="100" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-input v-model="row.remark" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.remark || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" min-width="100" align="center">
+              <template #default="{ row }">
+                <template v-if="editingRowId === row.id">
+                  <el-button type="success" size="small" circle @click="saveItem(row)" title="保存">
+                    <el-icon><Check /></el-icon>
+                  </el-button>
+                  <el-button size="small" circle @click="cancelEdit(row)" title="取消">
+                    <el-icon><Close /></el-icon>
+                  </el-button>
+                </template>
+                <template v-else-if="editingRowId !== row.id">
+                  <el-button type="warning" size="small" circle @click="editItem(row)" title="编辑">
+                    <el-icon><Edit /></el-icon>
+                  </el-button>
+                </template>
+                <el-button
+                  v-if="!editingRowId || editingRowId === row.id"
+                  type="danger"
+                  size="small"
+                  circle
+                  @click="deleteItem(row.id)"
+                  title="删除"
+                >
+                  <el-icon><Delete /></el-icon>
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
 
         <!-- 页码区域 -->
-        <div class="pagination" v-if="inspectionTotalPages > 1">
-          <div class="page-btn" :class="{ disabled: inspectionCurrentPage === 1 }" @click="inspectionPrevPage">上一页</div>
-          <div
-            v-for="p in inspectionPageButtons"
-            :key="p"
-            class="page-btn"
-            :class="{ active: p === inspectionCurrentPage }"
-            @click="inspectionGoPage(p)"
-          >{{ p }}</div>
-          <div class="page-btn" :class="{ disabled: inspectionCurrentPage >= inspectionTotalPages }" @click="inspectionNextPage">下一页</div>
-        </div>
+        <el-pagination
+          v-if="inspectionTotalPages > 1"
+          :current-page="inspectionCurrentPage"
+          :page-size="inspectionPageSize"
+          :total="inspectionTotalCount"
+          layout="total, prev, pager, next"
+          @current-change="inspectionGoPage"
+          style="margin-top: 20px; justify-content: center;"
+        />
       </template>
 
       <!-- 套餐设置页面 -->
@@ -394,15 +382,11 @@
         <!-- 顶部操作栏 -->
         <div class="top-bar">
           <div class="action-group">
-            <button class="btn btn-icon" @click="refreshPage">
-              <i>↻</i> 刷新
-            </button>
-            <button class="btn btn-secondary" @click="resetForm">
-              <i>🔄</i> 重置
-            </button>
-            <button class="btn btn-success" @click="handlePackageManagement">套餐管理</button>
+            <el-button :icon="Refresh" @click="refreshPage">刷新</el-button>
+            <el-button :icon="RefreshRight" @click="resetForm">重置</el-button>
+            <el-button type="success" @click="handlePackageManagement">套餐管理</el-button>
           </div>
-          <button class="btn btn-lg" @click="handleSave">保存</button>
+          <el-button type="success" size="large" @click="handleSave">保存</el-button>
         </div>
 
         <!-- 表单区域 -->
@@ -411,9 +395,9 @@
           <div class="form-grid">
             <div class="form-item">
               <span class="form-label">套餐类别</span>
-              <select class="form-control form-select">
-                <option value="1" selected>检验套餐</option>
-              </select>
+              <el-select v-model="packageCategory" style="width: 100%;">
+                <el-option label="检验套餐" value="检验套餐" />
+              </el-select>
             </div>  
 
             
@@ -457,57 +441,57 @@
             </div>
             <div class="form-item" id="userContainer" v-show="packageLevel === '个人套餐'">
               <span class="form-label">用户</span>
-              <input type="text" class="form-control" :value="userStore.nickName" readonly>
+              <el-input :model-value="userStore.nickName" readonly />
             </div>
             <div class="form-item">
               <span class="form-label"><span style="color:red"></span>套餐名称</span>
-              <input type="text" class="form-control" v-model="packageName" placeholder="请输入套餐名称">
+              <el-input v-model="packageName" placeholder="请输入套餐名称" />
               <div class="error-message" id="packageNameError" style="color: #ff4d4f; font-size: 12px; margin-top: 4px; display: none;">套餐名称不能为空</div>
             </div>
             <div class="form-item">
               <span class="form-label">卫生机构</span>
-              <input type="text" class="form-control" :value="userStore.orgName || '测试机构'" readonly>
+              <el-input :model-value="userStore.orgName || '测试机构'" readonly />
             </div>
             <div class="form-item">
               <span class="form-label">套餐金额</span>
-              <input type="text" class="form-control" style="width: 120px;" :value="packageAmount.toFixed(2)" readonly>
+              <el-input :model-value="packageAmount.toFixed(2)" readonly style="width: 120px;" />
             </div>
             <div class="form-item">
               <span class="form-label">折扣 %</span>
-              <input type="text" class="form-control" v-model="discount" @input="calculateAmounts">
+              <el-input v-model="discount" @input="calculateAmounts" />
             </div>
             <div class="form-item">
               <span class="form-label">制单人</span>
-              <input type="text" class="form-control" readonly :value="userStore.nickName">
+              <el-input :model-value="userStore.nickName" readonly />
             </div>
             <div class="form-item">
               <span class="form-label">备注</span>
-              <input type="text" class="form-control" v-model="remarks" placeholder="请输入备注">
+              <el-input v-model="remarks" placeholder="请输入备注" />
             </div>
             <div class="form-item">
               <span class="form-label">是否停用</span>
-              <el-radio-group v-model="isDisabled" size="medium">
+              <el-radio-group v-model="isDisabled">
                 <el-radio :label="false">启用</el-radio>
                 <el-radio :label="true">停用</el-radio>
               </el-radio-group>
             </div>
             <div class="form-item">
               <span class="form-label">显示套餐名</span>
-              <el-radio-group v-model="showPackageName" size="medium">
+              <el-radio-group v-model="showPackageName">
                 <el-radio :label="true">是</el-radio>
                 <el-radio :label="false">否</el-radio>
               </el-radio-group>
             </div>
             <div class="form-item">
               <span class="form-label">生成服务费</span>
-              <el-radio-group v-model="generateServiceFee" size="medium">
+              <el-radio-group v-model="generateServiceFee">
                 <el-radio :label="true">是</el-radio>
                 <el-radio :label="false">否</el-radio>
               </el-radio-group>
             </div>
             <div class="form-item">
               <span class="form-label">套餐价格</span>
-              <el-radio-group v-model="enablePackagePrice" size="medium">
+              <el-radio-group v-model="enablePackagePrice">
                 <el-radio :label="true">启用</el-radio>
                 <el-radio :label="false">不启用</el-radio>
               </el-radio-group>
@@ -515,20 +499,22 @@
             
             <div class="form-item">
               <span class="form-label">服务费</span>
-              <input type="text" class="form-control" :value="serviceFee.toFixed(2)" readonly>
+              <el-input :model-value="serviceFee.toFixed(2)" readonly />
             </div>
             <div class="form-item">
               <span class="form-label">lis分组</span>
-              <select class="form-control form-select" v-model="selectedLisGroup">
-                <option value="">请选择lis分组</option>
-                <option v-for="group in lisGroupList" :key="group.id" :value="group.id">
-                  {{ group.groupName || group.lisGroupName }}
-                </option>
-              </select>
+              <el-select v-model="selectedLisGroup" placeholder="请选择lis分组" style="width: 100%;">
+                <el-option
+                  v-for="group in lisGroupList"
+                  :key="group.id"
+                  :label="group.groupName || group.lisGroupName"
+                  :value="group.id"
+                />
+              </el-select>
             </div>
             <div class="form-item">
               <span class="form-label">血量</span>
-              <input type="text" class="form-control" v-model="bloodVolume">
+              <el-input v-model="bloodVolume" />
             </div>
           </div>
         </div>
@@ -537,166 +523,173 @@
         <div class="table-container" style="width: 100%; margin-top: 20px;">
           <div class="table-header" style="display: flex; justify-content: space-between; align-items: center; padding: 10px;">
             <div class="table-title" style="font-size: 16px; font-weight: bold;">检验套餐明细</div>
-            <button class="action-btn" title="添加项目" @click="addPackageItem" style="width: 32px; height: 32px; font-size: 20px; display: flex; align-items: center; justify-content: center;">+</button>
+            <el-button type="primary" size="small" circle @click="addPackageItem" title="添加项目">
+              <el-icon><Plus /></el-icon>
+            </el-button>
           </div>
-          
-          <table class="data-table">
-            <thead>
-              <tr>
-                <th style="width: 40px;">行号</th>
-                <th style="width: 250px;">项目名称/规格</th>
-                <th style="width: 100px;">剂量</th>
-                <th style="width: 100px;">途径</th>
-                <th style="width: 100px;">频次</th>
-                <th style="width: 80px;">天数</th>
-                <th style="width: 80px;">数量</th>
-                <th style="width: 80px;">单位</th>
-                <th style="width: 100px;">单价</th>
-                <th style="width: 100px;">金额</th>
-                <th style="width: 100px;">服务费</th>
-                <th style="width: 100px;">总金额</th>
-                <th style="width: 150px;">产地</th>
-                <th style="width: 80px;">操作</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr v-for="(item, index) in packageItems" :key="index" :class="{ 'editing': editingRowId === index }">
-                <td>{{ index + 1 }}</td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <input
-                      type="text"
-                      v-model="item.name"
-                      placeholder="请输入或选择项目名称"
-                      @focus="handleItemFocus(index)"
-                      :style="inputStyle"
-                    />
-                  </template>
-                  <template v-else>
-                    {{ item.name }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <input type="text" v-model="item.dosage" placeholder="剂量" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.dosage || '-' }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <select v-model="item.route" style="width: 100%;" :style="inputStyle">
-                      <option value="">请选择</option>
-                      <option value="项/人">项/人</option>
-                      <option value="次/人">次/人</option>
-                      <!-- 可根据实际需求添加更多选项 -->
-                    </select>
-                  </template>
-                  <template v-else>
-                    {{ item.route || '-' }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <select v-model="item.frequency" style="width: 100%;" :style="inputStyle">
-                      <option value="">请选择</option>
-                      <option value="一次">一次</option>
-                      <option value="每日">每日</option>
-                      <option value="每周">每周</option>
-                      <!-- 可根据实际需求添加更多选项 -->
-                    </select>
-                  </template>
-                  <template v-else>
-                    {{ item.frequency || '-' }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <input type="number" v-model.number="item.days" placeholder="天数" style="width: 100%;" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.days || '-' }}
-                  </template>
-                </td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <input type="number" v-model.number="item.quantity" placeholder="数量" style="width: 100%;" @input="updateItemAmount(item)" :style="inputStyle" min="0" step="1">
-                  </template>
-                  <template v-else>
-                    {{ item.quantity || '-' }}
-                  </template>
-                </td>
-                <td>{{ item.unit || '-' }}</td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <input type="number" v-model.number="item.unitPrice" placeholder="单价" style="width: 100%;" @input="updateItemAmount(item)" :style="inputStyle" min="0" step="0.01">
-                  </template>
-                  <template v-else>
-                    {{ item.unitPrice.toFixed(2) }}
-                  </template>
-                </td>
-                <td>{{ item.amount.toFixed(2) }}</td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <input type="number" v-model.number="item.serviceFee" placeholder="服务费" style="width: 100%;" step="0.01" @input="updateItemTotalAmount(item)" :style="inputStyle" min="0">
-                  </template>
-                  <template v-else>
-                    {{ item.serviceFee.toFixed(2) }}
-                  </template>
-                </td>
-                <td>{{ item.totalAmount.toFixed(2) }}</td>
-                <td>
-                  <template v-if="editingRowId === index">
-                    <input type="text" v-model="item.origin" placeholder="产地" style="width: 100%;" :style="inputStyle">
-                  </template>
-                  <template v-else>
-                    {{ item.origin || '-' }}
-                  </template>
-                </td>
-                <td class="action-cell">
-                  <div class="table-actions" style="display: flex; gap: 5px;">
-                    <template v-if="editingRowId === index">
-                      <!-- 编辑模式下的保存和取消按钮 -->
-                      <div class="action-btn confirm-btn" title="保存" @click="handleEditItem(index)">
-                        <span style="font-size: 12px;">✓</span>
-                      </div>
-                      <div class="action-btn cancel-btn" title="取消" @click="cancelEditItem(index)">
-                        <span style="font-size: 12px;">✕</span>
-                      </div>
-                    </template>
-                    <template v-else>
-                      <!-- 非编辑模式下的编辑和删除按钮 -->
-                      <div class="action-btn edit-btn" title="编辑" @click="handleEditItem(index)">
-                        <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                          <path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path>
-                          <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path>
-                        </svg>
-                      </div>
-                      <div class="action-btn delete-btn" title="删除" @click="deletePackageItem(index)">
-                        <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                          <polyline points="3 6 5 6 21 6"></polyline>
-                          <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"></path>
-                          <line x1="10" y1="11" x2="10" y2="17"></line>
-                          <line x1="14" y1="11" x2="14" y2="17"></line>
-                        </svg>
-                      </div>
-                    </template>
-                  </div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+
+          <el-table
+            :data="packageItems"
+            border
+            stripe
+            style="width: 100%"
+            :row-class-name="({ $index }) => editingRowId === $index ? 'editing-row' : ''"
+          >
+            <el-table-column label="行号" min-width="50" align="center">
+              <template #default="{ $index }">
+                {{ $index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="项目名称/规格" min-width="180" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-input
+                    v-model="row.name"
+                    placeholder="请输入或选择项目名称"
+                    size="small"
+                  />
+                </template>
+                <template v-else>
+                  {{ row.name }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="剂量" min-width="70" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-input v-model="row.dosage" placeholder="剂量" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.dosage || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="途径" min-width="90" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-select v-model="row.route" placeholder="请选择" size="small" style="width: 100%;">
+                    <el-option label="请选择" value="" />
+                    <el-option label="项/人" value="项/人" />
+                    <el-option label="次/人" value="次/人" />
+                  </el-select>
+                </template>
+                <template v-else>
+                  {{ row.route || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="频次" min-width="90" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-select v-model="row.frequency" placeholder="请选择" size="small" style="width: 100%;">
+                    <el-option label="请选择" value="" />
+                    <el-option label="一次" value="一次" />
+                    <el-option label="每日" value="每日" />
+                    <el-option label="每周" value="每周" />
+                  </el-select>
+                </template>
+                <template v-else>
+                  {{ row.frequency || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="天数" min-width="60" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-input-number v-model.number="row.days" placeholder="天数" size="small" :controls="false" style="width: 100%;" />
+                </template>
+                <template v-else>
+                  {{ row.days || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" min-width="60" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-input-number v-model.number="row.quantity" placeholder="数量" size="small" :controls="false" :min="0" :step="1" style="width: 100%;" @change="updateItemAmount(row)" />
+                </template>
+                <template v-else>
+                  {{ row.quantity || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" min-width="50" align="center">
+              <template #default="{ row }">
+                {{ row.unit || '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" min-width="80" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-input-number v-model.number="row.unitPrice" placeholder="单价" size="small" :controls="false" :min="0" :precision="2" style="width: 100%;" @change="updateItemAmount(row)" />
+                </template>
+                <template v-else>
+                  {{ row.unitPrice.toFixed(2) }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" min-width="80" align="center">
+              <template #default="{ row }">
+                {{ row.amount.toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="服务费" min-width="80" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-input-number v-model.number="row.serviceFee" placeholder="服务费" size="small" :controls="false" :min="0" :precision="2" style="width: 100%;" @change="updateItemTotalAmount(row)" />
+                </template>
+                <template v-else>
+                  {{ row.serviceFee.toFixed(2) }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="总金额" min-width="80" align="center">
+              <template #default="{ row }">
+                {{ row.totalAmount.toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="产地" min-width="80" align="center">
+              <template #default="{ row, $index }">
+                <template v-if="editingRowId === $index">
+                  <el-input v-model="row.origin" placeholder="产地" size="small" />
+                </template>
+                <template v-else>
+                  {{ row.origin || '-' }}
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" min-width="100" align="center">
+              <template #default="{ $index }">
+                <template v-if="editingRowId === $index">
+                  <el-button type="success" size="small" circle @click="handleEditItem($index)" title="保存">
+                    <el-icon><Check /></el-icon>
+                  </el-button>
+                  <el-button size="small" circle @click="cancelEditItem($index)" title="取消">
+                    <el-icon><Close /></el-icon>
+                  </el-button>
+                </template>
+                <template v-else>
+                  <el-button type="warning" size="small" circle @click="handleEditItem($index)" title="编辑">
+                    <el-icon><Edit /></el-icon>
+                  </el-button>
+                  <el-button type="danger" size="small" circle @click="deletePackageItem($index)" title="删除">
+                    <el-icon><Delete /></el-icon>
+                  </el-button>
+                </template>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
       </template>
-    </div>
-  </div>
+    </el-main>
+  </el-container>
 </template>
 
 <script setup>
 import useUserStore from '@/store/modules/user';
-import {computed, nextTick, onActivated, onMounted, ref, watch} from 'vue';
+import {computed, getCurrentInstance, nextTick, onActivated, onMounted, ref, watch} from 'vue';
 import {ElLoading, ElMessage, ElMessageBox} from 'element-plus';
+import {Check, Edit, Plus, Delete, Refresh, RefreshRight, Search, Download, Close} from '@element-plus/icons-vue';
 import {onBeforeRouteUpdate, useRoute, useRouter} from 'vue-router';
 import {
   addInspectionType,
@@ -722,6 +715,17 @@ import {deptTreeSelect} from '@/api/system/user';
 // 获取当前登录用户信息
 const userStore = useUserStore();
 
+// 获取字典数据
+const { proxy } = getCurrentInstance()
+const { activity_category_code } = proxy.useDict('activity_category_code')
+
+// 获取"检验"分类的字典值
+const inspectionCategoryCode = computed(() => {
+  const dictList = activity_category_code.value
+  const inspectionItem = dictList?.find(item => item.label === '检验')
+  return inspectionItem?.value // 默认使用数据库中检验的 category_code 值
+})
+
 // 创建路由实例
 const router = useRouter();
 const route = useRoute();
@@ -734,48 +738,34 @@ const selectedLisGroup = ref('');
 // 获取就诊科室数据 - 与门诊挂号页面保持一致，在组件初始化时直接调用
 getLocationInfo();
 
-onMounted(() => {
-  // 其他初始化逻辑
-});
-
 // 获取LIS分组数据
 const getLisGroupList = async () => {
   try {
     const response = await listLisGroup();
     if (response.code === 200) {
-      console.log('完整LIS分组响应:', response); // 记录完整响应
-      
       // 适配可能的不同响应格式
       let items = [];
-      
+
       // 检查响应数据
       if (response.data) {
         // 格式1: {data: {rows: [], total: number}} - 标准分页格式
         if (response.data.rows && Array.isArray(response.data.rows)) {
           items = response.data.rows;
-          console.log('LIS分组分页数据:', items);
         }
         // 格式2: {data: []} - 简单数组格式
         else if (Array.isArray(response.data)) {
           items = response.data;
-          console.log('LIS分组数组数据:', items);
         }
         // 格式3: {data: {data: []}} - 双重嵌套格式
         else if (response.data.data && Array.isArray(response.data.data)) {
           items = response.data.data;
-          console.log('LIS分组双重嵌套数据:', items);
         }
         // 格式4: {data: {data: {rows: []}}} - 双重嵌套分页格式
         else if (response.data.data && response.data.data.rows && Array.isArray(response.data.data.rows)) {
           items = response.data.data.rows;
-          console.log('LIS分组双重嵌套分页数据:', items);
-        }
-        // 其他格式
-        else {
-          console.log('无法识别的数据格式:', response.data);
         }
       }
-      
+
       lisGroupList.value = items;
     } else {
       ElMessage.error('获取LIS分组数据失败');
@@ -803,11 +793,7 @@ const typeTotalPages = computed(() => {
   const total = tableData.value.length;
   return Math.max(1, Math.ceil(total / typePageSize.value));
 });
-const typePageButtons = computed(() => {
-  const total = typeTotalPages.value;
-  return Array.from({ length: total }, (_, i) => i + 1);
-});
-// 按“序号(sortOrder)”排序后再分页展示（需求：不要按大类编码排序）
+// 按”序号(sortOrder)”排序后再分页展示（需求：不要按大类编码排序）
 function parseCodeParts(code) {
   const s = (code ?? '').toString().trim();
   // 支持 1、01、3-001、3_001 等：用 -/_ 分隔
@@ -850,14 +836,6 @@ function typeGoPage(p) {
   if (p < 1 || p > typeTotalPages.value) return;
   typeCurrentPage.value = p;
 }
-function typePrevPage() {
-  if (typeCurrentPage.value <= 1) return;
-  typeCurrentPage.value -= 1;
-}
-function typeNextPage() {
-  if (typeCurrentPage.value >= typeTotalPages.value) return;
-  typeCurrentPage.value += 1;
-}
 watch(
   () => tableData.value.length,
   () => {
@@ -903,12 +881,10 @@ const getInspectionTypeList = () => {
   });
 };
 const editingRowId = ref(null);
-const inputStyle = { width: '100%', height: '28px', padding: '0 4px', border: '1px solid #d9d9d9', borderRadius: '2px' };
 const departments = ref([]);
 
-/** 查询执行科室 - 与“科室管理”页面保持完全一致的过滤与展示口径 */
+/** 查询执行科室 - 与”科室管理”页面保持完全一致的过滤与展示口径 */
 function getLocationInfo() {
-  console.log('========== 检验项目设置 - 获取执行科室 ==========');
   // 与科室管理页 queryParams 对齐：pageNo/pageSize/typeEnum/classEnum/name
   // deptTreeSelect 内部默认 typeEnum=2（科室），这里显式传入确保不会被外部覆盖
   const queryParams = {
@@ -918,30 +894,23 @@ function getLocationInfo() {
     typeEnum: 2,
     classEnum: undefined
   };
-  console.log('请求参数:', queryParams);
-  
+
   deptTreeSelect(queryParams).then((response) => {
-    console.log('API 原始响应:', response);
     let orgList = [];
     // 处理分页响应格式
     if (response && response.data) {
       if (response.data.records && Array.isArray(response.data.records)) {
         orgList = response.data.records;
-        console.log('从 response.data.records 获取数据，数量:', orgList.length);
       } else if (Array.isArray(response.data)) {
         orgList = response.data;
-        console.log('从 response.data 获取数据，数量:', orgList.length);
       }
     } else if (Array.isArray(response)) {
       orgList = response;
-      console.log('从 response 直接获取数据，数量:', orgList.length);
     }
-    
-    console.log('处理前的原始科室列表（包含 children）:', orgList);
-    
+
     /**
      * 关键：科室管理页面使用 el-table 展示的是 records（顶层列表），并不会展示 children 子节点。
-     * 为了“完全一致”，这里也只使用 records 顶层数据，并移除 children，避免出现科室管理页看不到的下级节点。
+     * 为了”完全一致”，这里也只使用 records 顶层数据，并移除 children，避免出现科室管理页看不到的下级节点。
      */
     const topLevel = (orgList || []).map(n => {
       const { children, ...rest } = (n || {});
@@ -950,28 +919,14 @@ function getLocationInfo() {
 
     // 与科室管理页保持一致：即使 name 为空也保留该行（科室管理表格仍会显示一行）
     departments.value = topLevel;
-    console.log('========== 检验项目设置 - 执行科室加载完成 ==========');
   }).catch((error) => {
     console.error('获取执行科室失败:', error);
     departments.value = [];
   });
 }
 
-// 处理科室选择变化
-function handleDepartmentChange(selectedNode, item) {
-  console.log('选择的科室节点:', selectedNode);
-  // 如果selectedNode是对象，只取name属性
-  if (typeof selectedNode === 'object' && selectedNode !== null) {
-    item.department = selectedNode.name;
-  } else {
-    // 否则直接使用（可能是字符串）
-    item.department = selectedNode;
-  }
-}
-
 // 处理套餐级别选择变化
 function handlePackageLevelChange(value) {
-  console.log('选择的套餐级别:', value);
   if (value !== '科室套餐') {
     department.value = '';
   }
@@ -979,7 +934,6 @@ function handlePackageLevelChange(value) {
 
 // 处理套餐科室选择变化
 function handlePackageDepartmentChange(selectedNode) {
-  console.log('选择的套餐科室节点:', selectedNode);
   // 如果selectedNode是对象，只取name属性
   if (typeof selectedNode === 'object' && selectedNode !== null) {
     department.value = selectedNode.name;
@@ -1030,40 +984,87 @@ const serviceRanges = ref([
   { value: '体检', label: '体检' }
 ]);
 
-// 检验类型数据
-const testTypes = ref([
-  { value: '生化', label: '生化' },
-  { value: '常规检验', label: '常规检验' },
-  { value: '免疫学检验', label: '免疫学检验' },
-  { value: '微生物检验', label: '微生物检验' },
-  { value: '分子生物学检验', label: '分子生物学检验' },
-  { value: '血液学检验', label: '血液学检验' },
-  { value: '尿液检验', label: '尿液检验' },
-  { value: '粪便检验', label: '粪便检验' },
-  { value: '脑脊液检验', label: '脑脊液检验' },
-  { value: '其他检验', label: '其他检验' }
-]);
+// 检验类型数据 - 从后端动态获取
+const testTypes = ref([]);
+
+// 加载检验类型列表（用于检验项目页面的下拉框）
+const loadInspectionTypes = async () => {
+  try {
+    const response = await listInspectionType();
+    if (response.code === 200 && response.data) {
+      const data = Array.isArray(response.data) ? response.data : (response.data.records || []);
+      testTypes.value = data
+        .filter(item => item.validFlag === 1)
+        .map(item => ({
+          id: item.id,
+          value: item.name,
+          label: item.name
+        }));
+    }
+  } catch (error) {
+    console.error('获取检验类型列表失败:', error);
+  }
+};
+
+// 监听页面切换，当切换到检验项目页面时加载检验类型下拉框数据
+watch(activeNav, (newVal) => {
+  if (newVal === 1 && testTypes.value.length === 0) {
+    // 切换到检验项目页面时，且检验类型数据未加载时才加载
+    loadInspectionTypes();
+  }
+}, { immediate: true });
 
 // 检验项目数据 - 从后端API获取
 const inspectionItems = ref([]);
 
-// 从后端API获取检验项目数据
-const loadObservationItems = async () => {
+// 检验项目总数（用于后端分页）
+const inspectionTotalCount = ref(0);
+
+// 从后端API获取检验项目数据，支持真正的查询功能
+const loadObservationItems = async (resetPage = false) => {
   try {
-    const response = await getDiagnosisTreatmentList({
-      pageNo: 1,
-      pageSize: 100,
-      categoryCode: '检验'
-    });
-    
+    // 构建查询参数，将过滤条件传递给后端
+    const params = {
+      pageNo: resetPage ? 1 : inspectionCurrentPage.value,
+      pageSize: inspectionPageSize.value,
+      categoryCode: inspectionCategoryCode.value
+    };
+
+    // 添加搜索关键字（名称/编码）
+    if (nameFilter.value) {
+      params.searchKey = nameFilter.value;
+    }
+
+    // 添加检验类型过滤
+    if (testTypeFilter.value) {
+      const selectedType = testTypes.value.find(t => t.label === testTypeFilter.value);
+      if (selectedType) {
+        params.inspectionTypeId = selectedType.id;
+      }
+    }
+
+    const response = await getDiagnosisTreatmentList(params);
+
     if (response.code === 200) {
       let data = [];
+      let totalCount = 0;
+
       if (response.data && response.data.records) {
         data = response.data.records;
+        totalCount = response.data.total || data.length;
       } else if (response.data && Array.isArray(response.data)) {
         data = response.data;
+        totalCount = data.length;
       }
-      
+
+      // 更新总数用于分页
+      inspectionTotalCount.value = totalCount;
+
+      // 如果是重置页码，回到第一页
+      if (resetPage) {
+        inspectionCurrentPage.value = 1;
+      }
+
       inspectionItems.value = data
         // 过滤掉已停用的项目（状态为3）
         .filter(item => item.statusEnum !== 3)
@@ -1071,7 +1072,8 @@ const loadObservationItems = async () => {
           id: item.id,
           code: item.busNo || '',
           name: item.name || '',
-          testType: '',
+          testType: item.inspectionTypeId_dictText || item.testType || '', // 优先使用字典翻译字段
+          inspectionTypeId: item.inspectionTypeId || null, // 检验类型ID
           package: '',
           sampleType: item.specimenCode_dictText || '',
           amount: parseFloat(item.retailPrice || 0),
@@ -1092,18 +1094,10 @@ const testTypeFilter = ref('');
 const nameFilter = ref('');
 const packageFilter = ref('');
 
-// 过滤后的检验项目数据
+// 过滤后的检验项目数据（仅保留费用套餐的前端过滤，其他过滤已由后端处理）
 const filteredInspectionItems = computed(() => {
   return inspectionItems.value.filter(item => {
-    // 按检验类型过滤
-    if (testTypeFilter.value && item.testType !== testTypeFilter.value) {
-      return false;
-    }
-    // 按名称或编码过滤
-    if (nameFilter.value && !(item.name.includes(nameFilter.value) || item.code.includes(nameFilter.value))) {
-      return false;
-    }
-    // 按费用套餐过滤
+    // 按费用套餐过滤（费用套餐是前端自定义字段，需要前端过滤）
     if (packageFilter.value && item.package !== packageFilter.value) {
       return false;
     }
@@ -1112,46 +1106,30 @@ const filteredInspectionItems = computed(() => {
 });
 
 // ==============================
-// 分页（检验项目 tab）
+// 分页（检验项目 tab）- 后端分页
 // ==============================
 const inspectionCurrentPage = ref(1);
 // 每页条数：按需求固定为10
 const inspectionPageSize = ref(10);
 const inspectionTotalPages = computed(() => {
-  const total = filteredInspectionItems.value.length;
+  const total = inspectionTotalCount.value;
   return Math.max(1, Math.ceil(total / inspectionPageSize.value));
 });
-const inspectionPageButtons = computed(() => {
-  const total = inspectionTotalPages.value;
-  return Array.from({ length: total }, (_, i) => i + 1);
-});
+// 由于改为后端分页，直接使用 filteredInspectionItems 即可
 const pagedInspectionItems = computed(() => {
-  const start = (inspectionCurrentPage.value - 1) * inspectionPageSize.value;
-  return filteredInspectionItems.value.slice(start, start + inspectionPageSize.value);
+  return filteredInspectionItems.value;
 });
 function inspectionGoPage(p) {
   if (p < 1 || p > inspectionTotalPages.value) return;
   inspectionCurrentPage.value = p;
+  // 后端分页：切换页码时重新加载数据
+  loadObservationItems();
 }
-function inspectionPrevPage() {
-  if (inspectionCurrentPage.value <= 1) return;
-  inspectionCurrentPage.value -= 1;
-}
-function inspectionNextPage() {
-  if (inspectionCurrentPage.value >= inspectionTotalPages.value) return;
-  inspectionCurrentPage.value += 1;
-}
-watch(
-  () => filteredInspectionItems.value.length,
-  () => {
-    // 过滤条件变化后，回到第一页，避免出现“当前页没数据但页码还在后面”的体验
-    inspectionCurrentPage.value = 1;
-  }
-);
 
-// 执行过滤
+// 执行过滤（真正的查询功能）
 const filterItems = () => {
-  // 过滤逻辑已经在computed属性中实现，这里可以添加额外的逻辑
+  // 传递 true 表示重置到第一页并重新加载数据
+  loadObservationItems(true);
 };
 
 // 重置过滤条件
@@ -1159,6 +1137,8 @@ const resetFilters = () => {
   testTypeFilter.value = '';
   nameFilter.value = '';
   packageFilter.value = '';
+  // 重置后重新加载数据
+  loadObservationItems(true);
 };
 
 // 套餐相关数据
@@ -1204,7 +1184,6 @@ const loadPackageItemsFromAPI = () => {
 
     // 只保留前几个项目作为示例
     packageItems.value = formattedItems.slice(0, 10);
-    console.log('加载的套餐项目:', packageItems.value);
   });
 };
 
@@ -1216,10 +1195,8 @@ const queryDiagnosisItems = (queryString, cb) => {
     pageNo: 1,
     pageSize: 100 // 增加分页大小，显示更多项目
   };
-  
+
   getDiagnosisTreatmentList(params).then(response => {
-    console.log('诊疗目录API完整返回:', response);
-    
     // 处理不同的数据结构
     let data;
     if (response.data && response.data.records) {
@@ -1232,18 +1209,15 @@ const queryDiagnosisItems = (queryString, cb) => {
       console.error('API返回数据格式不符合预期:', response.data);
       return cb([]);
     }
-    
-    // 添加调试信息，查看返回的数据结构
-    console.log('诊疗目录返回数据:', data);
-    
+
     // 过滤出目录类别为检验的项目
     // 支持多种可能的字段名
     const inspectionItems = data.filter(item => {
-      return item.categoryCode_dictText === '检验' || 
+      return item.categoryCode_dictText === '检验' ||
              item.categoryName === '检验' ||
              item.category === '检验';
     });
-    
+
     // 处理每个检验项目，确保有正确的字段映射
     const results = inspectionItems.map(item => {
       // 确保每个项目都有必要的字段
@@ -1256,8 +1230,7 @@ const queryDiagnosisItems = (queryString, cb) => {
         ...item
       };
     });
-    
-    console.log('处理后的检验项目:', results);
+
     cb(results);
   }).catch(error => {
     console.error('查询诊疗目录失败:', error);
@@ -1266,12 +1239,6 @@ const queryDiagnosisItems = (queryString, cb) => {
   });
 };
 
-// 处理项目名称输入框获得焦点事件
-const handleItemFocus = (index) => {
-  // 可以在这里添加项目选择逻辑，或者留空让用户直接输入
-};
-
-
 // 添加新的套餐项目
 let addingItem = false;
 const addPackageItem = () => {
@@ -1315,18 +1282,6 @@ const deletePackageItem = (index) => {
   });
 };
 
-// 处理选择诊疗项目
-const handleItemSelect = (item, selectedItem) => {
-  console.log('选择的诊疗项目:', selectedItem);
-  // 将选中的项目名称、使用单位、单价赋值到检验套餐明细行对应的字段中
-  item.name = selectedItem.name || selectedItem.value; // 使用name或value作为项目名称
-  item.unit = selectedItem.unit || selectedItem.usageUnit || ''; // 使用unit或usageUnit作为使用单位
-  item.unitPrice = parseFloat(selectedItem.retailPrice || selectedItem.price || 0.00); // 使用retailPrice或price作为单价
-  item.quantity = 1; // 默认数量为1
-  item.serviceFee = calculateItemServiceFee(item); // 计算该项目的服务费
-  updateItemAmount(item);
-  ElMessage.success(`已选择检验项目: ${item.name}`);
-};
 
 // 更新项目金额（考虑折扣）
 const updateItemAmount = (item) => {
@@ -1462,44 +1417,6 @@ const calculateAmounts = () => {
   }
 };
 
-// 选择套餐项目
-const handleSelectPackage = (item) => {
-  console.log('选择的检验项目:', item);
-  // 直接更新套餐金额
-  if (item.retailPrice) {
-    // 清空现有套餐项目列表
-    packageItems.value = [];
-    
-    // 创建新的套餐项目
-    const newPackageItem = {
-      name: item.name,
-      dosage: '项/人',
-      route: '项/人',
-      frequency: '',
-      days: '',
-      quantity: 1,
-      unit: item.unit || '项',
-      unitPrice: parseFloat(item.retailPrice),
-      amount: parseFloat(item.retailPrice),
-      serviceFee: 0.00, // 初始化为0
-      totalAmount: parseFloat(item.retailPrice), // 初始总金额
-      origin: ''
-    };
-    
-    // 添加到套餐项目列表
-    packageItems.value.push(newPackageItem);
-    
-    // 调用updateItemAmount计算折扣后的金额和服务费
-    updateItemAmount(newPackageItem);
-    
-    // 更新套餐名称
-    packageName.value = item.name;
-  } else {
-    console.error('选择的项目没有价格信息:', item);
-    ElMessage.warning('选择的项目没有价格信息');
-  }
-  ElMessage.success(`已选择检验项目: ${item.name}`);
-};
 
 // 检验类型相关方法
 // 处理表格点击事件，用于自动删除空的编辑行
@@ -1569,11 +1486,8 @@ const handleConfirm = (row) => {
   if (submitData.department && typeof submitData.department === 'object') {
     submitData.department = submitData.department.name || submitData.department.label || '';
   }
-  
-  console.log('原始row数据:', row);
-  console.log('提交前的submitData:', submitData);
-  
-  // 验证必填字段：为空则提示并保留该行（不要直接删行，否则用户“点确定就没了”体验很差）
+
+  // 验证必填字段：为空则提示并保留该行（不要直接删行，否则用户”点确定就没了”体验很差）
   if (!submitData.code || submitData.code.trim() === '') {
     ElMessage.warning('请输入大类编码');
     return;
@@ -1697,32 +1611,19 @@ const handleAdd = (row, index) => {
       cancelButtonText: '取消',
       type: 'warning'
     }).then(() => {
-      console.log('删除按钮被点击，原始ID:', id, '类型:', typeof id);
-      
       // 确保ID是数字类型
       const numericId = Number(id);
-      console.log('转换后的ID:', numericId, '类型:', typeof numericId);
-      
+
       // 判断是否为临时ID（前端 temp_ 前缀）
       const isTemporaryId = isTempId(id);
-      
+
       if (!isTemporaryId) { // 真实数据库ID
-        console.log('调用删除API，ID:', numericId, 'API路径:', `/system/inspection-type/${numericId}`);
-        delInspectionType(numericId).then(response => {
-          console.log('删除成功，响应:', response);
+        delInspectionType(numericId).then(() => {
           ElMessage.success('删除成功');
           getInspectionTypeList();
         }).catch(error => {
           console.error('删除检验类型失败:', error);
           ElMessage.error('删除失败: ' + (error.response?.data?.msg || '未知错误'));
-          if (error.response) {
-            console.error('响应状态:', error.response.status);
-            console.error('响应数据:', error.response.data);
-          } else if (error.request) {
-            console.error('请求发送但未收到响应:', error.request);
-          } else {
-            console.error('请求配置错误:', error.message);
-          }
         });
       } else {
         // 删除临时新增的行
@@ -1826,7 +1727,8 @@ const saveItem = async (item) => {
     const submitData = {
       busNo: item.code.trim(),
       name: item.name.trim(),
-      categoryCode: '检验',
+      categoryCode: inspectionCategoryCode.value,
+      inspectionTypeId: item.inspectionTypeId || null, // 检验类型ID
       specimenCode: item.sampleType,
       retailPrice: item.amount,
       descriptionText: item.remark,
@@ -2025,9 +1927,6 @@ const handleSave = () => {
     updateTime: new Date().toISOString()
   }));
 
-  console.log('准备保存的基本信息:', basicInfo);
-  console.log('准备保存的明细数据:', detailData);
-
   // 调用保存API（暂时使用模拟保存，后续对接真实API）
   savePackageData(basicInfo, detailData);
 };
@@ -2043,11 +1942,7 @@ const savePackageData = async (basicInfo, detailData) => {
 
   try {
     // 1. 先保存基本信息
-    console.log('准备发送的基本信息数据:', basicInfo);
     const basicResponse = await addInspectionPackage(basicInfo);
-    console.log('后端返回的完整响应:', basicResponse);
-    console.log('响应类型:', typeof basicResponse);
-    console.log('响应数据结构:', JSON.stringify(basicResponse, null, 2));
 
     // 检查响应码
     if (basicResponse.code !== 200) {
@@ -2057,7 +1952,7 @@ const savePackageData = async (basicInfo, detailData) => {
 
     // 检查响应数据结构 - 兼容多种可能的响应格式
     let packageId = null;
-    
+
     if (basicResponse.data) {
       // 标准格式：{code: 200, data: {packageId: xxx}}
       packageId = basicResponse.data.packageId || basicResponse.data.id;
@@ -2076,8 +1971,6 @@ const savePackageData = async (basicInfo, detailData) => {
       throw new Error('保存成功但未返回套餐ID。请检查后端接口是否正确返回了packageId或id字段');
     }
 
-    console.log('成功获取到套餐ID:', packageId);
-
     // 2. 分别保存每个明细数据到明细表
     for (let i = 0; i < detailData.length; i++) {
       const detailItem = {
@@ -2085,20 +1978,14 @@ const savePackageData = async (basicInfo, detailData) => {
         packageId: packageId
       };
 
-      console.log(`保存第 ${i + 1} 个明细项:`, detailItem);
-
       const detailResponse = await saveInspectionPackageDetails(detailItem);
 
       if (detailResponse.code !== 200) {
         loading.close();
         throw new Error(`保存第 ${i + 1} 个明细项失败: ${detailResponse.msg || '未知错误'}`);
       }
-
-      console.log(`第 ${i + 1} 个明细项保存成功:`, detailResponse.data);
     }
 
-    console.log('所有明细项保存完成');
-
     // 关闭加载提示
     loading.close();
 
@@ -2110,7 +1997,7 @@ const savePackageData = async (basicInfo, detailData) => {
   } catch (error) {
     // 确保在错误时也关闭loading
     loading.close();
-    
+
     console.error('保存失败:', error);
 
     // 处理不同类型的错误
@@ -2263,14 +2150,19 @@ const refreshPage = () => {
 onMounted(() => {
     getInspectionTypeList();
     getLisGroupList();
-    // 加载检验项目数据
-    loadObservationItems();
     // 加载检验套餐明细项目
     loadPackageItemsFromAPI();
       // 初始化计算套餐金额和服务费
     calculateAmounts();
   });
 
+// 监听检验分类代码，当字典数据加载完成后加载检验项目数据
+watch(activity_category_code, (newVal) => {
+  if (newVal && newVal.length > 0 && inspectionItems.value.length === 0) {
+    loadObservationItems();
+  }
+}, { immediate: true });
+
 /**
  * 关键修复：
  * 从“套餐管理”跳转到这里时，通常只是改变 query（packageId/mode/tab），组件不会重新挂载，
@@ -2325,6 +2217,11 @@ watch(packageItems, (newVal) => {
 </script>
 
 <style>
+/* Element UI 表格编辑行样式 */
+.el-table .editing-row {
+  background-color: #fdf6ec !important;
+}
+
 /* 基础样式重置 */
 * {
   margin: 0;
@@ -2335,47 +2232,31 @@ watch(packageItems, (newVal) => {
 
 /* 整体布局 */
 .inspection-container {
-  display: flex;
   width: 100%;
   height: 100vh;
   background-color: #f5f7fa;
 }
 
-/* 左侧导航 */
-.side-nav {
-  width: 200px;
+/* 左侧边栏 */
+.side-aside {
   background-color: #fff;
   box-shadow: 1px 0 5px rgba(0, 0, 0, 0.05);
-  padding: 20px 0;
+  transition: width 0.3s;
+  overflow: hidden;
 }
 
-.nav-item {
-  height: 40px;
-  display: flex;
-  align-items: center;
-  padding: 0 20px;
-  cursor: pointer;
-  transition: all 0.2s;
-  color: #333;
-}
-
-.nav-item:hover {
-  background-color: #f0f7ff;
-  color: #1890ff;
-}
-
-.nav-item.active {
-  background-color: #1890ff;
-  color: #fff;
+/* 左侧导航 */
+.side-nav {
+  border-right: none;
+  height: 100%;
 }
 
 /* 右侧主内容 */
 .main-content {
-  flex: 1;
   padding: 20px;
   overflow-y: auto;
   overflow-x: hidden;
-  max-width: 100%;
+  background-color: #f5f7fa;
 }
 
 /* 页面标题 */
@@ -2396,26 +2277,9 @@ watch(packageItems, (newVal) => {
   margin-bottom: 20px;
 }
 
-.add-new-btn {
-  height: 32px;
-  padding: 0 16px;
-  background-color: #1890ff;
-  color: #fff;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  transition: all 0.2s;
-}
-
-.add-new-btn:hover {
-  background-color: #40a9ff;
-}
-
 /* 过滤区域 */
 .filter-section {
+  width: 100%;
   background-color: #fff;
   padding: 16px;
   border-radius: 4px;
@@ -2439,82 +2303,15 @@ watch(packageItems, (newVal) => {
   font-weight: 500;
 }
 
-.filter-select {
-  width: 120px;
-  height: 32px;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  padding: 0 8px;
-  font-size: 14px;
-  background-color: #fff;
-  cursor: pointer;
-  transition: all 0.2s;
-}
-
-.filter-select:focus {
-  outline: none;
-  border-color: #1890ff;
-  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
-}
-
-.filter-input {
-  width: 180px;
-  height: 32px;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  padding: 0 8px;
-  font-size: 14px;
-  transition: all 0.2s;
-}
-
-.filter-input:focus {
-  outline: none;
-  border-color: #1890ff;
-  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
-}
-
 .filter-actions {
   display: flex;
   gap: 8px;
   margin-left: auto;
 }
 
-/* 按钮样式 */
-.btn {
-  height: 32px;
-  padding: 0 16px;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  font-size: 14px;
-  transition: all 0.2s;
-}
-
-.btn-primary {
-  background-color: #1890ff;
-  color: #fff;
-  border-color: #1890ff;
-}
-
-.btn-primary:hover {
-  background-color: #40a9ff;
-  border-color: #40a9ff;
-}
-
-.btn-secondary {
-  background-color: #f5f5f5;
-  color: #333;
-}
-
-.btn-secondary:hover {
-  background-color: #e8e8e8;
-}
-
 /* 表格容器 */
 .table-container {
+  width: 100%;
   background-color: #fff;
   border-radius: 4px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
@@ -2563,99 +2360,6 @@ watch(packageItems, (newVal) => {
   height: 100%;
 }
 
-.data-table-type .action-cell {
-  justify-content: flex-start;
-  padding-left: 24px;
-}
-
-/* 套餐明细表格的操作列垂直居中 */
-.data-table .action-cell {
-  vertical-align: middle;
-}
-
-.action-btn {
-  width: 28px;
-  height: 28px;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  border: none;
-  transition: all 0.2s ease;
-  font-size: 16px;
-  font-weight: bold;
-  position: relative;
-  z-index: 10;
-  background-color: #66b1ff;
-  color: white;
-  flex-shrink: 0;
-}
-
-.confirm-btn {
-  background-color: #1890FF;
-  color: white;
-}
-
-.edit-btn {
-  background-color: #FFC107;
-  color: white;
-  font-size: 14px;
-}
-
-.add-btn {
-  background-color: #1890FF;
-  color: white;
-}
-
-.delete-btn {
-  background-color: #FF4D4F;
-  color: white;
-  font-size: 14px;
-  z-index: 20;
-  pointer-events: auto;
-}
-
-.cancel-btn {
-  background-color: #FFA500;
-  color: white;
-  font-size: 14px;
-}
-
-/* 分页 */
-.pagination {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 8px;
-  margin-top: 20px;
-}
-
-.page-btn {
-  padding: 6px 12px;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  cursor: pointer;
-  transition: all 0.2s;
-}
-
-.page-btn:hover {
-  border-color: #1890ff;
-  color: #1890ff;
-}
-
-.page-btn.active {
-  background-color: #1890ff;
-  color: #fff;
-  border-color: #1890ff;
-}
-
-.page-btn.disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-  pointer-events: none;
-}
-
 /* 套餐设置样式 */
 .top-bar {
   height: 48px;
@@ -2674,65 +2378,15 @@ watch(packageItems, (newVal) => {
   gap: 12px;
 }
 
-.btn {
-  height: 32px;
-  padding: 0 16px;
-  border-radius: 4px;
-  font-weight: 500;
-  font-size: 14px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  border: none;
-  transition: all 0.2s;
-}
-
-.btn-icon {
-  padding: 0 12px;
-}
-
-.btn-icon i {
-  margin-right: 4px;
-}
-
-.btn-primary {
-  background-color: #1890ff;
-  color: #fff;
-}
-
-.btn-success {
-  background-color: #00b27a;
-  color: #fff;
-}
-  
-.btn-lg {
-  height: 36px;
-  padding: 0 24px;
-  font-size: 14px;
-  background-color: #0fb26d;
-  color: white;
-  transition: all 0.2s;
-}
-
-.btn-lg:hover {
-  background-color: #0d9d5f;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.btn-lg:active {
-  transform: translateY(1px);
-}
-
 /* 表单区域 */
 .form-section {
+  width: 100%;
   background: #fff;
   border-radius: 4px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
   padding: 16px;
   margin-bottom: 16px;
-  max-width: 100%;
-  overflow-x: hidden;
+  box-sizing: border-box;
 }
 
 .section-title {
@@ -2743,17 +2397,20 @@ watch(packageItems, (newVal) => {
   border-bottom: 1px solid #f0f0f0;
 }
 
+/* 弹性布局表单 */
 .form-grid {
-  display: grid;
-  grid-template-columns: repeat(4, 1fr);
+  display: flex;
+  flex-wrap: wrap;
   gap: 16px;
 }
 
 .form-item {
   display: flex;
   align-items: center;
-  min-width: 0;
-  max-width: 100%;
+  /* 每行4个：总宽度 = 100% - 3*16px(gap) = 52px，每项 = (100% - 48px) / 4 */
+  width: calc((100% - 48px) / 4);
+  min-width: 180px;
+  box-sizing: border-box;
 }
 
 .form-label {
@@ -2765,190 +2422,34 @@ watch(packageItems, (newVal) => {
 }
 
 /* 响应式设计 */
-@media (max-width: 992px) {
-  /* 隐藏左侧导航 */
-  .side-nav {
-    display: none;
-  }
-  
-  /* 主内容区域设置为100%宽度 */
-  .main-content {
-    margin-left: 0;
-    width: 100%;
-    padding: 10px;
-  }
-  
-  /* 过滤区域垂直排列 */
-  .filter-section {
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 12px;
-  }
-  
-  .filter-item {
-    width: 100%;
-    justify-content: flex-start;
-  }
-  
-  /* 过滤操作按钮换行 */
-  .filter-actions {
-    width: 100%;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    margin-left: 0;
-  }
-  
-  /* 调整按钮样式 */
-  .filter-actions .btn {
-    margin-right: 8px;
-    margin-bottom: 8px;
-  }
-  
-  /* 调整表单网格布局 */
-  .form-grid {
-    grid-template-columns: repeat(2, 1fr);
-  }
-  
-  /* 操作按钮换行显示 */
-  .filter-actions {
-    width: 100%;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-  }
-  
-  /* 表格容器在小屏幕上添加横向滚动 */
-  .table-container {
-    overflow-x: auto;
-  }
-  
-  /* 数据表格在小屏幕上保持最小宽度 */
-  .data-table {
-    min-width: 1000px;
-  }
-  
-  /* 调整表单标签宽度 */
-  .form-label {
-    width: 60px;
-  }
-  
-  /* 调整输入框和选择框样式 */
-  .filter-input,
-  .filter-select {
-    width: calc(100% - 80px);
-  }
-  
-  /* 表单网格调整为2列 */
-  .form-grid {
-    grid-template-columns: repeat(2, 1fr);
+@media (max-width: 1400px) {
+  /* 每行3个：总gap = 2*16px = 32px */
+  .form-item {
+    width: calc((100% - 32px) / 3);
   }
 }
 
-.form-control {
-  flex: 1;
-  height: 32px;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  padding: 0 8px;
-  font-size: 14px;
-  max-width: 100%;
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.form-control:focus {
-  outline: none;
-  border-color: #1890ff;
-  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
-}
-
-.form-select {
-  width: 100%;
-  background: white;
-  appearance: none;
-}
-
-.radio-group {
-  display: flex;
-  gap: 1px;
-}
-
-.radio-item {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-}
-
-/* 表格头部 */
-.table-header {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 16px;
-  padding: 16px;
-}
-
-.table-title {
-  font-weight: 700;
-  font-size: 14px;
-}
-
-/* 表格内操作按钮 */
-.table-actions {
-  display: flex;
-  gap: 8px;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  flex-wrap: nowrap;
-}
-
-/* 表格内输入框和选择框样式 */
-.data-table input,
-.data-table select {
-  width: 100%;
-  height: 28px;
-  padding: 0 8px;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  font-size: 12px;
-  box-sizing: border-box;
-}
-
-.data-table input:focus,
-.data-table select:focus {
-  outline: none;
-  border-color: #40a9ff;
-  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
-}
-
-/* 编辑模式行样式 */
-.data-table tr.editing {
-  background-color: #f0f7ff;
-  box-shadow: 0 0 0 1px #1890ff;
-}
-
-/* 响应式设计 */
 @media (max-width: 1200px) {
-  .form-grid {
-    grid-template-columns: repeat(2, 1fr);
+  /* 每行2个：总gap = 1*16px = 16px */
+  .form-item {
+    width: calc((100% - 16px) / 2);
   }
 }
 
 @media (max-width: 992px) {
-  .inspection-container {
-    flex-direction: column;
-  }
-  
-  .side-nav {
+  .side-aside {
     display: none;
   }
   
-  .main-content {
-    margin-left: 0;
+  .form-item {
+    width: calc((100% - 16px) / 2);
+  }
+}
+
+@media (max-width: 768px) {
+  .form-item {
     width: 100%;
-    padding: 10px;
+    min-width: 0;
   }
   
   .filter-section {
@@ -2966,17 +2467,21 @@ watch(packageItems, (newVal) => {
     flex-wrap: wrap;
     gap: 8px;
   }
-  
-  .form-grid {
-    grid-template-columns: 1fr;
-  }
-  
-  .table-container {
-    overflow-x: auto;
-  }
-  
-  .data-table {
-    min-width: 1000px;
-  }
+}
+
+/* 表格内操作按钮 */
+.table-actions {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  flex-wrap: nowrap;
+}
+
+/* 编辑模式行样式 */
+.el-table .editing-row {
+  background-color: #f0f7ff;
 }
 </style>
\ No newline at end of file