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

bug 470 494
Revert "Merge remote-tracking branch 'origin/develop' into develop"
2026-05-15 09:44:38 +08:00 · 2026-05-15 09:44:26 +08:00 · 2026-05-15 09:33:35 +08:00 · 2026-05-15 09:26:51 +08:00 · 2026-05-15 09:23:13 +08:00 · 2026-05-15 09:19:02 +08:00
24 changed files with 340 additions and 235 deletions
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-# ============================================================
-# Husky Pre-commit Hook - HIS项目
-# 配置: 关羽 | 日期: 2026-04-24
-# 功能: 提交前检查（已禁用）
-# ============================================================
-
-# 🔧 已禁用所有检查，直接允许提交
-echo "⏭️  [Pre-commit] 检查已禁用，允许提交"
-exit 0
--- 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
@@ -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);
+
 }
--- 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
@@ -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);
-            }
+            this.handDevice(deviceList, curDate, adviceOpType);

            // 签发时,把草稿状态的账单更新为待收费
            if (AdviceOpType.SIGN_ADVICE.getCode().equals(adviceOpType) && !adviceSaveList.isEmpty()) {
@@ -2107,9 +2103,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
                sourceEnum, sourceBillNo);
-        // 🔧 修复 Bug #444: 移除手术计费场景的药品过滤。
-        // 原过滤会导致门诊手术医嘱界面无法获取手术计费创建的药品记录。
-        // 前端各组件已根据自身业务逻辑做了正确的 adviceType 过滤。
+        // 手术计费场景：sourceBillNo 不为空时，过滤掉药品（1），保留耗材（2）和诊疗（3/6）
+        if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
+            requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
+                    && dto.getAdviceType() == 1);
+        }
        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
            // 请求状态
            requestBaseDto
@@ -2442,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;
+    }
+
 }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
+++ b/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());
--- 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
@@ -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));
+    }
+
 }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SurgeryItemDto.java
+++ b/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;
+}
--- 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
@@ -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);
+
 }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/dto/InpatientAdviceDto.java
