From 3394aa54d78dbdd702ba17a593ad5e25d9cbc787 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Wed, 20 May 2026 09:45:33 +0800
Subject: [PATCH] =?UTF-8?q?549=E3=80=90=E4=BD=8F=E9=99=A2=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E7=AB=99-=E4=B8=B4=E5=BA=8A=E5=8C=BB=E5=98=B1-?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=E3=80=91=E6=89=93=E5=BC=80=E2=80=9C=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E7=94=B3=E8=AF=B7=E5=8D=95=E2=80=9D=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=93=8D?=
 =?UTF-8?q?=E5=BA=94=E6=9E=81=E5=85=B6=E7=BC=93=E6=85=A2=20546=20=E3=80=90?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E7=AE=A1=E7=90=86=E3=80=91-=E3=80=90?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E5=88=97=E8=A1=A8=E3=80=91-=E3=80=90?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=82=A3=E8=80=85=E3=80=91=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=82=A3=E8=80=85=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E4=BD=86=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20536=20[=E9=97=A8=E8=AF=8A=E6=89=8B=E6=9C=AF=E5=AE=89?=
 =?UTF-8?q?=E6=8E=92]=E2=80=9C=E6=89=8B=E6=9C=AF=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E2=80=9D=E5=BC=B9=E7=AA=97=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6=E4=B8=8E=E7=95=8C?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=85=83=E7=B4=A0=E9=87=8D=E5=8F=A0=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E6=93=8D=E4=BD=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IDoctorStationAdviceAppService.java       |   2 +-
 .../DoctorStationAdviceAppServiceImpl.java    |   5 +-
 .../DoctorStationAdviceController.java        |   5 +-
 .../mapper/DoctorStationAdviceAppMapper.java  |   3 +-
 .../impl/PatientInformationServiceImpl.java   |  36 +---
 .../DoctorStationAdviceAppMapper.xml          |   4 +-
 openhis-ui-vue3/src/utils/medicalConstants.js |  15 ++
 .../order/applicationForm/laboratoryTests.vue | 109 ++++++------
 .../applicationForm/medicalExaminations.vue   |   2 +
 .../src/views/surgicalschedule/index.vue      | 161 +++++++++++-------
 10 files changed, 180 insertions(+), 162 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
index 641ad4db..f9f0b95e 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
@@ -147,6 +147,6 @@ public interface IDoctorStationAdviceAppService {
      */
     IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
 
-    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
+    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode);
 
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
index 40bd312e..4a17e6d7 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -2571,12 +2571,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     }
 
     @Override
-    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
+    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode) {
         IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getExaminationPage(
                 new Page<>(pageNo, pageSize),
                 PublicationStatus.ACTIVE.getValue(),
                 organizationId,
-                searchKey);
+                searchKey,
+                categoryCode);
         return result;
     }
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
index 84b83334..2e64d725 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
@@ -226,8 +226,9 @@ public class DoctorStationAdviceController {
             @RequestParam(value = "organizationId", required = false) Long organizationId,
             @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize,
-            @RequestParam(value = "searchKey", defaultValue = "") String searchKey) {
-        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey));
+            @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+            @RequestParam(value = "categoryCode", defaultValue = "23") String categoryCode) {
+        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey, categoryCode));
     }
 
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
index 67a16f4b..36b12109 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
@@ -203,6 +203,7 @@ public interface DoctorStationAdviceAppMapper {
     IPage<SurgeryItemDto> getExaminationPage(@Param("page") Page<SurgeryItemDto> page,
             @Param("statusEnum") Integer statusEnum,
             @Param("organizationId") Long organizationId,
-            @Param("searchKey") String searchKey);
+            @Param("searchKey") String searchKey,
+            @Param("categoryCode") String categoryCode);
 
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
index 54909bb8..abe838ee 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java
@@ -133,47 +133,13 @@ public class PatientInformationServiceImpl implements IPatientInformationService
     @Override
     public IPage<PatientBaseInfoDto> getPatientInfo(PatientBaseInfoDto patientBaseInfoDto, String searchKey,
             Integer pageNo, Integer pageSize, HttpServletRequest request) {
-        // 获取登录者信息
+        // 构建基础查询条件
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        Long userId = loginUser.getUserId();
-        Integer tenantId = loginUser.getTenantId().intValue();
-        
-        // 先构建基础查询条件
         QueryWrapper<PatientBaseInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(
                 patientBaseInfoDto, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name,
                         CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr)),
                 request);
         
