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

@@ -2440,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

@@ -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,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/DiagnosisQueryDto.java

@@ -96,4 +96,9 @@ public class DiagnosisQueryDto {
      */
     private String diagnosisDoctor;
 
+    /**
+     * 是否已有传染病报卡（0-无，1-有）
+     */
+    private Integer hasInfectiousReport;
+
 }

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/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -178,6 +178,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         inpatientAdviceParam.setEncounterIds(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
+        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
+        inpatientAdviceParam.setRequestStatus(null);
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
                 = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);

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/java/com/openhis/web/inventorymanage/appservice/impl/RequisitionIssueAppServiceImpl.java

@@ -3,29 +3,38 @@
  */
 package com.openhis.web.inventorymanage.appservice.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
+import com.core.common.exception.ServiceException;
 import com.core.common.utils.*;
 import com.core.common.utils.bean.BeanUtils;
+import com.openhis.administration.domain.DeviceDefinition;
 import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.service.IDeviceDefinitionService;
 import com.openhis.administration.service.IPractitionerService;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.openhis.medication.domain.MedicationDefinition;
+import com.openhis.medication.service.IMedicationDefinitionService;
 import com.openhis.web.common.dto.UnitDto;
 import com.openhis.web.inventorymanage.appservice.IRequisitionIssueAppService;
 import com.openhis.web.inventorymanage.dto.*;
 import com.openhis.web.inventorymanage.mapper.RequisitionIssueMapper;
+import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.domain.SupplyRequest;
+import com.openhis.workflow.service.IInventoryItemService;
 import com.openhis.workflow.service.ISupplyRequestService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -48,6 +57,15 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
     @Autowired
     private IPractitionerService practitionerService;
 
+    @Autowired
+    private IInventoryItemService inventoryItemService;
+
+    @Autowired
+    private IMedicationDefinitionService medicationDefinitionService;
+
+    @Autowired
+    private IDeviceDefinitionService deviceDefinitionService;
+
     @Autowired
     private AssignSeqUtil assignSeqUtil;
 
@@ -167,6 +185,10 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
 
         // 单据号取得
         List<String> busNoList = requisitionIssueDtoList.stream().map(IssueDto::getBusNo).collect(Collectors.toList());
+
+        // 库存校验：领用数量不能超过源仓库实际库存
+        this.validateRequisitionStock(requisitionIssueDtoList);
+
         // 请求数据取得
         List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
         if (!requestList.isEmpty()) {
@@ -328,4 +350,73 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
             }
         }
     }
+
+    /**
+     * 校验领用数量是否超过源仓库实际库存
+     *
+     * @param requisitionIssueDtoList 领用出库单据列表
+     */
+    private void validateRequisitionStock(List<IssueDto> requisitionIssueDtoList) {
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        for (IssueDto issueDto : requisitionIssueDtoList) {
+            Long itemId = issueDto.getItemId();
+            String lotNumber = issueDto.getLotNumber();
+            Long sourceLocationId = issueDto.getSourceLocationId();
+            BigDecimal reqQuantity = issueDto.getItemQuantity();
+            String itemUnit = issueDto.getUnitCode();
+            String itemTable = issueDto.getItemTable();
+
+            // 根据物品类型查询定义信息（拆零比、常规单位、最小单位）
+            BigDecimal partPercent = BigDecimal.ONE;
+            String unitCode = itemUnit;
+            String minUnitCode = itemUnit;
+
+            if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(itemTable)) {
+                MedicationDefinition medDef = medicationDefinitionService.getById(itemId);
+                if (medDef != null) {
+                    unitCode = medDef.getUnitCode();
+                    minUnitCode = medDef.getMinUnitCode();
+                    if (medDef.getPartPercent() != null) {
+                        partPercent = medDef.getPartPercent();
+                    }
+                }
+            } else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(itemTable)) {
+                DeviceDefinition devDef = deviceDefinitionService.getById(itemId);
+                if (devDef != null) {
+                    unitCode = devDef.getUnitCode();
+                    minUnitCode = devDef.getMinUnitCode();
+                    if (devDef.getPartPercent() != null) {
+                        partPercent = devDef.getPartPercent();
+                    }
+                }
+            }
+
+            // 计算领用数量折合最小单位的值
+            BigDecimal reqQuantityInMinUnit;
+            if (itemUnit.equals(unitCode)) {
+                // 领用单位 = 包装单位，需乘以拆零比
+                reqQuantityInMinUnit = reqQuantity.multiply(partPercent);
+            } else {
+                // 领用单位 = 最小单位，无需换算
+                reqQuantityInMinUnit = reqQuantity;
+            }
+
+            // 查询源仓库实际库存（按物品编号、批号、仓库匹配）
+            List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
+                    itemId, lotNumber, sourceLocationId, tenantId);
+
+            // 累加匹配批号的总库存（库存表quantity字段为最小单位）
+            BigDecimal totalStock = BigDecimal.ZERO;
+            for (InventoryItem inventoryItem : inventoryItemList) {
+                if (inventoryItem.getLocationId().equals(sourceLocationId)) {
+                    totalStock = totalStock.add(inventoryItem.getQuantity());
+                }
+            }
+
+            // 比较领用数量与库存
+            if (reqQuantityInMinUnit.compareTo(totalStock) > 0) {
+                throw new ServiceException("操作失败，库存数量不足");
+            }
+        }
+    }
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java

