Fix Bug #445: 引用计费时已生成医嘱项目重新出现在待生成列表 — handleQuoteBilling 中先清空 temporaryAdvices 再执行 ID 匹配过滤，导致过滤逻辑对空数组无效；且 ID 匹配不可靠（新医嘱无 requestId/chargeItemId），已改为在清空前提取复合键（名称|||规格|||数量）并在数据加载后用该键过滤

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

.agentforge/analysis/556.md

@@ -1,27 +0,0 @@
-# Bug #556 Analysis
-
-## Title
-【门诊医生站-检验】新增检验申请单时就诊卡号/执行时间未自动回显，且项目列表冗余显示"套餐"文字
-
-## Root Cause Analysis
-
-### Issue 1: 就诊卡号未自动回显
-- **Code**: `inspectionApplication.vue:886` - `formData.medicalrecordNumber = props.patientInfo.identifierNo || ''`
-- **Root Cause**: Logic is correct but depends on `props.patientInfo.identifierNo` being populated. The watch on `props.patientInfo` (line 2074) triggers `initData()`. The card number field itself is correctly bound. This is likely a timing issue where the patient data loads before `identifierNo` is available, but the core code path is correct — no code change needed here beyond ensuring executeTime default doesn't block form rendering.
-
-### Issue 2: 执行时间未默认填充当前系统时间
-- **Code**: `inspectionApplication.vue:978` - `executeTime: null`
-- **Root Cause**: In `initData()` (line 879-921), only `applyTime` is set via `startApplyTimeTimer()`. `formData.executeTime` is never assigned a default value. Similarly in `resetForm()` (line 1550), `executeTime` remains `null`.
-- **Fix**: Add `formData.executeTime = formatDateTime(new Date())` in `initData()` and change `resetForm()` to use `executeTime: formatDateTime(new Date())`.
-
-### Issue 3: 项目列表冗余显示"套餐"文字
-- **Code**: `inspectionApplication.vue:1190` - Already fixed with `packageName` check. But `inspectionApplication.vue:2000` in `loadApplicationToForm()` still uses loose check: `item.feePackageId != null || item.itemName?.includes('套餐')`.
-- **Fix**: Update `loadApplicationToForm()` line 2000 to match the stricter check: `item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName`.
-
-## Files to Modify
-- `openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue`
-
-## Changes
-1. `initData()`: Add `formData.executeTime = formatDateTime(new Date())` after line 899
-2. `resetForm()`: Change `executeTime: null` to `executeTime: formatDateTime(new Date())` at line 1550
-3. `loadApplicationToForm()`: Fix `isPackage` logic at line 2000

.agentforge/bugs/556-analysis.md

@@ -1,53 +0,0 @@
-# Bug #556 分析报告
-
-## 问题描述
-【门诊医生站-检验】新增检验申请单时：
-1. 就诊卡号字段为空，未自动带出患者就诊卡号
-2. 执行时间字段未自动填充，仅显示占位提示
-3. 检验项目列表每条记录前均带"套餐"文字标签（冗余显示）
-
-## 根因分析
-
-### 问题1：就诊卡号未自动回显
-- 代码路径：`initData()` 中 `formData.medicalrecordNumber = props.patientInfo.identifierNo || ''`
-- 数据绑定：`v-model="formData.medicalrecordNumber"`
-- `props.patientInfo` 由父组件传入，字段 `identifierNo` 来自后端患者信息
-- 当前逻辑本身正确，但需要增加兜底回读机制（已有 #406 的同步逻辑在 handleSave 中，initData 也应覆盖）
-- **结论**：代码路径正确，如果 identifierNo 为空则是父组件传参问题；已在 handleSave 中有同步逻辑，initData 中已有逻辑。无需额外修复。
-
-### 问题2：执行时间未自动填充
-- 根因：`formData.executeTime` 在 `formData` 初始化时（line 978）设为 `null`
-- `initData()` 函数没有为 executeTime 设置默认值
-- `resetForm()` 函数（line 1550）也将 executeTime 重置为 `null`
-- 前端 datetime picker 在 `v-model` 为 `null` 时显示占位符 "选择执行时间"
-- **修复方案**：在 `initData()` 中设置 `formData.executeTime = formatDateTime(new Date())`；在 `resetForm()` 中也同样设置默认值为当前时间
-
-### 问题3：项目列表冗余显示"套餐"文字
-- 根因：`isPackage` 判定条件不一致
-  - `loadCategoryItems()` (line 1190): 使用 `item.feePackageId != null && ... && item.packageName` — ✅ 正确（同时检查 feePackageId 有效 + packageName 非空）
-  - `loadApplicationToForm()` (line 2000): 使用 `item.feePackageId != null || item.itemName?.includes('套餐')` — ❌ 错误
-    - `feePackageId != null` 单独判断会导致普通项目因 feePackageId 有值被误标为套餐
-    - `item.itemName?.includes('套餐')` 更是直接按名称文字判断，极不准确
-- 影响位置：
-  - 检验项目选择区（line 566）：`<el-tag v-if="item.isPackage">套餐</el-tag>`
-  - 已选项目列表（line 617）：`<el-tag v-if="item.isPackage">套餐</el-tag>`
-  - 检验信息详情表格（line 448）：`<el-tag v-if="scope.row.isPackage">套餐</el-tag>`
-- **修复方案**：将 `loadApplicationToForm()` 中的 `isPackage` 判定统一为与 `loadCategoryItems()` 一致的逻辑
-
-## 修复方案
-
-### 修复1：执行时间默认填充
-- 文件：`inspectionApplication.vue`
-- 位置：`initData()` 函数，在已有患者信息赋值后添加 `formData.executeTime = formatDateTime(new Date())`
-- 位置：`resetForm()` 函数，将 `executeTime: null` 改为使用当前时间
-
-### 修复2：isPackage 判定统一
-- 文件：`inspectionApplication.vue`
-- 位置：`loadApplicationToForm()` 函数 line 2000
-- 旧代码：`const isPackage = item.feePackageId != null || item.itemName?.includes('套餐')`
-- 新代码：`const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName`
-
-## 验收标准
-1. 新增检验申请单时，执行时间字段自动填充当前系统时间（YYYY-MM-DD HH:mm:ss 格式）
-2. 检验项目列表中，只有真正的套餐项目前显示"套餐"标签，普通项目不显示
-3. 就诊卡号在有患者信息时正常显示

analysis_469.md

@@ -1,42 +0,0 @@
-# 分析报告 — Bug #469
-
-## 问题描述
-检验申请列表的【操作】列仅显示固定的"打印"和"删除"按钮，未根据申请单状态动态切换操作权限。
-
-## 根因分析
-文件 `openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue` 第97-104行：
-- 操作列模板中固定渲染"打印"和"删除"按钮，没有任何状态判断逻辑
-- 缺少"修改"和"撤回"按钮
-
-## 状态机设计
-| 状态 | 条件 | 允许的操作 |
-|------|------|-----------|
-| 待开立 | applyStatus == 0 | 修改、删除 |
-| 已开立 | applyStatus == 1 && needExecute != true | 撤回 |
-| 已执行 | applyStatus == 1 && needExecute == true | 无（仅打印） |
-
-## 修复方案
-1. **前端 Vue**: 操作列改为 `v-if` 条件渲染按钮（修改/删除/撤回/打印）
-2. **前端 API**: 新增撤回接口 `withdrawInspectionApplication(applyNo)`
-3. **后端 Controller**: 新增 `POST /withdraw/{applyNo}` 端点
-4. **后端 Service**: 新增 `withdrawInspectionLabApply` 方法，将 applyStatus 置回 0，needRefund/needExecute 置回 false
-
-## 修复结果
-✅ 成功，共14行改动（2个commit完成）
-
-### 修复详情
-1. **commit c643a78b** - 初始修复：将操作列从静态"打印/删除"改为基于状态的动态按钮（修改/删除/撤回/详情），10行改动
-2. **commit f369ea41** - 跟进修复：将"详情"按钮包裹在 `<template v-else>` 中，避免对所有状态始终渲染，4行改动
-
-### 状态机实现
-| 状态 | 条件 | 显示按钮 |
-|------|------|---------|
-| 待签发 | billStatus == '0' | 修改 + 删除 |
-| 已签发 | billStatus == '1' | 撤回 |
-| 其他状态 | 已采证/已送检/报告已出/已作废 | 详情 |
-
-### 涉及文件
-- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue` - 前端操作列动态按钮
-- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js` - 前端API（deleteRequestForm, withdrawRequestForm）
-- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java` - 后端Controller（/delete, /withdraw 端点）
-- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java` - 后端Service实现

bug547_analysis.md