-        // 检查是否是精确ID查询（从门诊挂号页面跳转时使用）
-        boolean hasExactIdQuery = (patientBaseInfoDto.getId() != null);
-        
-        // 只有非精确ID查询时，才添加医生患者过滤条件
-        if (!hasExactIdQuery) {
-            // 查询当前用户对应的医生信息
-            LambdaQueryWrapper<com.openhis.administration.domain.Practitioner> practitionerQuery = new LambdaQueryWrapper<>();
-            practitionerQuery.eq(com.openhis.administration.domain.Practitioner::getUserId, userId);
-            // 使用list()避免TooManyResultsException异常，然后取第一个记录
-            List<com.openhis.administration.domain.Practitioner> practitionerList = practitionerService.list(practitionerQuery);
-            com.openhis.administration.domain.Practitioner practitioner = practitionerList != null && !practitionerList.isEmpty() ? practitionerList.get(0) : null;
-            
-            // 如果当前用户是医生，添加医生患者过滤条件
-            if (practitioner != null) {
-                // 查询该医生作为接诊医生（ADMITTER, code="1"）和挂号医生（REGISTRATION_DOCTOR, code="12"）的所有就诊记录的患者ID
-                List<Long> doctorPatientIds = patientManageMapper.getPatientIdsByPractitionerId(
-                        practitioner.getId(),
-                        Arrays.asList(ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode()),
-                        tenantId);
-                
-                if (doctorPatientIds != null && !doctorPatientIds.isEmpty()) {
-                    // 添加患者ID过滤条件 - 注意：这里使用列名而不是表别名
-                    queryWrapper.in("id", doctorPatientIds);
-                } else {
-                    // 如果没有相关患者，返回空结果
-                    queryWrapper.eq("id", -1); // 设置一个不存在的ID
-                }
-            }
-            // 如果不是医生，查询所有患者
-        }
         
         IPage<PatientBaseInfoDto> patientInformationPage
                 = patientManageMapper.getPatientPage(new Page<>(pageNo, pageSize), queryWrapper);
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
index c3067563..a53da429 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -895,7 +895,7 @@
         ORDER BY t1.ID, t1.name ASC, t2.ID ASC
     </select>
 
-    <!-- 检查项目专用分页查询：仅查检查(23) + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
+    <!-- 检查/检验项目专用分页查询：仅查指定 category_code + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
     <select id="getExaminationPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
         SELECT DISTINCT ON (t1.ID)
             t1.ID AS advice_definition_id,
@@ -913,7 +913,7 @@
             AND t2.status_enum = #{statusEnum}
             AND t2.instance_table = 'wor_activity_definition'
         WHERE t1.delete_flag = '0'
-          AND t1.category_code = '23'
+          AND t1.category_code = #{categoryCode}
           <if test="searchKey != null and searchKey != ''">
               AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
           </if>
diff --git a/openhis-ui-vue3/src/utils/medicalConstants.js b/openhis-ui-vue3/src/utils/medicalConstants.js
index 92a5d3c4..fb57629d 100755
--- a/openhis-ui-vue3/src/utils/medicalConstants.js
+++ b/openhis-ui-vue3/src/utils/medicalConstants.js
@@ -220,3 +220,18 @@ export function getSlotStatusDescription(value) {
 export function getSlotStatusClass(status) {
   return SlotStatusClassMap[status] || 'status-unbooked';
 }
+
+/**
+ * 诊疗项目分类代码（对应后端 ActivityDefCategory 枚举）
+ * wor_activity_definition.category_code 字段
+ */
+export const ActivityCategory = {
+  /** 治疗 */
+  TREATMENT: '21',
+  /** 检验 */
+  PROOF: '22',
+  /** 检查 */
+  TEST: '23',
+  /** 手术 */
+  PROCEDURE: '24',
+};
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
index c91557b5..806ec519 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
@@ -17,17 +17,14 @@
           style="width: 300px; margin-bottom: 10px"
         >
           <template #append>
-            <el-button @click="handleSearch">搜索</el-button>
+            <el-button @click="handleSearch" :loading="loading">搜索</el-button>
           </template>
         </el-input>
-        <span v-if="!searchKey" class="total-count">共 {{ totalCount }} 项</span>
-        <span v-else class="total-count">搜索到 {{ filteredCount }} 项 / 共 {{ totalCount }} 项</span>
+        <span class="total-count">共 {{ totalCount }} 项</span>
       </div>
       <el-transfer
         v-model="transferValue"
         :data="transferData"
-        filter-placeholder="项目代码/名称"
-        filterable
         :titles="['未选择', '已选择']"
       />
     </div>
@@ -136,7 +133,8 @@
 <script setup name="LaboratoryTests">
 import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch, computed} from 'vue';
 import {patientInfo} from '../../../store/patient.js';