@@ -90,18 +90,26 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
 
         // 逐个校验activityList中的项目是否都配置了执行科室，并收集positionId供后续使用
         // 必须在任何数据库操作之前完成全部校验，避免部分保存后异常导致脏数据
+        // 🔧 Bug #516: 优先使用前端传入的positionId（用户手动选择的发往科室），仅在未选择时使用配置的执行科室
         List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
         // 缓存校验结果，避免主循环中重复查询和可能出现的数据不一致
         java.util.Map<Long, Long> activityIdToPositionIdMap = new java.util.HashMap<>();
         if (activityList != null && !activityList.isEmpty()) {
             for (ActivitySaveDto activitySaveDto : activityList) {
-                Long positionId = activityOrganizationConfig.stream()
+                // 优先使用前端传入的positionId（用户手动选择的科室）
+                Long frontendPositionId = activitySaveDto.getPositionId();
+                if (frontendPositionId != null) {
+                    activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), frontendPositionId);
+                    continue;
+                }
+                // 前端未传入时，使用配置的执行科室
+                Long configPositionId = activityOrganizationConfig.stream()
                     .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
                     .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
-                if (positionId == null) {
+                if (configPositionId == null) {
                     throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
                 }
-                activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), positionId);
+                activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId);
             }
         }
 

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/doctorstation/DoctorStationDiagnosisAppMapper.xml

@@ -134,7 +134,11 @@
                T2.yb_no,
                T1.onset_date AS onsetDate,
                T1.diagnosis_time AS diagnosisTime,
-               T1.doctor AS diagnosisDoctor
+               T1.doctor AS diagnosisDoctor,
+               CASE WHEN EXISTS (
+                   SELECT 1 FROM infectious_card T4
+                   WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1
+               ) THEN 1 ELSE 0 END AS hasInfectiousReport
         FROM adm_encounter_diagnosis AS T1
                  LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
             AND T2.delete_flag = '0' AND T2.tcm_flag = 0

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

@@ -280,9 +280,13 @@
                                          aa.balance_amount
                            ) AS personal_account
                               ON personal_account.encounter_id = ae.id
-                     LEFT JOIN med_medication_dispense mmd
+                     LEFT JOIN LATERAL (
-                               ON mmd.med_req_id = T1.id
+                         SELECT status_enum
-                                   AND mmd.delete_flag = '0'
+                         FROM med_medication_dispense
+                         WHERE med_req_id = T1.id AND delete_flag = '0'
+                         ORDER BY create_time DESC
+                         LIMIT 1
+                     ) mmd ON true
                 WHERE T1.delete_flag = '0'
                 AND T1.refund_medicine_id IS NULL
                 AND T1.generate_source_enum = #{doctorPrescription}
@@ -301,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,
@@ -337,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

@@ -8,20 +8,25 @@
         SELECT drf.id  AS request_form_id,
                drf.encounter_id,
                drf.prescription_no,
-               drf.NAME,
+               COALESCE(
+                   (SELECT STRING_AGG(DISTINCT wad.name, '、')
+                    FROM wor_service_request wsr2
+                    LEFT JOIN wor_activity_definition wad ON wad.id = wsr2.activity_id AND wad.delete_flag = '0'
+                    WHERE wsr2.prescription_no = drf.prescription_no AND wsr2.delete_flag = '0'),
+                   drf.name
+               ) AS name,
                drf.desc_json,
                drf.requester_id,
                drf.create_time,
                ap.NAME AS patient_name,
