Merge remote-tracking branch 'origin/develop' into develop

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,16 @@ 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);
+
 }

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

@@ -728,12 +728,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
 
             /**
              * 处理耗材请求
-             * 🔧 BugFix #443: 签发时跳过 handDevice，避免重复创建 DeviceDispense 并覆盖关键字段（如 performLocation）
-             * 签发时只需更新状态（下方 sign-advice 批量更新逻辑已处理）
              */
-            if (AdviceOpType.SAVE_ADVICE.getCode().equals(adviceOpType)) {
             this.handDevice(deviceList, curDate, adviceOpType);
-            }
 
             // 签发时,把草稿状态的账单更新为待收费
             if (AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType) && !adviceSaveList.isEmpty()) {
@@ -2444,4 +2440,20 @@ 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;
+    }
+
 }

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

@@ -246,8 +246,7 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
         EncounterDiagnosis encounterDiagnosis;
         for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
             encounterDiagnosis = new EncounterDiagnosis();
-            // 注意：不设置 encounterDiagnosisId，因为上面已经删除了所有记录
-            // 如果设置旧的 ID，saveOrUpdate 会尝试 UPDATE 不存在的记录导致失败或重复插入
+            encounterDiagnosis.setId(saveDiagnosisChildParam.getEncounterDiagnosisId());
             encounterDiagnosis.setEncounterId(encounterId);
             encounterDiagnosis.setConditionId(saveDiagnosisChildParam.getConditionId());
             encounterDiagnosis.setMaindiseFlag(saveDiagnosisChildParam.getMaindiseFlag());

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

@@ -203,4 +203,22 @@ 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));
+    }
+
 }

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,18 @@ 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);
+
 }

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/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -91,15 +91,13 @@
             os.surgery_nature AS surgeryType,
             cs.incision_level AS incisionLevel,
             fc.contract_name AS feeType,
+            os.fee_type AS feeType,
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os
         LEFT JOIN adm_patient ap ON os.patient_id = ap.id
         INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
         LEFT JOIN adm_organization o ON cs.org_id = o.id
         LEFT JOIN doc_request_form drf ON drf.prescription_no=cs.surgery_no