+++ b/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;
    /**
     * 执行科室
     */
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
+++ b/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 (
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
@@ -42,8 +42,8 @@
            T5.package_name,
            T6.name as sub_item_name
        FROM wor_activity_definition T1
-        /* 价格表使用LEFT JOIN，避免因缺少价格记录导致搜索不到项目 */
-        LEFT JOIN adm_charge_item_definition T2
+        /* 只JOIN必要的价格表，使用INNER JOIN避免笛卡尔积 */
+        INNER JOIN adm_charge_item_definition T2
            ON T1.id = T2.instance_id
            AND T2.instance_table = 'wor_activity_definition'
        /* 检验类型关联 */
--- 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
@@ -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>
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
+++ b/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
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/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">
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/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) {
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -1026,7 +1026,7 @@ const mapAdviceTypeLabel = (type, adviceTableName) => {
    return found.label;
  }

-  // 🔧 Bug #458 Fix: 诊疗/手术类型字典缺失或标签为空时的兜底
+  // 🔧 Bug #458 Fix: 诊疗/手术类型字典缺失时的兜底，避免保存后"医嘱类型"列显示为空
  if (adviceTableName === 'wor_activity_definition' || adviceTableName === 'wor_service_request') {
    if (type === 6) return '手术';
    if (type === 4) return '手术';
@@ -1036,15 +1036,6 @@ const mapAdviceTypeLabel = (type, adviceTableName) => {
    return '诊疗';
  }

-  // 🔧 Bug #458 Fix: 兜底映射，确保所有有效 adviceType 都有显示标签
-  // 不依赖字典数据和表名，直接返回标准类型名称
-  if (type === 3) return '诊疗';
-  if (type === 6) return '手术';
-  if (type === 4) return '耗材';
-  if (type === 1) return '西药';
-  if (type === 2) return '中成药';
-  if (type === 5) return '会诊';
-
  return '';
 };

@@ -1667,16 +1658,12 @@ function getListInfo(addNewRow) {
                              contentJson?.consultationRequestId;
        
        let adviceType = item.adviceType;
-
+        
        // 🔧 Bug Fix: 后端保存时将耗材(4)转换为中成药(2)，显示时需要转换回来
        // 检查 adviceTableName，如果是耗材表则应该是耗材类型
        const adviceTableName = contentJson?.adviceTableName || item.adviceTableName;
-
-        // 🔧 Bug #458 Fix: 后端可能返回空字符串的 adviceType_dictText，需重新计算
-        const backendDictText = item.adviceType_dictText;
-        let adviceType_dictText = (backendDictText && backendDictText.trim())
-          ? backendDictText
-          : mapAdviceTypeLabel(adviceType, adviceTableName);
+        
+        let adviceType_dictText = item.adviceType_dictText || mapAdviceTypeLabel(adviceType, adviceTableName);
        
        // 如果是会诊类型，设置为会诊类型
        if (isConsultation) {
--- a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
@@ -636,11 +636,12 @@ function getList() {
    if (res.code === 200) {
      surgeryList.value = res.data?.records || []
    } else {
-      console.warn('手术列表加载失败（可能无权限或数据异常）:', res.msg)
+      proxy.$modal.msgError(res.msg || '数据加载失败，请稍后重试')
      surgeryList.value = []
    }
  }).catch(error => {
-    console.warn('手术列表请求异常:', error)
+    console.error('获取手术列表失败:', error)
+    proxy.$modal.msgError('数据加载失败，请稍后重试')
    surgeryList.value = []
  }).finally(() => {
    loading.value = false
@@ -1141,8 +1142,8 @@ function submitForm() {
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            // 由父组件 @saved 事件负责刷新列表（带延迟确保后端事务已提交）
-            emit('saved')
+            getList() // 提交成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
          } else {
            proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
          }
@@ -1158,8 +1159,8 @@ function submitForm() {
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            // 由父组件 @saved 事件负责刷新列表
-            emit('saved')
+            getList() // 修改成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
          } else {
            proxy.$modal.msgError(res.msg || '更新手术失败，请检查表单信息')
          }
--- a/openhis-ui-vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -153,7 +153,7 @@
          </el-tab-pane>
          <el-tab-pane label="手术申请" name="surgery">
            <surgeryApplication :patientInfo="patientInfo" :activeTab="activeTab" ref="surgeryRef"
-              @saved="() => { prescriptionRef?.getListInfo(); setTimeout(() => surgeryRef?.getList(), 500) }" />
+              @saved="() => { prescriptionRef?.getListInfo(); surgeryRef?.getList() }" />
          </el-tab-pane>
          <el-tab-pane label="电子处方" name="eprescription">
            <eprescriptionlist :patientInfo="patientInfo" ref="eprescriptionRef" />
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -678,16 +678,15 @@ const handlePrint = async (row) => {
    }

    // 构建 descJson 字段行（与详情弹窗展示的字段一致）
-    const fieldKeys = ['targetDepartment', 'urgencyLevel', 'expectedExaminationTime', 'allergyHistory', 'examinationPurpose', 'medicalHistorySummary', 'symptom', 'sign', 'clinicalDiagnosis', 'otherDiagnosis', 'relatedResult', 'attention'];
+    const fieldKeys = ['targetDepartment', 'symptom', 'sign', 'clinicalDiagnosis', 'otherDiagnosis', 'relatedResult', 'attention'];
    let descFieldsHtml = '';
    fieldKeys.forEach((key) => {
      const label = labelMap[key] || key;
-      const value = transformField(key, descData[key]);
-      if (value != null && value !== '') {
+      if (descData[key] != null && descData[key] !== '') {
        descFieldsHtml += `
          <div class="info-row">
            <span class="label">${label}：</span>
-            <span class="value">${value}</span>
+            <span class="value">${descData[key]}</span>
          </div>`;
      }
    });
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -289,62 +289,43 @@ 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) {
-      diagnosisNetDatas.value = res.data.illness;
-      res.data.illness.forEach((item, index) => {
-        newList.push({
-          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,
-          diagnosisTime: new Date().toLocaleString('zh-CN')
+    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 || ''),
+            ybNo: item.ybNo,
+            medTypeCode: item.medTypeCode,
+            diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+            diagnosisTime: new Date().toLocaleString('zh-CN')
+          });
        });
-      });
-
-      // 将新数据添加到现有列表中
-      form.value.diagnosisList.push(...newList);
-
-      // 重新排序整个列表
-      form.value.diagnosisList.sort((a, b) => {
-        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
-        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
-        return aNo - bNo;
-      });
-      // TCM 数据添加后也去重
-      deduplicateDiagnosisList();
+        
+        // 将新数据添加到现有列表中
+        form.value.diagnosisList.push(...newList);
+        
+        // 重新排序整个列表
+        form.value.diagnosisList.sort((a, b) => {
+          const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+          const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+          return aNo - bNo;
+        });
+      }
+      emits('diagnosisSave', false);
    }