-                CASE MIN(wsr.status_enum)
+                CASE
-                    WHEN 1 THEN 0
+                    WHEN MIN(wsr.status_enum) = 1 THEN 0
-                    WHEN 2 THEN 1
+                    WHEN MIN(wsr.status_enum) = 2 THEN 1
-                    WHEN 3 THEN 4
+                    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 4 THEN 4
+                    WHEN MIN(wsr.status_enum) = 3 THEN 4
-                    WHEN 5 THEN 5
+                    WHEN MIN(wsr.status_enum) = 4 THEN 3
-                    WHEN 6 THEN 5
+                    WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
-                    WHEN 7 THEN 5
+                    WHEN MIN(wsr.status_enum) = 8 THEN 6
-                    WHEN 8 THEN 6
                     ELSE NULL
                 END AS status
         FROM doc_request_form AS drf
@@ -41,15 +46,14 @@
               AND drf.create_time <= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
           </if>
           <if test="status != null and status != ''">
-               AND CASE MIN(wsr.status_enum)
+               AND CASE
-                       WHEN 1 THEN 0
+                       WHEN MIN(wsr.status_enum) = 1 THEN 0
-                       WHEN 2 THEN 1
+                       WHEN MIN(wsr.status_enum) = 2 THEN 1
-                       WHEN 3 THEN 4
+                       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 4 THEN 4
+                       WHEN MIN(wsr.status_enum) = 3 THEN 4
-                       WHEN 5 THEN 5
+                       WHEN MIN(wsr.status_enum) = 4 THEN 3
-                       WHEN 6 THEN 5
+                       WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
-                       WHEN 7 THEN 5
+                       WHEN MIN(wsr.status_enum) = 8 THEN 6
-                       WHEN 8 THEN 6
                        ELSE NULL
                    END = #{status}::integer
           </if>
@@ -164,7 +168,7 @@
                     AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
                 </if>
                 <if test="requestFormDto.typeCode != null and requestFormDto.typeCode != ''">
