Fix Bug #442: 手术计费：点击"删除"待签发耗材时异常报错，导致操作失败

根因：DoctorStationAdviceAppMapper.xml 中 getRequestBaseInfo SQL 的第二个 UNION 查询（手术计费耗材从 adm_charge_item 关联 wor_device_request）中，biz_request_flag 和 requester_id 使用了 CI.enterer_id（计费录入人），而非 DR.requester_id（设备申请创建人）。当录入人与当前操作人不一致时，biz_request_flag 为 '0'，导致删除操作被后端拒绝。

修复：将 CI.enterer_id 改为 COALESCE(DR.requester_id, CI.enterer_id)，优先使用 DeviceRequest 的 requester_id，确保 biz_request_flag 基于正确的创建人计算。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java

@@ -25,7 +25,7 @@ public class SysTenantController extends BaseController {
     private ISysTenantService sysTenantService;
 
     /**
-     * 查询租户分页列表
+     * 查询租户分页列表（只读操作，不限制租户管理权限）
      *
      * @param tenantId 租户ID查询
      * @param tenantCode 租户编码模糊查询
@@ -35,7 +35,7 @@ public class SysTenantController extends BaseController {
      * @param pageSize 每页多少条
      * @return 租户分页列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/page")
     public R<IPage<SysTenant>> getTenantPage(@RequestParam(required = false) Integer tenantId,
         @RequestParam(required = false) String tenantCode, @RequestParam(required = false) String tenantName,
@@ -45,19 +45,19 @@ public class SysTenantController extends BaseController {
     }
 
     /**
-     * 查询租户详情
+     * 查询租户详情（只读操作）
      *
      * @param tenantId 租户ID
      * @return 租户分页列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/{tenantId}")
     public R<SysTenant> getTenantDetail(@PathVariable Integer tenantId) {
         return R.ok(sysTenantService.getById(tenantId));
     }
 
     /**
-     * 查询租户所属用户分页列表
+     * 查询租户所属用户分页列表（只读操作）
      *
      * @param tenantId 租户ID查询
      * @param userName 用户昵称模糊查询
@@ -67,7 +67,7 @@ public class SysTenantController extends BaseController {
      * @param pageSize 每页多少条
      * @return 租户所属用户分页列表
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/user/page")
     public R<IPage<SysUser>> getTenantUserPage(@RequestParam(required = false) Integer tenantId,
         @RequestParam(required = false) String userName, @RequestParam(required = false) String nickName,
@@ -141,14 +141,14 @@ public class SysTenantController extends BaseController {
     }
 
     /**
-     * 查询租户未绑定的用户列表
+     * 查询租户未绑定的用户列表（只读操作）
      *
      * @param tenantId 租户ID
      * @param pageNum 当前页
      * @param pageSize 每页多少条
      * @return 结果
      */
-    @PreAuthorize("@ss.hasPermi('system:tenant:operate')")
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
     @GetMapping("/{tenantId}/unbind-users")
     public R<IPage<SysUser>> getUnbindTenantUserList(@PathVariable Integer tenantId,
         @RequestParam(required = false) String userName, @RequestParam(required = false) String nickName,
@@ -194,4 +194,4 @@ public class SysTenantController extends BaseController {
     public R<List<SysTenant>> getUserBindTenantList(@PathVariable String username) {
         return sysTenantService.getUserBindTenantList(username);
     }
-}
+}

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java

@@ -246,6 +246,16 @@ public class OpCreateScheduleDto {
      */
     private String communicationInfo;
 
+    /**
+     * 是否外请专家 1-是 0-否
+     */
+    private Integer isExternalExpert;
+
+    /**
+     * 外请专家姓名
+     */
+    private String externalExpertName;
+
     /**
      * 备注
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java

@@ -106,4 +106,9 @@ public class OpScheduleDto extends OpSchedule {
      * 创建人名称
      */
     private String createByName;
+
+    /**
+     * 费用类别
+     */
+    private String feeType;
 }

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

@@ -231,29 +231,49 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // 费用定价主表ID集合
         List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId)
                 .collect(Collectors.toList());
-        // 医嘱库存集合
+
-        List<AdviceInventoryDto> adviceInventoryList = doctorStationAdviceAppMapper.getAdviceInventory(locationId,
+        // 判断是否包含药品或耗材类型（只有这些类型才需要库存相关查询）
-                adviceDefinitionIdList,
+        boolean hasMedOrDevice = adviceTypes != null
-                CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue());
+                && (adviceTypes.contains(1) || adviceTypes.contains(2));
-        // 待发放个数信息
+
-        List<AdviceInventoryDto> adviceDraftInventoryList = doctorStationAdviceAppMapper.getAdviceDraftInventory(
+        // 医嘱库存集合 — 仅药品/耗材需要库存查询，手术/诊疗(3,6)无库存概念，跳过以减少数据库开销
-                CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
+        List<AdviceInventoryDto> adviceInventoryList;
-                DispenseStatus.DRAFT.getValue(), DispenseStatus.PREPARATION.getValue());
+        List<AdviceInventoryDto> adviceDraftInventoryList;
-        // 预减库存
+        List<AdviceInventoryDto> adviceInventory;
-        List<AdviceInventoryDto> adviceInventory = adviceUtils.subtractInventory(adviceInventoryList,
+        if (hasMedOrDevice) {
-                adviceDraftInventoryList);
+            adviceInventoryList = doctorStationAdviceAppMapper.getAdviceInventory(locationId,
-        // 查询取药科室配置
+                    adviceDefinitionIdList,
-        List<AdviceInventoryDto> medLocationConfig = doctorStationAdviceAppMapper.getMedLocationConfig(organizationId);
+                    CommonConstants.SqlCondition.ABOUT_INVENTORY_TABLE_STR, PublicationStatus.ACTIVE.getValue());
-        // 将配置转为 {categoryCode -> 允许的locationId集合}
+            // 待发放个数信息
-        Map<String, Set<Long>> allowedLocByCategory = new HashMap<>();
+            adviceDraftInventoryList = doctorStationAdviceAppMapper.getAdviceDraftInventory(
-        if (medLocationConfig != null && !medLocationConfig.isEmpty()) {
+                    CommonConstants.TableName.MED_MEDICATION_DEFINITION, CommonConstants.TableName.ADM_DEVICE_DEFINITION,
-            for (AdviceInventoryDto cfg : medLocationConfig) {
+                    DispenseStatus.DRAFT.getValue(), DispenseStatus.PREPARATION.getValue());
-                if (cfg.getCategoryCode() == null || cfg.getLocationId() == null) {
+            // 预减库存
-                    continue;
+            adviceInventory = adviceUtils.subtractInventory(adviceInventoryList, adviceDraftInventoryList);
+        } else {
+            adviceInventoryList = Collections.emptyList();
+            adviceDraftInventoryList = Collections.emptyList();
+            adviceInventory = Collections.emptyList();
+        }
+        // 查询取药科室配置 — 仅药品开单场景需要
+        List<AdviceInventoryDto> medLocationConfig;
+        Map<String, Set<Long>> allowedLocByCategory;
+        if (hasMedOrDevice) {
+            medLocationConfig = doctorStationAdviceAppMapper.getMedLocationConfig(organizationId);
+            // 将配置转为 {categoryCode -> 允许的locationId集合}
+            allowedLocByCategory = new HashMap<>();
+            if (medLocationConfig != null && !medLocationConfig.isEmpty()) {
+                for (AdviceInventoryDto cfg : medLocationConfig) {
+                    if (cfg.getCategoryCode() == null || cfg.getLocationId() == null) {
+                        continue;
+                    }
+                    allowedLocByCategory.computeIfAbsent(String.valueOf(cfg.getCategoryCode()), k -> new HashSet<>())
+                            .add(cfg.getLocationId());
                 }
-                allowedLocByCategory.computeIfAbsent(String.valueOf(cfg.getCategoryCode()), k -> new HashSet<>())
-                        .add(cfg.getLocationId());
             }
+        } else {
+            medLocationConfig = Collections.emptyList();
+            allowedLocByCategory = Collections.emptyMap();
         }
         // 费用定价子表信息 - 使用分批处理避免大量参数问题
         List<AdvicePriceDto> childCharge = new ArrayList<>();

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

@@ -1,5 +1,6 @@
 package com.openhis.web.doctorstation.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
@@ -55,6 +56,7 @@ public class InfectiousDiseaseReportDto {
     private String sex;
 
     /** 出生日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 
     /** 实足年龄 */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java

@@ -17,6 +17,9 @@ 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.core.common.utils.SecurityUtils;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.IInventoryItemService;
 import com.openhis.web.basedatamanage.dto.LocationDto;
 import com.openhis.web.common.dto.UnitDto;
 import com.openhis.web.inventorymanage.appservice.IProductTransferAppService;
@@ -57,6 +60,9 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
     @Autowired
     private IPractitionerService practitionerService;
 
+    @Autowired
+    private IInventoryItemService inventoryItemService;
+
     /**
      * 商品调拨页面初始化
      *
@@ -196,6 +202,23 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
     @Override
     public R<?> addOrEditBatchTransferReceipt(List<ProductTransferDto> productTransferDtoList, Boolean flag) {
 
+        // 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        for (ProductTransferDto dto : productTransferDtoList) {
+            if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                return R.fail("调拨数量必须大于0");
+            }
+            // 查询该药品在源仓库的实时库存总量
+            List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
+            java.math.BigDecimal actualStock = inventoryList.stream()
+                .map(InventoryItem::getQuantity)
+                .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+            if (dto.getItemQuantity().compareTo(actualStock) > 0) {
+                return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
+            }
+        }
+
         List<String> idList = new ArrayList<>();
         if (flag) {
             // 批量保存按钮
@@ -309,6 +332,22 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
     @Override
     public R<?> addOrEditTransferReceipt(List<ProductTransferDto> productTransferDtoList) {
 
+        // 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        for (ProductTransferDto dto : productTransferDtoList) {
+            if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                return R.fail("调拨数量必须大于0");
+            }
+            List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
+            java.math.BigDecimal actualStock = inventoryList.stream()
+                .map(InventoryItem::getQuantity)
+                .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+            if (dto.getItemQuantity().compareTo(actualStock) > 0) {
+                return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
+            }
+        }
+
         List<String> idList = new ArrayList<>();
 
         // 单据号取得
@@ -380,6 +419,25 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
      */
     @Override
     public R<?> submitApproval(String busNo) {
+        // 提交前再次校验调拨数量（从数据库查实时库存）
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNo);
+        if (requestList != null && !requestList.isEmpty()) {
+            Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+            for (SupplyRequest request : requestList) {
+                if (request.getItemQuantity() == null || request.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                    return R.fail("调拨数量必须大于0，请检查后重新保存");
+                }
+                // 查询该药品在源仓库的实时库存总量
+                List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                    request.getItemId(), request.getLotNumber(), request.getSourceLocationId(), tenantId);
+                java.math.BigDecimal actualStock = inventoryList.stream()
+                    .map(InventoryItem::getQuantity)
+                    .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+                if (request.getItemQuantity().compareTo(actualStock) > 0) {
+                    return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "），请检查后重新保存");
+                }
+            }
+        }
         // 单据提交审核
         boolean result = supplyRequestService.submitApproval(busNo);
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))

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