-    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; // 这里是关键！把”诊断排序”改成新顺序
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/api.js
+++ b/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({
--- 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
@@ -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) => {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue
+++ b/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 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({
-    pageSize: 500,
-    pageNum: 1,
-    categoryCode: '24',
-    organizationId: patientInfo.value.inHospitalOrgId,
-    adviceTypes: [3, 6], //1 药品 2耗材 3诊疗 6手术
-  })
+  getSurgeryPage({ organizationId: orgId, pageNo: 1, pageSize: 100, searchKey: key || '' })
    .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 || '';
-          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);
+      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({
--- a/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
+++ b/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，无法调用！');
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -1535,8 +1535,8 @@ function handleMedicalAdvice(row) {
  temporarySigned.value = hasSubmittedAdvices; // 修复：根据已有数据状态设置，而非盲目重置
  temporaryMedicalLoading.value = true // 🔧 新增：开始加载

-  // 调用计费接口获取数据（使用手术计费来源参数，匹配 surgery billing 创建的记录）
-  getPrescriptionList(row.visitId, 6, row.operCode).then((res) => {
+  // 调用计费接口获取数据
+  getPrescriptionList(row.visitId).then((res) => {
    console.log('=== 拉取计费数据返回结果 ===', res)
    if (res.code === 200 && res.data) {
      // 🔧 修复：显示所有药品请求数据，不管有没有计费项目
@@ -1741,39 +1741,27 @@ function handleTemporaryMedicalSubmit(data) {
      }
    })
    
-    // 🔧 修复 Bug #445: 使用稳定可靠的字段组合匹配已提交项目，从已生成列表中剔除待生成项
-    // 匹配键：优先使用 chargeItemId（后端费用项目ID，最可靠），其次使用 名称+规格+数量 组合
-    const submittedKeys = new Set()
-    const submittedChargeIds = new Set()
+    // 🔧 修复 Bug #445: 使用稳定的字段组合匹配已提交项目，而不是依赖可能为空的 requestId/chargeItemId
+    // 构建已提交项目的匹配键集合（药品名称 + 规格 + 数量）
+    const submittedKeys = new Set(
+      (data.temporaryAdvices || [])
+        .map(a => {
+          const om = a.originalMedicine || {}
+          const name = om.medicineName || om.adviceName || om.advice_name || a.adviceName || ''
+          const spec = om.specification || om.volume || ''
+          const qty = om.quantity || 0
+          return `${name}|||${spec}|||${qty}`
+        })
+        .filter(k => k !== '|||0') // 过滤掉空项
+    )

-    ;(data.temporaryAdvices || []).forEach(a => {
-      const om = a.originalMedicine || {}
-      // 收集 chargeItemId（最可靠的匹配标识）
-      if (om.chargeItemId) {
-        submittedChargeIds.add(om.chargeItemId)
-      }
-      // 构建名称+规格+数量的匹配键（用于无 chargeItemId 的兜底匹配）
-      // 注意：originalMedicine 中的名称字段是 adviceName（来自 billingMedicines.map 时的字段）
-      const name = om.medicineName || om.adviceName || om.advice_name || a.adviceName || ''
-      const spec = om.specification || om.volume || ''
-      const qty = om.quantity || 0
-      if (name) {
-        submittedKeys.add(`${name}|||${spec}|||${qty}`)
-      }
-    })
-
-    if (submittedChargeIds.size > 0 || submittedKeys.size > 0) {
+    if (submittedKeys.size > 0) {
      temporaryBillingMedicines.value = (temporaryBillingMedicines.value || []).filter(m => {
-        // 优先用 chargeItemId 匹配
-        if (m.chargeItemId && submittedChargeIds.has(m.chargeItemId)) {
-          return false
-        }
-        // 兜底用 名称+规格+数量 匹配
-        const key = `${m.medicineName || m.adviceName || ''}|||${m.specification || m.volume || ''}|||${m.quantity || 0}`
+        const key = `${m.medicineName || ''}|||${m.specification || ''}|||${m.quantity || 0}`
        return !submittedKeys.has(key)
      })
    } else {
-      // 如果没有任何匹配标识，清空待生成列表（保守策略：认为所有项目都已提交）
+      // 如果没有任何匹配键，清空待生成列表（所有项目都已提交）
      temporaryBillingMedicines.value = []
    }
Author	SHA1	Message	Date
Ranyunqiao	12d0733c0c	Merge remote-tracking branch 'origin/develop' into develop	2026-05-15 09:44:38 +08:00
Ranyunqiao	610fff704a	bug 470 494	2026-05-15 09:44:26 +08:00
wangjian963	0aa7dd9b82	Revert "Merge remote-tracking branch 'origin/develop' into develop" This reverts commit `5946c1ea4b`, reversing changes made to `8d905c9844`.	2026-05-15 09:33:35 +08:00
wangjian963	5946c1ea4b	Merge remote-tracking branch 'origin/develop' into develop	2026-05-15 09:26:51 +08:00
wangjian963	8d905c9844	Reapply "Fix Bug #489-regression: [住院护士站-医嘱处理] UNION加SELECT DISTINCT后NULL列类型推断失败导致接口异常" This reverts commit `49fc905316`.	2026-05-15 09:23:13 +08:00
wangjian963	49fc905316	Revert "Fix Bug #489-regression: [住院护士站-医嘱处理] UNION加SELECT DISTINCT后NULL列类型推断失败导致接口异常" This reverts commit `4e7e79d9c0`.	2026-05-15 09:19:02 +08:00
关羽	3ee09b22c7	Fix Bug #511 : [住院医生工作站-临床医嘱] 护士退回的医嘱在医生站双击无法进入编辑模式，导致无法修改重发 - 使用 Number() 做 statusEnum 类型转换并用 === 严格比较，避免前后端类型不一致导致双击无响应 - 使用 splice 替代直接赋值更新 prescriptionList，确保 Vue 响应式系统能正确触发渲染更新 - 使用 nextTick 包裹 expandOrder 设置，确保数据更新后再设置展开状态，保证 el-table 正确识别 row-key - 增加 findIndex 返回 -1 时的错误处理，给用户可见提示而非静默失败	2026-05-15 01:28:18 +08:00
关羽	6b4f897b9c	Fix Bug #509 : [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据，且提示语需优化 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 01:09:52 +08:00
关羽	848a55cf23	Fix Bug #507 : [住院护士站-住院记账-补费] 项目单位未获取、执行科室显示内码且缺乏默认/模糊搜索逻辑根因分析： 1. 执行科室显示内码：loadDepartmentOptions 只读取树形结构的第一层（records[0].children），但后端返回的是多层嵌套的树形数据。修复为递归扁平化 flattenTree() 提取所有科室节点。 2. 单位字段为空：getUnitCodeOptions 中 unitCode_dictText/minUnitCode_dictText 为 null 时， option 的 codeText 为 null 导致 el-select 无法显示。修复为 fallback 到 code 值本身。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 01:08:23 +08:00
荀彧	4ae4421827	Fix Bug #498 : 【住院医生工作站-检查申请】检查申请列表状态筛选HAVING子句与SELECT映射不一致导致筛选失败 SELECT的CASE映射将status_enum=4映射为3(待接收)，但HAVING子句将status_enum=4映射为4，导致按"待接收"或"已接收"状态筛选时无结果返回。同时修正status_enum=5/6/7的映射从5→7。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 00:27:01 +08:00
关羽	4138dc39f6	Fix Bug #495 : 【医嘱闭环】已校对医嘱无法流转至"医嘱执行"界面，导致费用无法提交执行后端SQL查询未过滤requestStatus（医嘱请求状态），导致医嘱执行页面的"待执行"tab 返回所有状态医嘱而非仅返回已校对(status=3)的医嘱。修复方式： 1. AdviceProcessAppMapper.java: 新增requestStatus参数 2. AdviceProcessAppMapper.xml: 在med_medication_request和wor_service_request子查询的 WHERE条件中增加 AND T1.status_enum = #{requestStatus} 过滤 3. AdviceProcessAppServiceImpl.java: 保存requestStatus并传递给mapper，替代原注释"后端SQL已通过CASE条件处理"的错误假设 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 00:21:55 +08:00
荀彧	718e7a90c5	Fix Bug #497 : 【住院医生工作站-检查申请】检查申请列表调整"申请单状态"列位置至申请单号后将列表中的"申请单状态"列从申请者列之后移至申请单号之后，使列顺序为：申请单号→申请单状态→申请者→操作，与检验申请列表保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 00:14:59 +08:00
荀彧	68c682ad49	Fix Bug #508 : [住院护士站-住院记账-补费] 点击"划价组套"按钮无任何响应，无法选择组套项目根因分析：FeeDialog组件模板有两个根元素（两个el-dialog），在Vue 3中虽支持多根组件，但Element Plus的嵌套el-dialog配合append-to-body在多根场景下可能出现渲染/挂载问题。修复方案： 1. 将两个el-dialog包裹在单一根<div>中，确保组件挂载行为与项目中其他正常工作的嵌套弹窗一致 2. 内层弹窗增加destroy-on-close，确保每次打开时DOM完全重建，避免残留状态导致的不显示问题 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 00:13:04 +08:00
荀彧	c7368db889	Fix Bug #500 : 【门诊医生站】检查申请右侧"检查项目分类"切换时，界面出现明显抖动/闪烁根因分析： 1. el-collapse-item__content 上的 transition: height/max-height 0.3s 与 Element Plus 内部 accordion 动画冲突，造成"双重动画"效果，表现为切换分类时高度跳变 2. collapse-scroll 的 min-height: 120px 过小，切换内容较少的分类时容器收缩导致布局抖动 3. 分类内"加载中..."提示使用 v-if，出现/消失时引起 collapse content 高度突变修复策略： - 移除 el-collapse-item__content 和 el-collapse-item 的自定义 transition 属性，让 el-collapse 使用原生动画，消除双重动画 - 增大 collapse-scroll 的 min-height 从 120px 到 350px，确保切换时容器不收缩 - 将加载提示的 v-if 改为 v-show，避免 DOM 插入/移除引起高度跳变 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-15 00:02:32 +08:00
荀彧	e64370bb67	Fix Bug #486 : [住院医生工作站-临床医嘱] 医嘱检索框不支持全局模糊搜索，未选"医嘱类型"时检索结果为空 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 23:18:55 +08:00
关羽	078439245b	Fix Bug #488 : 【临床医嘱】双击编辑待签发医嘱，医嘱类型回显为数字且点击确认报接口错误问题1-医嘱类型回显为数字: 编辑待签发医嘱时,当行的adviceType值(如3/诊疗) 不在当前adviceTypeList选项列表中时,el-select会回显为纯数字。修复:新增hasAdviceTypeOption和getAdviceTypeLabel函数,当类型无匹配选项时显示el-tag标签而非空下拉框,避免数字回显。问题2-点击确认报itemNo接口错误: getBindDevice接口调用无catch处理, 接口失败时promise rejection阻断主流程保存。修复:为getBindDevice调用链添加.catch()静默降级,确保绑定设备接口失败不影响医嘱主流程保存。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 23:12:33 +08:00
关羽	1124b1010d	Fix Bug #480 : [住院护士站-医嘱执行] 非耗材类医嘱执行报"耗材库存"错误且全选逻辑联动异常根因分析： 1. 耗材库存报错：lotNumberMatch() 按 encounterId 查询 ALL 待发放 DeviceDispense，不区分是否为本次执行的医嘱。若该就诊存在其他未执行的耗材记录且库存为零，整个调用就会失败，导致非耗材类医嘱执行也被拦截。 2. 全选联动异常：toggleRowSelection() 程序化选中会触发 @select 事件， handleRowSelect 中调用 selectAllCheckboxesInRow 导致级联全选。修复方案： - 后端：lotNumberMatch 新增 requestIdList 可选参数，当传入时通过 DeviceRequest.basedOnId 过滤仅校验与本次执行医嘱关联的耗材记录，避免其他未执行医嘱干扰 - 前端：handleExecute 传入 selectedRequestIds（仅诊疗类医嘱的 requestId） - 前端：新增 skipSelectCascade 标志，程序化 toggleRowSelection 时阻止 handleRowSelect 触发 selectAllCheckboxesInRow，消除级联反馈环 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 22:22:01 +08:00
关羽	f41b86a143	Fix Bug #476 : 住院医生工作-检查申请单界面缺失核心临床字段（紧急程度、过敏史、检查目的等）补充打印功能中缺失的核心临床字段：紧急程度、期望检查时间、过敏史、检查目的、病史摘要，并对urgencyLevel等编码字段应用transformField进行值转换显示。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 22:11:25 +08:00
关羽	d3310ade51	Fix Bug #467 : [住院医生工作站-检验申请] 列表显示信息不规范：标题术语错误且单据名称未展示具体检验项目 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 22:10:56 +08:00
关羽	1dbf7859ea	Fix Bug #475 : 【住院医生工作站】开立检查申请单报错"请先配置当前时间段的执行科室"后，系统仍生成申请记录合并验证逻辑：移除独立的"配置列表是否为空"检查，改为在遍历 activityList 时统一验证每个项目的执行科室配置。所有验证在任何数据库操作之前完成，确保验证失败时不会产生脏数据。同时增加 activityList 为空时的明确提示。	2026-05-14 22:09:06 +08:00
wangjian963	4e7e79d9c0	Fix Bug #489-regression: [住院护士站-医嘱处理] UNION加SELECT DISTINCT后NULL列类型推断失败导致接口异常 Root cause: Bug #489修复为UNION添加SELECT DISTINCT后，PostgreSQL无法将服务侧无类型NULL文字自动匹配药品侧对应列的类型，报错"UNION types integer and text cannot be matched"（错误位置: skin_test_flag列，第9列）。 Fix: - InpatientAdviceDto.categoryCode: Integer → String，与DB varchar对齐 - AdviceProcessAppMapper.xml: 服务侧UNION 13处NULL添加PostgreSQL显式类型强转（::integer / ::bigint / ::numeric / ::varchar），同时part_percent 的'1'改为'1::numeric'以安全匹配药品侧numeric类型	2026-05-14 17:53:31 +08:00