-                    AND drf.type_code = #{requestFormDto.typeCode}
+                    AND drf.type_code IN (#{requestFormDto.typeCode}, 'SURGERY')
                 </if>
                 <if test="requestFormDto.applyTimeStart != null">
                     AND drf.create_time >= #{requestFormDto.applyTimeStart}

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java

@@ -49,6 +49,11 @@ public enum RequestStatus implements HisEnumInterface {
      */
     ENDED(7, "ended", "不执行"),
 
+    /**
+     * 已出报告
+     */
+    COMPLETED_REPORT(8, "completed_report", "已出报告"),
+
     /**
      * 未知
      */

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -692,6 +692,7 @@ async function handleFoodDiseasesCheck() {
 /**
  * 传染病报告卡处理
  * 通过诊断名称自动识别并勾选传染病报告卡中的疾病
+ * 修复 Bug #519：跳过已有已提交报卡的诊断
  */
 function handleInfectiousDiseaseReport() {
   // 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表）
@@ -743,8 +744,9 @@ function handleInfectiousDiseaseReport() {
     '手足口病': '0311',
   };
 
-  // 获取所有诊断名称对应的报卡编码
+  // 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断
   const allSelectedDiseases = form.value.diagnosisList
+    .filter(d => d.name && d.hasInfectiousReport !== 1)
     .map(d => diseaseNameToCode[d.name] || null)
     .filter(code => code);
 
@@ -752,9 +754,9 @@ function handleInfectiousDiseaseReport() {
     return;
   }
 
-  // 优先使用主诊断
+  // 优先使用主诊断（同样跳过已有报卡的）
-  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1);
+  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1);
-  const firstDiagnosis = form.value.diagnosisList[0];
+  const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0];
 
   const diagnosisToShow = {
     ...(mainDiagnosis || firstDiagnosis),

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue

@@ -1034,6 +1034,17 @@ function normalizeSex(value) {
   return '未知';
 }
 
+function normalizeSexFromPatientInfo(patientInfo) {
+  // 优先使用文本字段
+  if (patientInfo.genderEnum_enumText) return patientInfo.genderEnum_enumText;
+  if (patientInfo.genderName) return patientInfo.genderName;
+  if (patientInfo.sex) return normalizeSex(patientInfo.sex);
+  // 使用数字枚举字段
+  if (patientInfo.genderEnum === 1) return '男';
+  if (patientInfo.genderEnum === 2) return '女';
+  return '未知';
+}
+
 function normalizeAgeUnit(value) {
   const ageUnitMap = {
     1: '岁',
@@ -1295,7 +1306,7 @@ async function show(diagnosisData) {
     patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名
     parentName: '', // 家长姓名（14岁以下患者必填）
     idNo: patientInfo.idCard, // 身份证号
-    sex: patientInfo.sex || patientInfo.genderName || '男', // 性别
+    sex: normalizeSexFromPatientInfo(patientInfo), // 性别
 
     // 出生日期信息
     birthYear: birthInfo.year, // 出生年份

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/inspection/inspectionApplication.vue

@@ -56,6 +56,13 @@
           </template>
         </el-table-column>
         <el-table-column label="申请单号" prop="applyNo" min-width="160" align="center" header-align="center" />
+        <el-table-column label="单据状态" prop="applyStatus" width="100" align="center" header-align="center">
+          <template #default="scope">
+            <el-tag :type="getStatusType(scope.row.applyStatus)" size="small">
+              {{ getStatusLabel(scope.row.applyStatus, scope.row) }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="检验项目" prop="itemName" min-width="170px" align="center" header-align="center">
           <template #default="scope">
             <span>{{ scope.row.itemName }}</span>
@@ -1445,6 +1452,26 @@ const formatAmount = (amount) => {
   return num.toFixed(2)
 }
 
+// 单据状态标签文字
+const getStatusLabel = (applyStatus, row) => {
+  // applyStatus: 0=待开立, 1=已开立(已签发)
+  // 结合收费/执行标记推导更丰富的状态
+  if (applyStatus === 1) {
+    // 已收费后根据执行标记判断
+    if (row.needExecute === true) {
+      return '已执行'
+    }
+    return '已开立'
+  }
+  return '待开立'
+}
+
+// 单据状态标签颜色
+const getStatusType = (applyStatus) => {
+  if (applyStatus === 1) return 'success'
+  return 'info'
+}
+
 // 格式化日期时间为字符串 YYYY-MM-DD HH:mm:ss
 const formatDateTime = (date) => {
   if (!date) return ''

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

@@ -3591,13 +3591,10 @@ async function setValue(row) {
         prescriptionList.value[rowIndex.value].categoryEnum = 31; // 会诊的category_enum设置为31
       } else {
         // 诊疗类型（adviceType == 3）
-        // 🔧 Bug Fix #238: 诊疗项目默认使用患者就诊科室
+        // 🔧 Bug #455: 诊疗项目执行科室强制使用患者就诊科室，
-        if (!prescriptionList.value[rowIndex.value].orgId) {
+        // 不使用目录配置的执行科室（可能是错误ID或占位符，导致显示原始ID）
-          prescriptionList.value[rowIndex.value].orgId = props.patientInfo.orgId;
+        prescriptionList.value[rowIndex.value].orgId = props.patientInfo.orgId;
-        }
+        prescriptionList.value[rowIndex.value].positionName = findOrgNameById(props.patientInfo.orgId) || props.patientInfo.orgName || '';
-        if (!prescriptionList.value[rowIndex.value].positionName) {
-          prescriptionList.value[rowIndex.value].positionName = findOrgNameById(prescriptionList.value[rowIndex.value].orgId) || props.patientInfo.orgName || '';
-        }
         // 🔧 Bug #218 修复：使用组套中维护的quantity，如果没有则默认1
         prescriptionList.value[rowIndex.value].quantity = row.quantity || 1;
         // 🔧 Bug #144 修复：安全访问 priceList，防止 orderDetailInfos 为空时出错

openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue

@@ -1142,7 +1142,8 @@ function submitForm() {
             // 保存麻醉方式
             sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
             open.value = false
-            emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
+            getList() // 提交成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
           } else {
             proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
           }
@@ -1158,7 +1159,8 @@ function submitForm() {
             // 保存麻醉方式
             sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
             open.value = false
-            emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
+            getList() // 修改成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
           } else {
             proxy.$modal.msgError(res.msg || '更新手术失败，请检查表单信息')
           }

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

@@ -86,7 +86,11 @@
           </template>
           <el-table-column type="index" label="序号" width="60" align="center" />
           <el-table-column prop="patientName" label="患者姓名" width="120" />
-          <el-table-column prop="name" label="申请单名称" width="140" />
+          <el-table-column label="申请单名称" width="140">
+            <template #default="scope">
+              <span>{{ buildApplicationName(scope.row) }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="160" />
           <el-table-column prop="prescriptionNo" label="申请单号" width="140" />
           <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
@@ -429,6 +433,23 @@ const parseStatus = (status) => {
   return statusMap[String(status)] || '-';
 };
 
+/**
+ * 根据申请单详情构建申请单名称
+ * 单一项目：显示项目名称
+ * 多个项目：显示首个项目名称+"等X项"
+ */
+const buildApplicationName = (row) => {
+  const details = row.requestFormDetailList;
+  if (!details || details.length === 0) {
+    return row.name || '-';
+  }
+  if (details.length === 1) {
+    return details[0].adviceName || row.name || '-';
+  }
+  const first = details[0];
+  return `${first.adviceName || ''}等${details.length}项`;
+};
+
 /**
  * 获取状态标签类型 - 参考临床医嘱样式
  * @param {string|number} status - 状态码
@@ -513,6 +534,30 @@ const findTreeItem = (list, id) => {
   return null;
 };
 
+const recursionFun = (targetDepartment) => {
+  if (!targetDepartment) return '';
+  let name = '';
+  for (let index = 0; index < orgOptions.value.length; index++) {
+    const obj = orgOptions.value[index];
+    if (obj.id == targetDepartment) {
+      name = obj.name;
+      break;
+    }
+    const subObjArray = obj['children'];
+    if (subObjArray && subObjArray.length > 0) {
+      for (let i = 0; i < subObjArray.length; i++) {
+        const item = subObjArray[i];
+        if (item.id == targetDepartment) {
+          name = item.name;
+          break;
+        }
+      }
+    }
+    if (name) break;
+  }
+  return name;
+};
+
 const handleViewDetail = async (row) => {
   // 确保科室数据已加载，以便将 ID 解析为名称
   if (!orgOptions.value || orgOptions.value.length === 0) {
@@ -526,8 +571,7 @@ const handleViewDetail = async (row) => {
       const obj = JSON.parse(row.descJson);
       // 将发往科室 ID 转换为名称
       if (obj.targetDepartment) {
-        const deptItem = findTreeItem(orgOptions.value, obj.targetDepartment);
+        obj.targetDepartment = recursionFun(obj.targetDepartment);
-        obj.targetDepartment = deptItem ? deptItem.name : obj.targetDepartment;
       }
       descJsonData.value = obj;
     } catch (e) {

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/laboratoryTests.vue

@@ -325,7 +325,12 @@ const projectWithDepartment = (selectProjectIds, type) => {
       }
     }
     if (findItem && isRelease) {
-      form.targetDepartment = findItem.id;
+      // 提交时若用户已选「发往科室」，不得用项目默认执行科室覆盖
+      if (type === 2 && manualDept) {
+        form.targetDepartment = manualDept;
+      } else {
+        form.targetDepartment = findItem.id;
+      }
     }
   }
   return isRelease;
@@ -392,7 +397,7 @@ const submit = () => {
       unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
       unitPrice: item.priceList[0].price /** 单价 */,
       totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: item.positionId || form.targetDepartment, //执行科室id，未配置时使用用户手动选择的科室
+      positionId: form.targetDepartment || item.positionId, // 用户指定发往科室优先于项目默认执行科室
       ybClassEnum: item.ybClassEnum, //类别医保编码
       conditionId: item.conditionId, //诊断ID
       encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id

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,9 +542,12 @@ 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,
+      adviceName: item.adviceName,
       quantity: 1,
       unitCode: item.priceList[0].unitCode,
       unitPrice: item.priceList[0].price,
@@ -572,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="项目代码/名称"
+        :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

@@ -1503,16 +1503,16 @@ function handleSaveBatch() {
 }
 
 function setValue(row) {
-  // 构造单位列表
+  // 构造单位列表，确保 value 始终为 String 类型，避免 el-select 值类型不匹配
   unitCodeList.value = [
-    { value: row.unitCode, label: row.unitCode_dictText, type: 'unit' },
+    { value: String(row.unitCode ?? ''), label: row.unitCode_dictText, type: 'unit' },
     {
-      value: row.doseUnitCode,
+      value: String(row.doseUnitCode ?? ''),
       label: row.doseUnitCode_dictText,
       type: 'dose',
     },
     {
-      value: row.minUnitCode,
+      value: String(row.minUnitCode ?? ''),
       label: row.minUnitCode_dictText,
       type: 'minUnit',
     },
@@ -1577,9 +1577,9 @@ function setValue(row) {
     orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || row.orgName || patientInfo.value?.inHospitalOrgName || ''),
     // dose: undefined, Removed to preserve dose value from group package
     unitCodeList: unitCodeList.value,
-    doseUnitCode: row.doseUnitCode,
+    doseUnitCode: String(row.doseUnitCode ?? ''),
-    minUnitCode: row.minUnitCode,
+    minUnitCode: String(row.minUnitCode ?? ''),
-    unitCode: row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode,
+    unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode ?? '') : String(row.unitCode ?? ''),
     categoryEnum: row.categoryCode,
     definitionId: row.chargeItemDefinitionId,
     executeNum: 1,
@@ -1595,6 +1595,10 @@ function setValue(row) {
             ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
             : prevRow.minUnitPrice,
           positionName: selectedStock?.locationName,
+          // 🔧 Bug #523 修复：初始化 totalPrice 为 0，避免总金额列显示为横杠
+          totalPrice: row.quantity
+            ? new Decimal(row.quantity).mul(selectedStock?.price ?? 0).toFixed(6)
+            : '0',
         }
       : {
           quantity: 1,

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

@@ -19,11 +19,9 @@
             <el-tab-pane label="检验申请" name="test">
               <TestApplication ref="testApplicationRef" :show-status-column="true" />
             </el-tab-pane>
-```vue
             <el-tab-pane label="检查申请" name="examine">
               <ExamineApplication ref="examineApplicationRef" />
             </el-tab-pane>
-```
             <el-tab-pane label="汇总发药申请" name="summaryDrug">
               <SummaryDrugApplication ref="summaryDrugApplicationRef" />
             </el-tab-pane>
@@ -49,6 +47,7 @@
 import {computed, onBeforeMount, onMounted, provide, reactive, ref, watch,} from 'vue';
 
 import Emr from './emr/index.vue';
+import SummaryDrugApplication from './components/applicationShow/summaryDrugApplication.vue';
 import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
 import PatientList from '@/components/PatientList/patient-list.vue';
 import {localPatientInfo, updateLocalPatientInfo} from './store/localPatient';
@@ -84,6 +83,7 @@ const currentPatientInfo = ref({});
 const testApplicationRef = ref();
 const examineApplicationRef = ref();
 const surgeryApplicationRef = ref();
+const summaryDrugApplicationRef = ref();
 const bloodTtransfusionAapplicationRef = ref();
 
 // 患者列表相关逻辑

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue

@@ -251,7 +251,7 @@
     </div>
   </el-dialog>
   <!-- 划价组套选择对话框 -->
-  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body>
+  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000">
     <div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
       <el-input
         v-model="groupSetSearchText"
@@ -606,21 +606,26 @@ function getItemType_Text(type) {
   return map[type] || '其他';
 }
 function getUnitCodeOptions(row) {
-  const unitCodes = [
+  const unitCodes = [];
-    { code: row.unitCode != null ? String(row.unitCode) : null, codeText: row.unitCode_dictText },
+  // 大单位：优先用 code，code 缺失时用字典文本兜底
-    { code: row.minUnitCode != null ? String(row.minUnitCode) : null, codeText: row.minUnitCode_dictText },
+  if (row.unitCode != null && String(row.unitCode) !== '') {
-  ];
+    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText });
-  // 过滤掉 code 为空的单位选项
+  } else if (row.unitCode_dictText) {
-  const validUnitCodes = unitCodes.filter(item => item.code != null && item.code !== '');
+    unitCodes.push({ code: row.unitCode_dictText, codeText: row.unitCode_dictText });
-  // 使用 Set 来跟踪已经存在的 code
+  }
+  // 小单位：同上
+  if (row.minUnitCode != null && String(row.minUnitCode) !== '') {
+    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText });
+  } else if (row.minUnitCode_dictText) {
+    unitCodes.push({ code: row.minUnitCode_dictText, codeText: row.minUnitCode_dictText });
+  }
+  // 去重
   const seenCodes = new Set();
-  const uniqueUnitCodes = validUnitCodes.filter((item) => {
+  const uniqueUnitCodes = unitCodes.filter((item) => {
-    // 如果 Set 中没有这个 code，就保留它，并把它加入 Set
     if (!seenCodes.has(item.code)) {
       seenCodes.add(item.code);
       return true;
     }
-    // 如果已经存在，就过滤掉
     return false;
   });
   return uniqueUnitCodes;

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/newfeeDetailQuery.vue

@@ -463,20 +463,45 @@ function watchPatientSelection() {
   }, 300);
 }
 
-/** 查询科室 */
+/** 查询科室（支持树形/扁平多种响应结构） */
 const getLocationInfo = () => {
   getOrgList().then((res) => {
-    orgOptions.value = res.data?.records[0]?.children;
+    if (!res.data) {
+      orgOptions.value = [];
+      return;
+    }
+    // 尝试从树形结构取：records[0].children
+    if (res.data.records && res.data.records.length > 0) {
+      if (res.data.records[0].children && res.data.records[0].children.length > 0) {
+        orgOptions.value = res.data.records[0].children;
+        return;
+      }
+      // 如果 records[0] 有 id 和 name（非树根节点），直接用所有 records
+      if (res.data.records[0].id) {
+        orgOptions.value = res.data.records;
+        return;
+      }
+    }
+    // 兜底：如果 data 本身是数组
+    if (Array.isArray(res.data)) {
+      orgOptions.value = res.data;
+      return;
+    }
+    orgOptions.value = [];
+  }).catch(() => {
+    console.warn('科室列表加载失败（可能无权限）');
+    orgOptions.value = [];
   });
 };
 getLocationInfo();
 
-// 映射
+// 映射（查找失败时返回 '-' 而非显示内码）
 const selectOrg = (itemid) => {
+  if (!itemid) return '-';
   const item = orgOptions.value.find((item) => {
     return item.id == itemid;
   });
-  return item?.name;
+  return item?.name || '-';
 };
 // 重置
 const onReset = () => {

openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue

@@ -1057,8 +1057,8 @@ function confirmCharge() {
   params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');
 
   addVitalSigns(params).then(res => {
-    console.log('保存成功:', res);
     if (res.code === 200) {
+      proxy.msgSuccess('保存成功');
       // 保存成功后刷新列表
       getPatientList();
       // 清空表单
@@ -1087,8 +1087,6 @@ function confirmCharge() {
         urineVolume: '',
         stoolVolume: '',
       };
-      // 保存成功后关闭弹窗
-      closeDialog();
     }
   });
 }

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

@@ -534,6 +534,7 @@ const userStore = useUserStore();
 const openTraceNoDialog = ref(false)
 const rowData = ref({})
 const ypName = ref('')
+const currentIndex = ref(-1)
 
 const { proxy } = getCurrentInstance();
 const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
@@ -1072,13 +1073,6 @@ function onHeaderWarehouseChange() {
 
 // 选择仓库 / 选药品后拉取该仓库存
 function handleLocationClick(item, row, index) {
-  getCount({
-    itemId: form.purchaseinventoryList[index].itemId,
-    orgLocationId: form.purchaseinventoryList[index].sourceLocationId,
-  }).then((res) => {
-    if (res.data && res.data.length > 0) {
-      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
-      form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
   const r = form.purchaseinventoryList[index];
   let orgLocationId = r.sourceLocationId || receiptHeaderForm.headerLocationId || '';
   if (!orgLocationId) {
@@ -1481,7 +1475,7 @@ function handleScan(row,index){
   rowData.value = row
   rowData.value.itemType = receiptHeaderForm.medicationType
   ypName.value = row.name
-  openTraceNoDialog .value = true;
+  openTraceNoDialog.value = true;
   currentIndex.value = index
 }
 
@@ -1704,6 +1698,17 @@ const exportRequiredParams = ref({
   pageSize: 10,
   busNo: route.query.supplyBusNo
 });
+
+// 追溯码对话框提交处理
+function submit(traceNoData) {
+  if (currentIndex.value >= 0 && form.purchaseinventoryList[currentIndex.value]) {
+    form.purchaseinventoryList[currentIndex.value].traceNo = traceNoData.traceNo;
+    form.purchaseinventoryList[currentIndex.value].ybNo = traceNoData.ybNo;
+    proxy.$message.success('追溯码保存成功');
+  }
+  openTraceNoDialog.value = false;
+}
+
 function handleExport() {
   proxy.downloadGet(
     '/issue-manage/requisition/excel-out',