-import {getApplicationList, saveInspection} from './api';
+import {getExaminationPage, saveInspection} from './api';
+import {ActivityCategory} from '@/utils/medicalConstants';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
 import {ElMessage} from 'element-plus';
@@ -173,9 +171,8 @@ const skipDeptAutoFill = ref(false);
 // 将已加载的全部数据转为 transfer 组件所需的格式
 const buildTransferData = (records) => {
   return records.map((item) => {
-    const priceInfo = item.priceList?.[0] || {};
-    const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
-    const unit = item.unitCode_dictText || item.unitCode || '';
+    const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
+    const unit = item.unitCodeDictText || item.unitCode || '';
     return {
       adviceDefinitionId: item.adviceDefinitionId,
       orgId: item.orgId,
@@ -185,7 +182,8 @@ const buildTransferData = (records) => {
   });
 };
 
-// 加载全部数据（不分页，一次性拉取）
+const selectedItemsCache = ref(new Map());
+
 const loadAllData = async () => {
   if (!patientInfo.value?.inHospitalOrgId) {
     applicationListAll.value = [];
@@ -193,13 +191,12 @@ const loadAllData = async () => {
   }
   loading.value = true;
   try {
-    // 使用大 pageSize 一次性拉取所有启用状态的检验类诊疗项目
-    const res = await getApplicationList({
-      pageSize: 9999,
+    const res = await getExaminationPage({
+      pageSize: 100,
       pageNo: 1,
-      categoryCode: '22',
+      categoryCode: ActivityCategory.PROOF,
       organizationId: patientInfo.value.inHospitalOrgId,
-      adviceTypes: [3], // 1 药品 2 耗材 3 诊疗
+      searchKey: searchKey.value,
     });
     if (res.code !== 200) {
       proxy.$message.error(res.message);
@@ -208,8 +205,9 @@ const loadAllData = async () => {
     }
     applicationListAll.value = res.data?.records || [];
     totalCount.value = res.data?.total || 0;
-    // 检验项目列表为异步加载，编辑回显必须在数据就绪后执行，否则已选区一直为空
-    applyEditTransferSelection()
+    if (!searchKey.value) {
+      applyEditTransferSelection();
+    }
   } catch (e) {
     proxy.$message.error('获取检验项目列表失败');
     applicationListAll.value = [];
@@ -218,32 +216,18 @@ const loadAllData = async () => {
   }
 };
 
-// 根据搜索关键词过滤数据
-const filterData = (key) => {
-  if (!key || key.trim() === '') {
-    return applicationListAll.value;
-  }
-  const lowerKey = key.toLowerCase().trim();
-  return applicationListAll.value.filter((item) => {
-    return (
-      item.adviceName?.toLowerCase().includes(lowerKey) ||
-      item.pyStr?.toLowerCase().includes(lowerKey) ||
-      item.adviceBusNo?.toLowerCase().includes(lowerKey)
-    );
-  });
-};
-
-// transfer 组件实际显示的数据（受搜索词影响）
-const transferData = computed(() => buildTransferData(filterData(searchKey.value)));
-// 当前显示的条数
-const filteredCount = computed(() => filterData(searchKey.value).length);
+const transferData = computed(() => buildTransferData(applicationListAll.value));
 
 const getList = async () => {
   await loadAllData();
 };
 
+let searchTimer = null;
 const handleSearch = () => {
-  // 搜索时保持已选中的项目不受影响
+  clearTimeout(searchTimer);
+  searchTimer = setTimeout(() => {
+    loadAllData();
+  }, 300);
 };
 // 编辑初始化标志：避免 applyEditTransferSelection 设置 transferValue 时触发 projectWithDepartment 覆盖 descJson 中的科室值
 const isInitializing = ref(false);
@@ -302,13 +286,17 @@ const projectWithDepartment = (selectProjectIds, type) => {
   const arr = [];
   // 根据选中的项目id查找对应的项目（从全部原始数据中查找）
   selectProjectIds.forEach((element) => {
-    const searchData = applicationListAll.value.find((item) => {
+    let searchData = applicationListAll.value.find((item) => {
       return element == item.adviceDefinitionId;
     });
+    if (!searchData) {
+      searchData = selectedItemsCache.value.get(element);
+    }
     if (searchData) {
       const priceInfo = searchData.priceList?.[0] || {};
-      const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
-      const unit = searchData.unitCode_dictText || searchData.unitCode || '';
+      const price = searchData.price != null ? Number(searchData.price).toFixed(2)
+        : priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
+      const unit = searchData.unitCodeDictText || searchData.unitCode_dictText || searchData.unitCode || '';
       arr.push({
         adviceDefinitionId: searchData.adviceDefinitionId,
         orgId: searchData.orgId,
@@ -371,6 +359,12 @@ watch(
   (newValue) => {
     if (skipDeptAutoFill.value) return;
     if (isInitializing.value) return;
+    newValue.forEach((id) => {
+      if (!selectedItemsCache.value.has(id)) {
+        const item = applicationListAll.value.find((i) => i.adviceDefinitionId == id);
+        if (item) selectedItemsCache.value.set(id, item);
+      }
+    });
     projectWithDepartment(newValue, 1);
   }
 );
@@ -455,13 +449,14 @@ watch(
   }
 )
 
-// 编辑模式下，项目字典加载完成后重新回显已选项目
+// 编辑模式下，项目字典首次加载完成后回显已选项目（搜索刷新不重置）
 watch(
   () => applicationListAll.value,
   () => {
     if (!props.editData?.requestFormId) return;
     if (!props.editData.requestFormDetailList?.length) return;
     if (!applicationListAll.value.length) return;
+    if (searchKey.value) return;
 
     const selectedIds = [];
     props.editData.requestFormDetailList.forEach((detail) => {
@@ -486,26 +481,29 @@ const submit = () => {
   if (!projectWithDepartment(transferValue.value, 2)) {
     return;
   }
-  let applicationListAllFilter = applicationListAll.value.filter((item) => {
-    return transferValue.value.includes(item.adviceDefinitionId);
-  });
-  applicationListAllFilter = applicationListAllFilter.map((item) => {
+  let applicationListAllFilter = transferValue.value.map((id) => {
+    let item = applicationListAll.value.find((i) => i.adviceDefinitionId == id);
+    if (!item) {
+      item = selectedItemsCache.value.get(id);
+    }
+    if (!item) return null;
+    const priceInfo = item.priceList?.[0] || {};
     return {
       adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
       quantity: 1, // /** 请求数量 */
-      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
-      unitPrice: item.priceList[0].price /** 单价 */,
-      totalPrice: item.priceList[0].price /** 总价 */,
+      unitCode: item.unitCode || priceInfo.unitCode || '' /** 请求单位编码 */,
+      unitPrice: item.price ?? priceInfo.price ?? 0 /** 单价 */,
+      totalPrice: item.price ?? priceInfo.price ?? 0 /** 总价 */,
       positionId: form.targetDepartment || item.positionId, // 用户指定发往科室优先于项目默认执行科室
-      ybClassEnum: item.ybClassEnum, //类别医保编码
-      conditionId: item.conditionId, //诊断ID
-      encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
-      adviceType: item.adviceType, ///** 医嘱类型 */
-      definitionId: item.priceList[0].definitionId, //费用定价主表ID */
-      definitionDetailId: item.definitionDetailId, //费用定价子表ID */
+      ybClassEnum: item.ybClassEnum || '', //类别医保编码
+      conditionId: item.conditionId || '', //诊断ID
+      encounterDiagnosisId: item.encounterDiagnosisId || '', //就诊诊断id
+      adviceType: item.adviceType || 3, ///** 医嘱类型 */
+      definitionId: item.chargeItemDefinitionId || priceInfo.definitionId || '', //费用定价主表ID */
+      definitionDetailId: item.definitionDetailId || priceInfo.definitionDetailId || '', //费用定价子表ID */
       accountId: patientInfo.value.accountId, // // 账户id
     };
-  });
+  }).filter(Boolean);
   const params = {
     activityList: applicationListAllFilter,
     patientId: patientInfo.value.patientId, //患者ID
@@ -520,6 +518,7 @@ const submit = () => {
     if (res.code === 200) {
       proxy.$message.success(isEditMode.value ? '修改成功' : res.msg);
       transferValue.value = [];
+      selectedItemsCache.value.clear();
       emits('submitOk');
     } else {
       proxy.$message.error(res.message);
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
index 11613b94..d6d7ee5e 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
@@ -207,6 +207,7 @@ import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
 import {getExaminationPage, saveCheckd} from './api';
+import {ActivityCategory} from '@/utils/medicalConstants';
 import {ElMessage, ElMessageBox} from 'element-plus';
 import {WarningFilled, Warning, Refresh, Files, Document, EditPen, Aim, DocumentCopy} from '@element-plus/icons-vue';
 
@@ -276,6 +277,7 @@ const getList = () => {
     pageNo: 1,
     pageSize: 5000,
     searchKey: '',
+    categoryCode: ActivityCategory.TEST,
   })
     .then((res) => {
       if (res.code === 200 && res.data?.records) {
diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
index 8039c920..4a0698e3 100755
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -740,58 +740,59 @@
         </el-form-item>
       </el-form>
 
-      <!-- 结果表格区 -->
-      <el-table
-        ref="applyTableRef"
-        v-loading="applyLoading"
-        :data="applyList"
-        row-key="surgeryNo"
-        @row-click="handleApplyRowClick"
-        :row-class-name="tableRowClassName"
-        style="width: 100%"
-        max-height="340"
-        :scroll="{ y: 340 }"
-      >
-        <el-table-column type="selection" width="55" :selectable="handleSelectable" />
-        <el-table-column label="ID" align="center" width="80" fixed>
-          <template #default="{ $index }">
-            {{ (applyQueryParams.pageNo - 1) * applyQueryParams.pageSize + $index + 1 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="姓名" align="center" prop="name" width="100" />
-        <el-table-column label="手术单号" align="center" prop="surgeryNo" width="120" />
-        <el-table-column label="手术名称" align="center" prop="descJson.surgeryName" min-width="140" show-overflow-tooltip />
-        <el-table-column label="申请科室" align="center" width="100" prop="applyDeptName" />
-        <el-table-column label="手术类型" align="center" width="90">
-          <template #default="scope">
-            {{ getSurgeryTypeName(scope.row.surgeryType) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="手术等级" align="center" width="90">
-          <template #default="scope">
-            {{ getSurgeryLevelName(scope.row.surgeryLevel || scope.row.descJson?.surgeryLevel) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="麻醉方式" align="center" width="90">
-          <template #default="scope">
-            {{ getAnesthesiaName(scope.row.anesthesiaTypeEnum) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="主刀医生" align="center" width="100" prop="mainSurgeonName" />
-      </el-table>
-
-      <!-- 底部分页区 -->
-      <div class="pagination-container apply-pagination">
-        <pagination
-          v-show="applyTotal > 0"
-          :total="applyTotal"
-          :page="applyQueryParams.pageNo"
-          :limit="applyQueryParams.pageSize"
-          @update:page="val => applyQueryParams.pageNo = val"
-          @update:limit="val => applyQueryParams.pageSize = val"
-          @pagination="getSurgicalScheduleList"
-        />
-      </div>
+      <!-- 结果表格卡片 -->
+      <el-card shadow="never" class="apply-card">
+        <el-table
+          ref="applyTableRef"
+          v-loading="applyLoading"
+          :data="applyList"
+          row-key="surgeryNo"
+          @row-click="handleApplyRowClick"
+          :row-class-name="tableRowClassName"
+          style="width: 100%"
+          max-height="320"
+        >
+          <el-table-column type="selection" width="55" :selectable="handleSelectable" />
+          <el-table-column label="ID" align="center" width="80" fixed>
+            <template #default="{ $index }">
+              {{ (applyQueryParams.pageNo - 1) * applyQueryParams.pageSize + $index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="姓名" align="center" prop="name" width="100" />
+          <el-table-column label="手术单号" align="center" prop="surgeryNo" width="120" />
+          <el-table-column label="手术名称" align="center" prop="descJson.surgeryName" min-width="140" show-overflow-tooltip />
+          <el-table-column label="申请科室" align="center" width="100" prop="applyDeptName" />
+          <el-table-column label="手术类型" align="center" width="90">
+            <template #default="scope">
+              {{ getSurgeryTypeName(scope.row.surgeryType) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="手术等级" align="center" width="90">
+            <template #default="scope">
+              {{ getSurgeryLevelName(scope.row.surgeryLevel || scope.row.descJson?.surgeryLevel) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="麻醉方式" align="center" width="90">
+            <template #default="scope">
+              {{ getAnesthesiaName(scope.row.anesthesiaTypeEnum) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="主刀医生" align="center" width="100" prop="mainSurgeonName" />
+        </el-table>
+        <!-- 分页在卡片内部 -->
+        <div class="apply-pagination">
+          <pagination
+            v-show="applyTotal > 0"
+            :total="applyTotal"
+            :page="applyQueryParams.pageNo"
+            :limit="applyQueryParams.pageSize"
+            layout="total, sizes, prev, pager, next"
+            @update:page="val => applyQueryParams.pageNo = val"
+            @update:limit="val => applyQueryParams.pageSize = val"
+            @pagination="getSurgicalScheduleList"
+          />
+        </div>
+      </el-card>
       <!-- 底部操作区 -->
       <template #footer>
         <div class="dialog-footer" style="padding-top: 12px; border-top: 1px solid #ebeef5">
@@ -2468,19 +2469,35 @@ function getRowClassName({ row, rowIndex }) {
   margin-left: 10px;
 }
 
-/* 手术申请查询弹窗 — 分页与footer间距 */
+/* 手术申请查询弹窗 — flex 布局确保分页不溢出 */
 .surgery-apply-dialog :deep(.el-dialog__body) {
+  display: flex;
+  flex-direction: column;
   padding-bottom: 16px;
+  overflow: hidden;
 }
 .surgery-apply-dialog :deep(.el-dialog__footer) {
-  padding-top: 8px;
+  padding-top: 0;
+}
+.surgery-apply-dialog :deep(.apply-card) {
+  flex: 1;
+  overflow: hidden;
+  min-height: 0;
+}
+.surgery-apply-dialog :deep(.apply-card .el-card__body) {
+  overflow-y: auto;
 }
 .surgery-apply-dialog :deep(.apply-pagination) {
-  padding-top: 12px;
-  padding-bottom: 16px;
+  display: flex;
+  justify-content: flex-end;
+  padding-top: 8px;
+  border-top: 1px solid #ebeef5;
+}
+.surgery-apply-dialog :deep(.apply-pagination .pagination-container) {
+  margin-top: 0;
 }
 .surgery-apply-dialog :deep(.apply-pagination .el-pagination) {
-  margin-right: 80px;
+  position: static;
 }
 
 /* 选中行样式 */
@@ -2496,17 +2513,33 @@ function getRowClassName({ row, rowIndex }) {
 
 <style>
 /* 手术申请查询弹窗 — 非 scoped 确保穿透 teleport */
-.surgery-apply-dialog .apply-pagination {
-  padding-top: 12px !important;
-  padding-bottom: 16px !important;
-}
-.surgery-apply-dialog .apply-pagination .el-pagination {
-  margin-right: 80px !important;
-}
 .surgery-apply-dialog .el-dialog__body {
+  display: flex !important;
+  flex-direction: column !important;
   padding-bottom: 16px !important;
+  overflow: hidden !important;
 }
 .surgery-apply-dialog .el-dialog__footer {
+  padding-top: 0 !important;
+}
+.surgery-apply-dialog .apply-card {
+  flex: 1 !important;
+  overflow: hidden !important;
+  min-height: 0 !important;
+}
+.surgery-apply-dialog .apply-card .el-card__body {
+  overflow-y: auto !important;
+}
+.surgery-apply-dialog .apply-pagination {
+  display: flex !important;
+  justify-content: flex-end !important;
   padding-top: 8px !important;
+  border-top: 1px solid #ebeef5 !important;
+}
+.surgery-apply-dialog .apply-pagination .pagination-container {
+  margin-top: 0 !important;
+}
+.surgery-apply-dialog .apply-pagination .el-pagination {
+  position: static !important;
 }
 </style>