403 住院医生工作站：应用医嘱组套后，药品明细字段内容丢失未正确引入表格 521 [住院医生站-临床医嘱-检查申请] 手工选择执行科室后，保存仍提示“未找到项目执行的科室” 528 [住院医生工作站-检查申请] 修改申请单成功后，弹窗未自动关闭且列表数据未自动刷新 531 [住院医生站-临床医嘱-检查] 检查申请单打开数据没有正常加载

This reverts commit 5946c1ea4b, reversing
changes made to 8d905c9844.

.husky/pre-commit

@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-# ============================================================
-# Husky Pre-commit Hook - HIS项目
-# 配置: 关羽 | 日期: 2026-04-24
-# 功能: 提交前检查（已禁用）
-# ============================================================
-
-# 🔧 已禁用所有检查，直接允许提交
-echo "⏭️  [Pre-commit] 检查已禁用，允许提交"
-exit 0

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java

@@ -5,6 +5,7 @@ import com.core.common.core.domain.R;
 import com.openhis.web.doctorstation.dto.AdviceBaseDto;
 import com.openhis.web.doctorstation.dto.AdviceSaveParam;
 import com.openhis.web.doctorstation.dto.OrderBindInfoDto;
+import com.openhis.web.doctorstation.dto.SurgeryItemDto;
 import com.openhis.web.doctorstation.dto.UpdateGroupIdParam;
 
 import java.util.List;
@@ -134,4 +135,18 @@ public interface IDoctorStationAdviceAppService {
      * @return 已配置的药品类别编码列表
      */
     R<?> getConfiguredCategories(Long organizationId);
+
+    /**
+     * 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
+     *
+     * @param organizationId 科室ID（可选）
+     * @param pageNo 当前页
+     * @param pageSize 每页条数
+     * @param searchKey 模糊查询关键字（可选）
+     * @return 手术项目分页数据（含价格信息）
+     */
+    IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
+
+    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -2440,4 +2440,30 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         return R.ok(categoryCodes);
     }
 
+    /**
+     * 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
+     */
+    @Override
+    public IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
+        log.info("getSurgeryPage 开始: orgId={}, page={}/{}, searchKey={}", organizationId, pageNo, pageSize, searchKey);
+        long start = System.currentTimeMillis();
+        IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getSurgeryPage(
+                new Page<>(pageNo, pageSize),
+                PublicationStatus.ACTIVE.getValue(),
+                organizationId,
+                searchKey);
+        log.info("getSurgeryPage 完成: {}ms, total={}, records={}", System.currentTimeMillis() - start, result.getTotal(), result.getRecords().size());
+        return result;
+    }
+
+    @Override
+    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
+        IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getExaminationPage(
+                new Page<>(pageNo, pageSize),
+                PublicationStatus.ACTIVE.getValue(),
+                organizationId,
+                searchKey);
+        return result;
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java

@@ -36,6 +36,9 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.*;
 
@@ -598,6 +601,25 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         InfectiousDiseaseReport infectiousDiseaseReport = new InfectiousDiseaseReport();
         BeanUtils.copyProperties(infectiousDiseaseReportDto, infectiousDiseaseReport);
 