@@ -1,41 +0,0 @@
-# Bug #547 分析报告
-
-## Bug 描述
-在"系统管理-执行科室配置"页面，选择科室（如检验科）后添加新项目并保存，显示"与未知科室时间冲突"错误。
-
-## 根因定位
-
-**核心问题在 `OrganizationLocationAppServiceImpl.java:161-174`**
-
-时间冲突检测的查询逻辑存在两个缺陷：
-
-### 缺陷1：查询范围过窄
-```java
-// 只查同一科室 + 同一诊疗的记录
-getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getOrganizationId(), orgLoc.getActivityDefinitionId());
-```
-只查询**同一科室**的记录。如果同一诊疗项目在其他科室已有配置且时间重叠，不会被当前查询检测到。但系统本应阻止同一诊疗在多个科室同时段执行。
-
-### 缺陷2："未知科室"错误提示
-当冲突记录关联的科室被软删除（`delete_flag='1'`）时，`organizationService.getById()` 受 `@TableLogic` 注解影响查不到该科室，返回 null，错误提示变成"与未知科室时间冲突"。
-
-数据库验证发现确实存在软删除科室的组织位置记录（内科门诊、上海学校医院、信息科等，共9条）。
-
-### 数据流
-
-1. 前端选择科室 → 点击"添加新项目" → 填写诊疗和时间 → 点击"保存"
-2. 后端 `addOrEditOrgLoc()` 接收请求
-3. 查询现有冲突记录（**当前只查同科室**）
-4. 对冲突记录检查时间重叠
-5. 查找冲突科室名称 → 若科室被软删除则返回 null → "未知科室"
-
-## 修复方案
-
-1. **修改冲突检测范围**：查询同一 `activityDefinitionId` 的所有记录（跨科室检测），而非仅限当前科室
-2. **优雅处理"未知科室"**：当 `getById` 返回 null 时，使用 "已删除科室( ID )" 替代 "未知科室"，提供更有用的信息
-3. **新增 Service 方法**：`getOrgLocListByActivityDefinitionId(Long activityDefinitionId)` 用于按诊疗定义查询所有记录
-
-## 涉及文件
-- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java`
-- `openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java`
-- `openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java`

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/DoctorScheduleAppServiceImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.core.domain.R;
 import com.core.common.utils.SecurityUtils;
-import com.openhis.common.enums.SlotStatus;
+import com.openhis.common.constant.CommonConstants;
 import com.openhis.appointmentmanage.domain.DoctorSchedule;
 import com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto;
 import com.openhis.appointmentmanage.domain.SchedulePool;
@@ -502,8 +502,8 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
             // 该排班下存在有效患者预约（号源槽：已预约/已锁定/已取号）则禁止删除；已退号、仅可用/已取消槽位不计入
             long appointmentCount = scheduleSlotService.count(new QueryWrapper<ScheduleSlot>()
                     .in("pool_id", poolIds)
-                    .in("status", SlotStatus.BOOKED.getValue(), SlotStatus.LOCKED.getValue(),
+                    .in("status", CommonConstants.SlotStatus.BOOKED, CommonConstants.SlotStatus.LOCKED,
-                            SlotStatus.CHECKED_IN.getValue()));
+                            CommonConstants.SlotStatus.CHECKED_IN));
             if (appointmentCount > 0) {
                 return R.fail("该排班已有患者预约，禁止删除！如需取消请先处理患者退预约或使用'停诊'功能。");
             }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java

@@ -9,7 +9,7 @@ import com.openhis.clinical.domain.Ticket;
 import com.openhis.clinical.service.ITicketService;
 import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
 import com.openhis.web.appointmentmanage.dto.TicketDto;
-import com.openhis.common.enums.SlotStatus;
+import com.openhis.common.constant.CommonConstants.SlotStatus;
 import com.openhis.common.enums.OrderStatus;
 import org.springframework.stereotype.Service;
 
@@ -193,24 +193,25 @@ public class TicketAppServiceImpl implements ITicketAppService {
                 if (Boolean.TRUE.equals(raw.getIsStopped())) {
                     dto.setStatus("已停诊");
                 } else {
-                    SlotStatus status = SlotStatus.getByValue(raw.getSlotStatus());
+                    Integer slotStatus = raw.getSlotStatus();
-                    if (status != null) {
+                    if (slotStatus != null) {
-                        if (status == SlotStatus.LOCKED) {
+                        if (SlotStatus.CHECKED_IN.equals(slotStatus)) {
+                            dto.setStatus("已取号");
+                        } else if (SlotStatus.BOOKED.equals(slotStatus)) {
+                            // order_main.status: 0=患者取消(已退号) 2=系统取消 其余=已预约
                             if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
                                 dto.setStatus("已退号");
+                            } else if (OrderStatus.SYSTEM_CANCELLED.getValue().equals(raw.getOrderStatus())) {
+                                dto.setStatus("系统取消");
                             } else {
-                                dto.setStatus("已锁定");
+                                dto.setStatus("已预约");
                             }
-                        } else if (status == SlotStatus.BOOKED) {
+                        } else if (SlotStatus.RETURNED.equals(slotStatus)) {
-                            if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
-                                dto.setStatus("已退号");
-                            } else {
-                                dto.setStatus("已取号");
-                            }
-                        } else if (status == SlotStatus.CANCELLED) {
-                            dto.setStatus("已停诊");
-                        } else if (status == SlotStatus.RETURNED) {
                             dto.setStatus("已退号");
+                        } else if (SlotStatus.CANCELLED.equals(slotStatus)) {
+                            dto.setStatus("已停诊");
+                        } else if (SlotStatus.LOCKED.equals(slotStatus)) {
+                            dto.setStatus("已锁定");
                         } else {
                             dto.setStatus("未预约");
                         }
@@ -236,10 +237,6 @@ public class TicketAppServiceImpl implements ITicketAppService {
     /**
      * 统一状态入参，避免前端状态值大小写/中文/数字差异导致 SQL 条件失效后回全量数据
      */
-    /**
-     * 规范前端传入的状态查询参数，映射到 SQL 的 slotStatusNormExpr 值。
-     * 数值映射: 0=待约 1=已约(签到后) 2=锁定(预约后) 3=已签到 4=已停诊 5=已退号
-     */
     private void normalizeQueryStatus(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
         String rawStatus = query.getStatus();
         if (rawStatus == null) {
@@ -266,31 +263,28 @@ public class TicketAppServiceImpl implements ITicketAppService {
             case "已预约":
                 query.setStatus("booked");
                 break;
-            case "locked":
-            case "2":
-            case "已锁定":
-                query.setStatus("locked");
-                break;
             case "checked":
             case "checkin":
             case "checkedin":
-            case "3":
+            case "2":
             case "已取号":
                 query.setStatus("checked");
                 break;
             case "cancelled":
             case "canceled":
-            case "4":
+            case "3":
             case "已停诊":
             case "已取消":
                 query.setStatus("cancelled");
                 break;
             case "returned":
+            case "4":
             case "5":
             case "已退号":
                 query.setStatus("returned");
                 break;
             default:
+                // 设置为 impossible 值，配合 mapper 的 otherwise 分支直接返回空
                 query.setStatus("__invalid__");
                 break;
         }
@@ -373,25 +367,26 @@ public class TicketAppServiceImpl implements ITicketAppService {
                 if (Boolean.TRUE.equals(raw.getIsStopped())) {
                     dto.setStatus("已停诊");
                 } else {
-                    // 第二关：看独立的细分槽位状态 (0: 可用, 1: 已预约, 2: 已锁定...)
+                    // 第二关：看独立的细分槽位状态 (0: 可用, 1: 已预约, 2: 已取消...)
-                    SlotStatus status = SlotStatus.getByValue(raw.getSlotStatus());
+                    Integer slotStatus = raw.getSlotStatus();
-                    if (status != null) {
+                    if (slotStatus != null) {
-                        if (status == SlotStatus.LOCKED) {
+                        if (SlotStatus.CHECKED_IN.equals(slotStatus)) {
+                            dto.setStatus("已取号");
+                        } else if (SlotStatus.BOOKED.equals(slotStatus)) {
+                            // order_main.status: 0=患者取消(已退号) 2=系统取消 其余=已预约
                             if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
                                 dto.setStatus("已退号");
+                            } else if (OrderStatus.SYSTEM_CANCELLED.getValue().equals(raw.getOrderStatus())) {
+                                dto.setStatus("系统取消");
                             } else {
-                                dto.setStatus("已锁定");
+                                dto.setStatus("已预约");
                             }
-                        } else if (status == SlotStatus.BOOKED) {
+                        } else if (SlotStatus.RETURNED.equals(slotStatus)) {
-                            if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
-                                dto.setStatus("已退号");
-                            } else {
-                                dto.setStatus("已取号");
-                            }
-                        } else if (status == SlotStatus.CANCELLED) {
-                            dto.setStatus("已停诊");
-                        } else if (status == SlotStatus.RETURNED) {
                             dto.setStatus("已退号");
+                        } else if (SlotStatus.CANCELLED.equals(slotStatus)) {
+                            dto.setStatus("已停诊");
+                        } else if (SlotStatus.LOCKED.equals(slotStatus)) {
+                            dto.setStatus("已锁定");
                         } else {
                             dto.setStatus("未预约");
                         }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java

@@ -159,7 +159,7 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
         String activityName = activityDef != null ? activityDef.getName() : "";
 
         List<OrganizationLocation> organizationLocationList =
-            organizationLocationService.getOrgLocListByActivityDefinitionId(orgLoc.getActivityDefinitionId());
+            organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getOrganizationId(), orgLoc.getActivityDefinitionId());
         organizationLocationList = (orgLoc.getId() != null)
             ? organizationLocationList.stream().filter(item -> !orgLoc.getId().equals(item.getId())).toList()
             : organizationLocationList;
@@ -169,11 +169,9 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
                 if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
                     orgLoc.getStartTime(), orgLoc.getEndTime())) {
                     Organization org = organizationService.getById(organizationLocation.getOrganizationId());
-                    if (org == null) {
+                    String organizationName = org != null ? org.getName() : "未知科室";
-                        continue;
-                    }
                     return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
-                        + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + org.getName() + "时间冲突");
+                        + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
                 }
 
         if (orgLocQueryDto.getId() != null) {

openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/appservice/impl/OutpatientRegistrationAppServiceImpl.java

@@ -18,7 +18,6 @@ import com.openhis.administration.mapper.PatientMapper;
 import com.openhis.administration.service.*;
 import com.openhis.common.constant.CommonConstants;
 import com.openhis.common.constant.PromptMsgConstant;
-import com.openhis.common.enums.SlotStatus;
 import com.openhis.common.enums.*;
 import com.openhis.common.enums.ybenums.YbPayment;
 import com.openhis.common.utils.EnumUtils;
@@ -644,7 +643,8 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
                     .set(Order::getStatus, OrderStatus.PATIENT_CANCELLED.getValue())
                     .set(Order::getPayStatus, PaymentStatus.REFUND_ALL.getValue())
                     .set(Order::getCancelTime, new Date())
-                    .set(Order::getCancelReason, "诊前退号")
+                    .set(Order::getCancelReason,
+                        StringUtils.isNotEmpty(reason) ? reason : "诊前退号")
                     .set(Order::getUpdateTime, new Date())
                     .setSql("version = version + 1")
                     .eq(Order::getId, appointmentOrder.getId())
@@ -660,27 +660,17 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
                 return appointmentOrder.getId();
             }
 
-            // 只有已预约(1)的号源才能退号，对应签到后的 BOOKED 状态
+            int slotRows = scheduleSlotMapper.updateSlotStatus(slotId, CommonConstants.SlotStatus.AVAILABLE);
-            ScheduleSlot slot = scheduleSlotMapper.selectById(slotId);
+            if (slotRows > 0) {
-            if (slot == null || !SlotStatus.BOOKED.getValue().equals(slot.getStatus())) {
+                Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
-                log.warn("退号跳过：槽位非已预约状态, slotId={}, status={}", slotId,
+                if (poolId != null) {
-                    slot != null ? slot.getStatus() : null);
+                    schedulePoolMapper.refreshPoolStats(poolId);
-                return appointmentOrder.getId();
+                    schedulePoolMapper.update(null,
-            }
+                        new LambdaUpdateWrapper<SchedulePool>()
-
+                            .setSql("version = version + 1")
-            int slotRows = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.AVAILABLE.getValue());
+                            .set(SchedulePool::getUpdateTime, new Date())
-            if (slotRows == 0) {
+                            .eq(SchedulePool::getId, poolId));
-                log.warn("退号时更新槽位状态未影响任何行, slotId={}", slotId);
+                }
-                return appointmentOrder.getId();
-            }
-
-            Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
-            if (poolId != null) {
-                schedulePoolMapper.update(null,
-                    new LambdaUpdateWrapper<SchedulePool>()
-                        .setSql("booked_num = booked_num - 1, version = version + 1")
-                        .set(SchedulePool::getUpdateTime, new Date())
-                        .eq(SchedulePool::getId, poolId));
             }
             return appointmentOrder.getId();
         } catch (Exception e) {

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

@@ -2192,6 +2192,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                 CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
                 sourceEnum, sourceBillNo);
+        // 手术计费场景：sourceBillNo 不为空时，过滤掉药品（1），保留耗材（2）和诊疗（3/6）
+        if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
+            requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
+                    && dto.getAdviceType() == 1);
+        }
         for (RequestBaseDto requestBaseDto : requestBaseInfo) {
             // 请求状态
             requestBaseDto

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

@@ -23,9 +23,6 @@ public class SurgeryItemDto {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
-    /** 所属科室名称 */
-    private String orgName;
-
     /** 执行科室ID */
     @JsonSerialize(using = ToStringSerializer.class)
     private Long positionId;

openhis-server-new/openhis-application/src/main/java/com/openhis/web/patientmanage/appservice/impl/PatientInformationServiceImpl.java

@@ -269,7 +269,7 @@ public class PatientInformationServiceImpl implements IPatientInformationService
 //        log.debug("添加病人信息,patientInfoDto:{}", patientBaseInfoDto);
         // 如果患者没有输入身份证号则根据年龄自动生成
         String idCard = patientBaseInfoDto.getIdCard();
-        if (idCard == null || idCard.length() < 6 || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) {
+        if (idCard == null || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) {
             if (patientBaseInfoDto.getAge() != null) {
                 idCard = IdCardUtil.generateIdByAge(patientBaseInfoDto.getAge());
                 patientBaseInfoDto.setIdCard(idCard);

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

@@ -871,7 +871,6 @@
     </select>
 
     <!-- 手术项目专用分页查询：仅查手术 + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
-    <!-- 使用 LIMIT/OFFSET 直接查询，避免 MyBatis Plus 分页插件的 COUNT 开销 -->
     <select id="getSurgeryPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
         SELECT DISTINCT ON (t1.ID)
             t1.ID AS advice_definition_id,
@@ -894,7 +893,6 @@
               AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
           </if>
         ORDER BY t1.ID, t1.name ASC, t2.ID ASC
-        LIMIT #{limit} OFFSET #{offset}
     </select>
 
     <!-- 检查项目专用分页查询：仅查检查(23) + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
@@ -903,7 +901,6 @@
             t1.ID AS advice_definition_id,
             t1.NAME AS advice_name,
             t1.org_id AS org_id,
-            t3.name AS org_name,
             t1.org_id AS position_id,
             t2.ID AS charge_item_definition_id,
             t2.price AS price,
@@ -915,9 +912,6 @@
             AND t2.delete_flag = '0'
             AND t2.status_enum = #{statusEnum}
             AND t2.instance_table = 'wor_activity_definition'
-        LEFT JOIN adm_organization t3
-            ON t3.id = t1.org_id
-            AND t3.delete_flag = '0'
         WHERE t1.delete_flag = '0'
           AND t1.category_code = '23'
           <if test="searchKey != null and searchKey != ''">

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

@@ -57,6 +57,8 @@
                 AND ae.delete_flag = '0'
                      LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
                 AND ap.delete_flag = '0'
+                     LEFT JOIN wor_service_request AS wsr ON wsr.prescription_no = drf.prescription_no
+                AND wsr.delete_flag = '0'
             WHERE drf.delete_flag = '0'
               AND drf.encounter_id = #{encounterId}
               AND drf.type_code = #{typeCode}

openhis-server-new/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java

@@ -768,4 +768,36 @@ public class CommonConstants {
         Integer ACCOUNT_DEVICE_TYPE = 6;
     }
 
+    /**
+     * 号源槽位状态 (adm_schedule_slot.status)
+     */
+    public interface SlotStatus {
+        /** 可用 / 待预约 */
+        Integer AVAILABLE = 0;
+        /** 已预约 */
+        Integer BOOKED = 1;
+        /** 已取消 / 已停诊 */
+        Integer CANCELLED = 2;
+        /** 已签到 / 已取号 */
+        Integer CHECKED_IN = 3;
+        /** 已锁定 */
+        Integer LOCKED = 4;
+        /** 已退号 */
+        Integer RETURNED = 5;
+    }
+
+    /**
+     * 预约订单状态 (order_main.status)
+     */
+    public interface AppointmentOrderStatus {
+        /** 已预约 (待就诊) */
+        Integer BOOKED = 1;
+        /** 已取号 (已就诊) */
+        Integer CHECKED_IN = 2;
+        /** 已取消 */
+        Integer CANCELLED = 3;
+        /** 已退号 */
+        Integer RETURNED = 4;
+    }
+
 }

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

@@ -1,57 +0,0 @@
-package com.openhis.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 号源槽位状态 (adm_schedule_slot.status)
- *
- * <pre>
- * 状态流转:
- *   预约     → 0→2 (锁定), locked_num+1
- *   取消预约 → 2→0 (释放), locked_num-1
- *   签到     → 2→1 (已约), locked_num-1, booked_num+1
- *   退号     → 1→0 (释放), booked_num-1
- *   停诊     → 任意→4 (已取消)
- * </pre>
- *
- * @author system
- */
-@Getter
-@AllArgsConstructor
-public enum SlotStatus implements HisEnumInterface {
-
-    /** 可用 / 待预约 */
-    AVAILABLE(0, "available", "可用"),
-
-    /** 已预约 */
-    BOOKED(1, "booked", "已预约"),
-
-    /** 已锁定 (约而不付：预约后锁定号源) */
-    LOCKED(2, "locked", "已锁定"),
-
-    /** 已签到 / 已取号 */
-    CHECKED_IN(3, "checked_in", "已签到"),
-
-    /** 已取消 / 已停诊 */
-    CANCELLED(4, "cancelled", "已取消"),
-
-    /** 已退号 */
-    RETURNED(5, "returned", "已退号");
-
-    private final Integer value;
-    private final String code;
-    private final String info;
-
-    public static SlotStatus getByValue(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (SlotStatus val : values()) {
-            if (val.getValue().equals(value)) {
-                return val;
-            }
-        }
-        return null;
-    }
-}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java

@@ -38,12 +38,4 @@ public interface IOrganizationLocationService extends IService<OrganizationLocat
      */
     List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long organizationId, Long activityDefinitionId);
 
-    /**
-     * 根据诊疗定义id查询所有执行科室列表（跨科室）
-     *
-     * @param activityDefinitionId 诊疗定义id
-     * @return 执行科室列表
-     */
-    List<OrganizationLocation> getOrgLocListByActivityDefinitionId(Long activityDefinitionId);
-
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java

@@ -64,16 +64,4 @@ public class OrganizationLocationServiceImpl extends ServiceImpl<OrganizationLoc
             .eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
     }
 
-    /**
-     * 根据诊疗定义id查询所有执行科室列表（跨科室）
-     *
-     * @param activityDefinitionId 诊疗定义id
-     * @return 执行科室列表
-     */
-    @Override
-    public List<OrganizationLocation> getOrgLocListByActivityDefinitionId(Long activityDefinitionId) {
-        return baseMapper.selectList(new LambdaQueryWrapper<OrganizationLocation>()
-            .eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
-    }
-
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java

@@ -10,11 +10,10 @@ import org.springframework.stereotype.Repository;
 public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
 
     /**
-     * 按号源池实时重算统计值。
+     * 按号源池实时重算统计值，避免并发场景下计数漂移。
      *
-     * @param poolId       号源池ID
+     * 说明：available_num 在当前项目中可能为数据库生成列，因此这里仅维护
-     * @param bookedStatus 已约状态值，由 SlotStatus.BOOKED.getValue() 传入
+     * booked_num / locked_num，剩余号由数据库或查询逻辑计算。
-     * @param lockedStatus 锁定状态值，由 SlotStatus.LOCKED.getValue() 传入
      */
     @Update("""
             UPDATE adm_schedule_pool p
@@ -24,22 +23,20 @@ public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
                     FROM adm_schedule_slot s
                     WHERE s.pool_id = p.id
                       AND s.delete_flag = '0'
-                      AND s.status = #{bookedStatus}
+                      AND s.status = 1
                 ), 0),
                 locked_num = COALESCE((
                     SELECT COUNT(1)
                     FROM adm_schedule_slot s
                     WHERE s.pool_id = p.id
                       AND s.delete_flag = '0'
-                      AND s.status = #{lockedStatus}
+                      AND s.status = 3
                 ), 0),
                 update_time = now()
             WHERE p.id = #{poolId}
               AND p.delete_flag = '0'
             """)
-    int refreshPoolStats(@Param("poolId") Long poolId,
+    int refreshPoolStats(@Param("poolId") Long poolId);
-                         @Param("bookedStatus") Integer bookedStatus,
-                         @Param("lockedStatus") Integer lockedStatus);
 
     /**
      * 签到时更新号源池统计：锁定数-1，已预约数+1

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java

@@ -22,12 +22,9 @@ public interface ScheduleSlotMapper extends BaseMapper<ScheduleSlot> {
     TicketSlotDTO selectTicketSlotById(@Param("id") Long id);
 
     /**
-     * 原子抢占槽位：仅当当前状态=0(待约)时，更新为目标锁定状态。
+     * 原子抢占槽位：仅当当前状态=0(可用)时，更新为1(已预约)。
-     *
-     * @param slotId       槽位ID
-     * @param lockedStatus 锁定状态值，由 SlotStatus.LOCKED.getValue() 传入
      */
-    int lockSlotForBooking(@Param("slotId") Long slotId, @Param("lockedStatus") Integer lockedStatus);
+    int lockSlotForBooking(@Param("slotId") Long slotId);
 
     /**
      * 按主键更新槽位状态。
@@ -37,16 +34,12 @@ public interface ScheduleSlotMapper extends BaseMapper<ScheduleSlot> {
     /**
      * 更新槽位状态并记录签到时间
      *
-     * @param slotId         槽位ID
+     * @param slotId      槽位ID
-     * @param status         目标状态，由 SlotStatus.BOOKED.getValue() 传入
+     * @param status      状态
-     * @param checkInTime    签到时间
+     * @param checkInTime 签到时间
-     * @param requiredStatus 前置状态，由 SlotStatus.LOCKED.getValue() 传入
      * @return 结果
      */
-    int updateSlotStatusAndCheckInTime(@Param("slotId") Long slotId,
+    int updateSlotStatusAndCheckInTime(@Param("slotId") Long slotId, @Param("status") Integer status, @Param("checkInTime") Date checkInTime);
-                                       @Param("status") Integer status,
-                                       @Param("checkInTime") Date checkInTime,
-                                       @Param("requiredStatus") Integer requiredStatus);
 
     /**
      * 根据槽位ID查询所属号源池ID。

openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java

@@ -1,12 +1,10 @@
 package com.openhis.clinical.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.appointmentmanage.domain.AppointmentConfig;
 import com.openhis.appointmentmanage.service.IAppointmentConfigService;
 import com.openhis.appointmentmanage.domain.TicketSlotDTO;
-import com.openhis.appointmentmanage.domain.SchedulePool;
 import com.openhis.appointmentmanage.domain.ScheduleSlot;
 import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
 import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
@@ -15,7 +13,7 @@ import com.openhis.clinical.domain.Ticket;
 import com.openhis.clinical.mapper.TicketMapper;
 import com.openhis.clinical.service.IOrderService;
 import com.openhis.clinical.service.ITicketService;
-import com.openhis.common.enums.SlotStatus;
+import com.openhis.common.constant.CommonConstants.SlotStatus;
 import com.openhis.common.enums.OrderStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -179,7 +177,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             logger.error("安全拦截：号源底库核对失败，slotId: {}", slotId);
             throw new RuntimeException("号源数据不存在");
         }
-        if (slot.getSlotStatus() != null && SlotStatus.getByValue(slot.getSlotStatus()) != SlotStatus.AVAILABLE) {
+        if (slot.getSlotStatus() != null && !SlotStatus.AVAILABLE.equals(slot.getSlotStatus())) {
             throw new RuntimeException("手慢了！该号源已刚刚被他人抢占");
         }
         if (Boolean.TRUE.equals(slot.getIsStopped())) {
@@ -207,7 +205,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
         }
 
         // 原子抢占：避免并发下同一槽位被重复预约
-        int lockRows = scheduleSlotMapper.lockSlotForBooking(slotId, SlotStatus.LOCKED.getValue());
+        int lockRows = scheduleSlotMapper.lockSlotForBooking(slotId);
         if (lockRows <= 0) {
             throw new RuntimeException("手慢了！该号源已刚刚被他人抢占");
         }
@@ -262,15 +260,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             throw new RuntimeException("预约成功但号源回填订单失败，请重试");
         }
 
-        // 6. 预约成功后 locked_num+1（原子递增替代全量 recount，避免并发计数漂移）
+        refreshPoolStatsBySlotId(slotId);
-        Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
-        if (poolId != null) {
-            schedulePoolMapper.update(null,
-                new LambdaUpdateWrapper<SchedulePool>()
-                    .setSql("locked_num = locked_num + 1, version = version + 1")
-                    .set(SchedulePool::getUpdateTime, new Date())
-                    .eq(SchedulePool::getId, poolId));
-        }
         return 1;
     }
 
@@ -287,8 +277,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
         if (slot == null) {
             throw new RuntimeException("号源槽位不存在");
         }
-        // 只有锁定态(2)的号源可以取消预约
+        if (slot.getSlotStatus() == null || !SlotStatus.BOOKED.equals(slot.getSlotStatus())) {
-        if (slot.getSlotStatus() == null || SlotStatus.getByValue(slot.getSlotStatus()) != SlotStatus.LOCKED) {
             throw new RuntimeException("号源不可取消预约");
         }
 
@@ -303,7 +292,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             orderService.cancelAppointmentOrder(order.getId(), "患者取消预约");
         }
 
-        int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.AVAILABLE.getValue());
+        int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.AVAILABLE);
         if (updated > 0) {
             refreshPoolStatsBySlotId(slotId);
         }
@@ -329,14 +318,11 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
         orderService.updateOrderStatusById(latestOrder.getId(), OrderStatus.ACTIVE.getValue());
         orderMapper.updatePayStatus(latestOrder.getId(), 1, new Date());
 
-        // 2. 只有锁定态(2)的号源才能签到，签到时 2→1(LOCKED→BOOKED)
+        // 2. 查询号源槽位信息
         ScheduleSlot slot = scheduleSlotMapper.selectById(slotId);
-        if (slot == null || !SlotStatus.LOCKED.getValue().equals(slot.getStatus())) {
-            throw new RuntimeException("号源状态异常，无法签到");
-        }
 
-        // 3. 更新号源槽位状态 2→1（LOCKED→BOOKED，已预约=已签到）
+        // 3. 更新号源槽位状态为已签到，记录签到时间
-        scheduleSlotMapper.updateSlotStatusAndCheckInTime(slotId, SlotStatus.BOOKED.getValue(), new Date(), SlotStatus.LOCKED.getValue());
+        scheduleSlotMapper.updateSlotStatusAndCheckInTime(slotId, SlotStatus.CHECKED_IN, new Date());
 
         // 4. 更新号源池统计：锁定数-1，已预约数+1
         if (slot != null && slot.getPoolId() != null) {
@@ -365,7 +351,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             orderService.cancelAppointmentOrder(order.getId(), "医生停诊");
         }
 
-        int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.CANCELLED.getValue());
+        int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.CANCELLED);
         if (updated > 0) {
             refreshPoolStatsBySlotId(slotId);
         }
@@ -378,7 +364,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
     private void refreshPoolStatsBySlotId(Long slotId) {
         Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
         if (poolId != null) {
-            schedulePoolMapper.refreshPoolStats(poolId, SlotStatus.BOOKED.getValue(), SlotStatus.LOCKED.getValue());
+            schedulePoolMapper.refreshPoolStats(poolId);
         }
     }
 

openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml

@@ -4,17 +4,14 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.appointmentmanage.mapper.ScheduleSlotMapper">
 
-    <!--
+    <!-- 统一状态值（兼容数字/英文字符串存储），输出 Integer，避免 resultType 映射 NumberFormatException -->
-      统一状态值映射: DB 数值 → 规范化输出
-      0=待约 1=已约(签到后) 2=锁定(预约后) 3=已签到 4=已停诊 5=已退号
-    -->
     <sql id="slotStatusNormExpr">
         CASE
             WHEN LOWER(CONCAT('', s.status)) IN ('0', 'unbooked', 'available') THEN 0
             WHEN LOWER(CONCAT('', s.status)) IN ('1', 'booked') THEN 1
-            WHEN LOWER(CONCAT('', s.status)) IN ('2', 'locked') THEN 2
+            WHEN LOWER(CONCAT('', s.status)) IN ('2', 'cancelled', 'canceled', 'stopped') THEN 2
             WHEN LOWER(CONCAT('', s.status)) IN ('3', 'checked', 'checked_in', 'checkin') THEN 3
-            WHEN LOWER(CONCAT('', s.status)) IN ('4', 'cancelled', 'canceled', 'stopped') THEN 4
+            WHEN LOWER(CONCAT('', s.status)) IN ('4', 'locked') THEN 4
             WHEN LOWER(CONCAT('', s.status)) IN ('5', 'returned') THEN 5
             ELSE NULL
         END
@@ -34,9 +31,9 @@
         CASE
             WHEN LOWER(CONCAT('', p.status)) IN ('0', 'unbooked', 'available') THEN 0
             WHEN LOWER(CONCAT('', p.status)) IN ('1', 'booked') THEN 1
-            WHEN LOWER(CONCAT('', p.status)) IN ('2', 'locked') THEN 2
+            WHEN LOWER(CONCAT('', p.status)) IN ('2', 'cancelled', 'canceled', 'stopped') THEN 2
             WHEN LOWER(CONCAT('', p.status)) IN ('3', 'checked', 'checked_in', 'checkin') THEN 3
-            WHEN LOWER(CONCAT('', p.status)) IN ('4', 'cancelled', 'canceled', 'stopped') THEN 4
+            WHEN LOWER(CONCAT('', p.status)) IN ('4', 'locked') THEN 4
             WHEN LOWER(CONCAT('', p.status)) IN ('5', 'returned') THEN 5
             ELSE NULL
         END
@@ -152,11 +149,10 @@
             s.id = #{id}
     </select>
 
-    <!-- 预约锁定: 0→#{lockedStatus} (AVAILABLE→LOCKED)，由枚举传入 -->
     <update id="lockSlotForBooking">
         UPDATE adm_schedule_slot
         SET
-            status = #{lockedStatus},
+            status = 1,
             update_time = now()
         WHERE
             id = #{slotId}
@@ -178,7 +174,6 @@
             AND delete_flag = '0'
     </update>
 
-    <!-- 签到: #{requiredStatus}→#{status} (LOCKED→BOOKED)，前置条件由枚举传入 -->
     <update id="updateSlotStatusAndCheckInTime">
         UPDATE adm_schedule_slot
         SET
@@ -187,7 +182,6 @@
             update_time = NOW()
         WHERE
             id = #{slotId}
-            AND status = #{requiredStatus}
             AND delete_flag = '0'
     </update>
 
@@ -208,7 +202,7 @@
             update_time = now()
         WHERE
             id = #{slotId}
-            AND status = 2
+            AND status = 1
             AND delete_flag = '0'
     </update>
 
@@ -305,16 +299,15 @@
             <if test="query.phone != null and query.phone != ''">
                 AND o.phone LIKE CONCAT('%', #{query.phone}, '%')
             </if>
-            <!-- 5. 时间过滤: 仅待约(0)受时间限制，已锁定(2)/已约(1)/已签到(3)/已退号(5)不受影响 -->
+            <!-- 5. 按系统时间过滤（Bug #398 #399 修复：仅未预约受时间过滤，已预约/已取号/已退号不受影响） -->
             AND (
                 (<include refid="slotStatusNormExpr" /> = 0 AND (p.schedule_date > CURRENT_DATE OR (p.schedule_date = CURRENT_DATE AND (CAST(p.schedule_date AS TIMESTAMP) + CAST(s.expect_time AS TIME)) >= NOW())))
                 OR <include refid="slotStatusNormExpr" /> = 1
-                OR <include refid="slotStatusNormExpr" /> = 2
                 OR <include refid="slotStatusNormExpr" /> = 3
                 OR <include refid="slotStatusNormExpr" /> = 5
                 OR <include refid="orderStatusNormExpr" /> = 4
             )
-            <!-- 6. 状态筛选: unbooked(0) locked(2) booked(2) checked(1) cancelled(4) returned(5) -->
+            <!-- 6. 状态过滤 -->
             <if test="query.status != null and query.status != '' and query.status != 'all'">
                 <choose>
                     <when test="'unbooked'.equals(query.status) or '未预约'.equals(query.status)">
@@ -325,15 +318,7 @@
                         )
                     </when>
                     <when test="'booked'.equals(query.status) or '已预约'.equals(query.status)">
-                        AND <include refid="slotStatusNormExpr" /> = 2
+                        AND <include refid="slotStatusNormExpr" /> = 1
-                        AND <include refid="orderStatusNormExpr" /> = 1
-                        AND (
-                            d.is_stopped IS NULL
-                            OR d.is_stopped = FALSE
-                        )
-                    </when>
-                    <when test="'locked'.equals(query.status) or '已锁定'.equals(query.status)">
-                        AND <include refid="slotStatusNormExpr" /> = 2
                         AND <include refid="orderStatusNormExpr" /> = 1
                         AND (
                             d.is_stopped IS NULL
@@ -341,7 +326,13 @@
                         )
                     </when>
                     <when test="'checked'.equals(query.status) or '已取号'.equals(query.status)">
-                        AND <include refid="slotStatusNormExpr" /> = 1
+                        AND (
+                            <include refid="slotStatusNormExpr" /> = 3
+                            OR (
+                                <include refid="slotStatusNormExpr" /> = 1
+                                AND <include refid="orderStatusNormExpr" /> = 2
+                            )
+                        )
                         AND (
                             d.is_stopped IS NULL
                             OR d.is_stopped = FALSE
@@ -349,7 +340,7 @@
                     </when>
                     <when test="'cancelled'.equals(query.status) or '已停诊'.equals(query.status) or '已取消'.equals(query.status)">
                         AND (
-                            <include refid="slotStatusNormExpr" /> = 4
+                            <include refid="slotStatusNormExpr" /> = 2
                             OR d.is_stopped = TRUE
                         )
                     </when>

openhis-ui-vue3/src/utils/medicalConstants.js

@@ -172,12 +172,12 @@ export const SlotStatus = {
   AVAILABLE: 0,
   /** 已预约 */
   BOOKED: 1,
-  /** 已锁定 */
+  /** 已取消 / 已停诊 */
-  LOCKED: 2,
+  CANCELLED: 2,
   /** 已签到 / 已取号 */
   CHECKED_IN: 3,
-  /** 已取消 / 已停诊 */
+  /** 已锁定 */
-  CANCELLED: 4,
+  LOCKED: 4,
 };
 
 /**
@@ -185,10 +185,10 @@ export const SlotStatus = {
  */
 export const SlotStatusDescriptions = {
   0: '未预约',
-  1: '已取号',
+  1: '已预约',
-  2: '已锁定',
+  2: '已停诊',
   3: '已取号',
-  4: '已停诊',
+  4: '已锁定',
 };
 
 /**

openhis-ui-vue3/src/views/appoinmentmanage/outpatientAppointment/index.vue

@@ -34,7 +34,6 @@
           <select id="status-select" class="search-select" v-model="selectedStatus" @change="onSearch">
             <option value="all">全部</option>
             <option value="unbooked">未预约</option>
-            <option value="locked">已锁定</option>
             <option value="booked">已预约</option>
             <option value="checked">已取号</option>
             <option value="cancelled">已停诊</option>
@@ -254,7 +253,6 @@ import useUserStore from '@/store/modules/user';
 
 const STATUS_CLASS_MAP = {
   '未预约': 'status-unbooked',
-  '已锁定': 'status-locked',
   '已预约': 'status-booked',
   '已取号': 'status-checked',
   '已退号': 'status-returned',
@@ -776,7 +774,6 @@ export default {
       // 🔧 BugFix#399: 确保已取号状态正确匹配
       const statusMap = {
         unbooked: ['未预约'],
-        locked: ['已锁定'],
         booked: ['已预约'],
         checked: ['已取号', '已签到'],
         cancelled: ['已停诊', '已取消'],

openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue

@@ -1685,7 +1685,7 @@ function loadCheckInPatientList() {
   const today = formatDateStr(new Date(), 'YYYY-MM-DD');
   listTicket({
     date: today,
-    status: 'locked',
+    status: 'booked',
     name: checkInSearchKey.value, // 支持姓名等模糊查询，后端需适配
     page: checkInPage.value,
     limit: checkInLimit.value

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -1173,9 +1173,8 @@ function handleSaveSign(row, index) {
       cleanRow.generateSourceEnum = 6; // 手术计费
       cleanRow.sourceBillNo = props.patientInfo.sourceBillNo;
     }
-    // 🔧 门诊计费场景：保存为草稿，让药品出现在临时医嘱弹窗"已引用计费药品（待生成医嘱）"中
+    console.log('cleanRow', cleanRow)
-    const adviceOpType = props.patientInfo.sourceBillNo ? '0' : '1'
+    savePrescription({ adviceSaveList: [cleanRow] }, '1').then((res) => {
-    savePrescription({ adviceSaveList: [cleanRow] }, adviceOpType).then((res) => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('保存成功');
         getListInfo(false);

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

@@ -316,13 +316,13 @@
               <!-- Bug #384修复: 单价显示套餐价格（如果选中）或部位价格 -->
               <el-table-column label="单价" width="75" align="right">
                 <template #default="scope">
-                  {{ formatDetailAmount(getSelectedItemAmount(scope.row)) }}
+                  {{ scope.row.selectedMethod?.packagePrice || scope.row.price }}
                 </template>
               </el-table-column>
               <!-- Bug #384修复: 金额使用有效价格计算 -->
               <el-table-column label="金额" width="80" align="right">
                 <template #default="scope">
-                  {{ formatDetailAmount(getSelectedItemAmount(scope.row) * (scope.row.quantity || 1)) }}
+                  {{ ((scope.row.selectedMethod?.packagePrice || scope.row.price || 0) * (scope.row.quantity || 1)).toFixed(2) }}
                 </template>
               </el-table-column>
               <el-table-column label="类型" prop="checkType" width="70" align="center" />
@@ -392,6 +392,37 @@
                   <div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
                     加载中...
                   </div>
+                  <!-- Bug #428修复: 渲染分类联动加载的检查方法列表 -->
+                  <!-- Bug #500修复: v-if 改为 v-show，避免方法列表加载时 DOM 突然插入导致高度跳变 -->
+                  <div
+                    v-show="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>
+                  <!-- Bug #500修复: 加载中的方法列表骨架占位，提前预留空间避免高度跳变 -->
+                  <div
+                    v-if="categoryLoadingSet.has(cat.typeId) && (!cat.methods || cat.methods.length === 0)"
+                    class="method-section method-section-skeleton"
+                  >
+                    <div class="method-section-title">检查方法</div>
+                    <div class="skeleton-method-row"></div>
+                    <div class="skeleton-method-row"></div>
+                  </div>
                 </el-collapse-item>
               </el-collapse>
             </div>
@@ -409,103 +440,46 @@
                 class="selected-item-card"
                 :class="{ 'is-expanded': item.expanded }"
               >
-                <!-- 项目卡片头部：项目和检查方法解耦，点击展开查看方法/明细 -->
+                <!-- Bug #384修复 + #426修复: 项目卡片头部，可展开/收起 -->
                 <div class="card-header" @click="toggleItemExpand(item)">
-                  <el-tooltip :content="getDisplayItemName(item)" placement="top" :show-after="400">
+                  <el-tag v-if="item.isPackage || item.packageName" size="small" type="warning" style="margin-right: 4px; flex-shrink: 0;">套餐</el-tag>
-                    <span class="card-name">{{ getDisplayItemName(item) }}</span>
+                  <el-tooltip :content="item.name" placement="top" :show-after="400">
+                    <span class="card-name">{{ item.name }}</span>
                   </el-tooltip>
-                  <span class="card-price">¥{{ formatDetailAmount(getSelectedItemAmount(item)) }}</span>
+                  <span class="card-price">¥{{ formatDetailAmount(item.price) }}</span>
                   <el-icon :class="['expand-icon', { expanded: item.expanded }]">
-                    <ArrowDown />
+                    <ArrowDown v-if="!item.expanded" />
+                    <ArrowUp v-if="item.expanded" />
                   </el-icon>
                   <!-- 删除按钮 -->
                   <el-button link type="danger" size="small" @click.stop="handleRemoveItem(idx, item)">
                     <el-icon><Close /></el-icon>
                   </el-button>
                 </div>
-                <div v-if="item.expanded" class="selected-card-body">
+                <!-- Bug #428: 有套餐 ID 时默认展开；加载中/空/明细均在本区域展示 -->
-                  <div v-if="shouldShowItemPackageBody(item)">
+                <div v-if="item.expanded && shouldShowPackageBody(item)" class="selected-card-body">
-                    <div class="package-toggle" @click.stop="toggleItemPackageExpand(item)">
+                  <div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
-                      <span>项目套餐明细</span>
+                  <template v-else>
-                      <el-icon :class="['expand-icon', { expanded: item.itemPackageExpanded }]">
+                    <div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
-                        <ArrowDown />
+                      暂无套餐明细
-                      </el-icon>
                     </div>
-                    <div v-show="item.itemPackageExpanded">
+                    <div v-else class="package-details-list">
-                      <div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
+                      <div class="package-details-head">套餐明细</div>
-                      <template v-else>
+                      <div
-                        <div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
+                        v-for="(detail, dIdx) in getPackageDetailsList(item)"
-                          暂无套餐明细
+                        :key="detail.id ?? detail.itemCode ?? `d-${dIdx}`"
-                        </div>
+                        class="detail-row"
-                        <div v-else class="package-details-list">
-                        <div
-                          v-for="(detail, dIdx) in getPackageDetailsList(item)"
-                          :key="detail.id ?? detail.itemCode ?? `d-${dIdx}`"
-                          class="detail-row"
-                        >
-                          <el-tooltip :content="detail.name" placement="top" :show-after="500">
-                            <span class="detail-name">{{ detail.name }}</span>
-                          </el-tooltip>
-                          <div class="detail-meta">
-                            <span class="detail-qty">×{{ detail.quantity || 1 }}</span>
-                            <span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
-                          </div>
-                        </div>
-                      </div>
-                      </template>
-                    </div>
-                  </div>
-                  <div class="selected-card-section">
-                    <div class="selected-section-title">检查方法</div>
-                    <div v-if="!item.methods || item.methods.length === 0" class="selected-method-empty">
-                      暂无检查方法
-                    </div>
-                    <div
-                      v-for="method in item.methods"
-                      :key="method.id"
-                      class="selected-method-option"
-                    >
-                      <el-checkbox
-                        :model-value="item.selectedMethod?.id === method.id"
-                        @change="(val) => selectMethodCheckbox(val, item, method)"
-                        class="method-checkbox"
                       >
-                        {{ method.name }}
+                        <el-tooltip :content="detail.name" placement="top" :show-after="500">
-                      </el-checkbox>
+                          <span class="detail-name">{{ detail.name }}</span>
-                      <span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
+                        </el-tooltip>
-                    </div>
+                        <div class="detail-meta">
-                  </div>
+                          <span class="detail-qty">×{{ detail.quantity || 1 }}</span>
-                  <div v-if="shouldShowMethodPackageBody(item)">
+                          <span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
-                    <div class="package-toggle" @click.stop="toggleMethodPackageExpand(item)">
-                      <span>检查方法套餐明细</span>
-                      <el-icon :class="['expand-icon', { expanded: item.methodPackageExpanded }]">
-                        <ArrowDown />
-                      </el-icon>
-                    </div>
-                    <div v-show="item.methodPackageExpanded">
-                      <div v-if="item.methodPackageLoading" class="package-details-loading">加载中...</div>
-                      <template v-else>
-                        <div v-if="getMethodPackageDetailsList(item).length === 0" class="package-details-empty">
-                          暂无检查方法套餐明细
-                        </div>
-                        <div v-else class="package-details-list method-package-list">
-                        <div
-                          v-for="(detail, dIdx) in getMethodPackageDetailsList(item)"
-                          :key="detail.id ?? detail.itemCode ?? `md-${dIdx}`"
-                          class="detail-row"
-                        >
-                          <el-tooltip :content="detail.name" placement="top" :show-after="500">
-                            <span class="detail-name">{{ detail.name }}</span>
-                          </el-tooltip>
-                          <div class="detail-meta">
-                            <span class="detail-qty">×{{ detail.quantity || 1 }}</span>
-                            <span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
-                          </div>
                         </div>
                       </div>
-                      </template>
                     </div>
-                  </div>
+                  </template>
                 </div>
               </div>
             </div>
@@ -519,7 +493,7 @@
 <script setup>
 import { ref, reactive, computed, watch, onMounted, nextTick } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { Printer, Delete, ArrowDown, Close } from '@element-plus/icons-vue';
+import { Printer, Delete, ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
 import useUserStore from '@/store/modules/user';
 import request from '@/utils/request';
 import { listCheckMethod, searchCheckMethod, listCheckPackage } from '@/api/system/checkType';
@@ -650,48 +624,24 @@ async function loadPackageDetails(row, treeNode, resolve) {
   }
 }
 
+// #428修复 + #426修复: 为已选择项目加载套餐明细（通过packageId或packageName查询）
+/** 套餐明细挂在「部位」或已选的「检查方法」上（方法可带 packageId） */
+function getPackageCarrier(item) {
+  return item?.selectedMethod?.packageId ? item.selectedMethod : item;
+}
+
 function getPackageDetailsList(item) {
   // 明细挂在行对象上，避免仅写入 methods 内嵌对象时首帧不触发视图更新（体感需点两次才展开）
   if (Array.isArray(item?.packageDetailsDisplay)) {
     return item.packageDetailsDisplay;
   }
-  return Array.isArray(item?.packageDetails) ? item.packageDetails : [];
+  const carrier = getPackageCarrier(item);
-}
+  return Array.isArray(carrier?.packageDetails) ? carrier.packageDetails : [];
-
-function getMethodPackageDetailsList(item) {
-  if (Array.isArray(item?.methodPackageDetails)) {
-    return item.methodPackageDetails;
-  }
-  return Array.isArray(item?.selectedMethod?.packageDetails) ? item.selectedMethod.packageDetails : [];
 }
 
 /** 有套餐 ID 或 packageName 的已选行才展示右侧套餐区（加载中 / 空 / 明细列表） */
 function shouldShowPackageBody(item) {
-  return shouldShowItemPackageBody(item) || shouldShowMethodPackageBody(item);
+  return !!(getPackageCarrier(item)?.packageId || item.packageName || item.packageId);
-}
-
-function hasItemPackage(item) {
-  return !!(item?.packageId || item?.packageName);
-}
-
-function hasMethodPackage(item) {
-  return !!(item?.selectedMethod?.packageId || item?.selectedMethod?.packageName);
-}
-
-function isSamePackage(item) {
-  if (!hasItemPackage(item) || !hasMethodPackage(item)) return false;
-  if (item.packageId && item.selectedMethod?.packageId) {
-    return String(item.packageId) === String(item.selectedMethod.packageId);
-  }
-  return String(item.packageName || '') === String(item.selectedMethod?.packageName || '');
-}
-
-function shouldShowItemPackageBody(item) {
-  return hasItemPackage(item);
-}
-
-function shouldShowMethodPackageBody(item) {
-  return hasMethodPackage(item) && !isSamePackage(item);
 }
 
 /** 金额展示：统一两位小数 */
@@ -700,18 +650,20 @@ function formatDetailAmount(value) {
   return Number.isFinite(n) ? n.toFixed(2) : '0.00';
 }
 
-/** 已选卡片名称：去掉 UI 上冗余的“套餐”前缀，完整名称通过 tooltip 展示 */
+/** 默认检查方法：优先与部位 packageId 一致的方法，否则取首个带套餐的方法，否则取第一个 */
-function getDisplayItemName(item) {
+function pickDefaultMethod(methods, partItem) {
-  return String(item?.name || '').replace(/^套餐[：:\-\s]*/, '');
+  if (!methods?.length) return null;
-}
+  if (methods.length === 1) return methods[0];
-
+  const pid = partItem?.packageId ?? null;
-function getSelectedItemAmount(item) {
+  if (pid != null && pid !== '') {
-  const itemPrice = Number(item?.price || 0);
+    const matched = methods.find(
-  const methodPrice = Number(item?.selectedMethod?.packagePrice || 0);
+      (x) => x.packageId != null && String(x.packageId) === String(pid)
-  if (!hasMethodPackage(item) || isSamePackage(item)) {
+    );
-    return itemPrice;
+    if (matched) return matched;
   }
-  return itemPrice + methodPrice;
+  const withPkg = methods.find((x) => x.packageId != null);
+  if (withPkg) return withPkg;
+  return methods[0];
 }
 
 function parsePackageDetailsPayload(res) {
@@ -727,15 +679,15 @@ function parsePackageDetailsPayload(res) {
 
 // #428: 为已选择项目加载套餐明细（后端：CheckTypeController /system/check-type/package/{id}/details）
 async function loadPackageDetailsForItem(item) {
-  let packageId = item.packageId;
+  const carrier = getPackageCarrier(item);
-  const packageName = item.packageName;
+  let packageId = item.packageId || carrier?.packageId;
-  if (!packageId && !packageName) {
+  if (!packageId && !item.packageName) {
     return;
   }
   item.packageDetailsLoading = true;
   try {
-    if (!packageId && packageName) {
+    if (!packageId && item.packageName) {
-      const pkgRes = await listCheckPackage({ packageName });
+      const pkgRes = await listCheckPackage({ packageName: item.packageName });
       let packages = pkgRes?.data || [];
       if (!Array.isArray(packages)) {
         packages = packages.records || packages.data || [];
@@ -747,7 +699,6 @@ async function loadPackageDetailsForItem(item) {
       }
       packageId = packages[0].id;
       item.packageId = packageId;
-      item.packageName = item.packageName || packageName;
     }
     if (!packageId) {
       item.packageDetails = [];
@@ -767,6 +718,7 @@ async function loadPackageDetailsForItem(item) {
       quantity: detail.quantity || 1
     }));
     item.packageDetailsDisplay = mapped;
+    carrier.packageDetails = mapped;
     if (res.code === 200 && res.data) {
       item.packageDetails = Array.isArray(res.data)
         ? res.data.map((detail) => ({
@@ -783,6 +735,7 @@ async function loadPackageDetailsForItem(item) {
   } catch (err) {
     console.error('加载套餐明细失败:', err);
     item.packageDetailsDisplay = [];
+    carrier.packageDetails = [];
     item.packageDetails = [];
   } finally {
     item.packageDetailsLoading = false;
@@ -1105,10 +1058,7 @@ async function loadCategoryList() {
 
     // 默认展开第一个
     if (categoryList.value.length > 0) {
-      const firstCat = categoryList.value[0];
+      activeNames.value = categoryList.value[0].typeId;
-      activeNames.value = firstCat.typeId;
-      await nextTick();
-      await handleCategoryExpand(firstCat);
     }
   } catch (err) {
     console.error('加载检查项目分类失败', err);
@@ -1129,9 +1079,10 @@ const filteredCategoryList = computed(() => {
 });
 
 // ====== 合计 ======
+// Bug #384修复: 如果选中了检查方法，使用套餐价格；否则使用部位价格
 const totalAmountCalc = computed(() => {
   const total = selectedItems.value.reduce((sum, item) => {
-    const effectivePrice = getSelectedItemAmount(item);
+    const effectivePrice = item.selectedMethod?.packagePrice || item.price;
     return sum + (effectivePrice * (item.quantity || 1));
   }, 0);
   return total.toFixed(2);
@@ -1264,7 +1215,8 @@ function handleSave() {
         itemCode: String(item.id),
         itemName: item.name,
         bodyPartCode: item.checkType || 'unknown',
-        itemFee: getSelectedItemAmount(item),
+        // Bug #384修复: 如果选中了检查方法且有套餐价格，使用套餐价格；否则使用部位价格
+        itemFee: item.selectedMethod?.packagePrice || item.price,
         performDeptCode: form.performDeptCode || '',
         itemStatus: 0,
         itemSeq: index + 1,
@@ -1317,8 +1269,6 @@ function handleRowClick(row) {
             methods: [],
             selectedMethod: null,
             expanded: false,
-            itemPackageExpanded: true,
-            methodPackageExpanded: true,
             packageDetailsLoading: false,
             isPackage: false,
             packageId: null,
@@ -1348,10 +1298,17 @@ function handleRowClick(row) {
                 if (m.checkMethodId) {
                   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;
                     item.hasChildren = true;  // #426修复
                   }
                 }
+                if (!item.selectedMethod && item.methods.length) {
+                  item.selectedMethod = pickDefaultMethod(item.methods, { packageId: item.packageId });
+                }
                 if (item.selectedMethod?.packageId) {
+                  item.packageId = item.selectedMethod.packageId;
+                  item.isPackage = true;
                   item.hasChildren = true;  // #426修复
                 }
               }
@@ -1365,21 +1322,14 @@ function handleRowClick(row) {
         selectedItems.value = itemsWithMethods;
         // 加载套餐明细（单个失败不影响其他项目和明细显示）
         for (const it of selectedItems.value) {
-          if (hasItemPackage(it)) {
+          if (getPackageCarrier(it)?.packageId) {
             try {
               await loadPackageDetailsForItem(it);
             } catch (e) {
               console.error('加载套餐明细失败:', it.name, e);
             }
           }
-          if (hasMethodPackage(it) && !isSamePackage(it)) {
+          it.expanded = !!getPackageCarrier(it)?.packageId;
-            try {
-              await loadMethodPackageDetails(it, it.selectedMethod);
-            } catch (e) {
-              console.error('加载检查方法套餐明细失败:', it.name, e);
-            }
-          }
-          it.expanded = shouldShowPackageBody(it);
         }
         syncCategoryChecked();
         // Bug #384修复: 回充后更新检查方法显示
@@ -1409,6 +1359,97 @@ 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;
+      // 从方法中获取套餐信息（支持 packageId 或 packageName 解析）
+      if (method.packageId || method.packageName) {
+        existingItem.isPackage = true;
+        existingItem.packageId = method.packageId || existingItem.packageId;
+        existingItem.hasChildren = true;  // #426修复
+        existingItem.packageName = method.packageName || existingItem.packageName;  // #428修复: 确保 packageName 同步
+        // 预加载套餐明细
+        loadPackageDetailsForItem(existingItem);
+      }
+      updateMethodDisplay();
+      return;
+    }
+
+    // 如果该项目不存在，创建一个并关联方法
+    if (selectedItems.value.length > 0) {
+      const currentCategory = selectedItems.value[0].checkType;
+      // Bug #428修复: 使用 cat.typeName 进行比较（与 newItem.checkType 保持一致）
+      const newCategory = cat.typeName || '';
+      if (currentCategory !== newCategory) {
+        ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
+        return;
+      }
+    }
+
+    const newItem = {
+      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: cat.methods || [method],   // #428修复: 复制分类下全部方法，允许用户切换
+      selectedMethod: method,
+      expanded: false,
+      // 从方法或项目中获取套餐信息
+      isPackage: !!method.packageId || !!targetItem.packageName,
+      packageId: method.packageId || targetItem.packageId || null,
+      packageName: method.packageName || targetItem.packageName || null,  // #428修复: 复制 packageName，确保套餐明细可加载
+      hasChildren: !!(method.packageId || method.packageName || targetItem.packageId || targetItem.packageName)  // #426修复: 树形表格懒加载展开标记，支持 packageName 解析
+    };
+    selectedItems.value.push(newItem);
+
+    // 如果是套餐，预加载套餐明细
+    if (newItem.isPackage && (newItem.packageId || newItem.packageName)) {
+      loadPackageDetailsForItem(newItem);
+    }
+
+    // 自动回填执行科室
+    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) {
@@ -1465,8 +1506,6 @@ async function handleItemSelect(checked, item, cat) {
       methods: methods,
       selectedMethod: null,
       expanded: false,
-      itemPackageExpanded: true,
-      methodPackageExpanded: true,
       isPackage: !!(item.packageId || item.packageName),
       packageName: item.packageName || null,
       packageDetailsLoading: false,
@@ -1477,15 +1516,15 @@ async function handleItemSelect(checked, item, cat) {
     // 必须用数组里的响应式行，不能继续改局部 newRow：push 后列表内是 proxy，改 raw 对象不会触发右侧卡片更新（会一直卡在「加载中」）
     const row = selectedItems.value[selectedItems.value.length - 1];
 
-    // 勾选项目只加入项目列表，检查方法由用户在“检查方法”区域手动选择
+    // 右侧不再展示「检查方法」列表：自动选默认方法（保存、计价仍依赖 selectedMethod）
-    row.selectedMethod = null;
+    if (methods.length >= 1) {
+      row.selectedMethod = pickDefaultMethod(methods, item);
+    }
     updateMethodDisplay();
 
-    // 新勾选项目后默认展开，直接展示检查方法状态和套餐明细
+    // 有套餐 ID 时默认展开（先显示加载区，明细写入行对象 packageDetailsDisplay）
-    row.expanded = true;
+    row.expanded = !!getPackageCarrier(row)?.packageId;
-    row.itemPackageExpanded = true;
+    if (getPackageCarrier(row)?.packageId) {
-    row.methodPackageExpanded = true;
-    if (hasItemPackage(row)) {
       await loadPackageDetailsForItem(row);
     }
 
@@ -1511,35 +1550,13 @@ async function handleItemSelect(checked, item, cat) {
 // Bug #384修复 + #426修复: 展开/收起项目卡片
 async function toggleItemExpand(item) {
   item.expanded = !item.expanded;
-  if (item.expanded && hasItemPackage(item) && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
+  if (item.expanded && (item.isPackage || item.packageName) && (!item.packageDetails || item.packageDetails.length === 0) && !item.packageDetailsLoading) {
     await loadPackageDetailsForItem(item);
   }
-  if (
+  if (item.expanded && shouldShowPackageBody(item)) {
-    item.expanded &&
+    if (getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
-    shouldShowMethodPackageBody(item) &&
+      await loadPackageDetailsForItem(item);
-    getMethodPackageDetailsList(item).length === 0 &&
+    }
-    !item.methodPackageLoading
-  ) {
-    await loadMethodPackageDetails(item, item.selectedMethod);
-  }
-}
-
-async function toggleItemPackageExpand(item) {
-  item.itemPackageExpanded = !item.itemPackageExpanded;
-  if (item.itemPackageExpanded && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
-    await loadPackageDetailsForItem(item);
-  }
-}
-
-async function toggleMethodPackageExpand(item) {
-  item.methodPackageExpanded = !item.methodPackageExpanded;
-  if (
-    item.methodPackageExpanded &&
-    item.selectedMethod &&
-    getMethodPackageDetailsList(item).length === 0 &&
-    !item.methodPackageLoading
-  ) {
-    await loadMethodPackageDetails(item, item.selectedMethod);
   }
 }
 
@@ -1547,8 +1564,9 @@ async function toggleMethodPackageExpand(item) {
 async function selectMethodCheckbox(checked, item, method) {
   if (checked) {
     item.selectedMethod = method;
-    item.expanded = true;
+    if (item.expanded && (method.packageId || method.packageName)) {
-    item.methodPackageExpanded = true;
+      loadPackageDetailsForItem(item);
+    }
     // 动态加载该方法对应的套餐明细
     await loadMethodPackageDetails(item, method);
   } else {
@@ -1569,43 +1587,36 @@ async function loadMethodPackageDetails(item, method) {
   item.methodPackageLoading = true;
   item.methodPackageDetails = [];
   try {
-    let packageId = method.packageId;
+    if (!method.packageName) {
-    if (!packageId && !method.packageName) {
       item.methodPackageLoading = false;
       return;
     }
     // 通过packageName查询套餐获取packageId
-    if (!packageId && method.packageName) {
+    const pkgRes = await listCheckPackage({ packageName: method.packageName });
-      const pkgRes = await listCheckPackage({ packageName: method.packageName });
+    let packages = pkgRes?.data || [];
-      let packages = pkgRes?.data || [];
+    if (!Array.isArray(packages)) {
-      if (!Array.isArray(packages)) {
+      packages = packages.records || packages.data || [];
-        packages = packages.records || packages.data || [];
-      }
-      if (packages.length === 0) {
-        item.methodPackageLoading = false;
-        return;
-      }
-      packageId = packages[0].id;
-      method.packageId = packageId;
     }
+    if (packages.length === 0) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    const packageId = packages[0].id;
     // 查询套餐明细
     const detailRes = await request({
-      url: `/system/check-type/package/${packageId}/details`,
+      url: `/system/package/${packageId}/details`,
       method: 'get'
     });
-    const detailList = parsePackageDetailsPayload(detailRes);
+    if (detailRes.code === 200 && detailRes.data) {
-    if (detailList.length > 0) {
+      item.methodPackageDetails = detailRes.data.map(d => ({
-      const mapped = detailList.map(d => ({
         id: d.id,
-        name: d.name || d.itemName,
+        name: d.itemName || d.name,
         quantity: d.quantity || 1,
         unit: d.unit || '次',
-        price: d.price ?? d.unitPrice ?? d.itemPrice ?? 0,
+        price: d.unitPrice || d.price || 0,
         amount: d.amount || d.total || 0,
         checked: true  // 默认勾选
       }));
-      item.methodPackageDetails = mapped;
-      method.packageDetails = mapped;
     }
   } catch (err) {
     console.error('加载方法套餐明细失败:', err);
@@ -1619,18 +1630,20 @@ async function loadMethodPackageDetails(item, method) {
 async function onDetailMethodChange(row, val) {
   row.selectedMethod = val || null;
   if (val?.packageId || val?.packageName) {
+    row.packageId = val.packageId || row.packageId;
+    row.packageName = val.packageName || row.packageName;
+    row.isPackage = true;
     row.hasChildren = true;  // #426修复
   }
-  row.methodPackageDetails = [];
+  row.packageDetailsDisplay = undefined;
-  updateMethodDisplay();
+  const carrier = getPackageCarrier(row);
-  row.expanded = shouldShowPackageBody(row);
+  if (carrier) {
-  row.itemPackageExpanded = true;
+    carrier.packageDetails = undefined;
-  row.methodPackageExpanded = true;
-  if (hasItemPackage(row)) {
-    await loadPackageDetailsForItem(row);
   }
-  if (val?.packageId || val?.packageName) {
+  updateMethodDisplay();
-    await loadMethodPackageDetails(row, val);
+  row.expanded = !!getPackageCarrier(row)?.packageId;
+  if (getPackageCarrier(row)?.packageId) {
+    await loadPackageDetailsForItem(row);
   }
   nextTick(() => {
     form.totalAmount = totalAmountCalc.value;
@@ -1781,7 +1794,7 @@ defineExpose({ getList });
 
 /* 右：分类面板 */
 .category-panel {
-  width: 560px;
+  width: 420px;
   flex-shrink: 0;
   background: #fff;
   border-radius: 4px;
@@ -1938,9 +1951,9 @@ defineExpose({ getList });
 /* 已选择 tags */
 /* 已选择：加宽，避免套餐明细挤成一团 */
 .selected-panel {
-  width: 260px;
+  width: 220px;
-  min-width: 240px;
+  min-width: 200px;
-  max-width: 320px;
+  max-width: 280px;
   flex-shrink: 0;
   display: flex;
   flex-direction: column;
@@ -2000,8 +2013,9 @@ defineExpose({ getList });
   font-size: 13px;
   font-weight: 500;
   color: #303133;
-  line-height: 1.4;
+  overflow: hidden;
-  word-break: break-word;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .card-price {
@@ -2016,11 +2030,12 @@ defineExpose({ getList });
   color: #909399;
   transition: transform 0.2s ease;
   flex-shrink: 0;
-  transform: rotate(-90deg);
+  transition: transform 0.2s;
+  transform: rotate(0deg);
 }
 
 .expand-icon.expanded {
-  transform: rotate(0deg);
+  transform: rotate(90deg);
 }
 
 /* Bug #428修复: 套餐明细列表样式 */
@@ -2063,55 +2078,6 @@ defineExpose({ getList });
   background: #fafbfc;
 }
 
-.selected-card-section {
-  padding: 10px;
-  border-bottom: 1px solid #ebeef5;
-}
-
-.selected-section-title {
-  font-size: 12px;
-  font-weight: 600;
-  color: #409eff;
-  margin-bottom: 8px;
-  padding-bottom: 6px;
-  border-bottom: 1px dashed #d9ecff;
-}
-
-.selected-method-option {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  padding: 4px 0;
-}
-
-.selected-method-option .method-checkbox {
-  flex: 1;
-  min-width: 0;
-}
-
-.selected-method-empty {
-  color: #c0c4cc;
-  font-size: 12px;
-}
-
-.package-toggle {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 10px;
-  font-size: 12px;
-  font-weight: 600;
-  color: #909399;
-  cursor: pointer;
-  border-bottom: 1px dashed #dcdfe6;
-  background: #fffbe6;
-}
-
-.package-toggle:hover {
-  color: #409eff;
-}
-
 .package-details-loading,
 .package-details-empty {
   padding: 12px 10px;

openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue

@@ -1185,9 +1185,9 @@ const loadCategoryItems = async (categoryKey, loadMore = false) => {
 
     // 映射数据格式（从检验项目维护页面的数据结构映射）
     const mappedItems = records.map(item => {
-      // 套餐项目处理：需同时满足 feePackageId 有效且 packageName 非空
+      // 套餐项目处理：套餐项目使用套餐金额，普通项目使用零售价
-      // BugFix#556: 增加 packageName 联合判断，避免普通项目因 feePackageId 有值被误标为套餐
+      // BugFix#404: 增加对空字符串的判断，避免空字符串被误认为有效套餐ID
-      const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName
+      const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null'
       const itemPrice = isPackage
         ? (parseFloat(item.packageAmount || 0) || parseFloat(item.retailPrice || 0) || parseFloat(item.price || 0))
         : (parseFloat(item.retailPrice || 0) || parseFloat(item.price || 0))

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

@@ -86,7 +86,7 @@
           </template>
           <el-table-column type="index" label="序号" width="60" align="center" />
           <el-table-column prop="patientName" label="患者姓名" width="120" />
-          <el-table-column label="申请单名称" min-width="140">
+          <el-table-column label="申请单名称" width="140">
             <template #default="scope">
               <span>{{ buildApplicationName(scope.row) }}</span>
             </template>
@@ -444,9 +444,11 @@ const buildApplicationName = (row) => {
   if (!details || details.length === 0) {
     return row.name || '-';
   }
-  const names = details.map(d => d.adviceName).filter(Boolean);
+  if (details.length === 1) {
-  if (names.length === 0) return row.name || '-';
+    return details[0].adviceName || row.name || '-';
-  return names.join(' + ');
+  }
+  const first = details[0];
+  return `${first.adviceName || ''}等${details.length}项`;
 };
 
 /**

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

@@ -41,9 +41,7 @@
               <el-option label="全部" value="" />
               <el-option label="待签发" value="0" />
               <el-option label="已签发" value="1" />
-              <el-option label="已采证" value="4" />
+              <el-option label="已出报告" value="6" />
-              <el-option label="已送检" value="5" />
-              <el-option label="报告已出" value="6" />
               <el-option label="已作废" value="7" />
             </el-select>
           </el-form-item>
@@ -93,15 +91,7 @@
           <el-table-column prop="prescriptionNo" label="申请单号" width="140" />
           <el-table-column label="单据状态" width="100" align="center">
             <template #default="scope">
-              <el-tag
+              <span>{{ parseBillStatus(scope.row.billStatus ?? scope.row.status) }}</span>
-                :type="getBillStatusTagType(scope.row)"
-                effect="plain"
-                round
-                :class="{ 'report-status-tag': isReportStatus(scope.row) }"
-                @click="handleStatusClick(scope.row)"
-              >
-                {{ parseBillStatus(getBillStatus(scope.row)) }}
-              </el-tag>
             </template>
           </el-table-column>
           <el-table-column label="申请类型" width="100" align="center">
@@ -117,16 +107,16 @@
           <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
           <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="scope">
-              <!-- 待签发：可修改、删除 -->
+              <!-- 待签发（status=0或null/undefined）：可修改、删除 -->
-              <template v-if="isPendingStatus(scope.row)">
+              <template v-if="!scope.row.status || 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>
-              <!-- 已签发：可撤回 -->
+              <!-- 已签发（status=1）：可撤回 -->
-              <template v-else-if="isIssuedStatus(scope.row)">
+              <template v-else-if="scope.row.status == 1">
                 <el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
               </template>
-              <!-- 已采证、已送检、报告已出、已作废：仅查看详情 -->
+              <!-- 已校对(2)、待接收(3)、已收样(4)、已出报告(6)、已作废(7)：仅查看详情 -->
               <template v-else>
                 <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
               </template>
@@ -222,10 +212,10 @@
 </template>
 
 <script setup>
-import {computed, getCurrentInstance, nextTick, ref, watch} from 'vue';
+import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh, Search} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
-import {getInspection, deleteRequestForm, withdrawRequestForm, getProofResult} from './api';
+import {getInspection, deleteRequestForm, withdrawRequestForm} from './api';
 import {getDepartmentList} from '@/api/public.js';
 import LaboratoryTests from '../order/applicationForm/laboratoryTests.vue';
 import {saveInspection} from '../order/applicationForm/api.js';
@@ -280,7 +270,7 @@ const fetchData = async () => {
     if (res.code === 200 && res.data) {
       const raw = res.data?.records || res.data;
       const list = Array.isArray(raw) ? raw : [raw];
-      tableData.value = list.filter(Boolean).sort(sortByCreateTimeDesc);
+      tableData.value = list.filter(Boolean);
     } else {
       tableData.value = [];
     }
@@ -339,95 +329,19 @@ const labelMap = {
  * @param {string|number} status - 状态码
  * @returns {string} 状态文本
  */
-const getBillStatus = (row) => {
-  return row?.billStatus ?? row?.status ?? row?.statusEnum ?? row?.applyStatus;
-};
-
 const parseBillStatus = (status) => {
   const statusMap = {
     '0': '待签发',
     '1': '已签发',
-    '2': '已采证',
+    '2': '已校对',
-    '3': '已送检',
+    '3': '待接收',
-    '4': '已采证',
+    '4': '已收样',
-    '5': '已送检',
+    '6': '已出报告',
-    '6': '报告已出',
-    '8': '报告已出',
     '7': '已作废',
   };
   return statusMap[String(status)] || '-';
 };
 
-const getBillStatusTagType = (row) => {
-  const typeMap = {
-    '0': 'info',
-    '1': 'primary',
-    '2': 'primary',
-    '3': 'warning',
-    '4': 'primary',
-    '5': 'warning',
-    '6': 'success',
-    '7': 'danger',
-    '8': 'success',
-  };
-  return typeMap[String(getBillStatus(row))] || 'info';
-};
-
-const isPendingStatus = (row) => {
-  const status = getBillStatus(row);
-  return status === undefined || status === null || status === '' || String(status) === '0';
-};
-
-const isIssuedStatus = (row) => String(getBillStatus(row)) === '1';
-
-const isReportStatus = (row) => ['6', '8'].includes(String(getBillStatus(row)));
-
-const sortByCreateTimeDesc = (a, b) => {
-  const aTime = a?.createTime ? new Date(a.createTime).getTime() : 0;
-  const bTime = b?.createTime ? new Date(b.createTime).getTime() : 0;
-  return bTime - aTime;
-};
-
-const handleStatusClick = (row) => {
-  if (isReportStatus(row)) {
-    handleViewReport(row);
-  }
-};
-
-const pickReportUrl = (data, row) => {
-  if (!data) return '';
-  if (typeof data === 'string') return data;
-
-  const raw = data.records || data;
-  const list = Array.isArray(raw) ? raw : [raw];
-  const matched =
-    list.find((item) => {
-      const reportNo = item.busNo || item.reportNo || item.applyNo || item.prescriptionNo;
-      return reportNo && row.prescriptionNo && String(reportNo) === String(row.prescriptionNo);
-    }) || list[0];
-
-  return matched?.requestUrl || matched?.pdfUrl || matched?.reportUrl || matched?.url || '';
-};
-
-const handleViewReport = async (row) => {
-  try {
-    const res = await getProofResult({
-      encounterId: row.encounterId || patientInfo.value?.encounterId,
-      prescriptionNo: row.prescriptionNo,
-    });
-    if (res?.code === 200) {
-      const url = pickReportUrl(res.data, row);
-      if (url) {
-        window.open(url, '_blank');
-        return;
-      }
-    }
-    proxy.$modal?.msgWarning?.('暂未获取到检验报告链接');
-  } catch (e) {
-    proxy.$modal?.msgError?.(e.message || '获取检验报告失败');
-  }
-};
-
 /**
  * 解析申请类型（优先级代码）
  * @param {string} descJson - JSON字符串
@@ -529,13 +443,7 @@ const handleViewDetail = async (row) => {
   if (row.descJson) {
     try {
       const obj = JSON.parse(row.descJson);
-      // 将发往科室 ID 转换为名称
+      obj.targetDepartment = recursionFun(obj.targetDepartment);
-      if (obj.targetDepartment) {
-        const deptName = recursionFun(obj.targetDepartment);
-        if (deptName) {
-          obj.targetDepartment = deptName;
-        }
-      }
       // 转换申请类型编码为可读文本
       if (obj.applicationType === 0) obj.applicationType = '普通';
       else if (obj.applicationType === 1) obj.applicationType = '急诊';
@@ -554,12 +462,12 @@ const handleViewDetail = async (row) => {
  * 修改检验申请单（待签发状态）
  */
 const handleEdit = async (row) => {
+  // 确保科室数据已加载
+  if (!orgOptions.value || orgOptions.value.length === 0) {
+    await getLocationInfo();
+  }
   editRowData.value = row;
   editDialogVisible.value = true;
-  await nextTick();
-  editFormRef.value?.getList?.();
-  editFormRef.value?.getLocationInfo?.();
-  editFormRef.value?.getDiagnosisList?.();
 };
 
 /**
@@ -738,10 +646,6 @@ defineExpose({
   animation: rotating 2s linear infinite;
 }
 
-.report-status-tag {
-  cursor: pointer;
-}
-
 @keyframes rotating {
   0% {
     transform: rotate(0deg);

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

@@ -134,10 +134,10 @@
   </div>
 </template>
 <script setup name="LaboratoryTests">
-import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch, computed} from 'vue';
+import {getCurrentInstance, onMounted, reactive, ref, watch, computed} 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';
 
@@ -168,7 +168,6 @@ const loading = ref(false);
 const orgOptions = ref([]);
 const searchKey = ref('');
 const totalCount = ref(0);
-const skipDeptAutoFill = ref(false);
 
 // 将已加载的全部数据转为 transfer 组件所需的格式
 const buildTransferData = (records) => {
@@ -245,8 +244,6 @@ const getList = async () => {
 const handleSearch = () => {
   // 搜索时保持已选中的项目不受影响
 };
-// 编辑初始化标志：避免 applyEditTransferSelection 设置 transferValue 时触发 projectWithDepartment 覆盖 descJson 中的科室值
-const isInitializing = ref(false);
 const transferValue = ref([]);
 const form = reactive({
   // categoryType: '', // 项目类别
@@ -264,31 +261,7 @@ const form = reactive({
   otherDiagnosisList: [], //其他断目录
 });
 const rules = reactive({});
-
-const normalizeOrgTreeIds = (nodes) => {
-  if (!Array.isArray(nodes)) return [];
-  return nodes.map((node) => ({
-    ...node,
-    id: node.id != null ? String(node.id) : node.id,
-    children: node.children?.length ? normalizeOrgTreeIds(node.children) : undefined,
-  }));
-};
-
-const resolveTargetDepartmentId = (rawId) => {
-  if (rawId == null || rawId === '') return '';
-  const node = findTreeItem(orgOptions.value, rawId);
-  return node ? String(node.id) : String(rawId);
-};
-
-const applyTargetDepartmentEcho = () => {
-  if (form.targetDepartment) {
-    form.targetDepartment = resolveTargetDepartmentId(form.targetDepartment);
-  }
-};
-
 onMounted(() => {
-  getLocationInfo();
-  getDiagnosisList();
   getList();
 });
 /**
@@ -317,9 +290,8 @@ const projectWithDepartment = (selectProjectIds, type) => {
       });
     }
   });
-  // 保存用户手动选择/回显的发往科室（提交、编辑回显时需要保留）
+  // 保存用户手动选择的发往科室（提交时需要保留）
-  const manualDept =
+  const manualDept = type === 2 ? form.targetDepartment : '';
-    type === 2 || (isEditMode.value && form.targetDepartment) ? form.targetDepartment : '';
   // 清空科室
   form.targetDepartment = '';
   if (arr.length > 0) {
@@ -339,8 +311,8 @@ const projectWithDepartment = (selectProjectIds, type) => {
     const findItem = findTreeItem(orgOptions.value, obj.orgId);
     if (!findItem) {
       // type=2(提交)时，若用户已手动选择发往科室，则允许提交
-      if ((type === 2 || isEditMode.value) && manualDept) {
+      if (type === 2 && manualDept) {
-        form.targetDepartment = resolveTargetDepartmentId(manualDept);
+        form.targetDepartment = manualDept;
         isRelease = true;
       } else if (type === 2 && !manualDept) {
         // 提交时用户未手动选择科室，才提示错误
@@ -356,10 +328,10 @@ const projectWithDepartment = (selectProjectIds, type) => {
     }
     if (findItem && isRelease) {
       // 提交时若用户已选「发往科室」，不得用项目默认执行科室覆盖
-      if ((type === 2 || isEditMode.value) && manualDept) {
+      if (type === 2 && manualDept) {
-        form.targetDepartment = resolveTargetDepartmentId(manualDept);
+        form.targetDepartment = manualDept;
       } else {
-        form.targetDepartment = String(findItem.id);
+        form.targetDepartment = findItem.id;
       }
     }
   }
@@ -369,8 +341,6 @@ const projectWithDepartment = (selectProjectIds, type) => {
 watch(
   () => transferValue.value,
   (newValue) => {
-    if (skipDeptAutoFill.value) return;
-    if (isInitializing.value) return;
     projectWithDepartment(newValue, 1);
   }
 );
@@ -407,14 +377,7 @@ const applyEditTransferSelection = () => {
     }
   }
   const uniq = [...new Set(selectedIds)]
-  // 设置初始化标志，防止 transferValue 变化触发 projectWithDepartment 覆盖 descJson 中的科室值
-  isInitializing.value = true
-  skipDeptAutoFill.value = true
   transferValue.value = uniq
-  nextTick(() => {
-    skipDeptAutoFill.value = false
-  })
-  isInitializing.value = false
   if (newData.requestFormDetailList.length && uniq.length === 0) {
     console.warn(
       '[LaboratoryTests] 申请单明细未能在项目字典中匹配到项，请核对 activityId / 项目名称',
@@ -437,7 +400,6 @@ watch(
             form[key] = obj[key]
           }
         })
-        applyTargetDepartmentEcho()
       } catch (e) {
         console.error('解析 descJson 失败:', e)
       }
@@ -448,14 +410,7 @@ watch(
   { immediate: true, deep: true }
 )
 
-watch(
+// 编辑模式下，applicationListAll 加载完成后重新回显已选项目
-  () => orgOptions.value,
-  () => {
-    applyTargetDepartmentEcho()
-  }
-)
-
-// 编辑模式下，项目字典加载完成后重新回显已选项目
 watch(
   () => applicationListAll.value,
   () => {
@@ -472,10 +427,7 @@ watch(
         selectedIds.push(matched.adviceDefinitionId);
       }
     });
-    isInitializing.value = true;
     transferValue.value = selectedIds;
-    isInitializing.value = false;
-    applyEditTransferSelection();
   }
 );
 
@@ -528,9 +480,9 @@ const submit = () => {
 };
 /** 查询科室 */
 const getLocationInfo = () => {
-  return getDepartmentList().then((res) => {
+  getOrgList().then((res) => {
-    orgOptions.value = normalizeOrgTreeIds(res.data || []);
+    orgOptions.value = res.data.records;
-    applyTargetDepartmentEcho();
+    console.log('科室========>', JSON.stringify(orgOptions.value));
   });
 };
 // 获取诊断目录

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

@@ -428,52 +428,11 @@ const loadEditData = () => {
 const projectWithDepartment = (selectProjectIds) => {
   if (!selectProjectIds || selectProjectIds.length === 0) {
     form.targetDepartment = '';
-    return;
   }
-
-  // 获取第一个选中项目的发往科室（orgId）
-  // 优先使用配置的发往科室，如果没有则保留手动选择
-  const selectedProject = applicationListAll.value?.find(
-    item => selectProjectIds.includes(item.adviceDefinitionId)
-  );
-
-  if (selectedProject && selectedProject.orgId) {
-    // 项目配置了发往科室，自动填充
-    const orgId = selectedProject.orgId;
-    const orgName = selectedProject.orgName;
-
-    // 查找树中对应的节点，获取正确的 id 类型
-    const findNode = (nodes, targetId) => {
-      if (!nodes) return null;
-      for (const node of nodes) {
-        if (String(node.id) === String(targetId)) {
-          return node;
-        }
-        if (node.children && node.children.length > 0) {
-          const found = findNode(node.children, targetId);
-          if (found) return found;
-        }
-      }
-      return null;
-    };
-
-    const treeNode = findNode(orgOptions.value, orgId);
-    if (treeNode) {
-      // 使用树节点的原始 id 值（确保类型匹配）
-      form.targetDepartment = treeNode.id;
-    } else {
-      // 科室不在列表中（可能已删除），留空让用户手动选择
-      form.targetDepartment = '';
-    }
-  }
-  // 如果没有配置发往科室，保留手动选择（不修改 form.targetDepartment）
 };
 
 watch(() => transferValue.value, (newValue) => {
-  // 使用 nextTick 确保 DOM 更新完成后再设置值
+  projectWithDepartment(newValue);
-  nextTick(() => {
-    projectWithDepartment(newValue);
-  });
 });
 
 const getPriorityCode = () => {

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

@@ -429,8 +429,6 @@ const props = defineProps({
 });
 const isAdding = ref(false);
 const isSaving = ref(false);
-// 标记双击编辑的是否为已有数据的行（用于保存后是否自动添加下一行）
-const wasDoubleClickEdit = ref(false);
 const prescriptionRef = ref();
 const expandOrder = ref([]); //目前的展开行
 const stockList = ref([]);
@@ -806,7 +804,7 @@ function checkUnit(item, row) {
   }
 }
 
-// 行双击打开编辑块：待保存、待签发医嘱均可编辑；已签发/已完成/停止不允许编辑
+// 行双击打开编辑块，"待保存"和"待签发"均可编辑
 function clickRowDb(row, column, event) {
   // 检查点击的是否是复选框
   if (event && event.target.closest('.el-checkbox')) {
@@ -817,18 +815,14 @@ function clickRowDb(row, column, event) {
     return;
   }
   row.showPopover = false;
+  // statusEnum == 1 包含"待保存(无requestId)"和"待签发(有requestId)"，均允许编辑
   if (row.statusEnum == 1) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');
     row.isEdit = true;
     const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
-    rowIndex.value = index;
+    prescriptionList.value[index] = row;
-    if (index !== -1) {
-      prescriptionList.value[index] = row;
-    }
     expandOrder.value = [row.uniqueKey];
-  } else {
-    proxy.$modal.msgWarning('仅待保存或待签发医嘱允许编辑');
   }
 }
 
@@ -1399,9 +1393,7 @@ function handleSaveSign(row, index) {
       }
     });
   } else {
-    // 仅通过【新增】按钮创建的医嘱保存后才自动添加下一行空医嘱
+    if (prescriptionList.value[0].adviceName) {
-    // 双击编辑已有"待保存"医嘱保存时，不应自动添加空行
-    if (isAdding.value && prescriptionList.value[0].adviceName) {
       handleAddPrescription();
     }
   }

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

@@ -348,8 +348,7 @@ const adviceTypeList = computed(() => {
       return val === 3 || val === 4;
     }).map(item => ({
       label: item.label,
-      // drord_doctor_type 中耗材是 4，但 /advice-base-info 后端耗材类型是 2
+      value: parseInt(item.value)
-      value: parseInt(item.value) === 4 ? 2 : parseInt(item.value)
     }));
     return [...filtered, { label: '全部', value: '' }];
   }
@@ -484,9 +483,8 @@ watch(
   (visible) => {
     if (visible) {
       executeTime.value = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
-      // 弹窗打开时按当前患者科室重新加载，避免复用上一次患者/登录科室的结果
+      // 弹窗打开时重新加载科室和位置选项，确保数据最新
       loadDepartmentOptions();
-      getAdviceBaseInfos();
       getDiseaseInitLoc(16);
     } else {
       resetData();
@@ -567,8 +565,6 @@ function getAdviceBaseInfos() {
     queryParams.value.adviceTypes = [1, 2, 3];
   }
   queryParams.value.organizationId = orgId.value;
-  queryParams.value.adviceTypes = normalizeAdviceTypesForQuery(adviceType.value);
-  queryParams.value.organizationId = props.patientInfo.organizationId || orgId.value;
   queryParams.value.pricingFlag = 1; // 划价标记
   getAdviceBaseInfo(queryParams.value)
     .then((res) => {
@@ -624,12 +620,6 @@ function getItemType_Text(type) {
   const map = { 2: '耗材', 3: '诊疗' };
   return map[type] || '其他';
 }
-function normalizeAdviceTypesForQuery(type) {
-  if (type === '' || type === undefined || type === null) {
-    return '2,3';
-  }
-  return Number(type) === 4 ? 2 : type;
-}
 function getUnitCodeOptions(row) {
   const unitCodes = [];
   // 大单位：优先用 code，code 缺失时用字典文本兜底

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

@@ -262,7 +262,7 @@
 </template>
 
 <script setup>
-import {nextTick, onMounted, ref} from 'vue';
+import {computed, nextTick, onMounted, ref, watch} from 'vue';
 import {ElMessage, ElMessageBox} from 'element-plus';
 // Element Plus 图标导入
 import {User} from '@element-plus/icons-vue';
@@ -366,9 +366,9 @@ const rawPrescriptionList = ref([]); // 原始未分组数据
 const groupedPrescriptionList = ref([]); // 按encounterId分组后的数据
 const activeCollapseNames = ref([]); // Collapse激活状态
 const selectedRows = ref({}); // 选中的行数据
+const totalItemsCount = ref(0); // 总医嘱项数
+const totalAmount = ref(0); // 总金额（保留4位小数）
 const dialogVisible = ref(false);
-/** Tab 切换同步日期时跳过 date-picker change，避免与 v-model 循环触发 */
-const syncingDateFromTab = ref(false);
 const selectedFeeItems = ref([]);
 const currentPatientInfo = ref(null);
 const queryParams = ref({
@@ -381,6 +381,24 @@ const userStore = useUserStore();
 const userId = ref(safeGet(userStore, 'id', ''));
 const orgId = ref(safeGet(userStore, 'orgId', ''));
 
+// ========== 计算属性 ==========
+// 计算总统计信息（总项数、总金额）
+const calculateTotalStats = computed(() => {
+  let itemsCount = 0;
+  let amount = 0;
+
+  safeArray(groupedPrescriptionList.value).forEach((patientGroup) => {
+    safeArray(patientGroup).forEach((item) => {
+      itemsCount++;
+      // 累加单价，保留4位小数精度
+      amount = Math.round((amount + Number(safeGet(item, 'unitPrice', 0))) * 10000) / 10000;
+    });
+  });
+
+  totalItemsCount.value = itemsCount;
+  totalAmount.value = amount;
+});
+
 // ========== 方法 ==========
 /**
  * 计算单个患者的总金额（保留4位小数）
@@ -429,19 +447,16 @@ const handleTableSelectionChange = (index, val) => {
 };
 
 /**
- * 按 Tab 同步日期范围（避免 date-picker @change 与 Tab v-model 互相覆盖）
+ * 日期Tab切换
- * @param {string} rangeType - today | yesterday | custom
+ * @param {Object} tab - 标签页
  */
-const applyDateRangeByTab = (rangeType) => {
+const handleDateTabClick = (tab) => {
   const today = new Date();
   const yesterday = new Date(today);
   yesterday.setDate(today.getDate() - 1);
   const format = (date) => formatDateStr(date, 'YYYY-MM-DD');
 
-  syncingDateFromTab.value = true;
+  switch (safeGet(tab, 'paneName')) {
-  dateRange.value = rangeType;
-
-  switch (rangeType) {
     case 'today':
       dateRangeValue.value = [format(today), format(today)];
       break;
@@ -449,54 +464,27 @@ const applyDateRangeByTab = (rangeType) => {
       dateRangeValue.value = [format(yesterday), format(yesterday)];
       break;
     case 'custom':
-      if (safeArray(dateRangeValue.value).length < 2) {
+      if (!dateRangeValue.value.length) {
         dateRangeValue.value = [format(today), format(today)];
       }
       break;
-    default:
-      break;
   }
-
-  nextTick(() => {
-    syncingDateFromTab.value = false;
-  });
 };
 
 /**
- * 日期Tab切换
+ * 日期选择器变化
- * @param {Object} tab - 标签页
- */
-const handleDateTabClick = (tab) => {
-  const rangeType = tab?.paneName ?? tab?.props?.name;
-  if (!rangeType) return;
-  applyDateRangeByTab(rangeType);
-  handleQuery();
-};
-
-/**
- * 日期选择器变化（仅用户手动改日期时切到「自定义」）
  * @param {Array} val - 选中日期
  */
 const handleDatePickerChange = (val) => {
-  if (syncingDateFromTab.value) return;
-
   const dateVal = safeArray(val);
-  if (dateVal.length !== 2) return;
+  if (dateVal.length === 2) {
-
-  const start = new Date(dateVal[0]);
-  const end = new Date(dateVal[1]);
-  if (start > end) {
-    ElMessage.warning('开始日期不能晚于结束日期');
-    syncingDateFromTab.value = true;
-    dateRangeValue.value = [dateVal[1], dateVal[0]];
-    nextTick(() => {
-      syncingDateFromTab.value = false;
-    });
-    return;
-  }
-
-  if (dateRange.value !== 'custom') {
     dateRange.value = 'custom';
+    const start = new Date(dateVal[0]);
+    const end = new Date(dateVal[1]);
+    if (start > end) {
+      ElMessage.warning('开始日期不能晚于结束日期');
+      dateRangeValue.value = [dateVal[1], dateVal[0]];
+    }
   }
 };
 
@@ -726,7 +714,24 @@ const handleSingleDelete = (row) => {
 };
 // ========== 初始化 ==========
 onMounted(() => {
-  applyDateRangeByTab('today');
+  // 设置默认日期
+  const today = new Date();
+  const defaultDate = formatDateStr(today, 'YYYY-MM-DD');
+  dateRangeValue.value = [defaultDate, defaultDate];
+
+  // 监听日期变化自动查询
+  watch(
+    [dateRange, dateRangeValue],
+    ([newRange, newVal], [oldRange, oldVal]) => {
+      if (oldRange !== undefined && safeArray(newVal).length === 2) {
+        handleQuery();
+      }
+    },
+    { deep: true }
+  );
+
+  // 初始化统计信息
+  calculateTotalStats.value;
 });
 </script>
 

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

@@ -142,13 +142,6 @@
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100">
-              <template #default="scope">
-                <el-tag :type="getStatusType(scope.row.requestStatus)" size="small">
-                  {{ scope.row.requestStatus_enumText }}
-                </el-tag>
-              </template>
-            </el-table-column>
             <el-table-column label="执行科室" prop="positionName" width="230" />
             <el-table-column label="签发时间" prop="requestTime" width="230" />
           </el-table>
@@ -159,7 +152,7 @@
   </div>
 </template>
 <script setup>
-import {ref, computed, getCurrentInstance} from 'vue';
+import {ref, computed} from 'vue';
 import {adviceVerify, cancel, getPrescriptionList} from './api';
 import {patientInfoList} from '../../components/store/patient.js';
 import {formatDateStr} from '@/utils/index';
@@ -172,19 +165,6 @@ const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
 const selectionTrigger = ref(0);
-
-const getStatusType = (status) => {
-  const map = {
-    1: 'info',      // 待发送
-    2: 'primary',   // 已发送
-    3: 'success',   // 已完成
-    4: 'warning',   // 暂停
-    5: 'danger',    // 取消/待退
-    6: 'danger',    // 停嘱
-    7: 'info'       // 不执行
-  }
-  return map[status] || 'info'
-}
 const hasDispensedSelected = computed(() => {
   selectionTrigger.value;
   return getSelectRows().some(item => item.dispenseStatus === 4);

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

@@ -1067,6 +1067,15 @@ const temporaryPatientInfo = ref({})
 const temporaryBillingMedicines = ref([])
 const temporaryAdvices = ref([])
 
+// 🔧 新增：监听 temporaryAdvices 的变化，用于调试
+watch(temporaryAdvices, (newVal, oldVal) => {
+  console.log('=== temporaryAdvices 变化 ===')
+  console.log('=== 新值 ===', newVal)
+  console.log('=== 新值[1]?.dosage ===', newVal[1]?.dosage)
+  console.log('=== 旧值 ===', oldVal)
+  console.log('=== 旧值[1]?.dosage ===', oldVal[1]?.dosage)
+}, { deep: true })
+
 const temporaryMedicalLoading = ref(false) // 🔧 新增：临时医嘱加载状态
 const temporarySigned = ref(false) // 🔧 新增：签名状态，用于保持按钮名称一致性
 
@@ -1490,6 +1499,9 @@ async function closeChargeDialog() {
   chargeSurgeryInfo.value = {}
 }
 
+// 🔧 新增：标志位，用于区分是"打开"还是"刷新"
+const isRefreshAction = ref(false)
+
 // 处理医嘱按钮点击事件
 function handleMedicalAdvice(row) {
   // 如果没有传入行数据，使用选中的行
@@ -1517,7 +1529,31 @@ function handleMedicalAdvice(row) {
     applyId: row.applyId  // 手术申请单ID，用于过滤关联医嘱
   }
 
-  // 🔧 每次打开临时医嘱都重新拉取最新数据，确保计费弹窗签发后数据自动更新
+  // 🔧 关键修复：如果已有提交的医嘱数据，并且是同一个患者的就诊，则使用保存的数据
+  // 这样可以保留 requestId，避免重复创建医嘱记录
+  console.log('=== 检查是否使用已保存的医嘱数据 ===')
+  console.log('=== temporaryAdvices.value.length ===', temporaryAdvices.value.length)
+  console.log('=== temporaryAdvices.value[0]?.originalMedicine?.encounterId ===', temporaryAdvices.value[0]?.originalMedicine?.encounterId)
+  console.log('=== row.visitId ===', row.visitId)
+  console.log('=== isRefreshAction.value ===', isRefreshAction.value)
+  
+  const isSameEncounter = temporaryAdvices.value.length > 0 && 
+                         temporaryAdvices.value[0]?.originalMedicine?.encounterId === row.visitId &&
+                         !isRefreshAction.value
+  
+  console.log('=== isSameEncounter ===', isSameEncounter)
+  
+  if (isSameEncounter) {
+    console.log('=== 使用已保存的医嘱数据，避免重复创建 ===')
+    console.log('=== temporaryAdvices.value[0]?.originalMedicine?.requestId ===', temporaryAdvices.value[0]?.originalMedicine?.requestId)
+    // 直接打开弹窗，使用已保存的数据
+    showTemporaryMedical.value = true
+    temporaryMedicalLoading.value = false
+    isRefreshAction.value = false // 重置标志位
+    return
+  }
+
+  // 🔧 修复：每次打开临时医嘱时都重新加载数据，避免使用缓存数据导致数据重复
   // 先清空旧数据
   temporaryBillingMedicines.value = []
   temporaryAdvices.value = []
@@ -1530,39 +1566,46 @@ function handleMedicalAdvice(row) {
 
   // 调用计费接口获取数据
   getPrescriptionList(row.visitId, 6, row.operCode).then((res) => {
+    console.log('=== 拉取计费数据返回结果 ===', res)
     if (res.code === 200 && res.data) {
+      // 🔧 修复：显示所有药品请求数据，不管有没有计费项目
+      // 根据用户需求：已引用计费药品（待生成医嘱）和临时医嘱预览（已生成）显示的数据应该相同
+      // 在提交医嘱之前状态应该是"待签发"，提交之后变为"已签发"
+      // 再次打开医嘱界面的时候能看到这两个状态的药品
       const seenIds = new Set();
       const filteredItems = res.data.filter(item => {
         // 匹配 encounterId
         if (item.encounterId !== row.visitId) return false;
-        // 只保留药品(1)和耗材(2)，屏蔽诊疗(3)和手术(6)
+        // 只保留药品类型（adviceType=1），过滤掉耗材(2)和诊疗项目(3/6)
+        // 🔧 修复 Bug #444: 使用 Number() 显式转换，避免字符串 "1" 被 !== 1 放行
         const at = Number(item.adviceType ?? item.advice_type);
-        if (at !== 1 && at !== 2) return false;
+        if (at !== 1) return false;
         // 过滤掉名称为空的项目
         const medicineName = item.adviceName || item.advice_name;
         if (!medicineName || medicineName.trim() === '') return false;
-        // 排除名称中包含手术/检查/诊疗关键词的非药品项目
+        // 🔧 修复 Bug #444: 二次过滤，排除名称中包含手术/检查/诊疗关键词的非药品项目
+        // 某些计费项目可能在 adm_charge_item 中被错误标注为 adviceType=1
         const excludedKeywords = ['术', '超声', '多普勒', '检查', '检验', '彩超', 'X线', 'CT', 'MRI', '扫描', '造影'];
         if (excludedKeywords.some(kw => medicineName.includes(kw))) return false;
+        // 🔧 修复 Bug #445: 过滤掉已生成医嘱的项目（已有 requestId 的不应出现在"待生成"列表中）
+        if (item.requestId) return false;
         // 根据药品请求ID去重，避免重复显示
         const itemId = item.requestId || item.id;
         if (itemId && seenIds.has(itemId)) return false;
         if (itemId) seenIds.add(itemId);
         return true;
       })
-      // 按 statusEnum 区分：1=草稿(待生成)，2=已签发(已生成)
-      const draftItems = filteredItems.filter(item => item.statusEnum === 1)
-      const activeItems = filteredItems.filter(item => item.statusEnum === 2)
 
       // 🔧 修复：限制返回数量，最多显示前100条，避免数据过多导致页面卡死
       const maxItems = 100
-      if (draftItems.length > maxItems) {
+      if (filteredItems.length > maxItems) {
-        ElMessage.warning(`待签发医嘱数量过多(${draftItems.length}条)，仅显示前${maxItems}条`)
+        ElMessage.warning(`待签发医嘱数量过多(${filteredItems.length}条)，仅显示前${maxItems}条`)
-        draftItems.length = maxItems
+        filteredItems.length = maxItems
       }
 
-      // === 待生成列表：statusEnum=1 草稿状态的项目 ===
+      // 将过滤后的数据转换为临时医嘱需要的格式 - 兼容驼峰和下划线命名
-      temporaryBillingMedicines.value = draftItems.map(item => {
+      // 对于从 adm_charge_item（计费项目表）查询来的项目，特殊处理
+      temporaryBillingMedicines.value = filteredItems.map(item => {
         try {
           // 从 contentJson 或 content_json 中解析详细数据 - 兼容下划线和驼峰命名
           const jsonContent = item.contentJson || item.content_json;
@@ -1609,65 +1652,74 @@ function handleMedicalAdvice(row) {
           };
         }
       });
+    } else {
+      // 如果没有数据或接口调用失败，初始化空列表
+      temporaryBillingMedicines.value = []
+    }
+    
+    // 将计费药品转换为临时医嘱数据
+    temporaryAdvices.value = temporaryBillingMedicines.value.map((medicine, index) => {
+      // 解析规格中的数值和单位
+      const specMatch = medicine.specification ? medicine.specification.match(/(\d+)(\D+)/) : null
+      const specValue = specMatch ? parseInt(specMatch[1]) : 1
+      const specUnit = specMatch ? specMatch[2] : 'ml'
 
-      // === 已生成列表：statusEnum=2 已签发状态的项目，直接转为医嘱格式 ===
+      // 计算剂量 = 规格数值 × 数量
-      temporaryAdvices.value = activeItems.map((item, index) => {
+      const dosage = specValue * (medicine.quantity || 1)
-        try {
-          const jsonContent = item.contentJson || item.content_json;
-          const contentData = jsonContent ? JSON.parse(jsonContent) : {};
-          const medicineName = contentData.adviceName || contentData.advice_name || item.adviceName || item.advice_name || '';
-          const spec = contentData.volume || contentData.specification || item.volume || item.specification || '';
-          const specMatch = spec.match(/(\d+)(\D+)/)
-          const specValue = specMatch ? parseInt(specMatch[1]) : 1
-          const specUnit = specMatch ? specMatch[2] : 'ml'
-          const dosage = specValue * (contentData.quantity || item.quantity || 1)
 
-          let usageCode = contentData.methodCode || 'iv'
+      // 🔧 修复：优先从 contentJson 中读取已有的用法，如果没有则根据药品名称判断
-          let usageLabel = getUsageLabel(usageCode)
+      let usageCode = 'iv' // 默认静脉注射编码
-          if (usageCode === 'iv') {
+      let usageLabel = '静脉注射' // 默认显示名称
-            if (medicineName.includes('注射液')) { usageCode = 'iv'; usageLabel = '静脉注射' }
-          } else if (usageCode === 'po') {
-            if (medicineName.includes('片') || medicineName.includes('胶囊')) { usageCode = 'po'; usageLabel = '口服' }
-          }
 
-          return {
+      // 尝试从 contentJson 中读取用法
-            id: index + 1,
+      try {
-            adviceName: medicineName,
+        const jsonContent = medicine.contentJson || medicine.content_json;
-            dosage,
+        if (jsonContent) {
-            unit: specUnit,
+          const contentData = JSON.parse(jsonContent);
-            usage: usageCode,
+          if (contentData.methodCode) {
-            usageLabel,
+            usageCode = contentData.methodCode;
-            frequency: '临时',
+            usageLabel = getUsageLabel(contentData.methodCode);
-            executeTime: new Date().toLocaleString('zh-CN'),
-            originalMedicine: {
-              ...item,
-              medicineName: medicineName,
-              specification: spec,
-              quantity: contentData.quantity || item.quantity || 1,
-              encounterId: row.visitId
-            }
-          }
-        } catch (e) {
-          return {
-            id: index + 1,
-            adviceName: item.adviceName || item.advice_name || '',
-            dosage: 1, unit: 'ml', usage: 'iv', usageLabel: '静脉注射',
-            frequency: '临时',
-            executeTime: new Date().toLocaleString('zh-CN'),
-            originalMedicine: {
-              ...item,
-              medicineName: item.adviceName || item.advice_name || '',
-              specification: item.volume || item.specification || '',
-              quantity: item.quantity || 1,
-              encounterId: row.visitId
-            }
           }
         }
-      })
+      } catch (e) {
-    } else {
+        // 解析失败，继续使用默认值
-      temporaryBillingMedicines.value = []
+      }
-      temporaryAdvices.value = []
+
-    }
+      // 如果没有从 contentJson 中读取到用法，根据药品名称判断
+      if (!usageCode || usageCode === 'iv') {
+        if (medicine.medicineName && medicine.medicineName.includes('注射液')) {
+          usageCode = 'iv'
+          usageLabel = '静脉注射'
+        } else if (medicine.medicineName && medicine.medicineName.includes('片')) {
+          usageCode = 'po'
+          usageLabel = '口服'
+        } else if (medicine.medicineName && medicine.medicineName.includes('胶囊')) {
+          usageCode = 'po'
+          usageLabel = '口服'
+        }
+      }
+
+      return {
+        id: index + 1,
+        adviceName: medicine.medicineName || '',
+        dosage: dosage,
+        unit: specUnit,
+        usage: usageCode, // 🔧 修复：保存的是编码
+        usageLabel: usageLabel, // 🔧 新增：保存显示名称
+        frequency: '临时',
+        executeTime: new Date().toLocaleString('zh-CN'),
+        // 🔧 关键修复：确保 originalMedicine 中包含 encounterId 和匹配字段
+        // medicineName/specification/quantity 用于 handleTemporaryMedicalSubmit 中的
+        // 已提交项目匹配过滤（Bug #445），缺少这些字段会导致过滤失效
+        originalMedicine: {
+          ...medicine,
+          medicineName: medicine.medicineName,
+          specification: medicine.specification,
+          quantity: medicine.quantity,
+          encounterId: row.visitId // 添加 encounterId 字段
+        }
+      }
+    })
 
     // 打开临时医嘱弹窗
     showTemporaryMedical.value = true
@@ -1693,6 +1745,11 @@ function closeTemporaryMedical() {
 // 处理临时医嘱提交
 // 🔧 修复：提交成功后，更新 temporaryAdvices 中的 requestId，以便下次提交时执行更新操作
 function handleTemporaryMedicalSubmit(data) {
+  console.log('=== handleTemporaryMedicalSubmit 被调用 ===')
+  console.log('=== data ===', data)
+  console.log('=== data.temporaryAdvices ===', data.temporaryAdvices)
+  console.log('=== data.temporaryAdvices[1]?.dosage ===', data.temporaryAdvices[1]?.dosage)
+  
   // 🔧 修复：使用用户修改后的数据，而不是重新加载数据
   // 这样可以确保用户修改的内容（如剂量）在保存后仍然正确显示
   if (data.temporaryAdvices && data.temporaryAdvices.length > 0) {
@@ -1747,7 +1804,9 @@ function handleTemporaryMedicalSubmit(data) {
       // 如果没有任何匹配键，清空待生成列表（所有项目都已提交）
       temporaryBillingMedicines.value = []
     }
-
+    
+    console.log('=== 使用用户修改后的临时医嘱数据 ===', temporaryAdvices.value)
+    console.log('=== temporaryAdvices.value[1]?.dosage ===', temporaryAdvices.value[1]?.dosage)
   } else {
     // 如果没有传递数据，则清空
     temporaryAdvices.value = []
@@ -1795,21 +1854,6 @@ function handleTemporaryMedicalRefresh() {
 function handleQuoteBilling() {
   // 重新拉取计费药品数据
   if (temporaryPatientInfo.value.visitId) {
-    // 🔧 修复 Bug #445: 在清空之前提取已提交项目的复合匹配键
-    // 原因：后续的 ID 匹配过滤依赖 temporaryAdvices，但 temporaryAdvices 会被先清空
-    // 新医嘱没有 requestId/chargeItemId，需用名称+规格+数量的复合键匹配
-    const submittedKeys = new Set(
-      (temporaryAdvices.value || [])
-        .map(a => {
-          const om = a.originalMedicine || {}
-          const name = om.medicineName || om.adviceName || a.adviceName || ''
-          const spec = om.specification || om.volume || ''
-          const qty = om.quantity ?? 0
-          return `${name}|||${spec}|||${qty}`
-        })
-        .filter(k => k !== '|||0')
-    )
-
     temporaryMedicalLoading.value = true // 🔧 新增：开始加载
     getPrescriptionList(temporaryPatientInfo.value.visitId, 6, temporaryPatientInfo.value.operCode).then((res) => {
             if (res.code === 200 && res.data) {
@@ -1817,72 +1861,18 @@ function handleQuoteBilling() {
               temporaryBillingMedicines.value = []
               temporaryAdvices.value = []
     
-              // 🔧 修复 Bug #445: 只保留药品类型（adviceType=1），过滤掉耗材(2)和诊疗项目(3/6)
+              // 🔧 修复 Bug #445: 只保留药品类型（adviceType=1），过滤掉耗材(2)和诊疗项目(3)
               // 同时过滤掉已有 requestId 的项目（已生成医嘱的不需要再次显示在"待生成"列表中）
-              // 先提取已签发项目(statusEnum=2)填充已生成列表
-              const activeItems = res.data.filter(item => {
-                if (item.encounterId !== temporaryPatientInfo.value.visitId) return false;
-                const at = Number(item.adviceType ?? item.advice_type);
-                if (at !== 1 && at !== 2) return false;
-                if (item.statusEnum !== 2) return false;
-                const medicineName = item.adviceName || item.advice_name;
-                if (!medicineName || medicineName.trim() === '') return false;
-                const excludedKeywords = ['术', '超声', '多普勒', '检查', '检验', '彩超', 'X线', 'CT', 'MRI', '扫描', '造影'];
-                if (excludedKeywords.some(kw => medicineName.includes(kw))) return false;
-                return true;
-              })
-              temporaryAdvices.value = activeItems.map((item, index) => {
-                try {
-                  const jsonContent = item.contentJson || item.content_json;
-                  const contentData = jsonContent ? JSON.parse(jsonContent) : {};
-                  const medicineName = contentData.adviceName || contentData.advice_name || item.adviceName || item.advice_name || '';
-                  const spec = contentData.volume || contentData.specification || item.volume || item.specification || '';
-                  const specMatch = spec.match(/(\d+)(\D+)/)
-                  const specValue = specMatch ? parseInt(specMatch[1]) : 1
-                  const specUnit = specMatch ? specMatch[2] : 'ml'
-                  const dosage = specValue * (contentData.quantity || item.quantity || 1)
-                  let usageCode = contentData.methodCode || 'iv'
-                  let usageLabel = getUsageLabel(usageCode)
-                  if (usageCode === 'iv' && medicineName.includes('注射液')) { usageLabel = '静脉注射' }
-                  else if (usageCode === 'po' && (medicineName.includes('片') || medicineName.includes('胶囊'))) { usageLabel = '口服' }
-                  return {
-                    id: index + 1, adviceName: medicineName, dosage, unit: specUnit,
-                    usage: usageCode, usageLabel, frequency: '临时',
-                    executeTime: new Date().toLocaleString('zh-CN'),
-                    originalMedicine: {
-                      ...item,
-                      medicineName: medicineName,
-                      specification: spec,
-                      quantity: contentData.quantity || item.quantity || 1,
-                      encounterId: temporaryPatientInfo.value.visitId
-                    }
-                  }
-                } catch (e) {
-                  return {
-                    id: index + 1, adviceName: item.adviceName || item.advice_name || '',
-                    dosage: 1, unit: 'ml', usage: 'iv', usageLabel: '静脉注射',
-                    frequency: '临时', executeTime: new Date().toLocaleString('zh-CN'),
-                    originalMedicine: {
-                      ...item,
-                      medicineName: item.adviceName || item.advice_name || '',
-                      specification: item.volume || item.specification || '',
-                      quantity: item.quantity || 1,
-                      encounterId: temporaryPatientInfo.value.visitId
-                    }
-                  }
-                }
-              })
-
-              // 再提取草稿项目(statusEnum=1)填充待生成列表
               const filteredItems = res.data.filter(item => {
+                // 匹配 encounterId
                 if (item.encounterId !== temporaryPatientInfo.value.visitId) return false;
-                const at = Number(item.adviceType ?? item.advice_type);
+                // 只保留药品类型（adviceType=1），过滤掉耗材(2)和诊疗项目(3)
-                if (at !== 1 && at !== 2) return false;
+                if (item.adviceType !== 1) return false;
-                if (item.statusEnum !== 1) return false;
+                // 过滤掉名称为空的项目
                 const medicineName = item.adviceName || item.advice_name;
                 if (!medicineName || medicineName.trim() === '') return false;
-                const excludedKeywords = ['术', '超声', '多普勒', '检查', '检验', '彩超', 'X线', 'CT', 'MRI', '扫描', '造影'];
+                // 🔧 修复 Bug #445: 过滤掉已生成医嘱的项目（已有 requestId）
-                if (excludedKeywords.some(kw => medicineName.includes(kw))) return false;
+                if (item.requestId) return false;
                 return true;
               })
         // 🔧 修复：限制返回数量，最多显示前100条，避免数据过多导致页面卡死
@@ -1895,6 +1885,7 @@ function handleQuoteBilling() {
         // 将过滤后的数据转换为临时医嘱需要的格式
         temporaryBillingMedicines.value = filteredItems.map(item => {
           try {
+            // 从 contentJson 或 content_json 中解析详细数据 - 兼容下划线和驼峰命名
             const jsonContent = item.contentJson || item.content_json;
             const contentData = jsonContent ? JSON.parse(jsonContent) : {};
             return {
@@ -1913,9 +1904,10 @@ function handleQuoteBilling() {
               definitionDetailId: contentData.definitionDetailId || item.definitionDetailId
             }
           } catch (e) {
+            // 如果解析失败，使用顶层数据 - 兼容 snake_case 和 camelCase
             return {
               medicineName: item.adviceName || item.advice_name || '',
-              specification: item.specification || item.volume || '',
+              specification: item.specification || item.specification || item.volume || '',
               quantity: item.quantity || item.quantity_value || 0,
               batchNumber: item.lotNumber || item.lot_number || '',
               unitPrice: item.unitPrice || item.unit_price || 0,
@@ -1931,6 +1923,93 @@ function handleQuoteBilling() {
           }
         })
 
+        // 将计费药品转换为临时医嘱数据
+        temporaryAdvices.value = temporaryBillingMedicines.value.map((medicine, index) => {
+          // 解析规格中的数值和单位
+          const specMatch = medicine.specification ? medicine.specification.match(/(\d+)(\D+)/) : null
+          const specValue = specMatch ? parseInt(specMatch[1]) : 1
+          const specUnit = specMatch ? specMatch[2] : 'ml'
+
+          // 计算剂量 = 规格数值 × 数量
+          const dosage = specValue * (medicine.quantity || 1)
+
+          // 🔧 修复：优先从 contentJson 中读取已有的用法，如果没有则根据药品名称判断
+          let usageCode = 'iv' // 默认静脉注射编码
+          let usageLabel = '静脉注射' // 默认显示名称
+
+          // 尝试从 contentJson 中读取用法
+          try {
+            const jsonContent = medicine.contentJson || medicine.content_json;
+            if (jsonContent) {
+              const contentData = JSON.parse(jsonContent);
+              if (contentData.methodCode) {
+                usageCode = contentData.methodCode;
+                usageLabel = getUsageLabel(contentData.methodCode);
+              }
+            }
+          } catch (e) {
+            // 解析失败，继续使用默认值
+          }
+
+          // 如果没有从 contentJson 中读取到用法，根据药品名称判断
+          if (!usageCode || usageCode === 'iv') {
+            if (medicine.medicineName && medicine.medicineName.includes('注射液')) {
+              usageCode = 'iv'
+              usageLabel = '静脉注射'
+            } else if (medicine.medicineName && medicine.medicineName.includes('片')) {
+              usageCode = 'po'
+              usageLabel = '口服'
+            } else if (medicine.medicineName && medicine.medicineName.includes('胶囊')) {
+              usageCode = 'po'
+              usageLabel = '口服'
+            }
+          }
+
+          return {
+            id: index + 1,
+            adviceName: medicine.medicineName || '',
+            dosage: dosage,
+            unit: specUnit,
+            usage: usageCode, // 🔧 修复：保存的是编码
+            usageLabel: usageLabel, // 🔧 新增：保存显示名称
+            frequency: '临时',
+            executeTime: new Date().toLocaleString('zh-CN'),
+            // 🔧 关键修复：确保 originalMedicine 中包含 encounterId 和匹配字段
+            // medicineName/specification/quantity 用于已提交项目匹配过滤（Bug #445）
+            originalMedicine: {
+              ...medicine,
+              medicineName: medicine.medicineName,
+              specification: medicine.specification,
+              quantity: medicine.quantity,
+              encounterId: temporaryPatientInfo.value.visitId // 添加 encounterId 字段
+            }
+          }
+        })
+
+        // 🔧 修复 Bug #445: 过滤掉已生成医嘱的项目，避免"引用计费"后已提交项目重新出现在"待生成"列表
+        // 原因：后端返回的计费数据中，已生成医嘱的项目可能没有 requestId 字段
+        // 方案：用 chargeItemId/requestId/id 与已有的 temporaryAdvices 做匹配，排除已生成项目
+        if (temporaryAdvices.value.length > 0) {
+          const existingAdviceIds = new Set()
+          temporaryAdvices.value.forEach(a => {
+            const om = a.originalMedicine || {}
+            if (om.requestId) existingAdviceIds.add(String(om.requestId))
+            if (om.chargeItemId) existingAdviceIds.add(String(om.chargeItemId))
+            if (om.id) existingAdviceIds.add(String(om.id))
+          })
+          if (existingAdviceIds.size > 0) {
+            temporaryBillingMedicines.value = temporaryBillingMedicines.value.filter(m => {
+              const mRequestId = m.requestId != null ? String(m.requestId) : null
+              const mChargeItemId = m.chargeItemId != null ? String(m.chargeItemId) : null
+              const mId = m.id != null ? String(m.id) : null
+              if (mRequestId && existingAdviceIds.has(mRequestId)) return false
+              if (mChargeItemId && existingAdviceIds.has(mChargeItemId)) return false
+              if (mId && existingAdviceIds.has(mId)) return false
+              return true
+            })
+          }
+        }
+
         temporaryMedicalLoading.value = false // 🔧 新增：加载完成
         ElMessage.success('已成功引用最新计费药品信息！')
       } else {

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

@@ -48,12 +48,9 @@
     <div class="medicine-section">
       <div class="section-title">
         一、已引用计费药品（待生成医嘱）
-        <span v-if="(billingMedicines || []).length >= PAGE_SIZE" style="margin-left:auto;font-size:14px;color:#4a8bc9;cursor:pointer;white-space:nowrap;" @click="billingExpanded = !billingExpanded">
-          {{ billingExpanded ? '收起' : `展开全部(${(billingMedicines || []).length}条)` }}
-        </span>
       </div>
       <el-table
-        :data="displayBillingMedicines"
+        :data="billingMedicines"
         stripe
         border
         style="width: 100%;"
@@ -101,12 +98,9 @@
     <div class="advice-section">
       <div class="section-title">
         二、临时医嘱预览（已生成）
-        <span v-if="(displayAdvices || []).length >= PAGE_SIZE" style="margin-left:auto;font-size:14px;color:#4a8bc9;cursor:pointer;white-space:nowrap;" @click="advicesExpanded = !advicesExpanded">
-          {{ advicesExpanded ? '收起' : `展开全部(${(displayAdvices || []).length}条)` }}
-        </span>
       </div>
       <el-table
-        :data="displayAdvicesList"
+        :data="displayAdvices"
         stripe
         border
         style="width: 100%;"
@@ -156,7 +150,7 @@
           :disabled="allItemsSubmitted"
           @click="handleSignAndSubmit"
         >
-          {{ allItemsSubmitted ? '已签发' : '一键签名并生成医嘱' }}
+          {{ allItemsSubmitted ? '已签发' : (isSigned ? '提交医嘱' : '一键签名并生成医嘱') }}
         </el-button>
       </div>
     </div>
@@ -323,19 +317,6 @@ const allItemsSubmitted = computed(() => {
   return meds.length > 0 && meds.every(m => m.requestId)
 })
 
-// 展开/收起控制
-const PAGE_SIZE = 3
-const billingExpanded = ref(false)
-const advicesExpanded = ref(false)
-const displayBillingMedicines = computed(() => {
-  const all = props.billingMedicines || []
-  return billingExpanded.value ? all : all.slice(0, PAGE_SIZE)
-})
-const displayAdvicesList = computed(() => {
-  const all = displayAdvices.value || []
-  return advicesExpanded.value ? all : all.slice(0, PAGE_SIZE)
-})
-
 // 响应式数据 - isSigned 从父组件传入的 prop 初始化
 const isSigned = ref(props.isSignedProp)
 
@@ -1064,21 +1045,6 @@ const editFormUsageLabel = computed(() => {
   padding-bottom: 12px;
   margin-bottom: 16px;
   border-bottom: 2px solid #e4e7ed;
-  display: flex;
-  align-items: center;
-  gap: 12px;
-}
-
-.expand-btn {
-  font-size: 0.85rem;
-  color: #4a8bc9;
-  cursor: pointer;
-  font-weight: 400;
-  margin-left: auto;
-}
-.expand-btn:hover {
-  color: #2a6ba9;
-  text-decoration: underline;
 }
 
 .medicine-summary {