@@ -39,10 +39,9 @@ public interface IRequestFormManageAppService {
      * @param typeCode 申请单类型
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
      * @return 申请单列表
      */
-    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status);
+    List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate);
 
     /**
      * 分页查询申请单

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

@@ -414,7 +414,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
     @Override
     public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode) {
         // 调用重载方法，不传筛选参数
-        return getRequestForm(encounterId, typeCode, null, null, null);
+        return getRequestForm(encounterId, typeCode, null, null);
     }
 
     /**
@@ -424,17 +424,16 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
      * @param typeCode 申请单类型
      * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
      * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
-     * @param status 单据状态（可选）
      * @return 申请单列表
      */
     @Override
-    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status) {
+    public List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate) {
         // 检查参数
         if (encounterId == null) {
-            return new java.util.ArrayList<>(); // 返回空列表而不是查询数据库
+            return new java.util.ArrayList<>();
         }
 
-        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate, status, null);
+        List<RequestFormQueryDto> requestFormList = requestFormManageAppMapper.getRequestForm(encounterId, typeCode, startDate, endDate,null,null);
         for (RequestFormQueryDto requestFormQueryDto : requestFormList) {
             // 查询处方详情
             List<RequestFormDetailQueryDto> requestFormDetail =

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java

@@ -109,7 +109,7 @@ public class RequestFormManageController {
         if (encounterId == null) {
             return R.fail("就诊ID不能为空");
         }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate, status));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROOF.getCode(), startDate, endDate));
     }
 
     /**

openhis-server-new/openhis-application/src/main/resources/application-test.yml

@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=histest&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=histest1&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
         password: Jchl1528
       # 从库数据源

openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml

@@ -89,11 +89,15 @@
             cs.apply_doctor_name AS apply_doctor_name,
             drf.create_time AS apply_time,
             os.surgery_nature AS surgeryType,
+            fc.contract_name 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 adm_encounter ae ON ae.id = cs.encounter_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 doc_request_form drf ON drf.prescription_no=cs.surgery_no
         LEFT JOIN (
             SELECT patient_id, identifier_no

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

@@ -98,9 +98,6 @@
                 INNER JOIN adm_organization_location AS T6 ON T6.distribution_category_code = t1.category_code AND T6.delete_flag = '0' AND T6.item_code = '1' AND T6.organization_id = #{organizationId} AND (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
                 WHERE t1.delete_flag = '0'
                 AND T2.status_enum = #{statusEnum}
-                <if test="pricingFlag == 1">
-                    AND 1 = 2
-                </if>
                 <if test="categoryCode != null and categoryCode != ''">
                     <!-- 🔧 BugFix: 支持两种匹配方式 -->
                     <!-- 1. 直接匹配：distribution_category_code = category_code（都是数字代码） -->
@@ -544,9 +541,9 @@
         CI.service_id AS request_id,
         CI.service_id || '-ci-dev' AS unique_key,
         '' AS prescription_no,
-        CI.enterer_id AS requester_id,
+        COALESCE(DR.requester_id, CI.enterer_id) AS requester_id,
         CI.entered_date AS request_time,
-        CASE WHEN CI.enterer_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        CASE WHEN COALESCE(DR.requester_id, CI.enterer_id) = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
         DR.content_json AS content_json,
         NULL AS skin_test_flag,
         NULL AS inject_flag,

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -12,7 +12,6 @@
                drf.desc_json,
                drf.requester_id,
                drf.create_time,
-               drf.status,
                ap.NAME AS patient_name
         FROM doc_request_form AS drf
                  LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
@@ -28,9 +27,6 @@
           <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 drf.status = #{status}::integer
-          </if>
     </select>
 
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">

openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java

@@ -187,6 +187,12 @@ public class OpSchedule extends HisBaseEntity {
     /** 沟通信息 */
     private String communicationInfo;
 
+    /** 是否外请专家 1-是 0-否 */
+    private Integer isExternalExpert;
+
+    /** 外请专家姓名 */
+    private String externalExpertName;
+
     /** 备注信息 */
     private String remark;
 

openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue

@@ -519,9 +519,10 @@
     >
       <template #append>
         <!-- 审核记录：查看/审核都展示，保证留痕可追溯 -->
+        <!-- 修复：查看模式始终显示区块；审核模式始终显示区块（header + 空状态 或 timeline） -->
         <div
           class="audit-records-section"
-          v-if="drawerMode === 'view' || (drawerMode === 'audit' && auditRecords.length > 0)"
+          v-if="drawerMode === 'view' || drawerMode === 'audit'"
         >
           <h3 class="section-title">审核记录</h3>
           <el-timeline v-if="auditRecords.length > 0">

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

@@ -127,6 +127,7 @@ const queryParams = ref({
   pageSize: 100,
   pageNo: 1,
   adviceTypes: '1,2,3',
+  categoryCode: '',
 });
 
 // 节流函数 - 与V1.3一致：300ms，首次立即响应
@@ -148,6 +149,7 @@ watch(
     } else {
       queryParams.value.adviceTypes = '1,2,3';
     }
+    queryParams.value.categoryCode = newValue.categoryCode || '';
     throttledGetList();
   },
   { deep: true }
@@ -175,6 +177,12 @@ function getList() {
       const types = adviceTypes.split(',').map(t => parseInt(t));
       filteredData = filteredData.filter(item => types.includes(item.adviceType));
     }