+        // BeanUtils.copyProperties 不支持 LocalDate/LocalDateTime 到 java.util.Date 的类型转换，需手动处理
+        if (infectiousDiseaseReportDto.getOnsetDate() != null) {
+            infectiousDiseaseReport.setOnsetDate(
+                Date.from(infectiousDiseaseReportDto.getOnsetDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
+        }
+        if (infectiousDiseaseReportDto.getDiagDate() != null) {
+            infectiousDiseaseReport.setDiagDate(
+                Date.from(infectiousDiseaseReportDto.getDiagDate().atZone(ZoneId.systemDefault()).toInstant()));
+        }
+        // deathDate / reportDate 同理
+        if (infectiousDiseaseReportDto.getDeathDate() != null) {
+            infectiousDiseaseReport.setDeathDate(
+                Date.from(infectiousDiseaseReportDto.getDeathDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
+        }
+        if (infectiousDiseaseReportDto.getReportDate() != null) {
+            infectiousDiseaseReport.setReportDate(
+                Date.from(infectiousDiseaseReportDto.getReportDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
+        }
+
         /**
          * 设置创建人、删除状态、租户ID
          */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java

@@ -203,4 +203,31 @@ public class DoctorStationAdviceController {
         return iDoctorStationAdviceAppService.getConfiguredCategories(organizationId);
     }
 
+    /**
+     * 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
+     *
+     * @param organizationId 科室ID（可选）
+     * @param pageNo 当前页
+     * @param pageSize 每页条数
+     * @param searchKey 模糊查询关键字（可选）
+     * @return 手术项目分页数据（含价格信息）
+     */
+    @GetMapping(value = "/surgery-page")
+    public R<?> getSurgeryPage(
+            @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.getSurgeryPage(organizationId, pageNo, pageSize, searchKey));
+    }
+
+    @GetMapping(value = "/examination-page")
+    public R<?> getExaminationPage(
+            @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));
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java

@@ -0,0 +1,42 @@
+package com.openhis.web.doctorstation.dto;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 手术项目选择器专用 DTO（不含 @Dict 注解，绕过 DictAspect 的 Redis 字典翻译）
+ */
+@Data
+public class SurgeryItemDto {
+
+    /** 医嘱定义ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long adviceDefinitionId;
+
+    /** 手术名称 */
+    private String adviceName;
+
+    /** 所属科室ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orgId;
+
+    /** 执行科室ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long positionId;
+
+    /** 费用定价主表ID（用于提交时关联价格） */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long chargeItemDefinitionId;
+
+    /** 单价（直接从定价主表取，无需嵌套 priceList） */
+    private BigDecimal price;
+
+    /** 单位编码 */
+    private String unitCode;
+
+    /** 单位编码字典文本（前端用于显示单位） */
+    private String unitCodeDictText;
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java

@@ -185,4 +185,23 @@ public interface DoctorStationAdviceAppMapper {
      */
     Long getDefaultAccountId(@Param("encounterId") Long encounterId);
 
+    /**
+     * 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
+     *
+     * @param page 分页参数
+     * @param statusEnum 启用状态
+     * @param organizationId 科室ID（可选，用于过滤已配置的手术项目）
+     * @param searchKey 模糊查询关键字（可选）
+     * @return 手术项目分页数据
+     */
+    IPage<SurgeryItemDto> getSurgeryPage(@Param("page") Page<SurgeryItemDto> page,
+            @Param("statusEnum") Integer statusEnum,
+            @Param("organizationId") Long organizationId,
+            @Param("searchKey") String searchKey);
+
+    IPage<SurgeryItemDto> getExaminationPage(@Param("page") Page<SurgeryItemDto> page,
+            @Param("statusEnum") Integer statusEnum,
+            @Param("organizationId") Long organizationId,
+            @Param("searchKey") String searchKey);
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java

@@ -245,7 +245,7 @@ public class InpatientAdviceDto {
     /**
      * 药品/服务类型
      */
-    private Integer categoryCode;
+    private String categoryCode;
     /**
      * 执行科室
      */

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -811,4 +811,54 @@
         LIMIT 1
     </select>
 
+    <!-- 手术项目专用分页查询：仅查手术 + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
+    <select id="getSurgeryPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
+        SELECT
+            t1.ID AS advice_definition_id,
+            t1.NAME AS advice_name,
+            t1.org_id AS org_id,
+            t1.org_id AS position_id,
+            t2.ID AS charge_item_definition_id,
+            t2.price AS price,
+            t1.permitted_unit_code AS unit_code,
+            t1.permitted_unit_code AS unit_code_dict_text
+        FROM wor_activity_definition t1
+        LEFT JOIN adm_charge_item_definition t2
+            ON t2.instance_id = t1.ID
+            AND t2.delete_flag = '0'
+            AND t2.status_enum = #{statusEnum}
+            AND t2.instance_table = 'wor_activity_definition'
+        WHERE t1.delete_flag = '0'
+          AND (t1.category_code = '手术' OR t1.category_code = '24')
+          <if test="searchKey != null and searchKey != ''">
+              AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
+          </if>
+        ORDER BY t1.name ASC
+    </select>
+
+    <!-- 检查项目专用分页查询：仅查检查(23) + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
+    <select id="getExaminationPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
+        SELECT
+            t1.ID AS advice_definition_id,
+            t1.NAME AS advice_name,
+            t1.org_id AS org_id,
+            t1.org_id AS position_id,
+            t2.ID AS charge_item_definition_id,
+            t2.price AS price,
+            t1.permitted_unit_code AS unit_code,
+            t1.permitted_unit_code AS unit_code_dict_text
+        FROM wor_activity_definition t1
+        LEFT JOIN adm_charge_item_definition t2
+            ON t2.instance_id = t1.ID
+            AND t2.delete_flag = '0'
+            AND t2.status_enum = #{statusEnum}
+            AND t2.instance_table = 'wor_activity_definition'
+        WHERE t1.delete_flag = '0'
+          AND t1.category_code = '23'
+          <if test="searchKey != null and searchKey != ''">
+              AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
+          </if>
+        ORDER BY t1.name ASC
+    </select>
+
 </mapper>

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml

@@ -305,28 +305,28 @@
                    T1.occurrence_end_time AS end_time,
                    T1.requester_id AS requester_id,
                    T1.create_time AS request_time,
-                   NULL AS skin_test_flag,
+                   NULL::integer AS skin_test_flag,
-                   NULL AS inject_flag,
+                   NULL::integer AS inject_flag,
-                   NULL AS group_id,
+                   NULL::bigint AS group_id,
                    T1.performer_check_id,
                    T2."name" AS advice_name,
                    T2.id AS item_id,
-                   NULL AS volume,
+                   NULL::varchar AS volume,
-                   NULL AS lot_number,
+                   NULL::varchar AS lot_number,
                    T1.quantity AS quantity,
                    T1.unit_code AS unit_code,
                    T1.status_enum AS request_status,
-                   NULL AS method_code,
+                   NULL::varchar AS method_code,
-                   NULL AS rate_code,
+                   NULL::varchar AS rate_code,
-                   NULL AS dose,
+                   NULL::numeric AS dose,
-                   NULL AS dose_unit_code,
+                   NULL::varchar AS dose_unit_code,
                    ao1.id AS position_id,
                    ao1."name" AS position_name,
-                   NULL AS dispense_per_duration,
+                   NULL::integer AS dispense_per_duration,
-                   1 AS part_percent,
+                   1::numeric AS part_percent,
                    ccd."name" AS condition_definition_name,
                    T1.therapy_enum AS therapy_enum,
-                   NULL AS sort_number,
+                   NULL::integer AS sort_number,
                    T1.quantity AS execute_num,
                    af.day_times,
                    ae.bus_no,
@@ -341,7 +341,7 @@
                    personal_account.balance_amount,
                    personal_account.id AS account_id,
                    T2.category_code,
-                   NULL AS dispense_status
+                   NULL::integer AS dispense_status
             FROM wor_service_request AS T1
                      LEFT JOIN wor_activity_definition AS T2
                                ON T2.id = T1.activity_id

openhis-server-new/openhis-application/src/main/resources/mapper/personalization/OrdersGroupPackageAppMapper.xml

@@ -44,7 +44,9 @@
         sdd.dict_label AS unit_code_name,
         togpd.dose AS dose,
         togpd.rate_code AS rate_code,
+        rate_d.dict_label AS rate_code_dictText,
         togpd.method_code AS method_code,
+        method_d.dict_label AS method_code_dictText,
         togpd.dose_quantity AS dose_quantity,
         togpd.group_id,
         togpd.group_order AS group_order,
@@ -67,8 +69,9 @@
         AND togpd.order_definition_id = adm.ID
         LEFT JOIN wor_activity_definition AS wor ON togpd.order_definition_table = 'wor_activity_definition'
         AND togpd.order_definition_id = wor.ID
-        LEFT JOIN sys_dict_data AS sdd ON sdd.dict_value = togpd.unit_code AND sdd.dict_type = 'unit_code' AND
+        LEFT JOIN sys_dict_data AS sdd ON sdd.dict_value = togpd.unit_code AND sdd.dict_type = 'unit_code' AND sdd.status = '0'
-        sdd.status = '0'
+        LEFT JOIN sys_dict_data AS rate_d ON rate_d.dict_value = togpd.rate_code AND rate_d.dict_type = 'rate_code' AND rate_d.status = '0'
+        LEFT JOIN sys_dict_data AS method_d ON method_d.dict_value = togpd.method_code AND method_d.dict_type = 'method_code' AND method_d.status = '0'
         WHERE togpd.delete_flag = '0'
         <if test="groupPackageIds != null and !groupPackageIds.isEmpty()">
             AND togpd.group_package_id IN

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -1226,22 +1226,18 @@ function handleRowClick(row) {
   selectedItems.value = [];
   activeDetailTab.value = 'applyForm';
   request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    // 响应结构判定：Axios拦截器对 code===200 返回 res.data（AjaxResult体），
+    // 响应结构: Axios拦截器对code===200返回res.data（AjaxResult体）
-    // 但某些情况下可能返回完整 Axios 响应 {data: AjaxResult}。
+    // 结构为 { code: 200, data: examApply实体, items: [明细数组] }
-    // 用 res.code 判定是否已是 AjaxResult 体，避免二次解包导致 items 丢失。
+    const items = Array.isArray(res.items) ? res.items : [];
-    const isAjaxResult = res && typeof res === 'object' && res.code !== undefined;
+    const dataObj = res.data || {};
-    const ajaxBody = isAjaxResult ? res : (res.data || res);
 
-    // items 在 AjaxResult 顶层，data 字段是 ExamApply 实体
+    // 先填充表单字段
-    const rawItems = Array.isArray(ajaxBody.items) ? ajaxBody.items : [];
+    if (dataObj && typeof dataObj === 'object') Object.assign(form, dataObj);
-    const detailData = ajaxBody.data || {};
 
-    if (detailData && typeof detailData === 'object') Object.assign(form, detailData);
+    if (items.length > 0) {
-
-    if (rawItems.length > 0) {
       try {
         // 为每个项目加载检查方法
-        const itemsWithMethods = await Promise.all(rawItems.map(async m => {
+        const itemsWithMethods = await Promise.all(items.map(async m => {
           const item = {
             id: m.itemCode, name: m.itemName,
             price: m.itemFee || 0, quantity: 1,
@@ -1260,7 +1256,7 @@ function handleRowClick(row) {
           if (m.bodyPartCode) {
             try {
               const methodRes = await searchCheckMethod({ checkType: m.bodyPartCode });
-              // Bug #384修复: 正确解析 API 返回结构
+              // 正确解析 API 返回结构
               let methodData = methodRes?.data?.data || methodRes?.data || methodRes?.rows || methodRes;
               if (!Array.isArray(methodData) && methodRes?.data && Array.isArray(methodRes.data.data)) {
                 methodData = methodRes.data.data;
@@ -1270,16 +1266,15 @@ function handleRowClick(row) {
                   id: md.id,
                   name: md.name,
                   code: md.code,
-                  price: m.itemFee || 0,  // fallback 到已保存的价格
+                  price: m.itemFee || 0,
                   packageName: md.packageName || '',
                   packageId: md.packageId || null,
-                  packagePrice: md.packagePrice || null,  // Bug #384修复: 套餐价格
+                  packagePrice: md.packagePrice || null,
                   serviceFee: md.serviceFee || null
                 }));
-                // 如果有已保存的检查方法信息，尝试匹配
+                // 回充已保存的检查方法
                 if (m.checkMethodId) {
-                  item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
+                  item.selectedMethod = item.methods.find(md => String(md.id) === String(m.checkMethodId)) || null;
-                  // 从已保存的方法中获取套餐信息
                   if (item.selectedMethod?.packageId) {
                     item.isPackage = true;
                     item.packageId = item.selectedMethod.packageId;
@@ -1295,22 +1290,27 @@ function handleRowClick(row) {
               }
             } catch (err) {
               console.error('加载检查方法失败', err);
-              // 单个项目加载失败不影响其他项目，继续返回 item
             }
           }
           return item;
         }));
+        // Bug #408修复: 确保明细数据正确加载到selectedItems
         selectedItems.value = itemsWithMethods;
+        // 加载套餐明细（单个失败不影响其他项目和明细显示）
         for (const it of selectedItems.value) {
           if (getPackageCarrier(it)?.packageId) {
-            await loadPackageDetailsForItem(it);
+            try {
+              await loadPackageDetailsForItem(it);
+            } catch (e) {
+              console.error('加载套餐明细失败:', it.name, e);
+            }
           }
           it.expanded = !!getPackageCarrier(it)?.packageId;
         }
         syncCategoryChecked();
         // Bug #384修复: 回充后更新检查方法显示
         updateMethodDisplay();
-        // 修复【#408】：加载申请单详情后自动切换到检查明细页签，确保已加载的明细数据可见
+        // Bug #408修复: 加载申请单详情后自动切换到检查明细页签，确保已加载的明细数据可见
         activeDetailTab.value = 'applyDetail';
       } catch (err) {
         console.error('加载申请单详情失败', err);

openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue

@@ -564,22 +564,74 @@ function handleRemoveItem(index) {
   editingGroup.value.detailList.splice(index, 1);
 }
 
-// 单击应用按钮
+// 单击应用按钮（应用组套）
-function handleUseOrderGroup(row) {
+async function handleUseOrderGroup(row) {
   if (!row.detailList || row.detailList.length === 0) {
     ElMessage.warning('该组套没有明细项');
     return;
   }
+
+  // 🔧 Bug 修复：组套保存时未持久化 orderDetailInfos，导致应用时缺失医嘱库信息。
+  // 通过 API 批量查询补全，确保 setValue 能获取到 adviceType、inventoryList、priceList 等关键字段。
+  const itemsMissingDetail = row.detailList.filter(
+    item => !item.orderDetailInfos || Object.keys(item.orderDetailInfos).length === 0
+  );
+  const detailMap = {};
+  if (itemsMissingDetail.length > 0) {
+    const ids = itemsMissingDetail
+      .map(item => item.orderDefinitionId)
+      .filter(Boolean)
+      .join(',');
+    if (ids) {
+      try {
+        const res = await getAdviceBaseInfo({
+          adviceDefinitionIdParamList: ids,
+          organizationId: props.organizationId,
+        });
+        const records = res.data?.records || res.rows || [];
+        records.forEach(rec => {
+          if (rec.adviceDefinitionId) {
+            detailMap[rec.adviceDefinitionId] = rec;
+          }
+        });
+      } catch (e) {
+        // 批量查询失败，使用原始 orderDetailInfos
+      }
+    }
+  }
+
+  // 🔧 辅助函数：根据字典 code 查找对应的 dictText
+  const findDictText = (dictList, code) => {
+    if (!code || !dictList?.value?.length) return '';
+    const found = dictList.value.find(d => d.value === code);
+    return found?.label || '';
+  };
   
   // 🔧 数据预处理：确保每个明细项都有完整的医嘱信息
   const processedDetailList = row.detailList.map(item => {
-    const orderDetail = item.orderDetailInfos || {};
+    // 优先使用组套中已带的 orderDetailInfos，否则使用 API 查询结果
+    const orderDetail = (item.orderDetailInfos && Object.keys(item.orderDetailInfos).length > 0)
+      ? item.orderDetailInfos
+      : (detailMap[item.orderDefinitionId] || {});
     
+    // 🔧 修复：组套明细只存了 methodCode/rateCode，没有 dictText。
+    // 用字典查找补充 dictText，确保界面显示正确的用法/频次名称。
+    const resolvedMethodCode = item.methodCode ?? orderDetail.methodCode;
+    const resolvedRateCode = item.rateCode ?? orderDetail.rateCode;
+    const methodCodeDictText = item.methodCode_dictText 
+      || findDictText(method_code, resolvedMethodCode)
+      || orderDetail.methodCode_dictText 
+      || '';
+    const rateCodeDictText = item.rateCode_dictText
+      || findDictText(rate_code, resolvedRateCode)
+      || orderDetail.rateCode_dictText
+      || '';
+
     return {
       // 组套明细字段
       ...item,
       
-      // 医嘱库字段（可能为空，需要兜底）
+      // 医嘱库字段
       adviceName: orderDetail.adviceName || item.orderDefinitionName || '未知项目',
       adviceType: orderDetail.adviceType,
       adviceDefinitionId: item.orderDefinitionId || orderDetail.adviceDefinitionId,
@@ -592,7 +644,6 @@ function handleUseOrderGroup(row) {
       partPercent: orderDetail.partPercent ?? 1,
       partAttributeEnum: orderDetail.partAttributeEnum,
       unitConversionRatio: orderDetail.unitConversionRatio,
-      // 🔧 Bug #218 修复：positionId 可能存储在 item 本身，优先使用 item.positionId
       positionId: item.positionId ?? orderDetail.positionId,
       defaultLotNumber: orderDetail.defaultLotNumber,
       
@@ -602,6 +653,10 @@ function handleUseOrderGroup(row) {
       unitCodeName: item.unitCodeName || orderDetail.unitCode_dictText,
       minUnitCode: orderDetail.minUnitCode,
       doseUnitCode: orderDetail.doseUnitCode,
+
+      // 字典文本（传递到 item 层级，避免后续代码依赖 mergedDetail 再查一次）
+      methodCode_dictText: methodCodeDictText,
+      rateCode_dictText: rateCodeDictText,
       
       // 合并后的完整对象（用于 setValue）
       // 先展开 orderDetail 获取所有药品基础字段（categoryCode、minUnitCode、doseUnitCode、
@@ -616,19 +671,19 @@ function handleUseOrderGroup(row) {
         categoryCode: item.categoryCode ?? orderDetail.categoryCode,
         unitCodeName: item.unitCodeName,
         dose: item.dose ?? orderDetail.dose,
-        rateCode: item.rateCode ?? orderDetail.rateCode,
+        rateCode: resolvedRateCode,
-        methodCode: item.methodCode ?? orderDetail.methodCode,
+        rateCode_dictText: rateCodeDictText,
+        methodCode: resolvedMethodCode,
+        methodCode_dictText: methodCodeDictText,
         dispensePerDuration: item.dispensePerDuration ?? orderDetail.dispensePerDuration,
         doseQuantity: item.doseQuantity ?? orderDetail.doseQuantity,
-        // 🔧 Bug #218 / #403 修复：positionId 可能存储在 item 本身，优先使用 item.positionId
         positionId: item.positionId ?? orderDetail.positionId,
-        // 执行科室：优先使用组套明细中保存的 orgId
         orgId: item.orgId ?? orderDetail.orgId,
         orgName: item.orgName ?? orderDetail.orgName,
-        // 组号（保留组套中的分组信息）
         groupId: item.groupId,
         groupOrder: item.groupOrder,
-        therapyEnum: item.therapyEnum ?? orderDetail.therapyEnum ?? '1',
+        // 🔧 类型默认为临时医嘱（2=临时，1=长期）
+        therapyEnum: item.therapyEnum ?? orderDetail.therapyEnum ?? '2',
       }
     };
   });
@@ -645,9 +700,9 @@ function handlePreviewGroup(row) {
 }
 
 // 确认应用组套（从预览对话框）
-function confirmUseGroup() {
+async function confirmUseGroup() {
   if (currentGroup.value) {
-    handleUseOrderGroup(currentGroup.value);
+    await handleUseOrderGroup(currentGroup.value);
     previewVisible.value = false;
   }
 }

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -3662,6 +3662,13 @@ function handleSaveGroup(orderGroupList) {
       defaultLotNumber: item.orderDetailInfos?.defaultLotNumber,
     };
 
+    // 🔧 Bug 修复：字典查找兜底，防止 mergedDetail 中 dictText 为空
+    const findDictText = (dictList, code) => {
+      if (!code || !dictList?.length) return '';
+      const found = dictList.find(d => d.value === code);
+      return found?.label || '';
+    };
+
     // 在 setValue 之前预初始化空行
     prescriptionList.value[rowIndex.value] = {
       uniqueKey: nextId.value++,
@@ -3672,43 +3679,105 @@ function handleSaveGroup(orderGroupList) {
     // 使用医嘱项目详情设置值
     setValue(mergedDetail);
 
+    // 🔧 Bug 修复：使用 mergedDetail 优先，避免 item 中 undefined 覆盖 setValue 中已设置的字段
+    const resolvedQuantity = mergedDetail.quantity ?? item.quantity ?? 1;
+    const resolvedDose = mergedDetail.dose ?? item.dose;
+    const resolvedMethodCode = mergedDetail.methodCode ?? item.methodCode;
+    const resolvedRateCode = mergedDetail.rateCode ?? item.rateCode;
+    const resolvedUnitCode = mergedDetail.unitCode ?? item.unitCode;
+
+    // 🔧 Bug 修复：setValue 可能因库存不足提前 return，导致 unitPrice/minUnitPrice 等字段未设置。
+    // 从 mergedDetail 或 item 中获取兜底值，避免价格计算产生 NaN。
+    const safePrice = (val) => {
+      const n = Number(val);
+      return (n !== undefined && n !== null && !isNaN(n) && isFinite(n)) ? n : 0;
+    };
+    const resolvedUnitPrice = safePrice(
+      prescriptionList.value[rowIndex.value]?.unitPrice 
+      ?? mergedDetail.unitPrice 
+      ?? item.unitPrice 
+      ?? 0
+    );
+    const resolvedMinUnitPrice = safePrice(
+      prescriptionList.value[rowIndex.value]?.minUnitPrice 
+      ?? mergedDetail.minUnitPrice 
+      ?? item.minUnitPrice 
+      ?? 0
+    );
+    const resolvedPartPercent = safePrice(
+      item.orderDetailInfos?.partPercent 
+      ?? mergedDetail.partPercent 
+      ?? 1
+    );
+
     // 创建新的处方项目
     const newRow = {
       ...prescriptionList.value[rowIndex.value],
       patientId: props.patientInfo.patientId,
       encounterId: props.patientInfo.encounterId,
       accountId: accountId.value,
-      quantity: item.quantity,
+      quantity: resolvedQuantity,
-      methodCode: item.methodCode,
+      methodCode: resolvedMethodCode,
-      rateCode: item.rateCode,
+      methodCode_dictText: mergedDetail.methodCode_dictText 
-      dispensePerDuration: item.dispensePerDuration,
+        || findDictText(method_code.value, resolvedMethodCode) 
-      dose: item.dose,
+        || '',
-      doseQuantity: item.doseQuantity,
+      rateCode: resolvedRateCode,
+      rateCode_dictText: mergedDetail.rateCode_dictText 
+        || findDictText(rate_code.value, resolvedRateCode) 
+        || '',
+      dispensePerDuration: mergedDetail.dispensePerDuration ?? item.dispensePerDuration,
+      dose: resolvedDose,
+      doseQuantity: mergedDetail.doseQuantity ?? item.doseQuantity,
       executeNum: 1,
-      unitCode: item.unitCode,
+      unitCode: resolvedUnitCode,
-      unitCode_dictText: item.unitCodeName || '',
+      unitCode_dictText: item.unitCodeName 
+        || mergedDetail.unitCodeName 
+        || findDictText(unit_code.value, resolvedUnitCode) 
+        || '',
+      doseUnitCode: mergedDetail.doseUnitCode,
+      doseUnitCode_dictText: mergedDetail.doseUnitCode_dictText || '',
+      // 🔧 确保 price/adviceType 字段有安全默认值（避免 NaN 导致模板条件判断失效）
+      unitPrice: resolvedUnitPrice,
+      minUnitPrice: resolvedMinUnitPrice,
+      unitTempPrice: resolvedUnitPrice,
+      adviceType: prescriptionList.value[rowIndex.value]?.adviceType 
+        || Number(mergedDetail.adviceType) 
+        || Number(item.adviceType) 
+        || 0,
+      adviceType_dictText: prescriptionList.value[rowIndex.value]?.adviceType_dictText 
+        || mergedDetail.adviceType_dictText 
+        || item.adviceType_dictText 
+        || '',
       statusEnum: 1,
+      // 🔧 类型：组套应用默认为临时医嘱（2=临时，1=长期）
+      therapyEnum: mergedDetail.therapyEnum ?? item.therapyEnum ?? '2',
       // 🔧 修复执行科室逻辑：优先使用 orgId(所属科室)，其次 positionId
       // 🔧 Bug #455: 诊疗类(adviceType=3)使用患者就诊科室，不使用目录配置的ID
       orgId: item.adviceType === 3
         ? props.patientInfo?.orgId
         : (item.orderDetailInfos?.orgId || mergedDetail.orgId || item.positionId || item.orderDetailInfos?.positionId || mergedDetail.positionId),
+      positionName: prescriptionList.value[rowIndex.value]?.positionName 
+        || mergedDetail.orgName 
+        || mergedDetail.positionName 
+        || findOrgNameById(mergedDetail.orgId || props.patientInfo?.orgId) 
+        || '',
       dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
       conditionId: conditionId.value,
       conditionDefinitionId: conditionDefinitionId.value,
       encounterDiagnosisId: encounterDiagnosisId.value,
+      diagnosisName: diagnosisName.value,
     };
 
-    // 计算价格和总量
+    // 计算价格和总量（使用安全值）
-    const unitInfo = unitCodeList.value.find((k) => k.value == item.unitCode);
+    const unitInfo = unitCodeList.value.find((k) => k.value == resolvedUnitCode);
     if (unitInfo && unitInfo.type == 'minUnit') {
-      newRow.price = newRow.minUnitPrice;
+      newRow.price = resolvedMinUnitPrice;
-      newRow.totalPrice = (item.quantity * newRow.minUnitPrice).toFixed(6);
+      newRow.totalPrice = (resolvedQuantity * resolvedMinUnitPrice).toFixed(6);
-      newRow.minUnitQuantity = item.quantity;
+      newRow.minUnitQuantity = resolvedQuantity;
     } else {
-      newRow.price = newRow.unitPrice;
+      newRow.price = resolvedUnitPrice;
-      newRow.totalPrice = (item.quantity * newRow.unitPrice).toFixed(6);
+      newRow.totalPrice = (resolvedQuantity * resolvedUnitPrice).toFixed(6);
-      newRow.minUnitQuantity = item.quantity * (item.orderDetailInfos?.partPercent || mergedDetail.partPercent || 1);
+      newRow.minUnitQuantity = resolvedQuantity * resolvedPartPercent;
     }
 
     newRow.contentJson = JSON.stringify(newRow);

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue

@@ -220,6 +220,7 @@
         :is-edit-mode="true"
         :edit-data="editingRow"
         :external-patient-info="patientInfo"
+        @submit-ok="handleEditSuccess"
       />
       <template #footer>
         <el-button @click="editDialogVisible = false">取消</el-button>
@@ -967,12 +968,17 @@ const handleEdit = (row) => {
 
 // 编辑弹窗确认提交
 const handleEditSubmit = () => {
-  // 调用MedicalExaminations组件的submit方法
   if (editFormRef.value?.submit) {
     editFormRef.value.submit();
   }
 };
 
+// 编辑保存成功回调：关闭弹窗并刷新列表
+const handleEditSuccess = () => {
+  editDialogVisible.value = false;
+  fetchData();
+};
+
 watch(
   () => patientInfo.value?.encounterId,
   (val) => {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js

@@ -1,6 +1,24 @@
 import request from '@/utils/request';
 // 申请单相关接口
 
+// 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存等无关逻辑）
+export function getSurgeryPage(params) {
+  return request({
+    url: '/doctor-station/advice/surgery-page',
+    method: 'get',
+    params: params,
+  });
+}
+
+// 检查项目专用分页查询（仅检查(23) + 定价，绕过 AOP 校验提升加载速度）
+export function getExaminationPage(params) {
+  return request({
+    url: '/doctor-station/advice/examination-page',
+    method: 'get',
+    params: params,
+  });
+}
+
 //医嘱大下拉
 export function getApplicationList(queryParams) {
   return request({

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue

@@ -206,7 +206,7 @@ import dayjs from 'dayjs';
 import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
-import {getApplicationList, saveCheckd} from './api';
+import {getExaminationPage, saveCheckd} from './api';
 import {ElMessage, ElMessageBox} from 'element-plus';
 import {WarningFilled, Warning, Refresh, Files, Document, EditPen, Aim, DocumentCopy} from '@element-plus/icons-vue';
 
@@ -266,27 +266,23 @@ const isSevereAllergy = computed(() => {
 });
 
 const getList = () => {
-  console.log('getList called, effectivePatientInfo:', effectivePatientInfo.value);
   if (!effectivePatientInfo.value?.inHospitalOrgId) {
-    console.log('inHospitalOrgId is missing, setting empty list');
     applicationList.value = [];
     return;
   }
   loading.value = true;
-  getApplicationList({
+  getExaminationPage({
-    pageSize: 500,
-    pageNum: 1,
-    categoryCode: '23',
     organizationId: effectivePatientInfo.value.inHospitalOrgId,
-    adviceTypes: [3],
+    pageNo: 1,
+    pageSize: 5000,
+    searchKey: '',
   })
     .then((res) => {
-      if (res.code === 200) {
+      if (res.code === 200 && res.data?.records) {
         applicationListAll.value = res.data.records;
         applicationList.value = res.data.records.map((item) => {
-          const priceInfo = item.priceList?.[0] || {};
+          const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
-          const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
+          const unit = item.unitCodeDictText || item.unitCode || '';
-          const unit = item.unitCode_dictText || item.unitCode || '';
           return {
             adviceDefinitionId: item.adviceDefinitionId,
             orgId: item.orgId,
@@ -299,7 +295,6 @@ const getList = () => {
           nextTick(() => {
             // 使用 adviceName 匹配
             const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
-            console.log('getList completed, selectedNames:', selectedNames);
             const selectedIds = [];
             applicationList.value?.forEach(app => {
               // 匹配时去掉价格部分，只比较名称
@@ -308,7 +303,6 @@ const getList = () => {
                 selectedIds.push(app.key);
               }
             });
-            console.log('getList completed, matched selectedIds:', selectedIds);
             transferValue.value = selectedIds;
           });
         }
@@ -404,13 +398,11 @@ const loadPatientAllergyHistory = () => {
   if (!effectivePatientInfo.value?.patientId) return;
 };
 
-// 加载编辑数据
+// 加载编辑数据 — 只负责解析 descJson 填充表单字段
+// 已选项目的匹配由 getList 数据加载完成后统一处理
 const loadEditData = () => {
   if (!props.isEditMode || !props.editData?.requestFormId) return;
 
-  console.log('loadEditData called, editData:', props.editData);
-
-  // 解析已有的descJson填充表单
   if (props.editData.descJson) {
     try {
       const obj = JSON.parse(props.editData.descJson);
@@ -431,91 +423,16 @@ const loadEditData = () => {
       console.error('解析descJson失败:', e);
     }
   }
-
-  // 设置已选项目（从requestFormDetailList获取）
-  // 注意：后端返回的字段是 adviceName，不是 adviceDefinitionId
-  console.log('requestFormDetailList:', props.editData.requestFormDetailList);
-  if (props.editData.requestFormDetailList && props.editData.requestFormDetailList.length) {
-    // 使用 adviceName 匹配
-    const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
-    console.log('setting transferValue by adviceName to:', selectedNames);
-    // 通过名称匹配找到对应的 key
-    const selectedIds = [];
-    applicationList.value?.forEach(app => {
-      if (selectedNames.includes(app.label?.split(' (')[0])) {
-        selectedIds.push(app.key);
-      }
-    });
-    console.log('matched selectedIds:', selectedIds);
-    transferValue.value = selectedIds;
-  } else {
-    console.log('requestFormDetailList is empty or undefined');
-  }
 };
 
-const projectWithDepartment = (selectProjectIds, type) => {
+const projectWithDepartment = (selectProjectIds) => {
-  let isRelease = true;
+  if (!selectProjectIds || selectProjectIds.length === 0) {
-  const arr = [];
-  // 确保 applicationList 存在
-  if (!applicationList.value || !Array.isArray(applicationList.value)) {
-    return true;
-  }
-  selectProjectIds.forEach((element) => {
-    const searchData = applicationList.value.find((item) => {
-      return element == item.adviceDefinitionId;
-    });
-    arr.push(searchData);
-  });
-  // 只有当选择了项目（arr 非空）时才设置 targetDepartment
-  if (arr.length > 0) {
-    const obj = arr[0];
-    // 检查是否有未定义的项目（applicationList 中找不到）
-    if (!obj) {
-      console.warn('未找到项目定义，无法设置执行科室');
-      return false;
-    }
-    const isCompare = arr.every((item) => item && item.orgId == obj.orgId);
-    if (!isCompare) {
-      ElMessage({ type: 'error', message: '执行科室不同' });
-      isRelease = false;
-    }
-    const findItem = findTreeItem(orgOptions.value, obj.orgId);
-    if (!findItem) {
-      isRelease = false;
-      ElMessage({ type: 'error', message: '未找到项目执行的科室' });
-    }
-    if (type == 1 && isRelease) {
-      form.targetDepartment = findItem.id;
-      console.log('targetDepartment 设置为:', form.targetDepartment, '科室名称:', findItem.name);
-    }
-  } else {
-    // 清空选择时，也要清空 targetDepartment
     form.targetDepartment = '';
   }
-  return isRelease;
 };
 
 watch(() => transferValue.value, (newValue) => {
-  console.log('transferValue changed:', newValue);
+  projectWithDepartment(newValue);
-  console.log('applicationList length:', applicationList.value?.length);
-  projectWithDepartment(newValue, 1);
-});
-
-// 监听 applicationList 加载完成，重新设置已选项目
-watch(() => applicationList.value, (newList) => {
-  if (newList && newList.length > 0 && props.isEditMode && props.editData?.requestFormDetailList?.length) {
-    console.log('applicationList loaded, re-setting transferValue');
-    // 使用 adviceName 匹配
-    const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
-    const selectedIds = [];
-    newList.forEach(app => {
-      const appName = app.label?.split(' (')[0];
-      if (selectedNames.includes(appName)) {
-        selectedIds.push(app.key);
-      }
-    });
-    transferValue.value = selectedIds;
-  }
 });
 
 const getPriorityCode = () => {
@@ -526,8 +443,8 @@ const submit = () => {
   if (transferValue.value.length == 0) {
     return proxy.$message.error('请选择检查项目');
   }
-  if (!projectWithDepartment(transferValue.value, 2)) {
+  if (!form.targetDepartment) {
-    return;
+    return proxy.$message.error('请选择发往科室');
   }
   if (!form.examinationPurpose) {
     return ElMessageBox.alert('请输入检查目的', '提示', { confirmButtonText: '确定', type: 'warning' });
@@ -542,21 +459,25 @@ const submit = () => {
   let applicationListAllFilter = applicationListAll.value.filter((item) => {
     return transferValue.value.includes(item.adviceDefinitionId);
   });
+  // 从原始记录中提取检查项目名称，用于申请单名称字段
+  const selectedNames = applicationListAllFilter.map(item => item.adviceName).join('+');
   applicationListAllFilter = applicationListAllFilter.map((item) => {
+    // 新接口 getExaminationPage 返回扁平字段（price/unitCode），兼容旧接口 priceList[0]
+    const priceInfo = item.priceList?.[0] || {};
     return {
       adviceDefinitionId: item.adviceDefinitionId,
       adviceName: item.adviceName,
       quantity: 1,
-      unitCode: item.priceList[0].unitCode,
+      unitCode: item.unitCode || priceInfo.unitCode || '',
-      unitPrice: item.priceList[0].price,
+      unitPrice: item.price ?? priceInfo.price ?? 0,
-      totalPrice: item.priceList[0].price,
+      totalPrice: item.price ?? priceInfo.price ?? 0,
       positionId: item.positionId,
       ybClassEnum: item.ybClassEnum,
       conditionId: item.conditionId,
       encounterDiagnosisId: item.encounterDiagnosisId,
       adviceType: item.adviceType,
-      definitionId: item.priceList[0].definitionId,
+      definitionId: item.chargeItemDefinitionId || priceInfo.definitionId || '',
-      definitionDetailId: item.priceList[0].definitionDetailId,
+      definitionDetailId: item.definitionDetailId || priceInfo.definitionDetailId || '',
       accountId: effectivePatientInfo.value.accountId,
     };
   });
@@ -573,7 +494,7 @@ const submit = () => {
     encounterId: effectivePatientInfo.value.encounterId,
     organizationId: effectivePatientInfo.value.inHospitalOrgId,
     requestFormId: requestFormId,
-    name: applicationListAllFilter.map(item => item.adviceName).join('、'),
+    name: selectedNames,
     descJson: JSON.stringify(submitForm),
     categoryEnum: '22',
   }).then((res) => {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue

@@ -5,13 +5,27 @@
 -->
 <template>
   <div class="surgery-container">
-    <div v-loading="loading" class="transfer-wrapper" style="min-height: 300px;">
+    <div class="transfer-wrapper" style="min-height: 300px;">
+      <!-- 搜索框：≥3字触发后端搜索 -->
+      <div style="padding: 6px 0;">
+        <el-input
+          v-model="searchKey"
+          placeholder="请输入3个字及以上搜索"
+          clearable
+          @input="onSearchInput"
+          style="width: 320px;"
+        />
+      </div>
+      <!-- 加载提示不阻塞穿梭框操作 -->
+      <div v-if="loading" style="padding:8px 0; color:#909399; font-size:13px;">
+        <el-icon class="is-loading"><Loading /></el-icon> 手术项目加载中...
+      </div>
       <el-transfer
+        ref="transferRef"
         v-model="transferValue"
         :data="applicationList"
-        filter-placeholder="项目代码/名称"
+        :titles="['待选择', '已选择']"
-        filterable
+        :format="leftPanelFormat"
-        :titles="['未选择', '已选择']"
       />
     </div>
     <div class="bloodTransfusion-form">
@@ -78,17 +92,26 @@
   </div>
 </template>
 <script setup name="Surgery">
-import {getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
+import {computed, getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
 import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
-import {getApplicationList, saveSurgery} from './api';
+import {getSurgeryPage, saveSurgery} from './api';
 import {ElMessage} from 'element-plus';
 
 const { proxy } = getCurrentInstance();
 // 模块级缓存：避免每次打开弹窗都重新请求手术项目列表
 let surgeryRecordsCache = null; // 原始 API 记录
 let surgeryMappedCache = null;  // 映射后的 el-transfer 数据
+let searchDebounceTimer = null; // 搜索防抖
+const transferRef = ref(null);
+const dbTotal = ref(0); // 数据库中的手术项目总数
+const searchKey = ref(''); // 搜索关键字
+const checkedCount = computed(() => transferValue.value.length);
+const leftPanelFormat = computed(() => ({
+  noChecked: ` 0/${dbTotal.value}`,
+  hasChecked: ` \${checked}/${dbTotal.value}`,
+}));
 // 递归查找树形科室节点
 const findTreeItem = (list, id) => {
   if (!list || list.length === 0) return null;
@@ -108,55 +131,82 @@ const applicationListAll = ref();
 const applicationList = ref();
 const orgOptions = ref([]); // 科室选项
 const loading = ref(false); // 加载状态
+const mapToTransferItem = (item) => {
+  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,
+    label: item.adviceName + ' (￥' + price + '/' + unit + ')',
+    key: item.adviceDefinitionId,
+  };
+};
 const getList = () => {
   if (!patientInfo.value?.inHospitalOrgId) {
     applicationList.value = [];
     return;
   }
-  // 命中缓存时直接使用，避免重复请求导致加载缓慢
+  // 命中内存缓存时直接使用
   if (surgeryMappedCache && surgeryMappedCache.length > 0) {
     applicationList.value = surgeryMappedCache;
     applicationListAll.value = surgeryRecordsCache;
     return;
   }
+  loadPage('');
+};
+
+/**
+ * 加载手术项目分页数据
+ * @param {string} key 搜索关键字（可选）
+ */
+const loadPage = (key) => {
+  const orgId = patientInfo.value.inHospitalOrgId;
   loading.value = true;
-  getApplicationList({
+  getSurgeryPage({ organizationId: orgId, pageNo: 1, pageSize: 100, searchKey: key || '' })
-    pageSize: 500,
-    pageNum: 1,
-    categoryCode: '24',
-    organizationId: patientInfo.value.inHospitalOrgId,
-    adviceTypes: [3, 6], //1 药品 2耗材 3诊疗 6手术
-  })
     .then((res) => {
-      if (res.code === 200) {
+      if (res.code !== 200 || !res.data?.records) {
-        applicationListAll.value = res.data.records;
-        applicationList.value = res.data.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 || '';
-          return {
-            adviceDefinitionId: item.adviceDefinitionId,
-            orgId: item.orgId,
-            label: item.adviceName + ' (￥' + price + '/' + unit + ')',
-            key: item.adviceDefinitionId,
-          };
-        });
-        // 写入模块缓存，后续打开弹窗直接复用
-        surgeryRecordsCache = res.data.records;
-        surgeryMappedCache = applicationList.value;
-      } else {
-        console.warn('获取手术项目列表失败:', res.message);
         applicationList.value = [];
+        dbTotal.value = 0;
+        loading.value = false;
+        return;
       }
+      dbTotal.value = res.data.total || 0;
+      const records = res.data.records;
+      applicationListAll.value = records;
+      applicationList.value = records.map(mapToTransferItem);
+      // 仅在无搜索时缓存
+      if (!key) {
+        surgeryRecordsCache = records;
+        surgeryMappedCache = applicationList.value;
+      }
+      loading.value = false;
     })
     .catch((e) => {
-      console.warn('手术项目列表加载失败（可能无权限）:', e?.message || e);
+      console.error('手术项目加载失败:', e);
       applicationList.value = [];
-    })
+      dbTotal.value = 0;
-    .finally(() => {
       loading.value = false;
     });
 };
+
+/**
+ * 搜索输入框变化处理（防抖300ms，≥3字触发后端搜索）
+ */
+const onSearchInput = () => {
+  clearTimeout(searchDebounceTimer);
+  const val = searchKey.value.trim();
+  if (!val) {
+    // 清空搜索框，恢复初始数据
+    loadPage('');
+    return;
+  }
+  if (val.length >= 3) {
+    searchDebounceTimer = setTimeout(() => {
+      loadPage(val);
+    }, 300);
+  }
+};
+
 const transferValue = ref([]);
 const form = reactive({
   // categoryType: '', // 项目类别
@@ -243,20 +293,15 @@ const submit = () => {
   });
   applicationListAllFilter = applicationListAllFilter.map((item) => {
     return {
-      adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
+      adviceDefinitionId: item.adviceDefinitionId,
-      adviceDefinitionName: item.adviceDefinitionName /** 诊疗定义名称（手术项目名称） */,
+      adviceDefinitionName: item.adviceName,
-      quantity: 1, // /** 请求数量 */
+      quantity: 1,
-      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
+      unitCode: item.unitCode,
-      unitPrice: item.priceList[0].price /** 单价 */,
+      unitPrice: item.price,
-      totalPrice: item.priceList[0].price /** 总价 */,
+      totalPrice: item.price,
-      positionId: item.positionId, //执行科室id
+      positionId: item.positionId,
-      ybClassEnum: item.ybClassEnum, //类别医保编码
+      definitionId: item.chargeItemDefinitionId,
-      conditionId: item.conditionId, //诊断ID
+      accountId: patientInfo.value.accountId,
-      encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
-      adviceType: item.adviceType, ///** 医嘱类型 */
-      definitionId: item.priceList[0].definitionId, //费用定价主表ID */
-      definitionDetailId: item.definitionDetailId, //费用定价子表ID */
-      accountId: patientInfo.value.accountId, // // 账户id
     };
   });
   saveSurgery({

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue

@@ -1668,18 +1668,27 @@ function handleSaveGroup(orderGroupList) {
     const baseRow = prescriptionList.value[rowIndex.value];
     const newRow = {
       ...baseRow,
+      isEdit: false,
       patientId: patientInfo.value.patientId,
       encounterId: patientInfo.value.encounterId,
       accountId: accountId.value,
       executeNum: 1,
       statusEnum: 1,
-      orgId: resolveOrgId(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
+      orgId: resolveOrgId(
-      // 🔧 修复：同时保存 orgName，确保树匹配不到时仍有中文名称可显示
+        (item.orderDetailInfos?.orgId || mergedDetail.orgId)
-      orgName: findOrgName(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || item.orderDetailInfos?.orgName || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
+          ? (item.orderDetailInfos?.orgId || mergedDetail.orgId)
+          : patientInfo.value?.inHospitalOrgId
+      ) || '',
+      orgName: findOrgName(
+        (item.orderDetailInfos?.orgId || mergedDetail.orgId)
+          ? (item.orderDetailInfos?.orgId || mergedDetail.orgId)
+          : patientInfo.value?.inHospitalOrgId
+      ) || item.orderDetailInfos?.orgName || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
       dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
       conditionId: conditionId.value,
       conditionDefinitionId: conditionDefinitionId.value,
       encounterDiagnosisId: encounterDiagnosisId.value,
+      diagnosisName: diagnosisName.value,
       therapyEnum: baseRow?.therapyEnum || '1',
     };
     // 覆盖关键字段：优先使用 item 的值，其次 mergedDetail（已由 setValue 填充），最后 baseRow
@@ -1691,6 +1700,16 @@ function handleSaveGroup(orderGroupList) {
     newRow.doseQuantity = item.doseQuantity ?? mergedDetail.doseQuantity ?? baseRow.doseQuantity;
     newRow.unitCode = item.unitCode ?? mergedDetail.unitCode ?? baseRow.unitCode;
     newRow.unitCode_dictText = item.unitCodeName || mergedDetail.unitCodeName || baseRow.unitCode_dictText || '';
+    // 确保价格字段有兜底值（setValue 可能因库存不足提前 return 导致未设置）
+    newRow.unitPrice = baseRow.unitPrice ?? mergedDetail.unitPrice ?? 0;
+    newRow.minUnitPrice = baseRow.minUnitPrice ?? mergedDetail.minUnitPrice ?? 0;
+    newRow.unitTempPrice = newRow.unitPrice;
+    newRow.methodCode_dictText = mergedDetail.methodCode_dictText || item.methodCode_dictText || '';
+    newRow.rateCode_dictText = mergedDetail.rateCode_dictText || item.rateCode_dictText || '';
+    newRow.doseUnitCode = mergedDetail.doseUnitCode || item.doseUnitCode || baseRow.doseUnitCode;
+    newRow.doseUnitCode_dictText = mergedDetail.doseUnitCode_dictText || item.doseUnitCode_dictText || '';
+    newRow.orgId = mergedDetail.orgId || mergedDetail.positionId || baseRow.orgId || '';
+    newRow.positionName = mergedDetail.orgName || mergedDetail.positionName || baseRow.positionName || '';
 
     // 计算价格和总量
     // 🔧 Bug #403 修复：使用 newRow.unitCode（已由 setValue 填充）而非 item.unitCode