-        LEFT JOIN adm_encounter ae ON ae.id = os.visit_id AND ae.delete_flag = '0'
-        LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
-        LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
         LEFT JOIN (
             SELECT patient_id, identifier_no
             FROM (

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

@@ -811,4 +811,29 @@
         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>
+
 </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 AS inject_flag,
-                   NULL AS group_id,
+                   NULL::integer AS skin_test_flag,
+                   NULL::integer AS inject_flag,
+                   NULL::bigint AS group_id,
                    T1.performer_check_id,
                    T2."name" AS advice_name,
                    T2.id AS item_id,
-                   NULL AS volume,
-                   NULL AS lot_number,
+                   NULL::varchar AS volume,
+                   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 AS rate_code,
-                   NULL AS dose,
-                   NULL AS dose_unit_code,
+                   NULL::varchar AS method_code,
+                   NULL::varchar AS rate_code,
+                   NULL::numeric AS dose,
+                   NULL::varchar AS dose_unit_code,
                    ao1.id AS position_id,
                    ao1."name" AS position_name,
-                   NULL AS dispense_per_duration,
-                   1 AS part_percent,
+                   NULL::integer AS dispense_per_duration,
+                   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/regdoctorstation/RequestFormManageAppMapper.xml

@@ -45,6 +45,18 @@
           <if test="endDate != null and endDate != ''">
               AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
           </if>
+          <if test="status != null and status != ''">
+               AND CASE
+                       WHEN MIN(wsr.status_enum) = 1 THEN 0
+                       WHEN MIN(wsr.status_enum) = 2 THEN 1
+                       WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
+                       WHEN MIN(wsr.status_enum) = 3 THEN 4
+                       WHEN MIN(wsr.status_enum) = 4 THEN 3
+                       WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
+                       WHEN MIN(wsr.status_enum) = 8 THEN 6
+                       ELSE NULL
+                   END = #{status}::integer
+          </if>
           <if test="keyword != null and keyword != ''">
               AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
                    OR EXISTS (
@@ -60,19 +72,6 @@
           </if>
         GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json,
                  drf.requester_id, drf.create_time, ap.name
-        <if test="status != null and status != ''">
-            HAVING CASE MIN(wsr.status_enum)
-                       WHEN 1 THEN 0
-                       WHEN 2 THEN 1
-                       WHEN 3 THEN 4
-                       WHEN 4 THEN 4
-                       WHEN 5 THEN 5
-                       WHEN 6 THEN 5
-                       WHEN 7 THEN 5
-                       WHEN 8 THEN 6
-                       ELSE NULL
-                   END = #{status}::integer
-        </if>
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">

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

@@ -1362,9 +1362,8 @@ async function handleMethodSelect(checked, method, cat) {
         existingItem.isPackage = true;
         existingItem.packageId = method.packageId;
         existingItem.packageName = method.packageName || existingItem.packageName;  // #428修复: 确保 packageName 同步
-        existingItem.expanded = true;  // #428修复: 有套餐时默认展开，展示套餐明细
         // 预加载套餐明细
-        await loadPackageDetailsForItem(existingItem);
+        loadPackageDetailsForItem(existingItem);
       }
       updateMethodDisplay();
       return;
@@ -1400,10 +1399,9 @@ async function handleMethodSelect(checked, method, cat) {
     };
     selectedItems.value.push(newItem);
 
-    // 如果是套餐，预加载套餐明细并默认展开
+    // 如果是套餐，预加载套餐明细
     if (newItem.isPackage && newItem.packageId) {
-      newItem.expanded = true;
-      await loadPackageDetailsForItem(newItem);
+      loadPackageDetailsForItem(newItem);
     }
 
     // 自动回填执行科室
@@ -1525,10 +1523,7 @@ async function handleItemSelect(checked, item, cat) {
 // Bug #384修复 + #426修复: 展开/收起项目卡片
 async function toggleItemExpand(item) {
   item.expanded = !item.expanded;
-  const carrier = getPackageCarrier(item);
-  const hasDetails = Array.isArray(item.packageDetailsDisplay) && item.packageDetailsDisplay.length > 0
-    || Array.isArray(carrier?.packageDetails) && carrier.packageDetails.length > 0;
-  if (item.expanded && (item.isPackage || item.packageName) && !hasDetails && !item.packageDetailsLoading) {
+  if (item.expanded && (item.isPackage || item.packageName) && (!item.packageDetails || item.packageDetails.length === 0) && !item.packageDetailsLoading) {
     await loadPackageDetailsForItem(item);
   }
   if (item.expanded && shouldShowPackageBody(item)) {
@@ -1582,7 +1577,7 @@ async function loadMethodPackageDetails(item, method) {
     const packageId = packages[0].id;
     // 查询套餐明细
     const detailRes = await request({
-      url: `/system/check-type/package/${packageId}/details`,
+      url: `/system/package/${packageId}/details`,
       method: 'get'
     });
     if (detailRes.code === 200 && detailRes.data) {

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

@@ -289,19 +289,19 @@ function getList() {
         return obj;
       });
       form.value.diagnosisList = datas;
-      // 去重：按 conditionId 去重，防止后端重复插入导致重复记录
-      deduplicateDiagnosisList();
+      // form.value.diagnosisList = res.data;
       emits('diagnosisSave', false);
     }
   });
   getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
-    console.log('getTcmDiagnosis=======>', JSON.stringify(res.data?.illness));
+    console.log('getTcmDiagnosis=======>', JSON.stringify(res.data.illness));
 
-    if (res.code == 200 && res.data?.illness?.length > 0) {
+    if (res.code == 200) {
+      if (res.data.illness.length > 0) {
         diagnosisNetDatas.value = res.data.illness;
         res.data.illness.forEach((item, index) => {
           newList.push({
-          name: item.name + '-' + (res.data.symptom?.[index]?.name || ''),
+            name: item.name + '-' + (res.data.symptom[index]?.name || ''),
             ybNo: item.ybNo,
             medTypeCode: item.medTypeCode,
             diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
@@ -318,33 +318,14 @@ function getList() {
           const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
           return aNo - bNo;
         });
-      // TCM 数据添加后也去重
-      deduplicateDiagnosisList();
       }
       emits('diagnosisSave', false);
+    }
   });
   
   getTree();
 }
 
-/**
- * 诊断列表去重：按 ybNo + name 组合去重，保留第一条记录
- * 防止后端 saveOrUpdate 在删除后误 INSERT 导致重复
- */
-function deduplicateDiagnosisList() {
-  const seen = new Set();
-  const dedupedList = [];
-  for (const item of form.value.diagnosisList) {
-    // 使用 ybNo 和 name 组合作为唯一标识（中医诊断没有 ybNo，用 name 去重）
-    const key = item.ybNo ? `${item.ybNo}` : `name_${item.name}`;
-    if (!seen.has(key)) {
-      seen.add(key);
-      dedupedList.push(item);
-    }
-  }
-  form.value.diagnosisList = dedupedList;
-}
-
 init();
 function init() {
   diagnosisInit().then((res) => {
@@ -622,18 +603,6 @@ function handleSaveDiagnosis() {
         return aNo - bNo;
       });
 
-      // 步骤1.5：确保每条诊断都有诊断医生和诊断时间（元数据补全）
-      const doctorName = props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name;
-      const now = new Date().toLocaleString('zh-CN');
-      sortedList.forEach((item) => {
-        if (!item.diagnosisDoctor) {
-          item.diagnosisDoctor = doctorName;
-        }
-        if (!item.diagnosisTime) {
-          item.diagnosisTime = now;
-        }
-      });
-
       // 步骤2：重新分配连续的序号（从1开始）
       sortedList.forEach((item, index) => {
         item.diagSrtNo = index + 1; // 这里是关键！把”诊断排序”改成新顺序

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

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

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

@@ -274,7 +274,7 @@ const getList = () => {
   }
   loading.value = true;
   getApplicationList({
-    pageSize: 500,
+    pageSize: 5000,
     pageNum: 1,
     categoryCode: '23',
     organizationId: effectivePatientInfo.value.inHospitalOrgId,
@@ -542,6 +542,8 @@ 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) => {
     return {
       adviceDefinitionId: item.adviceDefinitionId,
@@ -573,7 +575,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="项目代码/名称"
-        filterable
-        :titles="['未选择', '已选择']"
+        :titles="['待选择', '已选择']"
+        :format="leftPanelFormat"
       />
     </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 getList = () => {
-  if (!patientInfo.value?.inHospitalOrgId) {
-    applicationList.value = [];
-    return;
-  }
-  // 命中缓存时直接使用，避免重复请求导致加载缓慢
-  if (surgeryMappedCache && surgeryMappedCache.length > 0) {
-    applicationList.value = surgeryMappedCache;
-    applicationListAll.value = surgeryRecordsCache;
-    return;
-  }
-  loading.value = true;
-  getApplicationList({
-    pageSize: 500,
-    pageNum: 1,
-    categoryCode: '24',
-    organizationId: patientInfo.value.inHospitalOrgId,
-    adviceTypes: [3, 6], //1 药品 2耗材 3诊疗 6手术
-  })
-    .then((res) => {
-      if (res.code === 200) {
-        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 || '';
+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,
   };
-        });
-        // 写入模块缓存，后续打开弹窗直接复用
-        surgeryRecordsCache = res.data.records;
-        surgeryMappedCache = applicationList.value;
-      } else {
-        console.warn('获取手术项目列表失败:', res.message);
+};
+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;
+  getSurgeryPage({ organizationId: orgId, pageNo: 1, pageSize: 100, searchKey: key || '' })
+    .then((res) => {
+      if (res.code !== 200 || !res.data?.records) {
+        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 = [];
-    })
-    .finally(() => {
+      dbTotal.value = 0;
       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 */,
-      adviceDefinitionName: item.adviceDefinitionName /** 诊疗定义名称（手术项目名称） */,
-      quantity: 1, // /** 请求数量 */
-      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
-      unitPrice: item.priceList[0].price /** 单价 */,
-      totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: item.positionId, //执行科室id
-      ybClassEnum: item.ybClassEnum, //类别医保编码
-      conditionId: item.conditionId, //诊断ID
-      encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
-      adviceType: item.adviceType, ///** 医嘱类型 */
-      definitionId: item.priceList[0].definitionId, //费用定价主表ID */
-      definitionDetailId: item.definitionDetailId, //费用定价子表ID */
-      accountId: patientInfo.value.accountId, // // 账户id
+      adviceDefinitionId: item.adviceDefinitionId,
+      adviceDefinitionName: item.adviceName,
+      quantity: 1,
+      unitCode: item.unitCode,
+      unitPrice: item.price,
+      totalPrice: item.price,
+      positionId: item.positionId,
+      definitionId: item.chargeItemDefinitionId,
+      accountId: patientInfo.value.accountId,
     };
   });
   saveSurgery({

openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue

@@ -1131,15 +1131,15 @@ function handleLocationClick(item, row, index) {
     .then((res) => {
       const list = res.data || [];
       const d = pickBestOrgQuantityRow(list);
-
-      // 严格批号查询有库存（orgQuantity > 0）
-      if (d && Number(d.orgQuantity ?? 0) > 0) {
+      const strictOk = d && Number(d.orgQuantity ?? 0) > 0;
+      if (strictOk) {
         applyFromDto(d, false);
+        if (Number(r.totalQuantity) <= 0) {
+          proxy.$message.warning('仓库数量为0，无法调用！');
+        }
         persistStore();
         return;
       }
-
-      // 严格查询无库存或数量为0 → 回退到非严格查询（查同仓库其他批号）
       if (lotTrimmed) {
         return runGet(false).then((res2) => {
           const list2 = res2.data || [];
@@ -1157,8 +1157,6 @@ function handleLocationClick(item, row, index) {
           persistStore();
         });
       }
-
-      // 没有指定批号，直接提示
       r.totalQuantity = 0;
       r.price = 0;
       proxy.$message.warning('仓库数量为0，无法调用！');