+
+    // 根据 categoryCode 过滤（如西药='2'，中成药='1'）
+    const categoryCode = queryParams.value.categoryCode;
+    if (categoryCode) {
+      filteredData = filteredData.filter(item => String(item.categoryCode) === String(categoryCode));
+    }
     
     // 根据搜索关键词过滤
     if (searchKey && searchKey.length >= 1) {

openhis-ui-vue3/src/views/doctorstation/components/callQueue/DoctorCallDialog.vue

@@ -375,7 +375,7 @@ const finishCallPatient = async () => {
     return;
   }
   try {
-    await completeEncounter(currentCallPatient.value.encounterId);
+    await completeEncounter({ encounterId: currentCallPatient.value.encounterId, firstEnum: currentCallPatient.value.firstEnum || 1 });
     emit('finish');
     emit('update:dialogVisible', false);
     ElMessage.success('患者已完诊');

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

@@ -349,11 +349,17 @@ async function getList() {
     if (res.code == 200) {
       // 过滤掉中医诊断，只保留西医诊断
       form.value.diagnosisList = res.data.filter(item => item.typeName !== '中医诊断');
-      // 为旧数据添加默认分类
+      // 为旧数据添加默认分类和selectedDiseases
       form.value.diagnosisList.forEach(item => {
         if (!item.classification) {
           item.classification = '西医';
         }
+        // 如果ybNo（诊断编码）符合传染病编码格式，添加到selectedDiseases
+        if (item.ybNo && /^(01|02|03)/.test(item.ybNo)) {
+          item.selectedDiseases = [item.ybNo];
+        } else {
+          item.selectedDiseases = item.selectedDiseases || [];
+        }
       });
       emits('diagnosisSave', false);
     }
@@ -685,23 +691,78 @@ async function handleFoodDiseasesCheck() {
 
 /**
  * 传染病报告卡处理
- * 通过诊断目录维护的'报卡类型'字段自动识别是否有需要填写的传染病报告卡
+ * 通过诊断名称自动识别并勾选传染病报告卡中的疾病
- * 如果有则弹出诊断对应需登记的报告卡界面
  */
 function handleInfectiousDiseaseReport() {
-  // 查找所有有报卡类型的诊断（reportTypeCode不为空）
+  // 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表）
-  const diagnosesWithReportType = form.value.diagnosisList.filter(d => d.reportTypeCode);
+  const diseaseNameToCode = {
+    // 甲类
+    '鼠疫': '0101',
+    '霍乱': '0102',
+    // 乙类
+    '传染性非典型肺炎': '0201',
+    '艾滋病': '0202',
+    '病毒性肝炎': '0203',
+    '脊髓灰质炎': '0204',
+    '人感染高致病性禽流感': '0205',
+    '麻疹': '0206',
+    '流行性出血热': '0207',
+    '狂犬病': '0208',
+    '流行性乙型脑炎': '0209',
+    '登革热': '0210',
+    '炭疽': '0211',
+    '细菌性和阿米巴性痢疾': '0212',
+    '肺结核': '0213',
+    '伤寒和副伤寒': '0214',
+    '流行性脑脊髓膜炎': '0215',
+    '百日咳': '0216',
+    '白喉': '0217',
+    '新生儿破伤风': '0218',
+    '猩红热': '0219',
+    '布鲁氏菌病': '0220',
+    '淋病': '0221',
+    '梅毒': '0222',
+    '钩端螺旋体病': '0223',
+    '血吸虫病': '0224',
+    '疟疾': '0225',
+    '新型冠状病毒肺炎': '0226',
+    '甲型H1N1流感': '0227',
+    '人感染H7N9禽流感': '0228',
+    // 丙类
+    '流行性感冒': '0301',
+    '流行性腮腺炎': '0302',
+    '风疹': '0303',
+    '急性出血性结膜炎': '0304',
+    '麻风病': '0305',
+    '流行性和地方性斑疹伤寒': '0306',
+    '黑热病': '0307',
+    '包虫病': '0308',
+    '丝虫病': '0309',
+    '除霍乱/菌痢/伤寒副伤寒以外的感染性腹泻病': '0310',
+    '其它感染性腹泻病': '0310',
+    '手足口病': '0311',
+  };
 
-  if (diagnosesWithReportType.length === 0) {
+  // 获取所有诊断名称对应的报卡编码
+  const allSelectedDiseases = form.value.diagnosisList
+    .map(d => diseaseNameToCode[d.name] || null)
+    .filter(code => code);
+
+  if (allSelectedDiseases.length === 0) {
     return;
   }
 
-  // 优先使用主诊断，如果没有主诊断有报卡类型则使用第一个有报卡类型的诊断
+  // 优先使用主诊断
-  const mainDiagnosisWithReport = diagnosesWithReportType.find(d => d.maindiseFlag === 1);
+  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1);
-  const targetDiagnosis = mainDiagnosisWithReport || diagnosesWithReportType[0];
+  const firstDiagnosis = form.value.diagnosisList[0];
+
+  const diagnosisToShow = {
+    ...(mainDiagnosis || firstDiagnosis),
+    selectedDiseases: allSelectedDiseases
+  };
 
   // 弹出传染病报告卡弹窗
-  proxy.$refs.infectiousDiseaseReportRef?.show(targetDiagnosis);
+  proxy.$refs.infectiousDiseaseReportRef?.show(diagnosisToShow);
 }
 
 /**
@@ -814,7 +875,8 @@ form.value.diagnosisList.push({
     classification: '西医', // 默认为西医
     onsetDate: getCurrentDate(),
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: getCurrentDate()
+    diagnosisTime: getCurrentDate(),
+    selectedDiseases: data.ybNo ? [data.ybNo] : [],  // 用于传染病报告卡自动勾选
   });
   
   // 添加后按排序号排序

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

@@ -16,15 +16,15 @@
               v-model="form.cardNo"
               class="card-number-input"
               placeholder="单位自编，与网络直报一致"
-              maxlength="12"
+              maxlength="20"
-              :disabled="readOnly"
+              :disabled="readOnly || dialogReadOnly"
           />
         </el-space>
       </el-card>
     </template>
 
     <el-card class="report-form" shadow="never">
-      <el-form ref="formRef" :model="form" :rules="rules" label-position="top" :disabled="readOnly">
+      <el-form ref="formRef" :model="form" :rules="rules" label-position="top" :disabled="readOnly || dialogReadOnly">
         <!-- 患者姓名、家长姓名、身份证号 -->
         <el-row :gutter="16" class="form-row">
           <el-col :span="8" class="form-item">
@@ -476,9 +476,9 @@
     <template #footer>
       <slot name="footer" :close="handleClose" :submit-loading="submitLoading">
         <el-space :size="16" justify="center" class="dialog-footer-space" style="display: flex; justify-content: center; width: 100%;">
-          <el-button v-if="!readOnly" type="primary" @click="handleSubmit" :loading="submitLoading" class="blue-button">保 存</el-button>
+          <el-button v-if="!(readOnly || dialogReadOnly)" type="primary" @click="handleSubmit" :loading="submitLoading" class="blue-button">保 存</el-button>
           <el-button type="info" @click="handleClose">关 闭</el-button>
-          <el-button v-if="!readOnly" type="danger" @click="handleReset">重 置</el-button>
+          <el-button v-if="!(readOnly || dialogReadOnly)" type="danger" @click="handleReset">重 置</el-button>
         </el-space>
       </slot>
     </template>
@@ -510,6 +510,7 @@ const DISEASE_NAMES = {
 };
 
 const dialogVisible = ref(false);
+const dialogReadOnly = ref(false);
 const formRef = ref(null);
 // 保存按钮加载状态，防止重复提交
 const submitLoading = ref(false);
@@ -1037,8 +1038,9 @@ function resetAddressSelector() {
  * 以只读详情方式打开报卡弹窗，供报卡管理等页面复用医生站报卡样式。
  * @param {Object} reportData - 报卡详情数据
  */
-function showReport(reportData = {}) {
+function showReport(reportData = {}, readOnly = true) {
   dialogVisible.value = true;
+  dialogReadOnly.value = readOnly;
 
   resetAddressSelector();
   initProvinceOptions();
@@ -1069,7 +1071,7 @@ function showReport(reportData = {}) {
     addressHouse: reportData.addressHouse || '',
     patientBelong: reportData.patientBelong || 1,
     occupation: reportData.occupation || '',
-    caseClass: reportData.caseClass != null ? String(reportData.caseClass) : '',
+    caseClass: reportData.diseaseType != null ? String(reportData.diseaseType) : '',
     onsetDate: normalizeDate(reportData.onsetDate),
     diagDate: normalizeDate(reportData.diagDate),
     deathDate: normalizeDate(reportData.deathDate),
@@ -1078,13 +1080,13 @@ function showReport(reportData = {}) {
     selectedClassB: diseaseSelection.selectedClassB,
     selectedClassC: diseaseSelection.selectedClassC,
     otherDisease: reportData.otherDisease || (diseaseCode === 'OTHER' ? reportData.diseaseName || '' : ''),
-    diseaseType: reportData.diseaseType || '',
+    diseaseType: reportData.diseaseSubtype || '',
     reportOrg: reportData.reportOrg || '',
     reportOrgPhone: reportData.reportOrgPhone || '',
     reportDoc: reportData.reportDoc || '',
     reportDate: normalizeDate(reportData.reportDate || reportData.createdAt),
-    correctName: reportData.correctName || '',
+    correctName: reportData.revisedDiseaseName || '',
-    withdrawReason: reportData.withdrawReason || '',
+    withdrawReason: reportData.returnReason || '',
     remark: reportData.remark || '',
     encounterId: reportData.encounterId || reportData.visitId || '',
     patientId: reportData.patientId || reportData.patId || '',
@@ -1205,6 +1207,7 @@ function calculateAge() {
  */
 async function show(diagnosisData) {
   dialogVisible.value = true;
+  dialogReadOnly.value = false;
 
   // 重置地址选择器状态
   resetAddressSelector();
@@ -1238,14 +1241,13 @@ async function show(diagnosisData) {
   let cardNo = '';
   try {
     const res = await getNextCardNo(orgCode);
-    if (res.code === 200 && res.data) {
+    if (res.code === 200 && res.data && res.data.length >= 12) {
       cardNo = res.data;
-    } else {
-      cardNo = 'TEMP_' + Date.now();
     }
+    // API失败或返回不合规时保持为空字符串，由用户手动填写或后端自动生成
   } catch (err) {
     console.error('获取卡片编号失败:', err);
-    cardNo = 'TEMP_' + Date.now();
+    // 保持为空，不使用不合规的临时值
   }
 
   form.value = {
@@ -1424,9 +1426,9 @@ async function buildSubmitData() {
 function validateFormManually() {
   const errors = [];
 
-  // 卡片编号验证（可选，但如果填写了必须是12位）
+  // 卡片编号验证（至少12位，后端自动生成16位编号）
-  if (form.value.cardNo && form.value.cardNo.length !== 12) {
+  if (form.value.cardNo && form.value.cardNo.length < 12) {
-    errors.push('卡片编号必须为12位');
+    errors.push('卡片编号至少12位');
   }
 
   // 身份证号验证

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

@@ -316,6 +316,7 @@
                     <span class="cat-title">{{ cat.categoryName }}</span>
                     <span v-if="categoryLoadingSet.has(cat.typeId)" class="loading-dot"></span>
                   </template>
+                  <!-- 检查项目（部位/项目列表） -->
                   <div
                     v-for="item in cat.items"
                     :key="item.id"
@@ -333,6 +334,27 @@
                   <div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
                     加载中...
                   </div>
+                  <!-- Bug #428修复: 渲染分类联动加载的检查方法列表 -->
+                  <div
+                    v-if="cat.methods && cat.methods.length > 0"
+                    class="method-section"
+                  >
+                    <div class="method-section-title">检查方法</div>
+                    <div
+                      v-for="method in cat.methods"
+                      :key="method.id"
+                      class="method-row"
+                    >
+                      <el-checkbox
+                        :model-value="isMethodSelected(method, cat)"
+                        @change="(val) => handleMethodSelect(val, method, cat)"
+                        class="method-checkbox"
+                      >
+                        {{ method.name }}
+                      </el-checkbox>
+                      <span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
+                    </div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </div>
@@ -918,6 +940,13 @@ function handleSave() {
       ElMessage.warning('请至少选择一个检查明细项目');
       return;
     }
+    // 检查每个项目是否已选择检查方法
+    const itemsWithoutMethod = selectedItems.value.filter(item => !item.selectedMethod);
+    if (itemsWithoutMethod.length > 0) {
+      const names = itemsWithoutMethod.map(item => item.name).join('、');
+      ElMessage.warning(`以下项目未选择检查方法：${names}，请在右侧勾选后再保存`);
+      return;
+    }
     // 从已选项目推导检查类型编码（取第一个项目的 checkType，如 CT / ECG / GI）
     const firstCheckType = selectedItems.value[0]?.checkType || 'unknown';
     form.examTypeCode = firstCheckType;
@@ -1040,6 +1069,78 @@ function handleDelete(row) {
   });
 }
 
+// Bug #428修复: 判断某个检查方法是否已被选中（任意项目关联了该方法）
+function isMethodSelected(method, cat) {
+  return selectedItems.value.some(item =>
+    item.selectedMethod?.id === method.id && item.checkType === cat.typeName
+  );
+}
+
+// Bug #428修复: 勾选检查方法
+async function handleMethodSelect(checked, method, cat) {
+  if (checked) {
+    // 找到该方法所属的第一个检查项目
+    const targetItem = cat.items[0];
+    if (!targetItem) {
+      // 如果分类下没有项目，尝试从其他分类找同名项目或创建
+      console.warn('分类下没有检查项目，无法关联方法');
+      return;
+    }
+
+    // 如果该项目已存在，只更新 selectedMethod
+    const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
+    if (existingItem) {
+      existingItem.selectedMethod = method;
+      updateMethodDisplay();
+      return;
+    }
+
+    // 如果该项目不存在，创建一个并关联方法
+    if (selectedItems.value.length > 0) {
+      const currentCategory = selectedItems.value[0].checkType;
+      const newCategory = cat.typeCode || '';
+      if (currentCategory !== newCategory) {
+        ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
+        return;
+      }
+    }
+
+    selectedItems.value.push({
+      id: targetItem.id, name: targetItem.name,
+      price: targetItem.price, quantity: 1,
+      serviceFee: targetItem.serviceFee || 0,
+      unit: targetItem.unit || '次',
+      applyPart: targetItem.name,
+      checkType: cat.typeName,
+      nationalCode: targetItem.nationalCode || '',
+      checked: true,
+      methods: [method],
+      selectedMethod: method,
+      expanded: false,
+      isPackage: !!targetItem.packageName,
+      packageId: targetItem.packageId || null
+    });
+
+    // 自动回填执行科室
+    if (selectedItems.value.length === 1 && cat?.performDeptName) {
+      form.performDeptCode = cat.performDeptName;
+    }
+
+    // 同时勾选左侧项目的 checkbox
+    targetItem.checked = true;
+
+  } else {
+    // 取消选择方法：将 selectedItems 中关联该方法的项的 selectedMethod 清空
+    const itemsWithMethod = selectedItems.value.filter(
+      item => item.selectedMethod?.id === method.id
+    );
+    for (const item of itemsWithMethod) {
+      item.selectedMethod = null;
+    }
+  }
+  updateMethodDisplay();
+}
+
 // ====== 勾选逻辑 ======
 async function handleItemSelect(checked, item, cat) {
   if (checked) {
@@ -1105,12 +1206,6 @@ async function handleItemSelect(checked, item, cat) {
       form.performDeptCode = cat.performDeptName;
     }
 
-    // 如果有且仅有一个检查方法，自动选中并更新显示
-    if (methods.length === 1) {
-      const lastIdx = selectedItems.value.length - 1;
-      selectedItems.value[lastIdx].selectedMethod = methods[0];
-      updateMethodDisplay();  // Bug #384修复: 联动更新显示
-    }
   } else {
     const idx = selectedItems.value.findIndex(s => s.id === item.id);
     if (idx > -1) selectedItems.value.splice(idx, 1);
@@ -1366,6 +1461,53 @@ defineExpose({ getList });
   margin-left: 6px;
 }
 
+/* Bug #428修复: 分类下检查方法区域样式 */
+.method-section {
+  padding: 6px 8px;
+  background: #f0f7ff;
+  border-radius: 4px;
+  margin-top: 6px;
+}
+
+.method-section-title {
+  font-size: 12px;
+  font-weight: 600;
+  color: #409eff;
+  margin-bottom: 4px;
+  padding-bottom: 3px;
+  border-bottom: 1px dashed #d9ecff;
+}
+
+.method-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 3px 4px;
+  border-radius: 3px;
+}
+
+.method-row:hover {
+  background: #e8f4ff;
+}
+
+.method-checkbox {
+  flex: 1;
+  overflow: hidden;
+}
+
+.method-checkbox :deep(.el-checkbox__label) {
+  font-size: 12px;
+  color: #303133;
+}
+
+.method-price-tag {
+  font-size: 11px;
+  color: #e6a23c;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-left: 6px;
+}
+
 /* 已选择 tags */
 .selected-panel {
   width: 140px;  /* Bug #384修复: 加宽以适应展开内容 */
@@ -1437,6 +1579,41 @@ defineExpose({ getList });
   transform: rotate(180deg);
 }
 
+/* Bug #428修复: 套餐明细列表样式 */
+.package-details-list {
+  padding: 6px 10px;
+  background: #fffbe6;
+  border-top: 1px solid #ffe58f;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.detail-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 2px 6px;
+  border-radius: 3px;
+  font-size: 11px;
+  background: #fff;
+}
+
+.detail-row:hover {
+  background: #fff9e6;
+}
+
+.detail-name {
+  color: #303133;
+  font-weight: 500;
+}
+
+.detail-info {
+  color: #909399;
+  font-size: 10px;
+  white-space: nowrap;
+}
+
 /* Bug #384修复: 检查方法勾选框列表 */
 .method-list {
   padding: 6px 10px;

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

@@ -109,6 +109,7 @@ const props = defineProps({
 });
 const { proxy } = getCurrentInstance();
 const encounterId = ref();
+const firstEnum = ref(1); // 初复诊标识：1=初诊，2=复诊
 onMounted(() => {
   getPatientList();
 });
@@ -127,6 +128,7 @@ function getPatientList() {
 
 function clickRow(row) {
   encounterId.value = row.encounterId;
+  firstEnum.value = row.firstEnum ?? row.first_enum ?? 1;
   emits('cellClick', row);
 }
 
@@ -182,7 +184,7 @@ function handleComplete() {
   }
   proxy.$modal.confirm('是否完成该患者问诊？').then(() => {
     proxy.$modal.loading();
-    completeEncounter(encounterId.value).then(() => {
+    completeEncounter({ encounterId: encounterId.value, firstEnum: firstEnum.value }).then(() => {
       proxy.$modal.closeLoading();
       proxy.$modal.msgSuccess('完成问诊成功');
       getPatientList();

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

@@ -2495,11 +2495,13 @@ function handleSave(prescriptionId) {
 
       // 🔧 BugFix#318: 从 parsedContent 提取标准医嘱字段，排除手术特有字段
       const standardFields = [
-        'accountId', 'chargeItemId', 'conditionDefinitionId', 'conditionId', 
+        'accountId', 'chargeItemId', 'conditionDefinitionId', 'conditionId',
-        'contentJson', 'definitionDetailId', 'definitionId', 'diagnosisName', 
+        'contentJson', 'definitionDetailId', 'definitionId', 'diagnosisName',
-        'dosageInstruction', 'effectiveOrgId', 'encounterDiagnosisId', 
+        'dosageInstruction', 'effectiveOrgId', 'encounterDiagnosisId',
-        'encounterId', 'lotNumber', 'patientId', 'practitionerId', 
+        'encounterId', 'lotNumber', 'patientId', 'practitionerId',
-        'prescriptionNo', 'skinTestFlag', 'unitPrice', 'volume', 'ybClassEnum'
+        'prescriptionNo', 'skinTestFlag', 'unitPrice', 'volume', 'ybClassEnum',
+        // 🔧 Bug Fix: 添加 therapyEnum 字段（医嘱类型：1=长期, 2=临时）
+        'therapyEnum'
       ];
       let filteredContent = {};
       standardFields.forEach(field => {
@@ -3143,7 +3145,9 @@ function handleSaveBatch(prescriptionId) {
           // 🔧 Bug Fix: 添加 definitionId 和 definitionDetailId 字段
           'definitionId', 'definitionDetailId',
           // 🔧 Bug Fix: 添加 categoryEnum 字段（耗材必填）
-          'categoryEnum'
+          'categoryEnum',
+          // 🔧 Bug Fix: 添加 therapyEnum 字段（医嘱类型：1=长期, 2=临时）
+          'therapyEnum'
         ];
         let filteredItem = {};
         standardItemFields.forEach(field => {
@@ -3342,7 +3346,7 @@ function syncGroupFields(row) {
   }
 }
 
-function setValue(row) {
+async function setValue(row) {
   unitCodeList.value = [];
   unitCodeList.value.push({ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' });
   
@@ -3394,8 +3398,8 @@ function setValue(row) {
     showPopover: false, // 确保查询框关闭
   };
   console.log('[BugFix] setValue - prescriptionList[rowIndex].adviceType_dictText:', prescriptionList.value[rowIndex.value].adviceType_dictText);
-  // 🔧 修复执行科室逻辑：优先使用项目维护的所属科室(row.orgId)，其次使用positionId，最后回退到患者科室
+  // 🔧 Bug #455: 执行科室默认逻辑：使用positionId(诊疗执行科室配置) → 患者就诊科室，不再使用row.orgId(项目所属科室)
-  prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId || props.patientInfo?.orgId;
+  prescriptionList.value[rowIndex.value].orgId = row.positionId || props.patientInfo?.orgId;
   prescriptionList.value[rowIndex.value].dose = row.dose || row.doseQuantity;
   prescriptionList.value[rowIndex.value].quantity = row.quantity || 1;
   prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
@@ -3514,7 +3518,7 @@ function setValue(row) {
       prescriptionList.value[rowIndex.value].positionId = finalLocationId;
     }
   } else {
-      getOrgList();
+      await getOrgList();
       // 会诊类型（adviceType == 5）和诊疗类型（adviceType == 3）的处理
       if (row.adviceType == 5) {
         // 会诊类型：设置默认值

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

@@ -24,7 +24,7 @@
       style="width: 100%"
     >
       <el-table-column type="index" label="序号" width="60" align="center" />
-      
+
       <!-- 手术单号 -->
       <el-table-column label="手术单号" align="center" width="150">
         <template #default="scope">
@@ -33,29 +33,31 @@
           </el-link>
         </template>
       </el-table-column>
-      
+
       <!-- 申请日期 -->
       <el-table-column label="申请日期" align="center" prop="createTime" width="180">
         <template #default="scope">
           {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
         </template>
       </el-table-column>
-      
+
       <!-- 患者姓名 -->
       <el-table-column label="患者姓名" align="center" prop="patientName" width="100" />
-      
+
       <!-- 申请医生 -->
       <el-table-column label="申请医生" align="center" prop="applyDoctorName" width="100" />
-      
+
       <!-- 申请科室 -->
       <el-table-column label="申请科室" align="center" prop="applyDeptName" width="120" show-overflow-tooltip />
-      
+
       <!-- 手术名称 -->
       <el-table-column label="手术名称" align="center" prop="surgeryName" min-width="150" show-overflow-tooltip />
-      
+
       <!-- 手术等级 -->
       <el-table-column label="手术等级" align="center" prop="surgeryLevel_dictText" width="100" />
 
+      <!-- 手术室确认时间 -->
+
       <el-table-column label="手术室确认时间" align="center" prop="operatingRoomConfirmTime" width="180">
         <template #default="scope">
           {{ scope.row.operatingRoomConfirmTime ? parseTime(scope.row.operatingRoomConfirmTime, '{y}-{m}-{d} {h}:{i}:{s}') : '-' }}
@@ -73,16 +75,16 @@
           </el-tag>
         </template>
       </el-table-column>
-      
+
       <!-- 操作 -->
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">
           <!-- 查看：显示手术申请详情（只读模式） -->
           <el-button link type="primary" icon="View" @click="handleView(scope.row)">查看</el-button>
-          
+
           <!-- 编辑：修改手术申请信息（只有状态为新开的能修改） -->
           <el-button link type="primary" icon="Edit" @click="handleEdit(scope.row)" v-if="scope.row.statusEnum === 0">编辑</el-button>
-          
+
           <!-- 删除：取消手术申请（作废） -->
           <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-if="scope.row.statusEnum === 0 || scope.row.statusEnum === 1">删除</el-button>
         </template>
@@ -509,6 +511,10 @@ const props = defineProps({
 })
 
 const loading = ref(true)
+const surgeryLoading = ref(false)
+const anesthesiaLoading = ref(false)
+let surgerySearchTimer = null
+let anesthesiaSearchTimer = null
 const surgeryList = ref([])
 const open = ref(false)
 const viewOpen = ref(false)
@@ -1127,12 +1133,13 @@ function submitForm() {
         // 新增手术
         addSurgery(form.value).then((res) => {
           if (res.code === 200) {
-            proxy.$modal.msgSuccess(res.msg || '新增成功')
+            proxy.$modal.msgSuccess(res.msg || '手术申请提交成功！')
             // 保存麻醉方式
             sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
             open.value = false
+            emit('saved') // 通知父组件刷新医嘱列表
+            // 刷新手术申请列表
             getList()
-            emit('saved') // 🔧 触发保存事件，通知父组件刷新医嘱列表
           } else {
             proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
           }
@@ -1144,12 +1151,13 @@ function submitForm() {
         // 修改手术
         updateSurgery(form.value).then((res) => {
           if (res.code === 200) {
-            proxy.$modal.msgSuccess(res.msg || '修改成功')
+            proxy.$modal.msgSuccess(res.msg || '手术申请修改成功！')
             // 保存麻醉方式
             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/doctorstation/mycardmanagement/index.vue

@@ -151,23 +151,12 @@
       </div>
     </div>
 
-    <el-dialog
+    <InfectiousDiseaseReportDialog
-      v-model="detailVisible"
+      ref="infectiousDiseaseReportRef"
-      :title="detailMode === 'view' ? '报卡详情 - 中华人民共和国传染病报告卡' : '编辑报卡 - 中华人民共和国传染病报告卡'"
+      :read-only="detailMode === 'view'"
-      width="1100px"
+      @success="detailVisible = false"
-      destroy-on-close
+      @close="detailVisible = false"
-      class="card-detail-dialog"
+    />
-    >
-      <InfectiousReport
-        :mode=" detailMode"
-        :card-data="currentCard"
-        @submit-edit="handleSaveEdit"
-        style="max-height: 75vh; overflow-y: auto;"
-      />
-      <template #footer>
-        <el-button @click="detailVisible = false">关闭</el-button>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -175,7 +164,7 @@
 import { ref, reactive, onMounted, onActivated, onBeforeUnmount, nextTick, computed } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { DataAnalysis, Warning, CircleCheck, Check, RefreshRight } from '@element-plus/icons-vue';
-import InfectiousReport from '../components/infectiousReport/index.vue';
+import InfectiousDiseaseReportDialog from '../components/diagnosis/infectiousDiseaseReportDialog.vue';
 import {
   getDoctorCardStatistics,
   getDoctorCardList,
@@ -185,7 +174,6 @@ import {
   batchDeleteCards,
   exportCardToWord,
   getCardDetail,
-  updateDoctorCard,
 } from './api';
 
 const loading = ref(false);
@@ -211,7 +199,7 @@ const queryParams = reactive({
 
 const detailVisible = ref(false);
 const detailMode = ref('view');
-const currentCard = ref({});
+const infectiousDiseaseReportRef = ref(null);
 
 // 计算表格高度：根据视口高度动态调整
 const tableHeight = computed(() => {
@@ -327,9 +315,11 @@ async function handleView(row) {
   try {
     const res = await getCardDetail(row.cardNo);
     if (res.code === 200) {
-      currentCard.value = res.data || {};
       detailMode.value = 'view';
       detailVisible.value = true;
+      nextTick(() => {
+        infectiousDiseaseReportRef.value?.showReport(res.data || {});
+      });
     }
   } catch (error) {
     ElMessage.error('获取详情失败');
@@ -340,57 +330,17 @@ async function handleEdit(row) {
   try {
     const res = await getCardDetail(row.cardNo);
     if (res.code === 200) {
-      currentCard.value = res.data || {};
       detailMode.value = 'edit';
       detailVisible.value = true;
+      nextTick(() => {
+        infectiousDiseaseReportRef.value?.showReport(res.data || {}, false);
+      });
     }
   } catch (error) {
     ElMessage.error('获取详情失败');
   }
 }
 
-async function handleSaveEdit(submitData) {
-  // submitData 来自 InfectiousReport 组件的 submit-edit 事件
-  try {
-    const updateData = {
-      cardNo: submitData.cardNo,
-      phone: submitData.phone,
-      contactPhone: submitData.contactPhone,
-      onsetDate: submitData.onsetDate,
-      diagDate: submitData.diagDate,
-      diseaseCode: submitData.diseaseCode,
-      diseaseType: submitData.diseaseType,
-      otherDisease: submitData.otherDisease,
-      caseClass: submitData.caseClass,
-      occupation: submitData.occupation,
-      patientBelong: submitData.patientBelong,
-      addressProv: submitData.addressProv,
-      addressCity: submitData.addressCity,
-      addressCounty: submitData.addressCounty,
-      addressTown: submitData.addressTown,
-      addressVillage: submitData.addressVillage,
-      addressHouse: submitData.addressHouse,
-      workplace: submitData.workplace,
-      parentName: submitData.parentName,
-      deathDate: submitData.deathDate,
-      correctName: submitData.correctName,
-      withdrawReason: submitData.withdrawReason,
-      remark: submitData.remark,
-    };
-    
-    const res = await updateDoctorCard(updateData);
-    if (res.code === 200) {
-      ElMessage.success('保存成功');
-      detailVisible.value = false;
-      getList();
-    } else {
-      ElMessage.error(res.msg || '保存失败');
-    }
-  } catch (error) {
-    ElMessage.error('保存失败：' + (error.message || '网络错误'));
-  }
-}
-
 async function handleSubmit(row) {
   try {
     await ElMessageBox.confirm('确认提交该报卡？', '提示', {
@@ -800,17 +750,4 @@ function handleResize() {
     margin-left: 0;
   }
 }
-
-/* 报卡详情弹窗 */
-:deep(.card-detail-dialog .el-dialog__body) {
-  padding: 0;
-  overflow: hidden;
-}
-
-:deep(.card-detail-dialog .infectious-report-container) {
-  padding: 16px;
-  height: auto;
-  max-height: 70vh;
-  overflow-y: auto;
-}
 </style>

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

@@ -103,8 +103,15 @@
             </template>
           </el-table-column>
           <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
-          <el-table-column label="操作" align="center" fixed="right">
+          <el-table-column label="操作" align="center" fixed="right" width="160">
             <template #default="scope">
+              <template v-if="scope.row.billStatus == 0 || scope.row.status == 0">
+                <el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
+                <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
+              </template>
+              <template v-else-if="scope.row.billStatus == 1 || scope.row.status == 1">
+                <el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
+              </template>
               <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
             </template>
           </el-table-column>
@@ -181,8 +188,8 @@
 import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh, Search} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
-import {getInspection} from './api';
+import {getInspection, deleteRequestForm, withdrawRequestForm} from './api';
-import {getDepartmentList} from '@/api/public.js';
+import {getOrgList} from '@/views/doctorstation/components/api.js';
 
 const { proxy } = getCurrentInstance();
 
@@ -353,11 +360,13 @@ const getLocationInfo = async () => {
 };
 
 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) {
@@ -365,9 +374,11 @@ const recursionFun = (targetDepartment) => {
         const item = subObjArray[i];
         if (item.id == targetDepartment) {
           name = item.name;
+          break;
         }
       }
     }
+    if (name) break;
   }
   return name;
 };
@@ -385,7 +396,6 @@ const handleViewDetail = async (row) => {
       const obj = JSON.parse(row.descJson);
       obj.targetDepartment = recursionFun(obj.targetDepartment);
       descJsonData.value = obj;
-      // descJsonData.value = JSON.parse(row.descJson);
     } catch (e) {
       console.error('解析 descJson 失败:', e);
       descJsonData.value = null;
@@ -396,6 +406,61 @@ const handleViewDetail = async (row) => {
   detailDialogVisible.value = true;
 };
 
+/**
+ * 修改检验申请单（待签发状态）
+ */
+const handleEdit = (row) => {
+  // 复用详情查看逻辑，后续可扩展为打开编辑弹窗
+  handleViewDetail(row);
+  proxy.$modal?.msgInfo?.('修改功能待接入，请通过详情弹窗查看后重新开立');
+};
+
+/**
+ * 删除检验申请单（仅待签发状态可删除）
+ */
+const handleDelete = async (row) => {
+  try {
+    await proxy.$modal?.confirm?.(`确定要删除申请单 "${row.prescriptionNo}" 吗？此操作不可恢复。`);
+  } catch {
+    return; // 用户取消
+  }
+
+  try {
+    const res = await deleteRequestForm({ prescriptionNo: row.prescriptionNo });
+    if (res?.code === 200) {
+      proxy.$modal?.msgSuccess?.('删除成功');
+      await fetchData();
+    } else {
+      proxy.$modal?.msgError?.(res?.msg || '删除失败');
+    }
+  } catch (e) {
+    proxy.$modal?.msgError?.(e.message || '删除异常');
+  }
+};
+
+/**
+ * 撤回检验申请单（已签发状态撤回至待签发）
+ */
+const handleWithdraw = async (row) => {
+  try {
+    await proxy.$modal?.confirm?.(`确定要撤回申请单 "${row.prescriptionNo}" 吗？撤回后将恢复为待签发状态。`);
+  } catch {
+    return; // 用户取消
+  }
+
+  try {
+    const res = await withdrawRequestForm({ prescriptionNo: row.prescriptionNo });
+    if (res?.code === 200) {
+      proxy.$modal?.msgSuccess?.('撤回成功');
+      await fetchData();
+    } else {
+      proxy.$modal?.msgError?.(res?.msg || '撤回失败');
+    }
+  } catch (e) {
+    proxy.$modal?.msgError?.(e.message || '撤回异常');
+  }
+};
+
 watch(
   () => patientInfo.value?.encounterId,
   async (val) => {

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

@@ -112,6 +112,8 @@ const showApplicationFormDialog = (name) => {
     setTimeout(() => {
       applicationFormName.value = components.value[name];
       applicationFormDialogVisible.value = true;
+      // 列表（项目列表）
+      applicationFormNameRef?.value.getList?.();
       // 科室列表
       applicationFormNameRef?.value.getLocationInfo();
       // 诊断目录列表
@@ -121,6 +123,8 @@ const showApplicationFormDialog = (name) => {
     applicationFormName.value = components.value[name];
     applicationFormDialogVisible.value = true;
     nextTick(() => {
+      // 列表（项目列表）
+      applicationFormNameRef?.value.getList?.();
       // 科室列表
       applicationFormNameRef?.value.getLocationInfo();
       // 诊断目录列表

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

@@ -81,7 +81,7 @@
 import {getCurrentInstance, onBeforeMount, onMounted, reactive, watch} from 'vue';
 import {patientInfo} from '../../../store/patient.js';
 import {getApplicationList, saveInspection} from './api';
-import {getDepartmentList} from '@/api/public.js';
+import {getOrgList} from '@/views/doctorstation/components/api.js';
 import {getEncounterDiagnosis} from '../../api.js';
 import {ElMessage} from 'element-plus';
 
@@ -164,7 +164,7 @@ onMounted(() => {
  * type(1：watch监听类型 2:点击保存类型)
  * selectProjectIds(选中项目的id数组)
  * */
-const projectWithDepartment = (selectProjectIds, type) => {
+const projectWithDepartment = (selectProjectIds) => {
   //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
   let isRelease = true;
   // 选中项目的数组
@@ -208,10 +208,8 @@ const projectWithDepartment = (selectProjectIds, type) => {
         });
       }
     }
-    if (type == 1) {
+    if (findItem && isRelease) {
-      if (isRelease) {
+      form.targetDepartment = findItem.id;
-        form.targetDepartment = findItem.id;
-      }
     }
   }
   return isRelease;
@@ -272,8 +270,8 @@ const submit = () => {
 };
 /** 查询科室 */
 const getLocationInfo = () => {
-  getDepartmentList().then((res) => {
+  getOrgList().then((res) => {
-    orgOptions.value = res.data || [];
+    orgOptions.value = res.data.records;
     console.log('科室========>', JSON.stringify(orgOptions.value));
   });
 };
@@ -310,7 +308,7 @@ function getDiagnosisList() {
     }
   });
 }
-defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
+defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
 </script>
 <style lang="scss" scoped>
 .LaboratoryTests-container {

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

@@ -6,13 +6,15 @@
 <template>
   <div class="surgery-container">
     <div class="transfer-wrapper">
-      <el-transfer
+      <div v-loading="loading" style="min-height: 300px;">
-        v-model="transferValue"
+        <el-transfer
-        :data="applicationList"
+          v-model="transferValue"
-        filter-placeholder="项目代码/名称"
+          :data="applicationList"
-        filterable
+          filter-placeholder="项目代码/名称"
-        :titles="['未选择', '已选择']"
+          filterable
-      />
+          :titles="['未选择', '已选择']"
+        />
+      </div>
     </div>
     <div class="bloodTransfusion-form">
       <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="demo-ruleForm">
@@ -104,11 +106,13 @@ const state = reactive({});
 const applicationListAll = ref([]);
 const applicationList = ref([]);
 const orgOptions = ref([]); // 科室选项
+const loading = ref(false); // 加载状态
 const getList = () => {
   if (!patientInfo.value?.inHospitalOrgId) {
     applicationList.value = [];
     return;
   }
+  loading.value = true;
   getApplicationList({
     pageSize: 500,
     pageNum: 1,
@@ -138,6 +142,9 @@ const getList = () => {
     .catch((e) => {
       console.warn('手术项目列表加载失败（可能无权限）:', e?.message || e);
       applicationList.value = [];
+    })
+    .finally(() => {
+      loading.value = false;
     });
 };
 const transferValue = ref([]);
@@ -301,7 +308,7 @@ function getDiagnosisList() {
     }
   });
 }
-defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
+defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
 </script>
 <style lang="scss" scoped>
 .surgery-container {

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

@@ -197,7 +197,6 @@
                     style="width: 62%"
                     v-model="scope.row.adviceName"
                     placeholder="请选择项目"
-                    @input="handleChange"
                     @click="handleFocus(scope.row, scope.$index)"
                     @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
                     @keydown="
@@ -380,7 +379,7 @@ const form = ref({
   prescriptionList: prescriptionList.value,
 });
 const adviceQueryParams = ref({
-  adviceType: 1,
+  adviceType: '',
   categoryCode: '', // 初始为空，等待加载配置后动态设置
   searchKey: '',
 });
@@ -686,7 +685,7 @@ function loadConfiguredCategories() {
         nextTick(() => {
           // 创建新对象触发响应式更新
           adviceQueryParams.value = {
-            adviceType: 1,
+            adviceType: '',
             categoryCode: defaultCategoryCode,
             searchKey: '',
           };
@@ -802,8 +801,10 @@ function clickRowDb(row, column, event) {
     return;
   }
   row.showPopover = false;
-  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
+  // 允许所有 statusEnum==1 的医嘱进入编辑：
-  if (row.statusEnum == 1 && !row.requestId) {
+  // 1. 新医嘱（无 requestId）：待保存
+  // 2. 护士退回医嘱（有 requestId）：退回后状态重置为 DRAFT(1)，需允许医生编辑修改后重新签发
+  if (row.statusEnum == 1) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');
     row.isEdit = true;

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue

@@ -174,7 +174,6 @@ const activeNames = ref([]);
 const userStore = useUserStore();
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
-const therapyEnum = ref(undefined);
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
@@ -190,6 +189,10 @@ const props = defineProps({
   deadline: {
     type: String,
   },
+  therapyEnum: {
+    type: Number,
+    default: undefined,
+  },
 });
 
 function handleGetPrescription() {
@@ -200,7 +203,7 @@ function handleGetPrescription() {
       encounterIds: encounterIds,
       pageSize: 10000,
       pageNo: 1,
-      therapyEnum: therapyEnum.value,
+      therapyEnum: props.therapyEnum,
       exeStatus: props.exeStatus,
       requestStatus: props.requestStatus,
     })

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue

@@ -58,7 +58,7 @@
             :clearable="false"
             @change="handleGetPrescription"
           />
-          <el-radio-group v-model="therapyEnum" class="ml20" @change="handleRadioChange">
+          <el-radio-group v-model="therapyEnum" class="ml20" @change="handleTherapyChange">
             <el-radio :value="undefined">全部</el-radio>
             <el-radio :value="1">长期</el-radio>
             <el-radio :value="2">临时</el-radio>
@@ -79,6 +79,7 @@
         :exeStatus="exeStatus"
         :requestStatus="requestStatus"
         :deadline="deadline"
+        :therapyEnum="therapyEnum"
       />
       <SummaryMedicineList v-else />
       <!-- <el-tabs v-model="activeName" class="demo-tabs centered-tabs" @tab-change="handleClick">
@@ -120,6 +121,7 @@ const requestStatus = ref(RequestStatus.COMPLETED);
 const chooseAll = ref(false);
 const drugType = ref('1');
 const isDetails = ref('1');
+const therapyEnum = ref(undefined);
 
 // 存储子组件引用的对象
 const prescriptionRefs = ref();
@@ -175,6 +177,10 @@ function handleRadioChange(value) {
   }
 }
 
+function handleTherapyChange() {
+  handleGetPrescription();
+}
+
 function handleExecute() {
   proxy.$refs['prescriptionRefs'].handleMedicineSummary();
 }

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderExecution/components/prescriptionList.vue

@@ -270,7 +270,7 @@ function normalizeDayTimeHm(part) {
   return `${h}:${m}`;
 }
 
-function handleGetPrescription() {
+function handleGetPrescription(skipAutoSelectAll = false) {
   if (patientInfoList.value.length > 0) {
     loading.value = true;
     let encounterIds = patientInfoList.value.map((i) => i.encounterId).join(',');
@@ -430,10 +430,12 @@ function handleGetPrescription() {
 
       // 将分组结果转换为数组形式
       prescriptionList.value = Object.values(groupedPrescriptions);
-      // 默认选中全部行
+      // 默认选中全部行（执行后刷新时不自动全选，保持用户操作状态）
-      nextTick(() => {
+      if (!skipAutoSelectAll) {
-        defaultSelectAllRows();
+        nextTick(() => {
-      });
+          defaultSelectAllRows();
+        });
+      }
       } catch (error) {
         console.error('医嘱执行-获取处方列表数据处理失败:', error);
         prescriptionList.value = [];
@@ -469,18 +471,17 @@ function handleExecute() {
   console.log(list, 'list');
   adviceExecute({ exeDate: exeDate.value, adviceExecuteDetailList: list }).then((res) => {
     if (res.code == 200) {
-      handleGetPrescription();
+      // 仅当选中医嘱中包含耗材类医嘱时，才调用耗材批号匹配（排除纯药品医嘱场景）
-      // 仅当选中医嘱中包含药品/耗材类医嘱时，才调用耗材批号匹配
+      const hasDevice = list.some((item) =>
-      const hasMedOrDevice = list.some(
+        String(item.adviceTable || '').includes('device'),
-        (item) =>
-          item.adviceTable === 'med_medication_request' ||
-          String(item.adviceTable || '').includes('device'),
       );
-      if (hasMedOrDevice) {
+      if (hasDevice) {
         lotNumberMatch({ encounterIdList: encounterIds }, { skipErrorMsg: true }).catch((error) => {
           console.warn('lotNumberMatch failed after adviceExecute:', error);
         });
       }
+      // 刷新列表（不自动全选，保持用户操作前的选择状态）
+      handleGetPrescription(true);
       proxy.$modal.msgSuccess(res.msg || '医嘱执行成功');
     } else {
       proxy.$modal.msgError(res.msg || '医嘱执行失败');
@@ -504,7 +505,7 @@ function handleNoExecute() {
   adviceNoExecute({ adviceExecuteDetailList: list }).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess(res.msg || '操作成功');
-      handleGetPrescription();
+      handleGetPrescription(true);
     } else {
       proxy.$modal.msgError(res.msg || '操作失败');
     }
@@ -543,7 +544,7 @@ function handleCancel() {
   adviceCancel({ adviceExecuteDetailList: producerIds }).then((res) => {
     if (res.code == 200) {
       proxy.$modal.msgSuccess(res.msg || '取消执行成功');
-      handleGetPrescription();
+      handleGetPrescription(true);
     } else {
       proxy.$modal.msgError(res.msg || '取消执行失败');
     }

openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue

@@ -11,9 +11,9 @@
     >
       <div>
         <el-radio-group v-model="type" class="ml20" @change="handleRadioChange">
-          <el-radio :label="1">全部</el-radio>
+          <el-radio :label="null">全部</el-radio>
-          <el-radio :label="2">长期</el-radio>
+          <el-radio :label="1">长期</el-radio>
-          <el-radio :label="3">临时</el-radio>
+          <el-radio :label="2">临时</el-radio>
         </el-radio-group>
         <el-button class="ml20" type="primary" plain @click="handleGetPrescription">
           查询
@@ -159,7 +159,7 @@ import {formatDateStr} from '@/utils/index';
 const activeNames = ref([]);
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
-const type = ref(1);
+const type = ref(null);
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
@@ -181,7 +181,7 @@ function handleGetPrescription() {
     getPrescriptionList({
       encounterIds: encounterIds,
       requestStatus: props.requestStatus,
-      ...(type.value !== undefined ? { therapyEnum: type.value } : {}),
+      ...(type.value != null ? { therapyEnum: type.value } : {}),
       pageSize: 10000,
       pageNo: 1,
     }).then((res) => {

openhis-ui-vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue

@@ -744,11 +744,7 @@ function handleSubmitApproval() {
   } else {
     submitApproval(receiptHeaderForm.busNo).then((response) => {
       proxy.$modal.msgSuccess('提交审批成功');
-      // proxy.$tab.closePage(route).then(({ visitedViews }) => {  // 关闭当前页
-      //   toLastView(visitedViews, route)
-      // })
       tagsViewStore.delView(router.currentRoute.value);
-      // 跳转到调拨管理页面
       router.replace({ path: 'transferManagentList' });
     });
   }
@@ -871,7 +867,6 @@ function handleUnitCodeChange(row, index, value) {
 }
 
 function handleItemQuantityChange(row, value) {
-  debugger;
   let quantityTemp = ''; // 转换成小单位的临时变量 做校验
   // 大单位情况
   if (row.unitCodeMap[row.unitCode] == 'unit') {
@@ -882,12 +877,6 @@ function handleItemQuantityChange(row, value) {
     row.itemQuantity = value;
     quantityTemp = value;
   }
-  if (row.totalSourceQuantity < quantityTemp) {
-    proxy.$modal.msgWarning('调拨数量不可超出源库存数量');
-    row.itemQuantity = 0;
-    row.itemQuantityDisplay = 0;
-    return;
-  }
   row.totalPrice = ((row.price * quantityTemp) / row.partPercent).toFixed(2);
   // 更新总数据中对应的记录
   const totalIndex = totalIncentoryInfoList.value.findIndex((item) => item.id === row.id);
@@ -918,11 +907,12 @@ function remakeBlur(row, index) {
   editBatchTransfer(index);
 }
 function handleSave() {
-  const invalidRow = totalIncentoryInfoList.value.find(
+  // 校验单价
+  const invalidPriceRow = totalIncentoryInfoList.value.find(
     (row) => !row.price || row.price <= 0
   );
-  if (invalidRow) {
+  if (invalidPriceRow) {
-    proxy.$message.warning('调拨单价不能为空或为0，请检查！');
+    proxy.$modal.msgError('调拨单价不能为空或为0，请检查！');
     return;
   }
   addTransferProductBatch(totalIncentoryInfoList.value).then((res) => {

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

@@ -970,12 +970,6 @@ function handleItemQuantityChange(row, value) {
     row.itemQuantity = value;
     quantityTemp = value;
   }
-  if (row.totalSourceQuantity < quantityTemp) {
-    proxy.$modal.msgWarning('调拨数量不可超出源库存数量');
-    row.itemQuantity = 0;
-    row.itemQuantityDisplay = 0;
-    return;
-  }
   row.totalPrice = ((row.price * quantityTemp) / row.partPercent).toFixed(2);
 }
 
@@ -1022,11 +1016,7 @@ function handleSubmitApproval() {
   } else {
     submitApproval(receiptHeaderForm.busNo).then((response) => {
       proxy.$modal.msgSuccess('提交审批成功');
-      // proxy.$tab.closePage(route).then(({ visitedViews }) => {  // 关闭当前页
-      //   toLastView(visitedViews, route)
-      // })
       tagsViewStore.delView(router.currentRoute.value);
-      // 跳转到调拨管理页面
       router.replace({ path: 'transferManagentList' });
       store.clearCurrentDataDB();
     });

openhis-ui-vue3/src/views/surgicalschedule/index.vue

@@ -829,7 +829,7 @@
             </el-descriptions>
           </div>
           <div style="padding: 10px">
-            <prescriptionlist :patientInfo="chargePatientInfo" ref="prescriptionRef" />
+            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef" />
             <div class="overlay" v-if="disabled"></div>
           </div>
         </div>
@@ -1136,12 +1136,14 @@ function loadDeptList() {
         const tree = res.data?.records || res.data || []
         deptList.value = flattenOrgTree(tree)
       } else {
-        proxy.$modal.msgError('获取科室列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('科室列表加载失败（可能无权限）:', res.message || res.code)
         deptList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取科室列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('科室列表加载失败:', error?.message || error)
       deptList.value = []
     })
 }
@@ -1154,12 +1156,14 @@ function loadDoctorList() {
         const records = res.data?.records || []
         doctorList.value = records.map(mapPractitionerToOption).filter(it => it.code && it.name)
       } else {
-        proxy.$modal.msgError('获取医生列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('医生列表加载失败（可能无权限）:', res.message || res.code)
         doctorList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取医生列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('医生列表加载失败:', error?.message || error)
       doctorList.value = []
     })
 }
@@ -1172,12 +1176,14 @@ function loadNurseList() {
         const records = res.data?.records || []
         nurseList.value = records.map(mapPractitionerToOption).filter(it => it.code && it.name)
       } else {
-        proxy.$modal.msgError('获取护士列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('护士列表加载失败（可能无权限）:', res.message || res.code)
         nurseList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取护士列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('护士列表加载失败:', error?.message || error)
       nurseList.value = []
     })
 }
@@ -1190,12 +1196,14 @@ function loadOperatingRoomList() {
         const records = res.data?.records || []
         operatingRoomList.value = records.map(mapOperatingRoomToOption).filter(it => it.roomCode)
       } else {
-        proxy.$modal.msgError('获取手术室列表失败')
+        // 权限不足时静默降级，不弹窗阻断（Bug #441）
+        console.warn('手术室列表加载失败（可能无权限）:', res.message || res.code)
         operatingRoomList.value = []
       }
     })
     .catch(error => {
-      proxy.$modal.msgError('获取手术室列表失败')
+      // 网络错误或权限拒绝：静默降级
+      console.warn('手术室列表加载失败:', error?.message || error)
       operatingRoomList.value = []
     })
 }
@@ -1404,6 +1412,10 @@ async function handleChargeCharge(row) {
 
 // 关闭计费弹窗
 function closeChargeDialog() {
+  // 先关闭 prescriptionlist 内所有已打开的项目字典 popover
+  if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
+    prescriptionRef.value.closeAllPopovers()
+  }
   showChargeDialog.value = false
   chargePatientInfo.value = {}
   chargeSurgeryInfo.value = {}
@@ -1910,6 +1922,7 @@ function resetForm() {
     allergyRemark: undefined,
     surgeryNature: undefined,
     surgerySite: undefined,
+    incisionType: undefined,
     admissionTime: undefined,
     entryTime: undefined,
     roomCode: undefined,

sql/bug_462_add_specimen_code_dict.sql

@@ -0,0 +1,18 @@
+-- Bug #462: 诊疗目录编辑弹窗中"所需标本"下拉框数据加载失败
+-- 根因: sys_dict_type 表中缺少 specimen_code 字典类型，sys_dict_data 表中缺少对应数据
+-- 修复: 插入字典类型及7条标本数据
+
+-- 插入字典类型
+INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, remark)
+VALUES ('标本类型', 'specimen_code', '0', 'admin', NOW(), '诊疗项目所需标本类型字典');
+
+-- 插入标本数据
+INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, status, create_by, create_time, remark)
+VALUES
+  (1, '血液', '1', 'specimen_code', '0', 'admin', NOW(), '血液标本'),
+  (2, '尿液', '2', 'specimen_code', '0', 'admin', NOW(), '尿液标本'),
+  (3, '粪便', '3', 'specimen_code', '0', 'admin', NOW(), '粪便标本'),
+  (4, '呼吸道', '4', 'specimen_code', '0', 'admin', NOW(), '呼吸道标本'),
+  (5, '无菌体液', '5', 'specimen_code', '0', 'admin', NOW(), '无菌体液标本'),
+  (6, '生殖道', '6', 'specimen_code', '0', 'admin', NOW(), '生殖道标本'),
+  (7, '其他', '7', 'specimen_code', '0', 'admin', NOW(), '其他标本');