Fix Bug #517: [库房管理-领用管理] 业务逻辑校验缺失：允许保存并提交领用数量大于库存数量（零库存领用）的单据

根因分析：
- 前端 handleSubmitApproval（提交审批）未做库存校验，直接调用后端 API
- 后端 submitApproval 也未做库存校验，仅在保存时（addOrEditIssueReceipt）有 validateRequisitionStock
- 用户可绕过前端保存校验（如编辑已有草稿后直接提交审批），将超库存单据提交审批流

修复方案：
1. 后端：在 submitApproval 方法中增加 validateRequisitionStockByBusNo，通过单据详情查询已保存明细，逐行校验领用数量是否超过源仓库库存
2. 前端：在 handleSubmitApproval 提交前逐行调用 validateRequisitionQtyVsStock 校验库存，超库存时拦截并提示

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

.agentforge/analysis/529.md

@@ -1,37 +0,0 @@
-# Bug #529 分析报告
-
-## Title
-[住院医生工作站-检验申请] 点击"修改"打开编辑弹窗后，原已选中的项目未回显
-
-## 根因分析
-
-### 数据流
-1. `testApplication.vue` 列表中点击"修改" → `handleEdit(row)` 设置 `editRowData = row` → 打开编辑弹窗
-2. 弹窗使用 `destroy-on-close`，每次打开都重新创建 `LaboratoryTests` 组件
-3. `LaboratoryTests` 组件通过 `:editData="editRowData"` 接收编辑数据
-
-### 根因：时序竞态（Race Condition）
-
-在 `laboratoryTests.vue` 中：
-
-1. **`onMounted()`** (line 262) 调用 `loadAllData()` 异步加载检验项目列表到 `applicationListAll.value`
-2. **watch on `props.editData`** (line 347-382) 设置了 `{ immediate: true }`，组件创建时立即触发
-3. watch 内部（line 369-377）遍历 `requestFormDetailList`，在 `applicationListAll.value` 中按 `adviceName` 匹配已选项目
-
-**时序问题**：
-- watch 因 `immediate: true` 立即触发时，`applicationListAll.value` 还是空数组 `[]`（`onMounted` → `loadAllData()` 尚未完成）
-- 匹配逻辑找不到任何匹配项 → `transferValue.value = []`
-- 随后 `loadAllData()` 完成，`applicationListAll.value` 被填充，但 watch 不会重新触发（因为 `props.editData` 没变化）
-- 结果：transfer 组件的 "已选择" 区域显示"无数据"
-
-### 涉及文件
-- **前端**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue` (line 347-382)
-- **前端**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue` (line 193-210, 弹窗渲染处)
-
-### 修复方案
-
-在 `laboratoryTests.vue` 中新增一个 watch 监听 `applicationListAll.value` 的变化，当数据加载完成且当前处于编辑模式时，重新执行回显匹配逻辑。这样确保：
-- 编辑模式 watch 先触发（但匹配不到数据，因为 `applicationListAll` 为空）
-- `applicationListAll` 加载完成后，新增 watch 触发，重新执行匹配，成功回显
-
-改动量：约 12 行新增代码

.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/analysis/bug545_analysis.md

@@ -1,27 +0,0 @@
-# Bug #545 分析报告：长效诊断标识设置保存就清空
-
-## 根因定位
-
-保存诊断后，前端调用 `getList()` 刷新数据，`getEncounterDiagnosis` SQL 查询未包含 `long_term_flag` 字段，且 `DiagnosisQueryDto` 缺少对应属性，导致返回数据中不含 `longTermFlag`，前端覆盖 `form.value.diagnosisList` 后下拉框清空。
-
-## 数据流追踪
-
-1. 前端用户在 `diagnosis.vue` 第218-231行的 el-select 下拉框选择"长期有效/临时有效"，值绑定到 `scope.row.longTermFlag`
-2. 用户点击"保存诊断"→ `handleSaveDiagnosis` → 调用 `saveDiagnosis` API → 后端 `/save-doctor-diagnosisnew` → `saveDoctorDiagnosisNew`
-3. 后端 `saveDoctorDiagnosisNew` 第376行和第404行已正确保存 `encounterDiagnosis.setLongTermFlag(saveDiagnosisChildParam.getLongTermFlag())`
-4. 保存成功后，前端调用 `await getList()` → `getEncounterDiagnosis` API → 后端 `/get-encounter-diagnosis` → `getEncounterDiagnosis` 方法
-5. **断点在此**: SQL (`DoctorStationDiagnosisAppMapper.xml:122-150`) SELECT 列表缺少 `T1.long_term_flag`，DTO (`DiagnosisQueryDto.java`) 缺少 `longTermFlag` 属性
-6. 前端第351行 `form.value.diagnosisList = res.data.filter(...)` 用不含 `longTermFlag` 的数据替换了原有数据
-7. 结果：`longTermFlag` 变为 `undefined`，下拉框清空
-
-## 修复方案
-
-1. **SQL**: `DoctorStationDiagnosisAppMapper.xml` getEncounterDiagnosis 查询新增 `T1.long_term_flag AS longTermFlag`
-2. **DTO**: `DiagnosisQueryDto.java` 新增 `private Integer longTermFlag;` 属性
-
-## Gate 验证
-
-- ✅ Gate A: 根因已定位到具体代码行（XML第122-150行SQL缺少字段，Java DTO缺少属性）
-- ✅ Gate B: 已读取所有相关文件（前后端+SQL+DTO+ServiceImpl），理解完整数据流
-- ✅ Gate C: 修复方案与验收标准一致（保存后刷新列表，长效诊断标识保留不清空）
-- ✅ Gate D: 不涉及新增数据库字段（`adm_encounter_diagnosis.long_term_flag` 已存在，Entity 第89行已有定义）

.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. 就诊卡号在有患者信息时正常显示

BUG540_ANALYSIS.md

@@ -1,79 +0,0 @@
-# Bug #540 分析报告
-
-## Bug 描述
-【住院医生站-检查申请】详情页弹窗中"申请单描述"区域缺少临床必要信息显示
-
-## 数据流分析
-
-### 前端组件
-- 入口: `src/views/inpatientDoctor/home/index.vue` → "检查申请" tab → `ExamineApplication`
-- 实际组件: `src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue`
-- 编辑表单组件: `src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue`
-
-### 后端 API
-- 查询: `GET /reg-doctorstation/request-form/get-check` → `typeCode = '23'` (ActivityDefCategory.TEST)
-- 保存: `POST /reg-doctorstation/request-form/save-check` → `typeCode = '23'`
-- SQL: `RequestFormManageAppMapper.xml` 的 `getRequestForm` 查询，SELECT `drf.desc_json`
-- DTO: `RequestFormQueryDto` 有 `descJson` 字段 (String 类型)
-
-### 数据库
-- 表: `doc_request_form`，type_code = '23' 的记录 desc_json 均有数据
-- descJson 包含: targetDepartment, urgencyLevel, symptom, sign, clinicalDiagnosis, otherDiagnosis, relatedResult, attention, examinationPurpose, medicalHistorySummary, allergyHistory, expectedExaminationTime 等
-
-## 根因定位
-
-对比检验申请 (testApplication.vue) 和检查申请 (examineApplication.vue) 的详情弹窗中"申请单描述"区域的渲染逻辑：
-
-**testApplication.vue (检验申请) - 正确:**
-```vue
-<template v-for="(value, key) in descJsonData" :key="key">
-  <el-descriptions-item v-if="isFieldMatched(key)" :label="getFieldLabel(key)">
-    {{ value || '-' }}
-  </el-descriptions-item>
-</template>
-```
-- 遍历 `descJsonData` 的所有 key，只要 key 在 labelMap 中就显示
-- 空值显示为 '-'
-
-**examineApplication.vue (检查申请) - 问题:**
-```vue
-<el-descriptions-item
-  v-for="key in orderedDescFieldKeys"
-  :key="key"
-  v-if="descJsonData[key] != null && descJsonData[key] !== ''"
-  :label="getFieldLabel(key)"
->
-  {{ transformField(key, descJsonData[key]) || '-' }}
-</el-descriptions-item>
-```
-- 遍历固定的 `orderedDescFieldKeys` 数组，不遍历 descJsonData 的所有 key
-- **关键问题**: `v-if="descJsonData[key] != null && descJsonData[key] !== ''"` 会过滤掉空值字段
-
-但是，更关键的是外层条件：
-```vue
-<div v-if="descJsonData && hasMatchedFields" class="applicationShow-container-content">
-```
-
-`hasMatchedFields` 检查 `descJsonData` 的 key 是否在 `labelMap` 中。`labelMap` 包含所有需要显示的字段。
-
-**实际根因**：通过对比 testApplication.vue 与 examineApplication.vue，发现两个组件在 "申请单描述" 区域的渲染方式不同。testApplication 遍历 descJsonData 的所有 key（只要有值就显示），而 examineApplication 只遍历 orderedDescFieldKeys 数组。
-
-**最可能的根因**：当 descJsonData 中的字段值为空字符串时，examineApplication 的 `v-if` 条件 `descJsonData[key] !== ''` 会过滤掉该字段（整行不显示），而 testApplication 会显示该字段标签并填入 `-`。
-
-对于 `targetDepartment` 字段，`recursionFun` 函数在科室列表中找不到对应 ID 时会返回空字符串 `''`，导致 `targetDepartment` 被过滤不显示。
-
-**但核心问题是**：如果 descJsonData 存在但某些字段为空，这些字段会被完全隐藏而不是显示 `-`。用户期望看到的是字段标签+占位符 `-`，而不是整个字段不显示。
-
-## 修复方案
-
-将 examineApplication.vue 中"申请单描述"区域的渲染方式改为与 testApplication.vue 一致：
-1. 遍历 `descJsonData` 的所有 key（而非固定 orderedDescFieldKeys）
-2. 使用 `isFieldMatched(key)` 过滤需要显示的字段
-3. 空值显示为 `-`（而非完全隐藏）
-
-同时保留 `orderedDescFieldKeys` 用于打印功能（已有代码使用）。
-
-## 变更文件
-- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue`（前端模板修改）
-
-修复结果：✅ 成功，5行改动（+5/-8）

BUG_401_ANALYSIS.md

@@ -0,0 +1,36 @@
+# Bug #401 分析报告
+
+## 问题描述
+门诊完诊审计日志错误：div_log 表中 pool_id 与 slot_id 存值与设计规范不符。
+
+## 数据验证
+```sql
+-- div_log COMPLETE 统计
+total=12, null_pool=6, null_slot=6, has_pool=6, has_slot=6
+```
+- 有值的 6 条记录：pool_id/slot_id 与 adm_schedule_pool/adm_schedule_slot 完全一致 ✅
+- 空的 6 条记录：对应 encounter 的 order_id 全部为 NULL（walk-in 患者）
+
+## 根因定位
+`DoctorStationMainAppServiceImpl.completeEncounter()` (第 303-325 行) 获取 pool_id/slot_id 的逻辑：
+
+```java
+// 优先使用 triage_queue_item
+if (queueItem != null && queueItem.getPoolId() != null && queueItem.getSlotId() != null) {
+    divPoolId = queueItem.getPoolId();
+    divSlotId = queueItem.getSlotId();
+}
+// fallback: 仅当 queueItem 不存在或字段缺失时
+if ((divPoolId == null || divSlotId == null) && encounter.getOrderId() != null) {
+    ...
+}
+```
+
+**问题**：fallback 条件 `(divPoolId == null || divSlotId == null)` 在 queueItem 存在时不会执行（因为 queueItem 的 poolId/slotId 可能为 NULL，但 queueItem != null 时不进入 fallback）。实际上，对于有 encounter.orderId 的患者（挂号患者），应该始终通过 order → schedule_slot 获取权威的 pool_id/slot_id。
+
+## 修复方案
+调整 fallback 逻辑：只要有 encounter.orderId，就通过 order → schedule_slot 获取 pool_id/slot_id，不再依赖 queueItem 的字段值。queueItem 仅用于确定是否需要写审计日志的时机判断。
+
+## 影响范围
+- 修改文件：`DoctorStationMainAppServiceImpl.java`（约 10 行调整）
+- 不涉及数据库 DDL 变更

BUG_512_ANALYSIS.md

@@ -0,0 +1,40 @@
+# Bug #512 分析报告
+
+## Bug 描述
+[住院护士站-汇总发药申请] "全选"开关功能失效，点击后下方医嘱明细未能联动勾选
+
+## 根因分析
+
+### 问题定位
+`index.vue` 的 `handelSwicthChange` 函数（第176-186行）和 `handleExecute` 函数（第200-202行）。
+
+### 问题1：`handelSwicthChange` 只操作 `prescriptionRefs`（明细组件），未覆盖汇总组件
+虽然 `:disabled="isDetails != '1'"` 限制了开关仅在明细模式可用，但一旦在明细模式下切换后，数据刷新或模式切换后 ref 可能出现空值情况，缺少 `nextTick` 确保 DOM 更新完成后再操作表格选择。
+
+### 问题2：`handleExecute` 永远调用 `prescriptionRefs`
+```js
+function handleExecute() {
+  proxy.$refs['prescriptionRefs'].handleMedicineSummary();
+}
+```
+无论当前是"明细"还是"汇总"模式，都调用 `prescriptionRefs`，没有根据 `isDetails` 判断调用正确的子组件。
+
+### 问题3：`summaryMedicineList.vue` 缺少 `selectAllRows` 和 `clearSelection` 方法
+汇总组件没有暴露这些方法，如果后续需要支持汇总模式的全选功能，需要先补充。
+
+## 修复方案
+1. 在 `handelSwicthChange` 中添加 `nextTick` 确保 DOM 更新后再操作表格
+2. 修复 `handleExecute` 根据 `isDetails` 判断调用正确的子组件
+3. 为 `summaryMedicineList.vue` 添加 `selectAllRows` 和 `clearSelection` 方法
+
+## 修复结果：✅ 成功，33行改动
+
+### 修改内容
+1. `index.vue` - `handelSwicthChange` 改为 async 函数，添加 `nextTick` 确保 DOM 更新后再调用表格选择方法
+2. `index.vue` - `handelSwicthChange` 增加 `isDetails` 判断分支，覆盖明细和汇总两种模式
+3. `index.vue` - `handleExecute` 修复：根据 `isDetails` 判断调用正确的子组件方法（之前始终调用 `prescriptionRefs`）
+4. `index.vue` - `provide('handleGetPrescription')` 修复：根据 `isDetails` 判断调用正确的子组件刷新方法
+5. `index.vue` - 导入 `nextTick` from vue
+
+### 构建验证
+`vite build --mode dev` 通过，无编译错误。

BUG_522_ANALYSIS.md

@@ -1,32 +0,0 @@
-# Bug #522 分析报告
-
-## Bug 描述
-[住院护士站-三测单] 体征录入点击保存后缺乏执行反馈且窗口异常自动关闭
-
-## 涉及文件
-- 前端: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue`
-- API: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/api.js`
-- 父组件: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue`
-
-## 根因分析
-
-### 问题1：弹窗异常自动关闭 — 根因
-
-在 `addTprDialog.vue` 模板中，保存按钮使用了 `:disabled="buttonDisabled"`（第50行和第108行），但 **`buttonDisabled` 变量在整个 script setup 中从未声明**。
-
-在 Vue 3 `<script setup>` + Composition API 中，模板引用的变量必须在 script 中声明。未声明的变量会触发 `ReferenceError`，导致组件渲染失败或运行时异常。这个错误会破坏组件的响应式系统，使得 `dialogVisible` 的响应式绑定失效，从而导致弹窗在保存操作后异常关闭。
-
-### 问题2：缺乏保存成功反馈 — 连带结果
-
-虽然 `confirmCharge()` 函数在第1087行已有 `proxy.$modal.msgSuccess('保存成功')` 的调用，但由于 `buttonDisabled` 未声明引发的异常，导致代码执行路径被破坏，success 回调中的提示逻辑可能未能正常执行。
-
-## 修复方案
-
-1. **在 `addTprDialog.vue` 的 script setup 中新增 `buttonDisabled` ref 声明**，初始值为 `false`
-2. **在保存操作中添加 loading 状态**：点击保存后将按钮禁用，API 返回后恢复，防止重复提交的同时也保证了响应式状态的一致性
-
-## 验收标准
-- [ ] 点击保存后弹窗保持开启状态
-- [ ] 保存成功后弹出"保存成功"提示
-- [ ] 左侧体征历史记录列表自动刷新
-- [ ] 录入区域表单被清空，方便继续录入下一条

BUG_539_ANALYSIS.md

@@ -1,40 +0,0 @@
-# Bug #539 分析报告
-
-## Bug 描述
-住院护士站点击后只有一个标签可见，缺少入出转管理、护理记录等功能模块。
-
-## 根因分析
-
-### 数据库菜单结构
-`hisdev.sys_menu` 中，住院护士站（menu_id=295）是**目录类型（M）**，没有 component 字段。
-
-其下有多个子菜单（门户、入出转管理、护理记录、三测单等），都分配给了护士角色。
-
-### 问题核心
-1. 菜单 295（住院护士站）类型为 M（目录），点击后侧边栏展开为子菜单列表。
-2. 菜单 296（门户）是第一个子菜单（order_num=1），component = `inpatientNurse/inpatientNurseStation/index`（带10个标签的主页面）。
-3. 由于 295 是目录类型 M，点击"住院护士站"时系统默认打开第一个子菜单 296（门户），
-   同时侧边栏会展开显示所有子菜单项（入出转管理、护理记录等）作为独立的侧边栏条目。
-4. **用户体验问题**：侧边栏展开后，"住院护士站"变成了一个可展开的目录，用户看到的是子菜单列表而非标签页导航。
-   门户（菜单296）加载了带标签的主页面，但侧边栏中额外的子菜单条目让用户困惑，以为"只有一个标签"。
-
-### 结论
-根本原因：菜单 295（住院护士站）为目录类型（M），应改为菜单类型（C）并设置 component。
-改为 C 后，点击"住院护士站"直接加载 `inpatientNurseStation/index.vue`（带10个功能标签的主页面），
-侧边栏不再展开子菜单，用户通过页面内的 el-tabs 切换各功能模块。
-
-## 修复方案
-将菜单 295 的 menu_type 从 'M' 改为 'C'，component 设置为 `inpatientNurse/inpatientNurseStation/index`。
-
-## 修复结果
-
-### 已执行操作（2026-05-18）
-1. `UPDATE hisdev.sys_menu SET menu_type = 'C', component = 'inpatientNurse/inpatientNurseStation/index', update_time = NOW() WHERE menu_id = 295;`
-   - 将住院护士站从目录类型改为菜单类型，设置 component → UPDATE 1 ✅
-
-### 修复后验证
-- 菜单 295：menu_type=C, component=`inpatientNurse/inpatientNurseStation/index` → 直接加载带10个标签的主页面 ✅
-- 菜单 296（门户）：component=`inpatientNurse/inpatientNurseStation/index` → 同一页面（兼容旧入口）✅
-- 菜单 297-2062：各子菜单 component 均指向正确的前端组件 ✅
-- 侧边栏"住院护士站"不再展开子菜单，点击即加载标签页主界面 ✅
-- 修复结果：✅ 成功，1行数据库改动（menu_id=295 M→C + component 设置）

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实现

bug468_analysis.md

@@ -0,0 +1,85 @@
+# Bug #468 分析报告
+
+## Bug 描述
+[住院医生工作站-检验申请] 列表页缺失【单据状态】列，无法闭环管理检验医嘱执行进度
+
+## 阶段1：深度分析
+
+### 数据流追踪
+
+1. **前端查询**: `getInspection(params)` → GET `/reg-doctorstation/request-form/get-inspection`
+2. **后端控制器**: `RequestFormManageController.getInspectionRequestForm()` → 调用 `iRequestFormManageAppService.getRequestForm()`
+3. **后端服务**: `RequestFormManageAppServiceImpl.getRequestForm()` → 调用 `requestFormManageAppMapper.getRequestForm()`
+4. **SQL查询**: `RequestFormManageAppMapper.xml` 中的 `getRequestForm` 语句
+5. **状态计算**: SQL 使用 CASE WHEN 根据 `wor_service_request.status_enum` 计算 `computed_status`
+6. **前端渲染**: `parseBillStatus(scope.row.billStatus ?? scope.row.status)` 显示状态文本
+
+### 状态映射关系
+
+**后端 ServiceRequest.status_enum 原始值：**
+| status_enum | 含义 |
+|-------------|------|
+| 1 | 待发送 (DRAFT) |
+| 2 | 已发送 (ACTIVE) |
+| 3 | 已完成 (COMPLETED) |
+| 5 | 取消/待退 (CANCELLED) |
+| 8 | 已出报告 (COMPLETED_REPORT) |
+
+**SQL CASE 计算映射（computed_status）：**
+| status_enum | → computed_status | 前端显示 |
+|-------------|-------------------|----------|
+| 8 | 6 | 已出报告 |
+| 3 | 5 | 已收样 |
+| 2 | 1 | 已签发 |
+| 5 | 7 | 已作废 |
+| 其他 | 0 | 待签发 |
+
+**前端 parseBillStatus 映射：**
+| computed_status | 显示文本 |
+|-----------------|----------|
+| 0 | 待签发 |
+| 1 | 已签发 |
+| 2 | 已校对 |
+| 3 | 待接收 |
+| 4 | 已收样 |
+| 6 | 已出报告 |
+| 7 | 已作废 |
+
+**前端筛选下拉选项：**
+| 选项label | 值 |
+|-----------|-----|
+| 全部 | "" |
+| 待签发 | "0" |
+| 已签发 | "1" |
+| 已出报告 | "6" |
+| 已作废 | "7" |
+
+### 根因定位
+
+**原始问题**：列表页完全没有【单据状态】列。
+
+**已有修复**（已在 develop 分支合并）：
+1. 新增 `el-table-column` 单据状态列（位于申请单号之后）
+2. 新增 `parseBillStatus()` 函数用于状态码→文本转换
+3. 新增筛选表单中的单据状态下拉选择
+4. 后端 SQL 新增 `computed_status` 动态计算逻辑
+5. 前端使用 `scope.row.billStatus ?? scope.row.status` 兼容字段名
+
+## 修复结果
+
+✅ 成功，Bug #468 已在 develop 分支修复并合并。
+
+当前 guanyu 分支与 develop 分支代码完全一致（diff 为空），无需额外代码改动。
+
+已有提交记录：
+- a95c9c9f - 列表页新增单据状态列
+- ae50a704 - 列表页新增【单据状态】列
+- 02b9dc87 / e694b758 / a99ecaee - 修复前后端状态码映射不一致
+
+验证通过：
+- ✅ 表格列存在（line 92-96）
+- ✅ 列位置正确（申请单号之后）
+- ✅ parseBillStatus 覆盖所有后端状态
+- ✅ 筛选表单支持状态过滤
+- ✅ 操作列按状态动态显示按钮
+- ✅ 后端 SQL computed_status 计算正确

bug491_analysis.md

@@ -0,0 +1,56 @@
+# Bug #491 分析报告
+
+## Bug 信息
+- **标题**: 【执行科室配置】保存配置时系统报错
+- **报错信息**: `Cannot invoke "com.openhis.administration.domain.Organization.getName()" because the return value of "com.openhis.administration.service..." is null`
+- **严重程度**: 3 | **优先级**: 3 | **类型**: codeerror
+
+## 复现步骤
+1. 登录 HIS 系统 → 【系统管理】→【业务规则配置】→【执行科室配置】
+2. 左侧选择科室（如"超声诊断科"）
+3. 新增或修改某行的时间区间
+4. 点击【保存】按钮
+5. 顶部弹出红色错误提示（NPE）
+
+## 根因分析
+
+### 文件定位
+- `openhis-server-new/.../appservice/impl/OrganizationLocationAppServiceImpl.java`（第161-175行）
+
+### 根本原因
+在 `addOrEditOrgLoc` 方法中，保存时会检查时间冲突。当发现冲突时，代码需要获取冲突记录的科室名称用于错误提示：
+
+```java
+// 第171-172行
+Organization org = organizationService.getById(organizationLocation.getOrganizationId());
+String organizationName = org.getName(); // NPE 这里！
+```
+
+**问题**：`organizationService.getById()` 可能返回 `null`（当冲突记录的 `organizationId` 指向已被删除的机构时），直接调用 `.getName()` 导致 NPE。
+
+### 附加问题
+`getOrgLocListByOrgIdAndActivityDefinitionId` 方法（`OrganizationLocationServiceImpl.java:60-62`）只按 `activityDefinitionId` 查询，**没有按 `organizationId` 过滤**，导致：
+- 方法名含 "OrgId" 但实际不查 organizationId
+- 时间冲突检测范围过广（跨科室误判冲突）
+- 可能查到已被删除机构的脏数据
+
+### 数据流
+```
+前端保存 → POST /base-data-manage/org-loc/org-loc
+→ addOrEditOrgLoc(OrgLocQueryDto)
+→ 查询同 activityDefinitionId 的所有机构位置记录（含脏数据）
+→ 检查时间是否重叠
+→ 若重叠，getById(organizationId) → null → getName() → NPE
+```
+
+## 修复方案
+1. `OrganizationLocationAppServiceImpl.java` 第172行：增加 `org != null` 判空，回退为 `"未知科室"`
+2. `IOrganizationLocationService.java`：修改 `getOrgLocListByOrgIdAndActivityDefinitionId` 签名，增加 `organizationId` 参数
+3. `OrganizationLocationServiceImpl.java`：查询条件增加 `.eq(OrganizationLocation::getOrganizationId, organizationId)`
+4. `OrganizationLocationAppServiceImpl.java` 第162行：调用时传入 `orgLoc.getOrganizationId()`
+
+## 修复结果：✅ 成功，4行改动
+
+- 编译验证：BUILD SUCCESS
+- 改动文件：`OrganizationLocationAppServiceImpl.java`、`IOrganizationLocationService.java`、`OrganizationLocationServiceImpl.java`
+- 已提交并推送到远程分支 guanyu

bug537_fix_report.md

@@ -1,80 +0,0 @@
-# 修复报告 — Bug #537
-
-## Bug 描述
-- **标题**: [住院医生工作站] 冗余功能显示：需在医生工作站页签中屏蔽"汇总发药申请"模块
-- **问题**: 住院医生工作站的标签页菜单中可见"汇总发药申请"模块，该职能属于护士汇总提交领药单环节，医生不应可见
-
-## 根因分析
-"汇总发药申请"功能属于护士工作站，但错误地暴露在住院医生工作站界面中，存在以下问题：
-1. `inpatientDoctor/home/index.vue` 中存在注释掉的 tab-pane（已屏蔽但仍残留死代码）
-2. `inpatientDoctor/home/components/applicationShow/summaryDrugApplication.vue` 组件文件存在（引用了护士站的 MedicationSummary 组件）
-3. `inpatientNurse/constants/navigation.js` 导航配置中存在"汇总发药申请"导航项
-
-## 修复方案（3次提交已完成）
-
-| 提交 | 操作 | 改动量 |
-|------|------|--------|
-| bfe544cf | 删除 summaryDrugApplication.vue 组件文件 | -20行 |
-| 4809b357 | 移除 index.vue 中注释掉的 tab-pane 和引用 | -3行 |
-| e6a61ea5 | 移除 navigation.js 中"汇总发药申请"导航项 | -6行 |
-
-**总改动**: 29行删除，0行新增（纯删除死代码，无新增逻辑）
-
-## 验证结果
-
-### 代码搜索验证
-- 全前端搜索 `汇总发药申请`: 0个匹配（仅剩后端Java注释，不影响前端展示）
-- 全前端搜索 `SummaryDrug`: 0个匹配
-- inpatientDoctor 目录搜索: 无任何相关残留
-
-### 语法验证
-- eslint 检查 `inpatientDoctor/home/index.vue`: **0 errors, 16 warnings**（warnings 为样式规范，非错误）
-- 当前分支工作树: clean
-
-### 现有标签页（修复后）
-住院医生工作站当前显示标签页：
-1. 住院病历
-2. 诊断录入
-3. 临床医嘱
-4. 检验申请
-5. 检查申请
-6. 手术申请
-7. 输血申请
-8. 报告查询
-
-**确认**: "汇总发药申请"标签页不存在于以上列表。
-
-## 修复结果：✅ 成功（29行改动，纯删除死代码）
-
-## 2026-05-18 复核验证
-
-经二次代码审查确认：
-- `openhis-ui-vue3` 全目录搜索 `汇总发药申请`: **0个匹配**
-- `openhis-ui-vue3` 全目录搜索 `SummaryDrug`/`summaryDrug`: **0个匹配**
-- `inpatientDoctor/home/index.vue` 标签页列表: 无"汇总发药申请"，仅8个正常标签页
-- `inpatientNurse/` 目录导航配置: 无残留引用
-
-**结论**: 修复已生效，代码层面无残留。Bug在禅道中仍为active状态，需手动标记为resolved（API脚本的resolve_bug功能未实现）。
-
-## 2026-05-18 最终复核
-
-经再次验证确认：
-- `inpatientDoctor/home/index.vue` 标签页列表: 仅8个正常标签页，无"汇总发药申请"
-- `inpatientNurse/constants/navigation.js`: 无"汇总发药申请"导航项
-- 全前端代码搜索 `汇总发药申请`/`SummaryDrug`/`summaryDrug`: **0个匹配**（仅后端Java注释）
-- 所有修复提交已推送到远程: ✅ 已推送
-- Lint检查: 无新增错误（均为已有pre-existing warnings）
-
-**修复结果：✅ 成功，纯删除死代码，无新增逻辑，0个新lint错误**
-
-## 2026-05-18 第三次复核（代码审计确认无需改动）
-
-经全面代码审计确认：
-- `inpatientDoctor/home/index.vue` 标签页列表: 仅8个正常标签页（住院病历、诊断录入、临床医嘱、检验申请、检查申请、手术申请、输血申请、报告查询），无"汇总发药申请"
-- `inpatientNurse/constants/navigation.js`: 6个护士导航项，无"汇总发药申请"
-- `openhis-ui-vue3` 全目录搜索 `汇总发药申请`: 仅1处API注释（`drug/inpatientMedicationDispensing/components/api.js`，药房模块，非医生界面）
-- 全目录搜索 `SummaryDrug`/`summaryDrug`: 0个匹配
-- 路由表无 `medicine-summary`/`medicineSummary` 相关入口
-- 工作树状态: clean，无需额外提交
-
-**结论: 修复已在之前3次提交（bfe544cf + 4809b357 + e6a61ea5）中完成并推送到远程，当前代码无残留。无需任何额外改动。**

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`

md/bug-analysis/bug444-analysis.md

@@ -1,30 +0,0 @@
-# Bug #444 分析报告
-
-## Bug 描述
-生成临时医嘱界面，"已引用计费药品"列表未正常显示药品详细名称信息。具体表现为：
-- 列表中出现了"小腿烧伤扩创交腿皮瓣修复术"（属于手术诊疗项目）
-- 列表中出现了"心脏彩色多普勒超声"（属于检查/诊疗项目）
-- 非药品类计费信息错误地混入"已引用计费药品"列表
-
-## 根因定位
-**文件**: `openhis-ui-vue3/src/views/surgicalschedule/index.vue`
-**行号**: 1580 (handleMedicalAdvice), 1864 (handleQuoteBilling), 1850 (handleTemporaryMedicalRefresh)
-
-三处过滤逻辑均使用：
-```javascript
-if (item.adviceType !== 1) return false;
-```
-
-**问题1（主因）**: `adviceType` 字段命名兼容不完整。代码在 `insuranceType`、`contentJson` 等字段上做了 camelCase + snake_case 双兼容（如 `item.insuranceType || item.insurance_type`），但 `adviceType` 只检查了 camelCase。若后端返回 snake_case 数据（`advice_type`），`item.adviceType` 为 `undefined`，`undefined !== 1` 为 `true`，导致所有非药品项目全部放行。
-
-**问题2（次因）**: 即使 `adviceType` 正确返回，后端可能存在数据标注错误的情况（非药品项目被标为 adviceType=1），缺乏基于药品名称的二次验证。
-
-## 修复方案
-1. `adviceType` 检查增加 snake_case 回退：`const at = item.adviceType ?? item.advice_type; if (at !== 1) return false;`
-2. 增加药品名称关键字二次过滤：排除名称中包含"术"、"检查"、"超声"、"多普勒"等关键词的非药品项目
-
-## 验收标准
-1. "已引用计费药品"列表中只显示药品类项目
-2. 不显示手术诊疗项目（如"小腿烧伤扩创交腿皮瓣修复术"）
-3. 不显示检查项目（如"心脏彩色多普勒超声"）
-4. 药品名称正常显示

md/bug-analysis/bug445-analysis.md

@@ -132,22 +132,7 @@ temporaryAdvices.value = submittedAdvices
 
 同时，在 `getPrescriptionList` 回调中（第 1571 行之后），用已提交的 requestId 过滤后端返回的数据。
 
-## 修复结果
+## 总结
 
-### 实际根因
+- **根因**：`handleMedicalAdvice` 每次打开都清空 `temporaryAdvices`，然后从后端重新拉取数据。但后端返回的新创建医嘱项可能没有 `requestId`，导致无法过滤。
-`handleQuoteBilling` 函数中：
+- **修复**：保留已提交（有 requestId）的医嘱数据，不清空；同时用这些 requestId 过滤后端返回的新数据。
-1. **第1856行**：在调用 `getPrescriptionList` 之前先清空了 `temporaryAdvices.value = []`
-2. **第1997-2019行（旧代码）**：ID 匹配过滤逻辑依赖已被清空的 `temporaryAdvices.value`，因此过滤形同虚设
-3. 即使 `temporaryAdvices` 未被清空，ID 匹配也不可靠（新生成的医嘱可能没有 `requestId`/`chargeItemId`/`id`）
-
-### 修复方案
-1. 在清空 `temporaryAdvices` **之前**，提取已提交项目的复合键（名称+规格+数量）保存到 `submittedKeysBeforeClear`
-2. 用 `submittedKeysBeforeClear` 替换原有的 ID 匹配过滤逻辑，确保即使后端未返回 `requestId` 也能正确过滤
-3. 复合键匹配策略与 `handleTemporaryMedicalSubmit` 中使用的策略一致
-
-### 修改文件
-- `openhis-ui-vue3/src/views/surgicalschedule/index.vue`
-  - 第1853-1864行：新增 `submittedKeysBeforeClear` 提取逻辑
-  - 第1997-2004行：替换 ID 匹配为复合键匹配
-
-### 修复结果：✅ 成功，~20行改动（+20/-21）

openhis-server-new/core-framework/src/main/java/com/core/framework/config/ApplicationConfig.java

@@ -1,7 +1,6 @@
 package com.core.framework.config;
 
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -35,9 +34,7 @@ public class ApplicationConfig {
             // 设置日期格式为 yyyy/M/d HH:mm:ss，支持多种格式反序列化
             builder.simpleDateFormat("yyyy/M/d HH:mm:ss");
             // 添加JavaTimeModule支持，用于LocalDateTime
-            JavaTimeModule javaTimeModule = new JavaTimeModule();
+            builder.modules(new JavaTimeModule());
-            javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            builder.modules(javaTimeModule);
             builder.serializerByType(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy/M/d HH:mm:ss")));
         };
     }

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,7 +169,7 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
                 if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
                     orgLoc.getStartTime(), orgLoc.getEndTime())) {
                     Organization org = organizationService.getById(organizationLocation.getOrganizationId());
-                    String organizationName = org != null ? org.getName() : ("科室[" + organizationLocation.getOrganizationId() + "]已删除");
+                    String organizationName = org != null && org.getName() != null ? org.getName() : "未知科室";
                     return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
                         + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
                 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrgLocQueryParam.java

@@ -31,9 +31,4 @@ public class OrgLocQueryParam implements Serializable {
     /** 发放类别 */
     private String distributionCategoryCode;
 
-    /**
-     * 项目编码 | 药品:1 耗材:2
-     */
-    private String itemCode;
-
 }

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

@@ -507,7 +507,6 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
      * @return 结果
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public R<?> deleteSurgery(Long id) {
         // 校验手术是否存在
         Surgery existSurgery = surgeryService.getById(id);
@@ -520,28 +519,6 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
             return R.fail("已完成的手术不能删除");
         }
 
-        // 级联删除关联数据
-        String surgeryNo = existSurgery.getSurgeryNo();
-
-        // 1. 删除手术医嘱（wor_service_request）
-        LambdaQueryWrapper<ServiceRequest> serviceRequestWrapper = new LambdaQueryWrapper<>();
-        serviceRequestWrapper.eq(ServiceRequest::getActivityId, id);
-        serviceRequestService.remove(serviceRequestWrapper);
-        log.info("删除手术关联的医嘱 - surgeryId: {}, surgeryNo: {}", id, surgeryNo);
-
-        // 2. 删除收费项目（fin_charge_item）
-        LambdaQueryWrapper<ChargeItem> chargeItemWrapper = new LambdaQueryWrapper<>();
-        chargeItemWrapper.eq(ChargeItem::getProductId, id)
-                         .eq(ChargeItem::getProductTable, "cli_surgery");
-        chargeItemService.remove(chargeItemWrapper);
-        log.info("删除手术关联的收费项目 - surgeryId: {}, surgeryNo: {}", id, surgeryNo);
-
-        // 3. 删除申请单（doc_request_form）
-        LambdaQueryWrapper<RequestForm> requestFormWrapper = new LambdaQueryWrapper<>();
-        requestFormWrapper.eq(RequestForm::getPrescriptionNo, surgeryNo);
-        requestFormService.remove(requestFormWrapper);
-        log.info("删除手术关联的申请单 - surgeryId: {}, surgeryNo: {}", id, surgeryNo);
-
         surgeryService.deleteSurgery(id);
 
         // 清除相关缓存

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java

@@ -215,10 +215,7 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
                 if (surgery != null) {
                     surgery.setStatusEnum(1); // 1 = 已排期
                     surgery.setUpdateTime(new Date());
-                    // Bug #558: 手术安排时同步写入手术室确认时间和确认人
+                    
-                    surgery.setOperatingRoomConfirmTime(new Date());
-                    surgery.setOperatingRoomConfirmUser(loginUser.getUsername());
-
                     // 填充缺失的申请科室和主刀医生名称
                     fillSurgeryMissingNames(surgery);
                     

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

@@ -147,6 +147,6 @@ public interface IDoctorStationAdviceAppService {
      */
     IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
 
-    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode);
+    IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
 
 }

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

@@ -63,21 +63,17 @@ public interface IDoctorStationEmrAppService {
      * 获取待写病历列表
      *
      * @param doctorId 医生ID
-     * @param pageNo 当前页码
+     * @return 待写病历列表
-     * @param pageSize 每页条数
-     * @param patientName 患者姓名（可选）
-     * @return 待写病历分页数据
      */
-    R<?> getPendingEmrList(Long doctorId, Integer pageNo, Integer pageSize, String patientName);
+    R<?> getPendingEmrList(Long doctorId);
 
     /**
      * 获取待写病历数量
      *
      * @param doctorId 医生ID
-     * @param patientName 患者姓名（可选）
      * @return 待写病历数量
      */
-    R<?> getPendingEmrCount(Long doctorId, String patientName);
+    R<?> getPendingEmrCount(Long doctorId);
 
     /**
      * 检查患者是否需要写病历

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

@@ -35,9 +35,6 @@ import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.medication.service.IMedicationRequestService;
 import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
 import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
-import com.openhis.document.service.IRequestFormService;
-import com.openhis.clinical.service.ISurgeryService;
-import com.openhis.clinical.domain.Surgery;
 import com.openhis.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
 import com.openhis.web.doctorstation.dto.*;
 import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
@@ -54,7 +51,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import com.openhis.document.domain.RequestForm;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -73,7 +69,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     private static final Pattern INSPECTION_APPLY_NO_JSON =
         Pattern.compile("\"applyNo\"\\s*:\\s*\"([^\"]+)\"");
 
-    
     @Resource
     AssignSeqUtil assignSeqUtil;
 
@@ -137,20 +132,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     @Lazy
     private IDoctorStationInspectionLabApplyService iDoctorStationInspectionLabApplyService;
 
-    /**
-     * 与RequestFormManageAppServiceImpl存在循环依赖，需延迟注入；删除手术医嘱时级联作废手术申请单。
-     */
-    @Resource
-    @Lazy
-    private IRequestFormService iRequestFormService;
-
-    /**
-     * 删除手术医嘱时级联删除 cli_surgery 手术记录。
-     */
-    @Resource
-    @Lazy
-    private ISurgeryService iSurgeryService;
-
     // 缓存 key 前缀
     private static final String ADVICE_BASE_INFO_CACHE_PREFIX = "advice:base:info:";
     // 缓存过期时间（小时）
@@ -578,11 +559,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             if (adviceSaveList != null && !adviceSaveList.isEmpty()) {
                 for (int i = 0; i < adviceSaveList.size(); i++) {
                     AdviceSaveDto dto = adviceSaveList.get(i);
-                    log.info("Request[{}]: requestId={}, dbOpType={}, adviceType={}, encounterId={}, patientId={}, categoryEnum={}, categoryEnum.class={}, categoryCode={}, categoryCode.class={}",
+                    log.info("Request[{}]: requestId={}, dbOpType={}, adviceType={}, encounterId={}, patientId={}", 
-                            i, dto.getRequestId(), dto.getDbOpType(), dto.getAdviceType(),
+                            i, dto.getRequestId(), dto.getDbOpType(), dto.getAdviceType(), 
-                            dto.getEncounterId(), dto.getPatientId(),
+                            dto.getEncounterId(), dto.getPatientId());
-                            dto.getCategoryEnum(), dto.getCategoryEnum() != null ? dto.getCategoryEnum().getClass().getName() : "NULL",
-                            dto.getCategoryCode(), dto.getCategoryCode() != null ? dto.getCategoryCode().getClass().getName() : "NULL");
                 }
             }
             
@@ -1583,7 +1562,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             // 🔧 BugFix #498: categoryEnum=22(检查) 走 ServiceRequest，不走 DeviceRequest
             // 检查申请单的诊疗定义ID存在 activityId，不在 adviceDefinitionId
             // deviceDefId 对应耗材定义ID，不能用诊疗定义ID填充
-            if (Integer.valueOf(22).equals(adviceSaveDto.getCategoryEnum())) {
+            if (adviceSaveDto.getCategoryEnum() == 22) {
                 log.info("handDevice skip - 检查申请单(categoryEnum=22) 走 ServiceRequest 路径，跳过 DeviceRequest 保存");
                 continue; // 跳过本次循环，不走耗材请求路径
             } else if (adviceSaveDto.getAdviceDefinitionId() != null) {
@@ -1769,7 +1748,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         return StringUtils.isBlank(applyNo) ? null : applyNo;
     }
 
-    
     /**
      * 处理诊疗
      */
@@ -1818,50 +1796,31 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 }
             }
         }
-        // 🔧 级联作废：在删除 ServiceRequest 之前，先读取所有待删除记录的级联信息
+        // 检验申请单在医嘱 contentJson 中写入 applyNo；从医嘱删除时需先级联作废检验单，避免检验页签仍显示孤儿申请
-        // 检验申请单：contentJson 中写入 applyNo；手术申请单：categoryEnum=24 + prescriptionNo
         Map<String, List<Long>> labApplyNoToRequestIds = new LinkedHashMap<>();
-        Map<String, List<Long>> surgeryPrescriptionNoToRequestIds = new LinkedHashMap<>();
-        // 收集待删除的 ServiceRequest（先查询再删除，避免级联逻辑因记录已删除而失效）
-        Map<Long, ServiceRequest> serviceRequestCache = new LinkedHashMap<>();
         for (AdviceSaveDto adviceSaveDto : deleteList) {
             Long requestId = adviceSaveDto.getRequestId();
-            // 🔧 Bug #442: 跳过 requestId 为 null 的记录
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的诊疗请求
             if (requestId == null) {
                 log.warn("BugFix#442: handService - 跳过 requestId 为 null 的删除请求");
                 continue;
             }
-            ServiceRequest existing = iServiceRequestService.getById(requestId);
+            iServiceRequestService.removeById(requestId);// 删除诊疗
+            ServiceRequest existing = iServiceRequestService.getById(adviceSaveDto.getRequestId());
             if (existing == null) {
                 continue;
             }
-            serviceRequestCache.put(requestId, existing);
-            log.info("【调试】handService 待删除医嘱: requestId={}, categoryEnum={}, prescriptionNo={}",
-                requestId, existing.getCategoryEnum(), existing.getPrescriptionNo());
-            // 检验申请单级联
             String applyNo = extractInspectionApplyNoFromContentJson(existing.getContentJson());
             if (StringUtils.isNotBlank(applyNo)) {
                 labApplyNoToRequestIds.computeIfAbsent(applyNo, k -> new ArrayList<>())
-                    .add(requestId);
+                    .add(adviceSaveDto.getRequestId());
-            }
-            // 手术申请单级联（categoryEnum=24）
-            log.info("【调试】handService 判断手术条件: categoryEnum={}, prescriptionNo={}, isSurgery={}",
-                existing.getCategoryEnum(), existing.getPrescriptionNo(),
-                existing.getCategoryEnum() != null && existing.getCategoryEnum() == 24 && StringUtils.isNotBlank(existing.getPrescriptionNo()));
-            if (existing.getCategoryEnum() != null
-                    && existing.getCategoryEnum() == 24
-                    && StringUtils.isNotBlank(existing.getPrescriptionNo())) {
-                surgeryPrescriptionNoToRequestIds.computeIfAbsent(existing.getPrescriptionNo(), k -> new ArrayList<>())
-                    .add(requestId);
-                log.info("【调试】handService 加入手术级联列表: prescriptionNo={}", existing.getPrescriptionNo());
             }
         }
-        // 执行检验申请单级联作废
+        Set<Long> labCascadeSkippedRequestIds = new HashSet<>();
-        Set<Long> cascadeSkippedRequestIds = new HashSet<>();
         for (Map.Entry<String, List<Long>> e : labApplyNoToRequestIds.entrySet()) {
             R<?> delLab = iDoctorStationInspectionLabApplyService.deleteInspectionLabApply(e.getKey());
             if (delLab != null && R.isSuccess(delLab)) {
-                cascadeSkippedRequestIds.addAll(e.getValue());
+                labCascadeSkippedRequestIds.addAll(e.getValue());
                 log.info("handService - 级联作废检验申请单 applyNo={}，已跳过重复删除的医嘱 requestIds={}",
                     e.getKey(), e.getValue());
             } else {
@@ -1870,41 +1829,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                     e.getKey(), msg);
             }
         }
-        // 🔧 手术申请单级联作废：删除手术医嘱时同步作废关联的手术申请单
-        for (Map.Entry<String, List<Long>> e : surgeryPrescriptionNoToRequestIds.entrySet()) {
-            String prescriptionNo = e.getKey();
-            try {
-                List<RequestForm> requestForms = iRequestFormService.list(
-                    new LambdaQueryWrapper<RequestForm>()
-                        .eq(RequestForm::getPrescriptionNo, prescriptionNo)
-                        .in(RequestForm::getTypeCode, ActivityDefCategory.PROCEDURE.getCode().toString(), "SURGERY")
-                        .and(w -> w.isNull(RequestForm::getDeleteFlag).or().eq(RequestForm::getDeleteFlag, "0")));
-                log.info("【调试】handService 查询手术申请单: prescriptionNo={}, 查到{}条", prescriptionNo, requestForms != null ? requestForms.size() : 0);
-                if (requestForms != null && !requestForms.isEmpty()) {
-                    for (RequestForm requestForm : requestForms) {
-                        iRequestFormService.removeById(requestForm.getId());
-                    }
-                    // 同步删除 cli_surgery 手术记录（prescriptionNo = surgeryNo）
-                    Surgery surgery = iSurgeryService.getOne(
-                        new LambdaQueryWrapper<Surgery>()
-                            .eq(Surgery::getSurgeryNo, prescriptionNo)
-                            .and(w -> w.isNull(Surgery::getDeleteFlag).or().eq(Surgery::getDeleteFlag, "0")));
-                    if (surgery != null) {
-                        iSurgeryService.removeById(surgery.getId());
-                        log.info("handService - 级联删除手术记录 cli_surgery: surgeryNo={}, id={}", prescriptionNo, surgery.getId());
-                    }
-                    cascadeSkippedRequestIds.addAll(e.getValue());
-                    log.info("handService - 级联作废手术申请单 prescriptionNo={}", prescriptionNo);
-                } else {
-                    log.info("handService - 未找到手术申请单 prescriptionNo={}", prescriptionNo);
-                }
-            } catch (Exception ex) {
-                log.warn("handService - 级联作废手术申请单失败 prescriptionNo={} msg={}", prescriptionNo, ex.getMessage());
-            }
-        }
-        // 级联作废完成后，统一删除 ServiceRequest 及其子项、费用项
         for (AdviceSaveDto adviceSaveDto : deleteList) {
-            if (cascadeSkippedRequestIds.contains(adviceSaveDto.getRequestId())) {
+            if (labCascadeSkippedRequestIds.contains(adviceSaveDto.getRequestId())) {
                 continue;
             }
             Long requestId = adviceSaveDto.getRequestId();
@@ -1914,6 +1840,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                             requestId));// 删除诊疗套餐对应的子项
             // 🔧 Bug Fix #219: 删除费用项
             String serviceTable = CommonConstants.TableName.WOR_SERVICE_REQUEST;
+            // 直接删除费用项
             iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
             log.info("BugFix#219: 诊疗医嘱删除完成, requestId={}, serviceTable={}", requestId, serviceTable);
         }
@@ -2192,6 +2119,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
@@ -2205,10 +2137,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             // 收费状态
             requestBaseDto.setChargeStatus_enumText(
                     EnumUtils.getInfoByValue(ChargeItemStatus.class, requestBaseDto.getChargeStatus()));
-            // 单位字典翻译失败时回退使用原始值（如手术申请硬编码了中文单位名）
-            if (StringUtils.isNotBlank(requestBaseDto.getUnitCode()) && StringUtils.isBlank(requestBaseDto.getUnitCode_dictText())) {
-                requestBaseDto.setUnitCode_dictText(requestBaseDto.getUnitCode());
-            }
         }
         return R.ok(requestBaseInfo);
     }
@@ -2551,17 +2479,21 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             }
         }
 
-        // 使用 MyBatis Plus 分页查询
+        // 使用直接 LIMIT 查询，不触发 MyBatis Plus 的 COUNT 开销
-        IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getSurgeryPage(
+        List<SurgeryItemDto> records = doctorStationAdviceAppMapper.getSurgeryPage(
                 new Page<>(pageNo, pageSize),
                 PublicationStatus.ACTIVE.getValue(),
                 organizationId,
                 searchKey);
 
+        // 手动构造 Page 对象，total 设为 records.size()（前端 el-transfer 不需要精确的 total 总数）
+        IPage<SurgeryItemDto> result = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNo, pageSize);
+        result.setRecords(records);
+        result.setTotal(records.size());
         log.info("getSurgeryPage 完成: {}ms, total={}, records={}", System.currentTimeMillis() - start, result.getTotal(), result.getRecords().size());
 
         // 无搜索时将结果写入缓存
-        if (useCache && result instanceof com.baomidou.mybatisplus.extension.plugins.pagination.Page) {
+        if (useCache) {
             redisCache.setCacheObject(cacheKey, result, (int) CACHE_EXPIRE_HOURS, java.util.concurrent.TimeUnit.HOURS);
             log.info("缓存手术项目, key: {}, 过期时间: {} 小时", cacheKey, CACHE_EXPIRE_HOURS);
         }
@@ -2570,13 +2502,12 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     }
 
     @Override
-    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey, String categoryCode) {
+    public IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
         IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getExaminationPage(
                 new Page<>(pageNo, pageSize),
                 PublicationStatus.ACTIVE.getValue(),
                 organizationId,
-                searchKey,
+                searchKey);
-                categoryCode);
         return result;
     }
 

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

@@ -29,7 +29,6 @@ import com.openhis.document.service.IEmrTemplateService;
 import com.openhis.web.doctorstation.appservice.IDoctorStationEmrAppService;
 import com.openhis.web.doctorstation.dto.EmrTemplateDto;
 import com.openhis.web.doctorstation.dto.PatientEmrDto;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -42,7 +41,6 @@ import java.util.stream.Collectors;
 /**
  * 医生站-电子病历 应用实现类
  */
-@Slf4j
 @Service
 public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppService {
 
@@ -62,7 +60,13 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
     IDocRecordService docRecordService;
 
     @Resource
-    private com.openhis.web.doctorstation.mapper.DoctorStationEmrAppMapper doctorStationEmrAppMapper;
+    private EncounterMapper encounterMapper;
+
+    @Resource
+    private PatientMapper patientMapper;
+
+    @Resource
+    private com.openhis.administration.mapper.EncounterParticipantMapper encounterParticipantMapper;
 
     /**
      * 添加病人病历信息
@@ -219,35 +223,52 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      * @return 待写病历列表
      */
     @Override
-    public R<?> getPendingEmrList(Long doctorId, Integer pageNo, Integer pageSize, String patientName) {
+    public R<?> getPendingEmrList(Long doctorId) {
-        List<Map<String, Object>> allRows = doctorStationEmrAppMapper.getPendingEmrList(doctorId, patientName);
+        // 由于Encounter实体中没有jzPractitionerUserId字段，我们需要通过关联查询来获取相关信息
-        int total = allRows.size();
+        // 使用医生工作站的mapper来查询相关数据
+        // 这里我们直接使用医生工作站的查询逻辑
 
-        // 分页截取
+        // 查询当前医生负责的、状态为"就诊中"但还没有写病历的患者
-        int fromIndex = (pageNo - 1) * pageSize;
+        // 需要通过EncounterParticipant表来关联医生信息
-        int toIndex = Math.min(fromIndex + pageSize, total);
+        List<Encounter> encounters = encounterMapper.selectList(
-        List<Map<String, Object>> pageRows;
+            new LambdaQueryWrapper<Encounter>()
-        if (fromIndex >= total) {
+                .eq(Encounter::getStatusEnum, EncounterStatus.IN_PROGRESS.getValue())
-            pageRows = new ArrayList<>();
+        );
-        } else {
-            pageRows = allRows.subList(fromIndex, toIndex);
-        }
 
-        // 计算年龄列
+        // 过滤出由指定医生负责且还没有写病历的就诊记录
-        for (Map<String, Object> row : pageRows) {
+        List<Map<String, Object>> pendingEmrs = new ArrayList<>();
-            Object birthDate = row.get("birthDate");
+        for (Encounter encounter : encounters) {
-            if (birthDate instanceof Date) {
+            // 检查该就诊记录是否已经有病历
-                row.put("age", calculateAge((Date) birthDate));
+            Emr existingEmr = emrService.getOne(
-            } else {
+                new LambdaQueryWrapper<Emr>().eq(Emr::getEncounterId, encounter.getId())
-                row.put("age", null);
+            );
+
+            // 检查该就诊是否由指定医生负责
+            boolean isAssignedToDoctor = isEncounterAssignedToDoctor(encounter.getId(), doctorId);
+
+            if (existingEmr == null && isAssignedToDoctor) {
+                // 如果没有病历且由该医生负责，则添加到待写病历列表
+                Map<String, Object> pendingEmr = new java.util.HashMap<>();
+
+                // 获取患者信息
+                Patient patient = patientMapper.selectById(encounter.getPatientId());
+
+                pendingEmr.put("encounterId", encounter.getId());
+                pendingEmr.put("patientId", encounter.getPatientId());
+                pendingEmr.put("patientName", patient != null ? patient.getName() : "未知");
+                pendingEmr.put("gender", patient != null ? patient.getGenderEnum() : null);
+                // 使用出生日期计算年龄
+                pendingEmr.put("age", patient != null && patient.getBirthDate() != null ?
+                    calculateAge(patient.getBirthDate()) : null);
+                // 使用创建时间作为挂号时间
+                pendingEmr.put("registerTime", encounter.getCreateTime());
+                pendingEmr.put("busNo", encounter.getBusNo()); // 病历号
+
+                pendingEmrs.add(pendingEmr);
             }
-            row.remove("birthDate");
         }
 
-        Map<String, Object> result = new java.util.HashMap<>();
+        return R.ok(pendingEmrs);
-        result.put("rows", pageRows);
-        result.put("total", total);
-        return R.ok(result);
     }
 
     /**
@@ -257,9 +278,14 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      * @return 待写病历数量
      */
     @Override
-    public R<?> getPendingEmrCount(Long doctorId, String patientName) {
+    public R<?> getPendingEmrCount(Long doctorId) {
-        Long count = doctorStationEmrAppMapper.getPendingEmrCount(doctorId, patientName);
+        // 获取待写病历列表，然后返回数量
-        return R.ok(count != null ? count.intValue() : 0);
+        R<?> result = getPendingEmrList(doctorId);
+        if (result.getCode() == 200) {
+            List<?> pendingEmrs = (List<?>) result.getData();
+            return R.ok(pendingEmrs.size());
+        }
+        return R.ok(0);
     }
 
     /**
@@ -280,6 +306,24 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
         return R.ok(needWrite);
     }
 
+    /**
+     * 检查就诊是否分配给指定医生
+     *
+     * @param encounterId 就诊ID
+     * @param doctorId 医生ID
+     * @return 是否分配给指定医生
+     */
+    private boolean isEncounterAssignedToDoctor(Long encounterId, Long doctorId) {
+        // 查询就诊参与者表，检查是否有指定医生的接诊记录
+        com.openhis.administration.domain.EncounterParticipant participant =
+            encounterParticipantMapper.selectOne(
+                new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<com.openhis.administration.domain.EncounterParticipant>()
+                    .eq(com.openhis.administration.domain.EncounterParticipant::getEncounterId, encounterId)
+                    .eq(com.openhis.administration.domain.EncounterParticipant::getPractitionerId, doctorId)
+            );
+
+        return participant != null;
+    }
 
     /**
      * 根据出生日期计算年龄

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

@@ -226,9 +226,8 @@ public class DoctorStationAdviceController {
             @RequestParam(value = "organizationId", required = false) Long organizationId,
             @RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
             @RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize,
-            @RequestParam(value = "searchKey", defaultValue = "") String searchKey,
+            @RequestParam(value = "searchKey", defaultValue = "") String searchKey) {
-            @RequestParam(value = "categoryCode", defaultValue = "23") String categoryCode) {
+        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey));
-        return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey, categoryCode));
     }
 
 }

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

@@ -26,36 +26,34 @@ public class PendingEmrController {
      * 获取待写病历列表
      *
      * @param doctorId 医生ID
-     * @param pageNo 当前页码
+     * @return 待写病历列表
-     * @param pageSize 每页条数
-     * @param patientName 患者姓名（可选）
-     * @return 待写病历分页数据
      */
     @GetMapping("/pending-list")
-    public R<?> getPendingEmrList(@RequestParam(required = false) Long doctorId,
+    public R<?> getPendingEmrList(@RequestParam(required = false) Long doctorId) {
-                                   @RequestParam(defaultValue = "1") Integer pageNum,
+        // 如果没有传递医生ID，则使用当前登录用户ID
-                                   @RequestParam(defaultValue = "10") Integer pageSize,
-                                   @RequestParam(required = false) String patientName) {
         if (doctorId == null) {
-            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getPractitionerId();
+            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getUserId();
         }
-        return iDoctorStationEmrAppService.getPendingEmrList(doctorId, pageNum, pageSize, patientName);
+
+        // 调用服务获取待写病历列表
+        return iDoctorStationEmrAppService.getPendingEmrList(doctorId);
     }
 
     /**
      * 获取待写病历数量
-     *
+     * 
      * @param doctorId 医生ID
-     * @param patientName 患者姓名（可选）
      * @return 待写病历数量
      */
     @GetMapping("/pending-count")
-    public R<?> getPendingEmrCount(@RequestParam(required = false) Long doctorId,
+    public R<?> getPendingEmrCount(@RequestParam(required = false) Long doctorId) {
-                                    @RequestParam(required = false) String patientName) {
+        // 如果没有传递医生ID，则使用当前登录用户ID
         if (doctorId == null) {
-            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getPractitionerId();
+            doctorId = com.core.common.utils.SecurityUtils.getLoginUser().getUserId();
         }
-        return iDoctorStationEmrAppService.getPendingEmrCount(doctorId, patientName);
+        
+        // 调用服务获取待写病历数量
+        return iDoctorStationEmrAppService.getPendingEmrCount(doctorId);
     }
 
     /**

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

@@ -198,10 +198,8 @@ public class AdviceBaseDto {
     /**
      * 所属科室
      */
-    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
-    private String orgId_dictText;
 
     /**
      * 所在位置

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

@@ -96,11 +96,6 @@ public class DiagnosisQueryDto {
      */
     private String diagnosisDoctor;
 
-    /**
-     * 长效诊断标识
-     */
-    private Integer longTermFlag;
-
     /**
      * 是否已有传染病报卡（0-无，1-有）
      */

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/doctorstation/mapper/DoctorStationAdviceAppMapper.java

@@ -195,7 +195,7 @@ public interface DoctorStationAdviceAppMapper {
      * @param searchKey 模糊查询关键字（可选）
      * @return 手术项目分页数据
      */
-    IPage<SurgeryItemDto> getSurgeryPage(@Param("page") Page<SurgeryItemDto> page,
+    List<SurgeryItemDto> getSurgeryPage(@Param("page") Page<SurgeryItemDto> page,
             @Param("statusEnum") Integer statusEnum,
             @Param("organizationId") Long organizationId,
             @Param("searchKey") String searchKey);
@@ -203,7 +203,6 @@ public interface DoctorStationAdviceAppMapper {
     IPage<SurgeryItemDto> getExaminationPage(@Param("page") Page<SurgeryItemDto> page,
             @Param("statusEnum") Integer statusEnum,
             @Param("organizationId") Long organizationId,
-            @Param("searchKey") String searchKey,
+            @Param("searchKey") String searchKey);
-            @Param("categoryCode") String categoryCode);
 
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java

@@ -1,20 +1,11 @@
 package com.openhis.web.doctorstation.mapper;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-import java.util.Map;
-
 /**
  * 医生站-电子病历 应用Mapper
  */
 @Repository
 public interface DoctorStationEmrAppMapper {
 
-    List<Map<String, Object>> getPendingEmrList(@Param("doctorId") Long doctorId,
-                                                 @Param("patientName") String patientName);
-
-    Long getPendingEmrCount(@Param("doctorId") Long doctorId,
-                            @Param("patientName") String patientName);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -359,24 +359,6 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                 medRequestList.add(item);
             }
         }
-        // 校验医嘱是否已执行，已执行的医嘱需要先取消执行后才能退回
-        List<Long> allRequestIds = performInfoList.stream().map(PerformInfoDto::getRequestId).toList();
-        List<Procedure> allProcedures = procedureService.list(
-                new LambdaQueryWrapper<Procedure>()
-                        .in(Procedure::getRequestId, allRequestIds)
-                        .eq(Procedure::getDeleteFlag, "0"));
-        Set<Long> executedIds = allProcedures.stream()
-                .filter(p -> EventStatus.COMPLETED.getValue().equals(p.getStatusEnum()))
-                .map(Procedure::getId)
-                .collect(Collectors.toSet());
-        Set<Long> cancelledRefundIds = allProcedures.stream()
-                .filter(p -> EventStatus.CANCEL.getValue().equals(p.getStatusEnum()) && p.getRefundId() != null)
-                .map(Procedure::getRefundId)
-                .collect(Collectors.toSet());
-        executedIds.removeAll(cancelledRefundIds);
-        if (!executedIds.isEmpty()) {
-            return R.fail("该医嘱已执行，请先取消执行后再退回");
-        }
         // 校验药品医嘱是否已发药，已发药的医嘱不允许退回
         if (!medRequestList.isEmpty()) {
             List<Long> medReqIds = medRequestList.stream().map(PerformInfoDto::getRequestId).toList();

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java

@@ -78,10 +78,12 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
                         .map(notPerformedReason -> new DispenseInitDto.NotPerformedReasonOption(notPerformedReason.getValue(),
                         notPerformedReason.getInfo()))
                         .collect(Collectors.toList());
-        // 发药状态（汇总单：待配药→已提交，已发放→已发药）
+        // 发药状态
         List<DispenseStatusOption> dispenseStatusOptions = new ArrayList<>();
-        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.PREPARATION.getValue(), "已提交"));
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.PREPARATION.getValue(),
-        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(), "已发药"));
+                DispenseStatus.PREPARATION.getInfo()));
+        dispenseStatusOptions.add(new DispenseStatusOption(DispenseStatus.COMPLETED.getValue(),
+                DispenseStatus.COMPLETED.getInfo()));
 
         initDto.setNotPerformedReasonOptions(notPerformedReasonOptions).setDispenseStatusOptions(dispenseStatusOptions);
         return R.ok(initDto);
@@ -159,8 +161,8 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
                 new Page<>(pageNo, pageSize), queryWrapper, DispenseStatus.COMPLETED.getValue(),
                 DispenseStatus.PREPARATION.getValue(), SupplyType.SUMMARY_DISPENSE.getValue());
         medicineSummaryFormPage.getRecords().forEach(e -> {
-            // 发药状态（汇总单展示文案）
+            // 发药状态
-            e.setStatusEnum_enumText(getSummaryFormStatusText(e.getStatusEnum()));
+            e.setStatusEnum_enumText(EnumUtils.getInfoByValue(DispenseStatus.class, e.getStatusEnum()));
         });
         return R.ok(medicineSummaryFormPage);
     }
@@ -290,17 +292,4 @@ public class MedicineSummaryAppServiceImpl implements IMedicineSummaryAppService
         }
         return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"取消"}));
     }
-
-    /**
-     * 汇总发药单状态展示文案（药品医嘱状态映射表：汇总申请→已提交，发药→已发药）
-     */
-    private String getSummaryFormStatusText(Integer statusEnum) {
-        if (DispenseStatus.PREPARATION.getValue().equals(statusEnum)) {
-            return "已提交";
-        }
-        if (DispenseStatus.COMPLETED.getValue().equals(statusEnum)) {
-            return "已发药";
-        }
-        return EnumUtils.getInfoByValue(DispenseStatus.class, statusEnum);
-    }
 }

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

@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -203,70 +202,62 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
     @Override
     public R<?> addOrEditBatchTransferReceipt(List<ProductTransferDto> productTransferDtoList, Boolean flag) {
 
+        // 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
-        Date now = DateUtils.getNowDate();
+        for (ProductTransferDto dto : productTransferDtoList) {
+            if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                return R.fail("调拨数量必须大于0");
+            }
+            // 查询该药品在源仓库的实时库存总量
+            List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
+            java.math.BigDecimal actualStock = inventoryList.stream()
+                .map(InventoryItem::getQuantity)
+                .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+            if (dto.getItemQuantity().compareTo(actualStock) > 0) {
+                return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
+            }
+        }
 
         List<String> idList = new ArrayList<>();
         if (flag) {
             // 批量保存按钮
+            // 单据号取得
             List<String> busNoList = productTransferDtoList.stream().map(ProductTransferDto::getBusNo).toList();
-            // 保存前：获取旧记录用于恢复预划扣库存
+            // 请求id取得
-            List<SupplyRequest> oldRequestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
+            List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
-            if (!oldRequestList.isEmpty()) {
+            if (!requestList.isEmpty()) {
-                // 恢复旧记录已预划扣的库存
+                List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
-                for (SupplyRequest oldReq : oldRequestList) {
+                // 单据信息删除
-                    if (oldReq.getItemId() != null && oldReq.getLotNumber() != null
+                supplyRequestService.removeByIds(requestIdList);
-                            && oldReq.getSourceLocationId() != null && oldReq.getItemQuantity() != null) {
-                        List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
-                                oldReq.getItemId(), oldReq.getLotNumber(), oldReq.getSourceLocationId(), tenantId);
-                        if (!invList.isEmpty()) {
-                            inventoryItemService.updateInventoryQuantity(
-                                    invList.get(0).getId(),
-                                    invList.get(0).getQuantity().add(oldReq.getItemQuantity()), now);
-                        }
-                    }
-                }
-                List<Long> oldIdList = oldRequestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
-                supplyRequestService.removeByIds(oldIdList);
-            }
-
-            // 校验 + 预划扣新记录
-            for (ProductTransferDto dto : productTransferDtoList) {
-                if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(BigDecimal.ZERO) <= 0) {
-                    return R.fail("调拨数量必须大于0");
-                }
-                List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
-                        dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
-                BigDecimal actualStock = inventoryList.stream()
-                        .map(InventoryItem::getQuantity)
-                        .reduce(BigDecimal.ZERO, BigDecimal::add);
-                if (dto.getItemQuantity().compareTo(actualStock) > 0) {
-                    return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
-                }
-                // 预划扣源仓库库存
-                if (!inventoryList.isEmpty()) {
-                    InventoryItem inv = inventoryList.get(0);
-                    inventoryItemService.updateInventoryQuantity(
-                            inv.getId(), inv.getQuantity().subtract(dto.getItemQuantity()), now);
-                }
             }
 
             // 生成批量调拨单据
             List<SupplyRequest> supplyRequestList = new ArrayList<>();
             for (ProductTransferDto productTransferDto : productTransferDtoList) {
+                // 初始化单据信息
                 SupplyRequest supplyRequest = new SupplyRequest();
                 BeanUtils.copyProperties(productTransferDto, supplyRequest);
+                // 生成商品批量调拨单据
                 supplyRequest
+                    // id
                     .setId(null)
+                    // 单据分类：库存供应
                     .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue())
+                    // 单据类型：商品批量调拨
                     .setTypeEnum(SupplyType.PRODUCT_BATCH_TRANSFER.getValue())
+                    // 制单人
                     .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
+                    // 申请时间
                     .setApplyTime(DateUtils.getNowDate())
+                    // 源库存数量
                     .setTotalQuantity(productTransferDto.getTotalSourceQuantity());
                 supplyRequestList.add(supplyRequest);
             }
             supplyRequestService.saveOrUpdateBatch(supplyRequestList);
+            // 请求id取得
             List<SupplyRequest> supplyRequestIdList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
+            // 返回请求id列表
             List<Long> requestIdList = supplyRequestIdList.stream().map(SupplyRequest::getId).toList();
             for (Long list : requestIdList) {
                 idList.add(list.toString());
@@ -274,58 +265,33 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
         } else {
             // 单独保存按钮
             for (ProductTransferDto productTransferDto : productTransferDtoList) {
-                // 更新已有记录：先恢复旧预划扣，再扣新的
+                // 初始化单据信息
-                if (productTransferDto.getId() != null) {
-                    SupplyRequest oldReq = supplyRequestService.getById(productTransferDto.getId());
-                    if (oldReq != null && oldReq.getItemId() != null && oldReq.getLotNumber() != null
-                            && oldReq.getSourceLocationId() != null && oldReq.getItemQuantity() != null) {
-                        List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
-                                oldReq.getItemId(), oldReq.getLotNumber(), oldReq.getSourceLocationId(), tenantId);
-                        if (!invList.isEmpty()) {
-                            inventoryItemService.updateInventoryQuantity(
-                                    invList.get(0).getId(),
-                                    invList.get(0).getQuantity().add(oldReq.getItemQuantity()), now);
-                        }
-                    }
-                }
-
-                // 校验 + 预划扣
-                if (productTransferDto.getItemQuantity() == null
-                        || productTransferDto.getItemQuantity().compareTo(BigDecimal.ZERO) <= 0) {
-                    return R.fail("调拨数量必须大于0");
-                }
-                List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
-                        productTransferDto.getItemId(), productTransferDto.getLotNumber(),
-                        productTransferDto.getSourceLocationId(), tenantId);
-                BigDecimal actualStock = inventoryList.stream()
-                        .map(InventoryItem::getQuantity)
-                        .reduce(BigDecimal.ZERO, BigDecimal::add);
-                if (productTransferDto.getItemQuantity().compareTo(actualStock) > 0) {
-                    return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
-                }
-                if (!inventoryList.isEmpty()) {
-                    InventoryItem inv = inventoryList.get(0);
-                    inventoryItemService.updateInventoryQuantity(
-                            inv.getId(), inv.getQuantity().subtract(productTransferDto.getItemQuantity()), now);
-                }
-
                 SupplyRequest supplyRequest = new SupplyRequest();
                 BeanUtils.copyProperties(productTransferDto, supplyRequest);
+
                 supplyRequest.setTotalQuantity(productTransferDto.getTotalSourceQuantity());
 
                 if (productTransferDto.getId() != null) {
+                    // 更新单据信息
                     supplyRequestService.updateById(supplyRequest);
                 } else {
+                    // 生成商品批量调拨单据
                     supplyRequest
+                        // 单据分类：库存供应
                         .setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue())
+                        // 单据类型：商品批量调拨
                         .setTypeEnum(SupplyType.PRODUCT_BATCH_TRANSFER.getValue())
+                        // 制单人
                         .setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
+                        // 申请时间
                         .setApplyTime(DateUtils.getNowDate());
                     supplyRequestService.save(supplyRequest);
                 }
+                // 返回单据id
                 return R.ok(supplyRequest.getId().toString(), null);
             }
         }
+        // 返回单据id
         return R.ok(idList, null);
     }
 
@@ -366,63 +332,33 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
     @Override
     public R<?> addOrEditTransferReceipt(List<ProductTransferDto> productTransferDtoList) {
 
+        // 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
-        Date now = DateUtils.getNowDate();
+        for (ProductTransferDto dto : productTransferDtoList) {
+            if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                return R.fail("调拨数量必须大于0");
+            }
+            List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
+            java.math.BigDecimal actualStock = inventoryList.stream()
+                .map(InventoryItem::getQuantity)
+                .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+            if (dto.getItemQuantity().compareTo(actualStock) > 0) {
+                return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
+            }
+        }
 
         List<String> idList = new ArrayList<>();
 
         // 单据号取得
         List<String> busNoList = productTransferDtoList.stream().map(ProductTransferDto::getBusNo).toList();
-        // 保存前：获取旧记录用于恢复预划扣库存
+        // 请求数据取得
-        List<SupplyRequest> oldRequestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
-        Map<String, BigDecimal> oldDeductionMap = new HashMap<>();
+        if (!requestList.isEmpty()) {
-        if (!oldRequestList.isEmpty()) {
+            // 请求id取得
-            for (SupplyRequest oldReq : oldRequestList) {
+            List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
-                if (oldReq.getItemId() != null && oldReq.getLotNumber() != null && oldReq.getSourceLocationId() != null
+            // 单据信息删除
-                        && oldReq.getItemQuantity() != null) {
+            supplyRequestService.removeByIds(requestIdList);
-                    String key = oldReq.getItemId() + "_" + oldReq.getLotNumber() + "_" + oldReq.getSourceLocationId();
-                    oldDeductionMap.merge(key, oldReq.getItemQuantity(), BigDecimal::add);
-                }
-            }
-            // 恢复旧记录已预划扣的库存
-            for (Map.Entry<String, BigDecimal> entry : oldDeductionMap.entrySet()) {
-                String[] parts = entry.getKey().split("_");
-                Long itemId = Long.parseLong(parts[0]);
-                String lotNumber = parts[1];
-                Long sourceLocationId = Long.parseLong(parts[2]);
-                BigDecimal restoreQty = entry.getValue();
-                List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
-                        itemId, lotNumber, sourceLocationId, tenantId);
-                if (!invList.isEmpty()) {
-                    inventoryItemService.updateInventoryQuantity(
-                            invList.get(0).getId(), invList.get(0).getQuantity().add(restoreQty), now);
-                }
-            }
-            // 删除旧记录
-            List<Long> oldIdList = oldRequestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
-            supplyRequestService.removeByIds(oldIdList);
-        }
-
-        // 校验 + 预划扣新记录
-        Map<String, BigDecimal> newDeductionMap = new HashMap<>();
-        for (ProductTransferDto dto : productTransferDtoList) {
-            if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(BigDecimal.ZERO) <= 0) {
-                return R.fail("调拨数量必须大于0");
-            }
-            List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
-                    dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
-            BigDecimal actualStock = inventoryList.stream()
-                    .map(InventoryItem::getQuantity)
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-            if (dto.getItemQuantity().compareTo(actualStock) > 0) {
-                return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
-            }
-            // 预划扣：扣减源仓库库存
-            if (!inventoryList.isEmpty()) {
-                InventoryItem inv = inventoryList.get(0);
-                inventoryItemService.updateInventoryQuantity(
-                        inv.getId(), inv.getQuantity().subtract(dto.getItemQuantity()), now);
-            }
         }
 
         List<SupplyRequest> supplyRequestList = new ArrayList<>();
@@ -469,22 +405,6 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
      */
     @Override
     public R<?> deleteReceipt(List<Long> supplyRequestIds) {
-        // 删除前恢复预划扣的库存
-        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
-        Date now = DateUtils.getNowDate();
-        for (Long reqId : supplyRequestIds) {
-            SupplyRequest sr = supplyRequestService.getById(reqId);
-            if (sr != null && sr.getItemId() != null && sr.getSourceLocationId() != null
-                    && sr.getItemQuantity() != null && sr.getLotNumber() != null) {
-                List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
-                        sr.getItemId(), sr.getLotNumber(), sr.getSourceLocationId(), tenantId);
-                if (!invList.isEmpty()) {
-                    InventoryItem inv = invList.get(0);
-                    inventoryItemService.updateInventoryQuantity(
-                            inv.getId(), inv.getQuantity().add(sr.getItemQuantity()), now);
-                }
-            }
-        }
         // 删除单据
         boolean result = supplyRequestService.removeByIds(supplyRequestIds);
         return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))

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

@@ -519,8 +519,58 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
             // 暂时先取出全部的库存，循环查库存同一会有问题，后续优化
             List<InventoryItem> inventoryItems = inventoryItemService.selectAllInventory();
             for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
-                // 🔧 源仓库库存已在保存时预划扣，审批通过时不再重复扣减
+                // 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
-                outList.add(supplyItemDetailDto);
+                // List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
+                // supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
+                // supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
+                List<InventoryItem> filteredInventoryItems = inventoryItems.stream()
+                        .filter(item -> item.getItemId().equals(supplyItemDetailDto.getItemId())
+                        && item.getLotNumber().equals(supplyItemDetailDto.getLotNumber())
+                        && item.getLocationId().equals(supplyItemDetailDto.getSourceLocationId()))
+                        .collect(Collectors.toList());
+
+                InventoryItem inventoryItemSource = new InventoryItem();
+                if (!filteredInventoryItems.isEmpty()) {
+                    inventoryItemSource = filteredInventoryItems.get(0);
+                    // 最小数量（最小单位库存数量）
+                    BigDecimal minQuantity = inventoryItemSource.getQuantity();
+
+                    // // 计算调拨后库存数量，结果取小单位
+                    // // 供应申请的物品计量单位与包装单位相同
+                    // if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
+                    // if
+                    // (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity().multiply(supplyItemDetailDto.getPartPercent()))
+                    // < 0) {
+                    // // 库存数量不足
+                    // throw new ServiceException("操作失败,库存数量不足");
+                    // } else {
+                    // // 源仓库库存-(调拨数量*拆零比)
+                    // minQuantity = minQuantity.subtract(
+                    // supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
+                    // }
+                    // } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
+                    // 直接扣减库存
+                    if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
+                        // 库存数量不足
+                        throw new ServiceException("操作失败,库存数量不足");
+                    } else {
+                        // 供应申请的物品计量单位与最小单位相同
+                        // 源仓库库存-调拨数量
+                        minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
+                    }
+                    // }
+                    // 更新源仓库库存数量
+                    Boolean aBoolean
+                            = inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
+                    if (!aBoolean) {
+                        throw new ServiceException("系统异常,请稍后重试");
+                    }
+
+                    // 添加到出库列表
+                    outList.add(supplyItemDetailDto);
+                } else {
+                    return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+                }
 
                 // 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
                 List<InventoryItem> inventoryItemPurposeList = inventoryItemService.selectInventoryByItemId(

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

@@ -133,13 +133,47 @@ public class PatientInformationServiceImpl implements IPatientInformationService
     @Override
     public IPage<PatientBaseInfoDto> getPatientInfo(PatientBaseInfoDto patientBaseInfoDto, String searchKey,
             Integer pageNo, Integer pageSize, HttpServletRequest request) {
-        // 构建基础查询条件
+        // 获取登录者信息
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long userId = loginUser.getUserId();
+        Integer tenantId = loginUser.getTenantId().intValue();
+        
+        // 先构建基础查询条件
         QueryWrapper<PatientBaseInfoDto> queryWrapper = HisQueryUtils.buildQueryWrapper(
                 patientBaseInfoDto, searchKey, new HashSet<>(Arrays.asList(CommonConstants.FieldName.Name,
                         CommonConstants.FieldName.BusNo, CommonConstants.FieldName.PyStr, CommonConstants.FieldName.WbStr)),
                 request);
         
+        // 检查是否是精确ID查询（从门诊挂号页面跳转时使用）
+        boolean hasExactIdQuery = (patientBaseInfoDto.getId() != null);
+        
+        // 只有非精确ID查询时，才添加医生患者过滤条件
+        if (!hasExactIdQuery) {
+            // 查询当前用户对应的医生信息
+            LambdaQueryWrapper<com.openhis.administration.domain.Practitioner> practitionerQuery = new LambdaQueryWrapper<>();
+            practitionerQuery.eq(com.openhis.administration.domain.Practitioner::getUserId, userId);
+            // 使用list()避免TooManyResultsException异常，然后取第一个记录
+            List<com.openhis.administration.domain.Practitioner> practitionerList = practitionerService.list(practitionerQuery);
+            com.openhis.administration.domain.Practitioner practitioner = practitionerList != null && !practitionerList.isEmpty() ? practitionerList.get(0) : null;
+            
+            // 如果当前用户是医生，添加医生患者过滤条件
+            if (practitioner != null) {
+                // 查询该医生作为接诊医生（ADMITTER, code="1"）和挂号医生（REGISTRATION_DOCTOR, code="12"）的所有就诊记录的患者ID
+                List<Long> doctorPatientIds = patientManageMapper.getPatientIdsByPractitionerId(
+                        practitioner.getId(),
+                        Arrays.asList(ParticipantType.ADMITTER.getCode(), ParticipantType.REGISTRATION_DOCTOR.getCode()),
+                        tenantId);
+                
+                if (doctorPatientIds != null && !doctorPatientIds.isEmpty()) {
+                    // 添加患者ID过滤条件 - 注意：这里使用列名而不是表别名
+                    queryWrapper.in("id", doctorPatientIds);
+                } else {
+                    // 如果没有相关患者，返回空结果
+                    queryWrapper.eq("id", -1); // 设置一个不存在的ID
+                }
+            }
+            // 如果不是医生，查询所有患者
+        }
         
         IPage<PatientBaseInfoDto> patientInformationPage
                 = patientManageMapper.getPatientPage(new Page<>(pageNo, pageSize), queryWrapper);
@@ -235,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/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java

@@ -36,8 +36,6 @@ import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.workflow.service.IDeviceDispenseService;
 import com.openhis.workflow.service.IDeviceRequestService;
 import com.openhis.workflow.service.IServiceRequestService;
-import com.openhis.document.domain.RequestForm;
-import com.openhis.document.service.IRequestFormService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -87,9 +85,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
     @Resource
     IDeviceDispenseService iDeviceDispenseService;
 
-    @Resource
-    IRequestFormService iRequestFormService;
-
     /**
      * 查询住院患者信息
      *
@@ -271,38 +266,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
 
         log.info("开始处理删除操作，共 {} 条记录", deleteList.size());
 
-        // 🔧 手术申请单级联作废：删除手术医嘱(categoryEnum=24)时同步作废关联的手术申请单
-        Map<String, List<Long>> surgeryPrescriptionNoToRequestIds = new LinkedHashMap<>();
-        for (RegAdviceSaveDto adviceDto : deleteList) {
-            if (adviceDto.getRequestId() == null) continue;
-            ServiceRequest existing = iServiceRequestService.getById(adviceDto.getRequestId());
-            if (existing == null) continue;
-            if (existing.getCategoryEnum() != null
-                    && existing.getCategoryEnum() == 24
-                    && existing.getPrescriptionNo() != null && !existing.getPrescriptionNo().isEmpty()) {
-                surgeryPrescriptionNoToRequestIds.computeIfAbsent(existing.getPrescriptionNo(), k -> new ArrayList<>())
-                        .add(adviceDto.getRequestId());
-            }
-        }
-        for (Map.Entry<String, List<Long>> e : surgeryPrescriptionNoToRequestIds.entrySet()) {
-            String prescriptionNo = e.getKey();
-            try {
-                List<RequestForm> requestForms = iRequestFormService.list(
-                        new LambdaQueryWrapper<RequestForm>()
-                                .eq(RequestForm::getPrescriptionNo, prescriptionNo)
-                                .eq(RequestForm::getTypeCode, ActivityDefCategory.PROCEDURE.getCode())
-                                .and(w -> w.isNull(RequestForm::getDeleteFlag).or().eq(RequestForm::getDeleteFlag, "0")));
-                for (RequestForm requestForm : requestForms) {
-                    iRequestFormService.removeById(requestForm.getId());
-                }
-                if (!requestForms.isEmpty()) {
-                    log.info("级联作废手术申请单 prescriptionNo={}, 共{}条", prescriptionNo, requestForms.size());
-                }
-            } catch (Exception ex) {
-                log.warn("级联作废手术申请单失败 prescriptionNo={}", prescriptionNo, ex);
-            }
-        }
-
         for (RegAdviceSaveDto adviceDto : deleteList) {
             Integer adviceType = adviceDto.getAdviceType();
             Long requestId = adviceDto.getRequestId();

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.core.common.core.domain.R;
-import com.core.common.enums.DelFlag;
 import com.core.common.exception.ServiceException;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
@@ -18,8 +17,6 @@ import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
 import com.openhis.document.domain.RequestForm;
 import com.openhis.document.service.IRequestFormService;
-import com.openhis.lab.domain.Specimen;
-import com.openhis.lab.service.ISpecimenService;
 import com.openhis.web.doctorstation.dto.ActivityChildrenJsonParams;
 import com.openhis.web.doctorstation.utils.AdviceUtils;
 import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
@@ -70,39 +67,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
     @Resource
     IActivityDefinitionService iActivityDefinitionService;
 
-    @Resource
-    ISpecimenService iSpecimenService;
-
-    /**
-     * 校验当前用户是否有权操作该申请单（申请者本人或管理员）
-     */
-    private R<?> validateRequestFormPermission(RequestForm requestForm) {
-        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
-            return null;
-        }
-        Long currentPractitionerId = SecurityUtils.getLoginUser().getPractitionerId();
-        Long requesterId = requestForm.getRequesterId();
-        if (currentPractitionerId == null || requesterId == null
-            || !currentPractitionerId.equals(requesterId)) {
-            return R.fail("无操作权限，仅申请开立者或管理员可操作");
-        }
-        return null;
-    }
-
-    /**
-     * 校验关联医嘱是否已采证（存在已采集/已接收标本则不可撤回）
-     */
-    private boolean hasCollectedSpecimen(List<Long> serviceRequestIds) {
-        if (serviceRequestIds == null || serviceRequestIds.isEmpty()) {
-            return false;
-        }
-        long count = iSpecimenService.count(
-            new LambdaQueryWrapper<Specimen>()
-                .in(Specimen::getServiceId, serviceRequestIds)
-                .ge(Specimen::getCollectionStatusEnum, SpecCollectStatus.COLLECTED.getValue()));
-        return count > 0;
-    }
-
     /**
      * 保存申请单
      *
@@ -117,7 +81,16 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         Long requestFormId = requestFormSaveDto.getRequestFormId();
         boolean isEdit = requestFormId != null && requestFormId != 0L;
 
-        // 🔧 手术/检查申请单：优先使用前端传入的positionId（用户手动选择的发往科室），跳过执行科室配置校验
+        // 诊疗执行科室配置校验（必须在任何数据库操作之前）
+        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
+            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
+        if (activityOrganizationConfig.isEmpty()) {
+            throw new ServiceException("请先配置当前时间段的执行科室");
+        }
+
+        // 逐个校验activityList中的项目是否都配置了执行科室，并收集positionId供后续使用
+        // 必须在任何数据库操作之前完成全部校验，避免部分保存后异常导致脏数据
+        // 🔧 Bug #516: 优先使用前端传入的positionId（用户手动选择的发往科室），仅在未选择时使用配置的执行科室
         List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
         // 缓存校验结果，避免主循环中重复查询和可能出现的数据不一致
         java.util.Map<Long, Long> activityIdToPositionIdMap = new java.util.HashMap<>();
@@ -129,15 +102,14 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                     activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), frontendPositionId);
                     continue;
                 }
-                // 前端未传入时，查询配置的执行科室（暂不校验，仅用于兼容无前端传入的场景）
+                // 前端未传入时，使用配置的执行科室
-                List<ActivityOrganizationConfigDto> activityOrganizationConfig =
-                    requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
                 Long configPositionId = activityOrganizationConfig.stream()
                     .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
                     .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
-                if (configPositionId != null) {
+                if (configPositionId == null) {
-                    activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId);
+                    throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
                 }
+                activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId);
             }
         }
 
@@ -204,77 +176,73 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         ChargeItem chargeItem;
         log.info("保存申请单，typeCode={}, activityListSize={}, encounterId={}", typeCode, activityList != null ? activityList.size() : 0, encounterId);
 
-        // 🔧 手术申请单：跳过普通医嘱生成，只由 isProcedure 块生成手术医嘱，避免重复
+        for (ActivitySaveDto activitySaveDto : activityList) {
-        boolean isSurgeryRequest = ActivityDefCategory.PROCEDURE.getCode().equals(typeCode);
+            serviceRequest = new ServiceRequest();
-        if (!isSurgeryRequest) {
+            serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());
-            for (ActivitySaveDto activitySaveDto : activityList) {
+            serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
-                serviceRequest = new ServiceRequest();
+            serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
-                serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());
+            serviceRequest.setPrescriptionNo(prescriptionNo);
-                serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
+            serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());// 治疗类型
-                serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            serviceRequest.setQuantity(activitySaveDto.getQuantity()); // 请求数量
-                serviceRequest.setPrescriptionNo(prescriptionNo);
+            serviceRequest.setUnitCode(activitySaveDto.getUnitCode()); // 请求单位编码
-                serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());// 治疗类型
+            serviceRequest.setCategoryEnum(categoryEnum); // 请求类型
-                serviceRequest.setQuantity(activitySaveDto.getQuantity()); // 请求数量
+            serviceRequest.setActivityId(activitySaveDto.getAdviceDefinitionId());// 诊疗定义id
-                serviceRequest.setUnitCode(activitySaveDto.getUnitCode()); // 请求单位编码
+            serviceRequest.setPatientId(patientId); // 患者
-                serviceRequest.setCategoryEnum(categoryEnum); // 请求类型
+            serviceRequest.setRequesterId(practitionerId); // 开方医生
-                serviceRequest.setActivityId(activitySaveDto.getAdviceDefinitionId());// 诊疗定义id
+            serviceRequest.setEncounterId(encounterId); // 就诊id
-                serviceRequest.setPatientId(patientId); // 患者
+            serviceRequest.setAuthoredTime(curDate); // 请求签发时间
-                serviceRequest.setRequesterId(practitionerId); // 开方医生
-                serviceRequest.setEncounterId(encounterId); // 就诊id
-                serviceRequest.setAuthoredTime(curDate); // 请求签发时间
 
-                Long positionId = activityIdToPositionIdMap.get(activitySaveDto.getAdviceDefinitionId());
+            Long positionId = activityIdToPositionIdMap.get(activitySaveDto.getAdviceDefinitionId());
-                if (positionId == null) {
+            if (positionId == null) {
-                    throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
+                throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
-                }
+            }
-                serviceRequest.setOrgId(positionId); // 执行科室
+            serviceRequest.setOrgId(positionId); // 执行科室
 
-                serviceRequest.setYbClassEnum(activitySaveDto.getYbClassEnum());// 类别医保编码
+            serviceRequest.setYbClassEnum(activitySaveDto.getYbClassEnum());// 类别医保编码
-                serviceRequest.setConditionId(activitySaveDto.getConditionId()); // 诊断id
+            serviceRequest.setConditionId(activitySaveDto.getConditionId()); // 诊断id
-                serviceRequest.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+            serviceRequest.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-                iServiceRequestService.save(serviceRequest);
+            iServiceRequestService.save(serviceRequest);
 
-                chargeItem = new ChargeItem();
+            chargeItem = new ChargeItem();
-                chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
+            chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
-                chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
+            chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
-                chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
-                chargeItem.setPatientId(patientId); // 患者
+            chargeItem.setPatientId(patientId); // 患者
-                chargeItem.setContextEnum(activitySaveDto.getAdviceType()); // 类型
+            chargeItem.setContextEnum(activitySaveDto.getAdviceType()); // 类型
-                chargeItem.setEncounterId(encounterId); // 就诊id
+            chargeItem.setEncounterId(encounterId); // 就诊id
-                chargeItem.setDefinitionId(activitySaveDto.getDefinitionId()); // 费用定价ID
+            chargeItem.setDefinitionId(activitySaveDto.getDefinitionId()); // 费用定价ID
-                chargeItem.setDefDetailId(activitySaveDto.getDefinitionDetailId()); // 定价子表主键
+            chargeItem.setDefDetailId(activitySaveDto.getDefinitionDetailId()); // 定价子表主键
-                chargeItem.setEntererId(practitionerId);// 开立人ID
+            chargeItem.setEntererId(practitionerId);// 开立人ID
-                chargeItem.setEnteredDate(curDate); // 开立时间
+            chargeItem.setEnteredDate(curDate); // 开立时间
-                chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
+            chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
-                chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
+            chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
-                chargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);// 产品所在表
+            chargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);// 产品所在表
-                chargeItem.setProductId(activitySaveDto.getAdviceDefinitionId());// 收费项id
+            chargeItem.setProductId(activitySaveDto.getAdviceDefinitionId());// 收费项id
-                chargeItem.setAccountId(activitySaveDto.getAccountId());// 关联账户ID
+            chargeItem.setAccountId(activitySaveDto.getAccountId());// 关联账户ID
-                chargeItem.setRequestingOrgId(orgId); // 开立科室
+            chargeItem.setRequestingOrgId(orgId); // 开立科室
-                chargeItem.setConditionId(activitySaveDto.getConditionId()); // 诊断id
+            chargeItem.setConditionId(activitySaveDto.getConditionId()); // 诊断id
-                chargeItem.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
+            chargeItem.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
-                chargeItem.setQuantityValue(activitySaveDto.getQuantity()); // 数量
+            chargeItem.setQuantityValue(activitySaveDto.getQuantity()); // 数量
-                chargeItem.setQuantityUnit(activitySaveDto.getUnitCode()); // 单位
+            chargeItem.setQuantityUnit(activitySaveDto.getUnitCode()); // 单位
-                chargeItem.setUnitPrice(activitySaveDto.getUnitPrice()); // 单价
+            chargeItem.setUnitPrice(activitySaveDto.getUnitPrice()); // 单价
-                chargeItem.setTotalPrice(activitySaveDto.getTotalPrice()); // 总价
+            chargeItem.setTotalPrice(activitySaveDto.getTotalPrice()); // 总价
-                iChargeItemService.save(chargeItem);
+            iChargeItemService.save(chargeItem);
 
-                // 处理诊疗套餐的子项信息
+            // 处理诊疗套餐的子项信息
-                ActivityDefinition activityDefinition =
+            ActivityDefinition activityDefinition =
-                    iActivityDefinitionService.getById(activitySaveDto.getAdviceDefinitionId());
+                iActivityDefinitionService.getById(activitySaveDto.getAdviceDefinitionId());
-                String childrenJson = activityDefinition.getChildrenJson();
+            String childrenJson = activityDefinition.getChildrenJson();
-                if (childrenJson != null) {
+            if (childrenJson != null) {
-                    // 诊疗子项参数类
+                // 诊疗子项参数类
-                    ActivityChildrenJsonParams activityChildrenJsonParams = new ActivityChildrenJsonParams();
+                ActivityChildrenJsonParams activityChildrenJsonParams = new ActivityChildrenJsonParams();
-                    activityChildrenJsonParams.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue()); // 治疗类型
+                activityChildrenJsonParams.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue()); // 治疗类型
-                    activityChildrenJsonParams.setPatientId(serviceRequest.getPatientId()); // 患者
+                activityChildrenJsonParams.setPatientId(serviceRequest.getPatientId()); // 患者
-                    activityChildrenJsonParams.setEncounterId(serviceRequest.getEncounterId()); // 就诊id
+                activityChildrenJsonParams.setEncounterId(serviceRequest.getEncounterId()); // 就诊id
-                    activityChildrenJsonParams.setAccountId(chargeItem.getAccountId()); // 账户id
+                activityChildrenJsonParams.setAccountId(chargeItem.getAccountId()); // 账户id
-                    activityChildrenJsonParams.setChargeItemId(chargeItem.getId()); // 费用项id
+                activityChildrenJsonParams.setChargeItemId(chargeItem.getId()); // 费用项id
-                    activityChildrenJsonParams.setParentId(serviceRequest.getId());// 子项诊疗的父id
+                activityChildrenJsonParams.setParentId(serviceRequest.getId());// 子项诊疗的父id
-                    activityChildrenJsonParams.setEncounterDiagnosisId(serviceRequest.getEncounterDiagnosisId());
+                activityChildrenJsonParams.setEncounterDiagnosisId(serviceRequest.getEncounterDiagnosisId());
-                    adviceUtils.handleActivityChild(childrenJson, organizationId, activityChildrenJsonParams);
+                adviceUtils.handleActivityChild(childrenJson, organizationId, activityChildrenJsonParams);
-                }
             }
         }
 
@@ -358,13 +326,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                 } else if (surgeryName != null && !surgeryName.isEmpty()) {
                     contentMap.put("surgeryName", surgeryName);
                 }
-                // 🔧 手术申请单级联删除：contentJson 中记录 requestFormId 和 prescriptionNo，删除医嘱时可定位并作废申请单
-                if (requestForm.getId() != null) {
-                    contentMap.put("requestFormId", String.valueOf(requestForm.getId()));
-                }
-                if (prescriptionNo != null && !prescriptionNo.isEmpty()) {
-                    contentMap.put("prescriptionNo", prescriptionNo);
-                }
                 if (surgeryCode != null && !surgeryCode.isEmpty()) {
                     contentMap.put("surgeryCode", surgeryCode);
                 }
@@ -407,10 +368,9 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                     surgeryChargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);
                     surgeryChargeItem.setServiceId(surgeryServiceRequest.getId());
                     surgeryChargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
-                    // 优先从 activityList 获取 productId 和 definitionId
+                    // 优先从 activityList 获取 productId
                     if (activityList != null && !activityList.isEmpty()) {
                         surgeryChargeItem.setProductId(activityList.get(0).getAdviceDefinitionId());
-                        surgeryChargeItem.setDefinitionId(activityList.get(0).getDefinitionId());
                         surgeryChargeItem.setAccountId(activityList.get(0).getAccountId());
                     }
                     surgeryChargeItem.setRequestingOrgId(orgId);
@@ -449,10 +409,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                             anesthesiaChargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);
                             anesthesiaChargeItem.setServiceId(surgeryServiceRequest.getId());
                             anesthesiaChargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
-                            // 从 activityList 获取 definitionId
-                            if (activityList != null && !activityList.isEmpty()) {
-                                anesthesiaChargeItem.setDefinitionId(activityList.get(0).getDefinitionId());
-                            }
                             anesthesiaChargeItem.setRequestingOrgId(orgId);
                             anesthesiaChargeItem.setQuantityValue(BigDecimal.valueOf(1));
                             anesthesiaChargeItem.setQuantityUnit("次");
@@ -469,18 +425,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                 log.error("生成手术医嘱过程中发生异常", e);
                 throw e;
             }
-            // 将手术项目名称写入申请单name字段，确保医嘱删除后申请单仍保留正确名称
-            if (activityList != null && !activityList.isEmpty()) {
-                String surgeryDisplayName = activityList.stream()
-                    .map(ActivitySaveDto::getAdviceDefinitionName)
-                    .filter(name -> name != null && !name.isEmpty())
-                    .distinct()
-                    .collect(Collectors.joining("、"));
-                if (!surgeryDisplayName.isEmpty()) {
-                    requestForm.setName(surgeryDisplayName);
-                    iRequestFormService.updateById(requestForm);
-                }
-            }
         } else {
             log.info("不是手术申请单，跳过手术医嘱生成，typeCode={}", typeCode);
         }
@@ -564,17 +508,12 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         if (requestForm == null) {
             return R.fail("申请单不存在");
         }
-        R<?> permissionResult = validateRequestFormPermission(requestForm);
-        if (permissionResult != null) {
-            return permissionResult;
-        }
         String prescriptionNo = requestForm.getPrescriptionNo();
 
         // 查询该申请单下所有 ServiceRequest（含子项）
         List<ServiceRequest> serviceRequests = iServiceRequestService.list(
             new LambdaQueryWrapper<ServiceRequest>()
-                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo)
+                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo));
-                .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
         if (serviceRequests == null || serviceRequests.isEmpty()) {
             return R.fail("未找到关联的诊疗医嘱");
         }
@@ -604,7 +543,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         // 4. 删除申请单
         iRequestFormService.removeById(requestFormId);
 
-        log.info("检验申请单删除成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
+        log.info("检查申请单删除成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
         return R.ok("删除成功");
     }
 
@@ -617,43 +556,32 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
         if (requestForm == null) {
             return R.fail("申请单不存在");
         }
-        R<?> permissionResult = validateRequestFormPermission(requestForm);
-        if (permissionResult != null) {
-            return permissionResult;
-        }
         String prescriptionNo = requestForm.getPrescriptionNo();
 
         // 查询该申请单下所有 ServiceRequest
         List<ServiceRequest> serviceRequests = iServiceRequestService.list(
             new LambdaQueryWrapper<ServiceRequest>()
-                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo)
+                .eq(ServiceRequest::getPrescriptionNo, prescriptionNo));
-                .eq(ServiceRequest::getDeleteFlag, DelFlag.NO.getCode()));
         if (serviceRequests == null || serviceRequests.isEmpty()) {
             return R.fail("未找到关联的诊疗医嘱");
         }
 
-        List<Long> serviceRequestIds = serviceRequests.stream()
-            .map(ServiceRequest::getId).collect(Collectors.toList());
-
-        // 校验：标本已采集则不可撤回
-        if (hasCollectedSpecimen(serviceRequestIds)) {
-            return R.fail("标本已采集，无法撤回");
-        }
-
         // 校验：只有已签发(status=2)的申请单可撤回
         boolean allActive = serviceRequests.stream()
             .allMatch(sr -> RequestStatus.ACTIVE.getValue().equals(sr.getStatusEnum()));
         if (!allActive) {
-            return R.fail("只有已签发且未采证的申请单可撤回");
+            return R.fail("只有已签发状态的申请单可撤回");
         }
 
-        // 将所有 ServiceRequest 状态改回待签发，与申请单展示状态同步
+        // 将所有 ServiceRequest 状态改回待签发(DRAFT=0)
+        List<Long> serviceRequestIds = serviceRequests.stream()
+            .map(ServiceRequest::getId).collect(Collectors.toList());
         iServiceRequestService.update(
             new ServiceRequest().setStatusEnum(RequestStatus.DRAFT.getValue()),
             new LambdaUpdateWrapper<ServiceRequest>()
                 .in(ServiceRequest::getId, serviceRequestIds));
 
-        log.info("检验申请单撤回成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
+        log.info("检查申请单撤回成功，requestFormId={}, prescriptionNo={}", requestFormId, prescriptionNo);
         return R.ok("撤回成功");
     }
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDetailQueryDto.java

@@ -13,11 +13,6 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class RequestFormDetailQueryDto {
 
-    /**
-     * 诊疗活动定义ID（wor_service_request.activity_id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显）
-     */
-    private Long activityId;
-
     /** 医嘱名称 */
     private String adviceName;
 

openhis-server-new/openhis-application/src/main/java/com/openhis/web/system/controller/HomeController.java

@@ -31,8 +31,8 @@ public class HomeController {
         HomeStatisticsDto statisticsDto = homeStatisticsService.getHomeStatistics();
 
         // 获取待写病历数量
-        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        Long userId = SecurityUtils.getLoginUser().getUserId();
-        R<?> pendingEmrCount = doctorStationEmrAppService.getPendingEmrCount(practitionerId, null);
+        R<?> pendingEmrCount = doctorStationEmrAppService.getPendingEmrCount(userId);
 
         // 将待写病历数量添加到统计数据中
         statisticsDto.setPendingEmr((Integer) pendingEmrCount.getData());

openhis-server-new/openhis-application/src/main/java/com/openhis/web/triageandqueuemanage/appservice/impl/TriageQueueAppServiceImpl.java

@@ -74,6 +74,7 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
             .eq(TriageQueueItem::getTenantId, tenantId)
             .eq(TriageQueueItem::getQueueDate, qd)
             .eq(TriageQueueItem::getDeleteFlag, "0")
+            .ne(TriageQueueItem::getStatus, TriageQueueStatus.COMPLETED.getValue())
             .orderByAsc(TriageQueueItem::getQueueOrder);
         
         // 如果指定了科室，按科室过滤；否则查询所有科室（全科模式）
@@ -91,6 +92,14 @@ public class TriageQueueAppServiceImpl implements TriageQueueAppService {
                 }
             });
         }
+
+        // 双重保险：再次过滤掉 COMPLETED 状态的患者（防止数据库中有异常数据）
+        if (list != null && !list.isEmpty()) {
+            int beforeSize = list.size();
+            list = list.stream()
+                .filter(item -> !TriageQueueStatus.COMPLETED.getValue().equals(item.getStatus()))
+                .collect(java.util.stream.Collectors.toList());
+        }
         return R.ok(list);
     }
 

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

@@ -89,7 +89,7 @@
             cs.apply_doctor_name AS apply_doctor_name,
             drf.create_time AS apply_time,
             os.surgery_nature AS surgeryType,
-            cs.incision_level AS incisionLevel,
+            cs.incision_level AS "incisionLevel",
             os.fee_type AS feeType,
             COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
         FROM op_schedule os

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

@@ -117,7 +117,7 @@
                     )
                 </if>
                 <if test="searchKey != null and searchKey != ''">
-                    AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%')
+                    AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
                 </if>
                 <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
                     AND t1.id IN
@@ -181,7 +181,7 @@
                 WHERE t1.delete_flag = '0'
                 AND t1.status_enum = #{statusEnum}
                 <if test="searchKey != null and searchKey != ''">
-                    AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%')
+                    AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
                 </if>
                 <if test="categoryCode != null and categoryCode != ''">
                     AND t1.category_code = #{categoryCode}
@@ -278,7 +278,7 @@
                     AND T1.category_code != '手术' AND T1.category_code != '24'
                 </if>
                 <if test="searchKey != null and searchKey != ''">
-                    AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%')
+                    AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
                 </if>
                 <if test="categoryCode != null and categoryCode != ''">
                     AND t1.category_code = #{categoryCode}
@@ -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,15 +893,15 @@
               AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
           </if>
         ORDER BY t1.ID, t1.name ASC, t2.ID ASC
+        LIMIT #{page.size} OFFSET ${(page.current - 1) * page.size}
     </select>
 
-    <!-- 检查/检验项目专用分页查询：仅查指定 category_code + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
+    <!-- 检查项目专用分页查询：仅查检查(23) + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
     <select id="getExaminationPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
         SELECT DISTINCT ON (t1.ID)
             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,
@@ -914,11 +913,8 @@
             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 = #{categoryCode}
+          AND t1.category_code = '23'
           <if test="searchKey != null and searchKey != ''">
               AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
           </if>

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

@@ -135,7 +135,6 @@
                T1.onset_date AS onsetDate,
                T1.diagnosis_time AS diagnosisTime,
                T1.doctor AS diagnosisDoctor,
-               T1.long_term_flag AS longTermFlag,
                CASE WHEN EXISTS (
                    SELECT 1 FROM infectious_card T4
                    WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1

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

@@ -4,38 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.web.doctorstation.mapper.DoctorStationEmrAppMapper">
 
-    <select id="getPendingEmrList" resultType="java.util.HashMap">
+</mapper>
-        SELECT e.id AS "encounterId",
-               e.patient_id AS "patientId",
-               p.name AS "patientName",
-               p.gender_enum AS "gender",
-               p.birth_date AS "birthDate",
-               e.create_time AS "registerTime",
-               e.bus_no AS "busNo"
-        FROM adm_encounter e
-        INNER JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.practitioner_id = #{doctorId}
-        LEFT JOIN adm_patient p ON e.patient_id = p.id
-        LEFT JOIN doc_emr emr ON e.id = emr.encounter_id
-        WHERE e.status_enum = 2
-          AND emr.id IS NULL
-        <if test="patientName != null and patientName != ''">
-            AND p.name LIKE CONCAT('%', #{patientName}, '%')
-        </if>
-        ORDER BY e.create_time DESC
-    </select>
-
-    <select id="getPendingEmrCount" resultType="java.lang.Long">
-        SELECT COUNT(*)
-        FROM adm_encounter e
-        INNER JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.practitioner_id = #{doctorId}
-        LEFT JOIN doc_emr emr ON e.id = emr.encounter_id
-        WHERE e.status_enum = 2
-          AND emr.id IS NULL
-        <if test="patientName != null and patientName != ''">
-            AND e.patient_id IN (
-                SELECT id FROM adm_patient WHERE name LIKE CONCAT('%', #{patientName}, '%')
-            )
-        </if>
-    </select>
-
-</mapper>

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

@@ -35,27 +35,21 @@
                            WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
                              AND ws.status_enum = 8
                        ) THEN 6
-                       WHEN EXISTS (
-                           SELECT 1 FROM wor_service_request ws
-                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
-                             AND ws.status_enum = 5
-                       ) THEN 7
                        WHEN EXISTS (
                            SELECT 1 FROM wor_service_request ws
                            WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
                              AND ws.status_enum = 3
                        ) THEN 5
-                       WHEN EXISTS (
-                           SELECT 1 FROM wor_service_request ws
-                           INNER JOIN lab_specimen ls ON ls.service_id = ws.id
-                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
-                             AND ls.collection_status_enum >= 1
-                       ) THEN 4
                        WHEN EXISTS (
                            SELECT 1 FROM wor_service_request ws
                            WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
                              AND ws.status_enum = 2
                        ) THEN 1
+                       WHEN EXISTS (
+                           SELECT 1 FROM wor_service_request ws
+                           WHERE ws.prescription_no = drf.prescription_no AND ws.delete_flag = '0'
+                             AND ws.status_enum = 5
+                       ) THEN 7
                        ELSE 0
                    END AS computed_status
             FROM doc_request_form AS drf
@@ -63,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/java/com/openhis/surgicalschedule/domain/OpSchedule.java

@@ -79,13 +79,11 @@ public class OpSchedule extends HisBaseEntity {
     private String surgerySite;
 
     /** 入院时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime admissionTime;
 
     /** 入手术室时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime entryTime;
 
     /** 手术室编码 */
@@ -144,23 +142,19 @@ public class OpSchedule extends HisBaseEntity {
     private String assistant3Code;
 
     /** 手术开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /** 手术结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
     /** 麻醉开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime anesStart;
 
     /** 麻醉结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime anesEnd;
 
     /** 手术状态 */

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/router/index.js

@@ -79,51 +79,6 @@ export const constantRoutes = [
             }
         ]
     },
-    // 住院护士站 — 快捷访问路由（与 sys_menu 中 menu_id=295 的动态路由并存，路径不同不冲突）
-    {
-        path: '/inpatientNurse',
-        component: Layout,
-        hidden: true,
-        redirect: '/inpatientNurse/inpatientNurseStation',
-        children: [
-            {
-                path: 'inpatientNurseStation',
-                component: () => import('@/views/inpatientNurse/inpatientNurseStation/index.vue'),
-                name: 'InpatientNurseStation',
-                meta: {title: '住院护士站'}
-            },
-            {
-                path: 'medicalOrderExecution',
-                component: () => import('@/views/inpatientNurse/medicalOrderExecution/index.vue'),
-                name: 'MedicalOrderExecution',
-                meta: {title: '医嘱执行'}
-            },
-            {
-                path: 'medicalOrderProofread',
-                component: () => import('@/views/inpatientNurse/medicalOrderProofread/index.vue'),
-                name: 'MedicalOrderProofread',
-                meta: {title: '医嘱校对'}
-            },
-            {
-                path: 'medicineCollect',
-                component: () => import('@/views/inpatientNurse/medicineCollect/index.vue'),
-                name: 'MedicineCollect',
-                meta: {title: '领药管理'}
-            },
-            {
-                path: 'tprsheet',
-                component: () => import('@/views/inpatientNurse/tprsheet/index.vue'),
-                name: 'TprSheet',
-                meta: {title: '体温单'}
-            },
-            {
-                path: 'nursingRecord',
-                component: () => import('@/views/inpatientNurse/nursingRecord/index.vue'),
-                name: 'NursingRecord',
-                meta: {title: '护理记录'}
-            }
-        ]
-    },
     // 添加套餐管理相关路由到公共路由，确保始终可用
     {
         path: '/maintainSystem/Inspection/PackageManagement',

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: '已锁定',
 };
 
 /**
@@ -220,18 +220,3 @@ export function getSlotStatusDescription(value) {
 export function getSlotStatusClass(status) {
   return SlotStatusClassMap[status] || 'status-unbooked';
 }
-
-/**
- * 诊疗项目分类代码（对应后端 ActivityDefCategory 枚举）
- * wor_activity_definition.category_code 字段
- */
-export const ActivityCategory = {
-  /** 治疗 */
-  TREATMENT: '21',
-  /** 检验 */
-  PROOF: '22',
-  /** 检查 */
-  TEST: '23',
-  /** 手术 */
-  PROCEDURE: '24',
-};

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

@@ -461,10 +461,6 @@ watch(
     console.log(prescriptionList.value,"prescriptionList.value")
     if(newValue&&newValue.length>0){
       let saveList = prescriptionList.value.filter((item) => {
-        // 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
-        if (isSurgeryChargeBillingContext()) {
-          return item.check && item.statusEnum == 1
-        }
         return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
       })
        console.log(saveList,"prescriptionList.value")
@@ -877,32 +873,6 @@ function ensureOrgTreeLoaded() {
     });
 }
 
-/** 待签发且未收费（chargeStatus=5 为已收费） */
-function isPendingUnsignedAndUnpaid(item) {
-  return item.statusEnum == 1 && item.chargeStatus != 5
-}
-
-/**
- * 门诊划价：仅允许操作本人开立（bizRequestFlag==1 或空）。
- * 手术计费：列表接口需按库中 generate_source_enum 查询（当前多为 1），故子组件仍传 generateSourceEnum=1；
- * 通过 patientInfo.generateSourceEnum===6（手术计费在 chargePatientInfo 中已写入）识别场景，删除时不卡 bizRequestFlag。
- */
-function isSurgeryChargeBillingContext() {
-  const fromPatient = props.patientInfo?.generateSourceEnum
-  return fromPatient != null && Number(fromPatient) === 6
-}
-
-function isBizRequestAllowedForDelete(item) {
-  if (isSurgeryChargeBillingContext()) {
-    return true
-  }
-  const src = props.generateSourceEnum != null ? Number(props.generateSourceEnum) : NaN
-  if (src === 6) {
-    return true
-  }
-  return Number(item.bizRequestFlag) === 1 || !item.bizRequestFlag
-}
-
 function handleDelete() {
   // 🔧 修复：使用 groupIndexList 而不是 check 属性
   // 因为 watch 监听器会在数据更新时重置 check 为 false
@@ -911,93 +881,80 @@ function handleDelete() {
     return;
   }
 
-  const canDeleteRow = (item) =>
+  let deleteList = groupIndexList.value.map((index) => {
-    isPendingUnsignedAndUnpaid(item) && isBizRequestAllowedForDelete(item)
+    const item = prescriptionList.value[index];
-
+    // 只删除待签发且未收费的项目
-  const anySelectedDeletable = groupIndexList.value.some((index) =>
+    if (item.statusEnum != 1 || item.chargeStatus == 5) {
-    canDeleteRow(prescriptionList.value[index])
+      return null;
-  )
-  if (!anySelectedDeletable) {
-    proxy.$modal.msgWarning(
-      '只能删除「待签发」且「未收费」的项目；门诊划价还需为本人开立。已签发、已收费或非本人开立项不可删。'
-    )
-    return
-  }
-
-  let deleteList = groupIndexList.value
-    .map((index) => {
-      const item = prescriptionList.value[index]
-      if (!canDeleteRow(item)) {
-        return null
-      }
-      if (item.requestId == null || item.requestId === undefined || item.requestId === '') {
-        return null
-      }
-      return {
-        requestId: item.requestId,
-        dbOpType: '3',
-        adviceType: item.adviceType,
-      }
-    })
-    .filter((item) => item !== null)
-
-  // 删除逻辑：按索引从大到小排序，避免删除后索引变化
-  const sortedIndexes = [...groupIndexList.value].sort((a, b) => b - a)
-  let hasSavedItem = false
-
-  for (const index of sortedIndexes) {
-    const item = prescriptionList.value[index]
-    if (!canDeleteRow(item)) {
-      continue
     }
-
+    // 🔧 Bug #442: 非本人创建的医嘱不允许删除（与签发/签退逻辑保持一致）
+    if (Number(item.bizRequestFlag) !== 1 && item.bizRequestFlag) {
+      return null;
+    }
+    // 🔧 Bug #442: 已保存的行必须有有效的 requestId，否则跳过（避免后端删除不存在的记录）
+    if (item.requestId == null || item.requestId === undefined || item.requestId === '') {
+      return null;
+    }
+    return {
+      requestId: item.requestId,
+      dbOpType: '3',
+      adviceType: item.adviceType,
+    };
+  }).filter(item => item !== null); // 过滤掉已签发、已收费、非本人创建或无 requestId 的项目
+  
+  if (deleteList.length == 0) {
+    proxy.$modal.msgWarning('只能删除待签发且未收费的项目');
+    return;
+  }
+  
+  // 删除逻辑：按索引从大到小排序，避免删除后索引变化
+  const sortedIndexes = groupIndexList.value.sort((a, b) => b - a);
+  let hasSavedItem = false;
+  
+  for (const index of sortedIndexes) {
+    const item = prescriptionList.value[index];
+    if (item.statusEnum != 1) {
+      continue; // 跳过已签发的项目
+    }
+    
     if (!item.requestId) {
       // 新增的行（未保存到数据库），直接删除
-      prescriptionList.value.splice(index, 1)
+      prescriptionList.value.splice(index, 1);
     } else {
-      hasSavedItem = true
+      hasSavedItem = true;
     }
   }
+  
+  if (hasSavedItem) {
+    // 🔧 Bug #454: 删除前弹出确认提示，告知用户将级联删除关联检验申请单
+    const hasLabItem = deleteList.some(item => item.adviceType === 3);
+    const confirmMsg = hasLabItem
+      ? '删除此医嘱将同时删除关联的检验申请单，是否确认删除？'
+      : '确认删除选中的医嘱项目吗？';
 
-  const cleanupAfterDelete = () => {
+    proxy.$modal.confirm(confirmMsg).then(() => {
+      savePrescription({ adviceSaveList: deleteList }).then((res) => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('操作成功');
+          getListInfo(false);
+          expandOrder.value = [];
+          groupIndexList.value = [];
+          groupList.value = [];
+          isAdding.value = false;
+          adviceQueryParams.value.adviceType = undefined;
+        }
+      });
+    }).catch(() => {
+      // 用户取消删除
+    });
+  } else {
+    // 只有新增行，已经在前端删除完成
+    proxy.$modal.msgSuccess('操作成功');
     expandOrder.value = [];
     groupIndexList.value = [];
     groupList.value = [];
     isAdding.value = false;
     adviceQueryParams.value.adviceType = undefined;
-  };
-
-  if (hasSavedItem) {
-    if (deleteList.length === 0) {
-      proxy.$modal.msgWarning('没有可提交删除的已保存医嘱，请刷新后重试');
-      getListInfo(false);
-      cleanupAfterDelete();
-      return;
-    }
-
-    // Bug #454: 删除前确认；检验医嘱提示级联删除申请单
-    const hasLabItem = deleteList.some((item) => item.adviceType === 3);
-    const confirmMsg = hasLabItem
-      ? '删除此医嘱将同时删除关联的检验申请单，是否确认删除？'
-      : '确认删除选中的医嘱项目吗？';
-
-    proxy.$modal
-      .confirm(confirmMsg)
-      .then(() => {
-        savePrescription({ adviceSaveList: deleteList }).then((res) => {
-          if (res.code == 200) {
-            proxy.$modal.msgSuccess('操作成功');
-            getListInfo(false);
-            cleanupAfterDelete();
-          }
-        });
-      })
-      .catch(() => {
-        // 用户取消删除
-      });
-  } else {
-    proxy.$modal.msgSuccess('操作成功');
-    cleanupAfterDelete();
   }
 }
 
@@ -1029,9 +986,7 @@ function changeCheck(value,index,row){
   groupList.value.map(k=>{
     if(k.check){
       if(k.statusEnum == 1){//待签发
-        // 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
+        if(Number(k.bizRequestFlag)==1||!k.bizRequestFlag){
-        const bizAllowed = isSurgeryChargeBillingContext() || Number(k.bizRequestFlag)==1||!k.bizRequestFlag
-        if(bizAllowed){
           if(handleSaveDisabled.value&&!handleSingOutDisabled.value&&groupList.value.length>1){
             proxy.$modal.msgWarning('请选择相同的状态的项目进行操作')
             return
@@ -1046,9 +1001,7 @@ function changeCheck(value,index,row){
         }
       }
       if(k.statusEnum == 2){ //已签发
-        // 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
+        if(Number(k.bizRequestFlag)==1||!k.bizRequestFlag){
-        const bizAllowed = isSurgeryChargeBillingContext() || Number(k.bizRequestFlag)==1||!k.bizRequestFlag
-        if(bizAllowed){
           if(!handleSaveDisabled.value&&handleSingOutDisabled.value&&groupList.value.length>1){
             proxy.$modal.msgWarning('请选择相同的状态的项目进行操作')
             return
@@ -1075,28 +1028,28 @@ function handleSave() {
     return;
   }
   let saveList = prescriptionList.value.filter((item) => {
-    // 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag，允许任何授权用户签发
-    // 门诊划价场景保留 bizRequestFlag 限制，只能操作本人开立的医嘱
-    if (isSurgeryChargeBillingContext()) {
-      return item.check && item.statusEnum == 1
-    }
     return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
   });
-  // 无可签发项目时提前返回，避免后端报"医嘱列表为空"
+  // let saveList = prescriptionList.value
-  if (saveList.length == 0) {
+  // .filter((item) => {
-    proxy.$modal.msgWarning('当前无可签发处方');
+  //   return item.check;
-    return;
+  // }).filter((item) => {
-  }
+  //   return item.statusEnum == 1&&item.bizRequestFlag==1
+  // })
+
+  // if (saveList.length == 0) {
+  //   proxy.$modal.msgWarning('当前无可签发处方');
+  //   return;
+  // }
   // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
   let list = saveList.map((item) => {
     const parsedContent = item.contentJson ? JSON.parse(item.contentJson) : {};
     return {
       ...parsedContent,
       requestId: item.requestId,
-      // 已有 requestId 的记录走 UPDATE 路径，新记录走 INSERT 路径
+      dbOpType: '1',
-      dbOpType: item.requestId ? '2' : '1',
       groupId: item.groupId,
-      // 补充顶层关键字段（这些可能不在 contentJson 中，需从 API 响应顶层提取）
+      // 🔧 Bug #443: 补充顶层关键字段（这些不在 contentJson 中，需从 API 响应顶层提取）
       encounterId: item.encounterId,
       patientId: item.patientId,
       locationId: item.positionId,
@@ -1104,14 +1057,6 @@ function handleSave() {
       adviceTableName: item.adviceTableName,
       adviceDefinitionId: item.adviceDefinitionId,
       chargeItemId: item.chargeItemId,
-      // 补充数量、单位、批号等字段（后端 handDevice 需要这些字段）
-      quantity: item.quantity,
-      unitCode: item.unitCode,
-      lotNumber: item.lotNumber,
-      categoryEnum: item.categoryEnum,
-      // 签发时显式设置手术计费关键字段，后端 generateSourceEnum 回退为默认值导致查询无法匹配
-      generateSourceEnum: props.generateSourceEnum ?? parsedContent.generateSourceEnum ?? item.generateSourceEnum,
-      sourceBillNo: props.sourceBillNo ?? parsedContent.sourceBillNo ?? item.sourceBillNo,
     };
   });
   // 确保 organizationId 不为 undefined（手术计费场景下可能缺失 orgId）
@@ -1173,9 +1118,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);
@@ -1199,10 +1143,6 @@ function handleSingOut() {
       return item.check;
     })
     .filter((item) => {
-      // 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
-      if (isSurgeryChargeBillingContext()) {
-        return item.statusEnum == 2 && item.chargeStatus != 5
-      }
       return item.statusEnum == 2 && item.chargeStatus != 5 && (Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
     })
     .map((item) => {

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

@@ -354,11 +354,6 @@ async function getList() {
         if (!item.classification) {
           item.classification = '西医';
         }
-        // 转换 longTermFlag 为字符串，以匹配 useDict 返回的字典值类型（字符串）
-        // 避免 el-select 因类型不匹配（整数 1 vs 字符串 "1"）导致下拉框清空
-        if (item.longTermFlag != null) {
-          item.longTermFlag = String(item.longTermFlag);
-        }
         // 如果ybNo（诊断编码）符合传染病编码格式，添加到selectedDiseases
         if (item.ybNo && /^(01|02|03)/.test(item.ybNo)) {
           item.selectedDiseases = [item.ybNo];
@@ -749,26 +744,22 @@ function handleInfectiousDiseaseReport() {
     '手足口病': '0311',
   };
 
-  // 获取所有命中传染病映射的诊断，但跳过已有已提交报卡的诊断
+  // 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断
-  const infectiousDiagnoses = form.value.diagnosisList
+  const allSelectedDiseases = form.value.diagnosisList
-    .map(d => ({
+    .filter(d => d.name && d.hasInfectiousReport !== 1)
-      diagnosis: d,
+    .map(d => diseaseNameToCode[d.name] || null)
-      diseaseCode: d.name && d.hasInfectiousReport !== 1 ? diseaseNameToCode[d.name] : null
+    .filter(code => code);
-    }))
-    .filter(item => item.diseaseCode);
-
-  const allSelectedDiseases = infectiousDiagnoses.map(item => item.diseaseCode);
 
   if (allSelectedDiseases.length === 0) {
     return;
   }
 
-  // 优先使用命中传染病映射的主诊断，否则使用第一条命中的传染病诊断
+  // 优先使用主诊断（同样跳过已有报卡的）
-  const mainInfectiousDiagnosis = infectiousDiagnoses.find(item => item.diagnosis.maindiseFlag === 1)?.diagnosis;
+  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1);
-  const firstInfectiousDiagnosis = infectiousDiagnoses[0].diagnosis;
+  const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0];
 
   const diagnosisToShow = {
-    ...(mainInfectiousDiagnosis || firstInfectiousDiagnosis),
+    ...(mainDiagnosis || firstDiagnosis),
     selectedDiseases: allSelectedDiseases
   };
 

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

@@ -548,8 +548,6 @@ const dialogReadOnly = ref(false);
 const formRef = ref(null);
 // 保存按钮加载状态，防止重复提交
 const submitLoading = ref(false);
-// 数据加载中标志，防止 showReport 加载已有数据时 watch 清空分型字段
-const loadingData = ref(false);
 
 const props = defineProps({
   title: {
@@ -942,8 +940,7 @@ const showSubtypeSelect = computed(() => {
 // 监听疾病选择变化，自动清空分型选择
 watch(() => [form.value.selectedClassA, form.value.selectedClassB, form.value.selectedClassC], (newVal, oldVal) => {
   // 如果疾病选择发生变化，清空分型选择
-  // 数据加载中时不清空，避免 showReport 加载已有数据时被错误清空
+  if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
-  if (JSON.stringify(newVal) !== JSON.stringify(oldVal) && !loadingData.value) {
     form.value.diseaseType = '';
   }
 }, { deep: true });
@@ -1095,9 +1092,6 @@ function showReport(reportData = {}, readOnly = true) {
   dialogVisible.value = true;
   dialogReadOnly.value = readOnly;
 
-  // 标记数据加载中，防止 watch 清空 diseaseType 分型字段
-  loadingData.value = true;
-
   resetAddressSelector();
   initProvinceOptions();
 
@@ -1155,9 +1149,6 @@ function showReport(reportData = {}, readOnly = true) {
     form.value.addressCounty,
     form.value.addressTown
   );
-
-  // 数据加载完成，恢复 watch 监听
-  loadingData.value = false;
 }
 
 /**
@@ -1442,7 +1433,7 @@ async function buildSubmitData() {
   const submitData = {
     cardNo: formData.cardNo,
     visitId: props.patientInfo?.encounterId || formData.encounterId || null,
-    diagId: formData.diagnosisId || null,
+    diagId: formData.diagnosisId ? Number(formData.diagnosisId) : null,
     patId: formData.patientId || null,
     idType: 1, // 默认身份证
     idNo: formData.idNo,

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

@@ -179,8 +179,8 @@
                       type="datetime"
                       placeholder="选择执行时间"
                       size="small"
-                      format="YYYY-MM-DD HH:mm"
+                      format="YYYY-MM-DD HH:mm:ss"
-                      value-format="YYYY-MM-DD HH:mm"
+                      value-format="YYYY-MM-DD HH:mm:ss"
                       style="width: 100%"
                     />
                   </el-form-item>
@@ -445,6 +445,7 @@
                 >
                   <el-table-column label="项目名称" prop="itemName" min-width="180">
                     <template #default="scope">
+                      <el-tag v-if="scope.row.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
                       <span :style="{ fontWeight: scope.row.isPackage ? 'bold' : 'normal' }">
                         {{ scope.row.itemName }}
                       </span>
@@ -562,6 +563,7 @@
                     @change="toggleInspectionItem(item)"
                     @click.stop
                   />
+                  <el-tag v-if="item.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
                   <span class="item-itemName">{{ item.itemName }}</span>
                   <span class="item-price">¥{{ item.itemPrice }}/{{ item.unit || "次" }}</span>
                 </div>
@@ -612,6 +614,7 @@
                     <template v-if="item.isPackage">{{ item.expanded ? '▼' : '▶' }}</template>
                     <template v-else>•</template>
                   </span>
+                  <el-tag v-if="item.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
                   <span class="item-itemName">{{ item.itemName }}</span>
                   <span class="item-price">¥{{ item.itemPrice }}/{{ item.unit || "次" }}</span>
                   <el-button
@@ -872,30 +875,6 @@ let applyTimeTimer = null
 const userStore = useUserStore()
 const { id: userId, name: userName, nickName: userNickName } = storeToRefs(userStore)
 
-/** 执行时间默认值：当前系统时间，精确到分钟 */
-const getDefaultExecuteTime = () => {
-  const d = new Date()
-  const year = d.getFullYear()
-  const month = String(d.getMonth() + 1).padStart(2, '0')
-  const day = String(d.getDate()).padStart(2, '0')
-  const hours = String(d.getHours()).padStart(2, '0')
-  const minutes = String(d.getMinutes()).padStart(2, '0')
-  return `${year}-${month}-${day} ${hours}:${minutes}`
-}
-
-/** 将后端时间规范为 YYYY-MM-DD HH:mm */
-const normalizeExecuteTime = (value) => {
-  if (!value) return getDefaultExecuteTime()
-  const d = new Date(String(value).replace(/-/g, '/'))
-  if (Number.isNaN(d.getTime())) return getDefaultExecuteTime()
-  const year = d.getFullYear()
-  const month = String(d.getMonth() + 1).padStart(2, '0')
-  const day = String(d.getDate()).padStart(2, '0')
-  const hours = String(d.getHours()).padStart(2, '0')
-  const minutes = String(d.getMinutes()).padStart(2, '0')
-  return `${year}-${month}-${day} ${hours}:${minutes}`
-}
-
 // 修改 initData 函数
 const initData = async () => {
   // 先初始化患者信息（如果有）
@@ -918,13 +897,6 @@ const initData = async () => {
     formData.applyNo = '自动生成'
     // 申请日期实时更新（启动定时器）
     startApplyTimeTimer()
-    // 执行时间默认当前系统时间（精确到分钟）
-    if (!formData.executeTime) {
-      formData.executeTime = getDefaultExecuteTime()
-    }
-
-    // 执行时间默认填充当前系统时间
-    formData.executeTime = formatDateTime(new Date())
 
     // 获取主诊断信息
     try {
@@ -1003,7 +975,7 @@ const formData = reactive({
   applyDeptCode: '',
   specimenName: '血液',
   encounterId: '',
-  executeTime: getDefaultExecuteTime(),
+  executeTime: null,
   applicationType: 0
 })
 
@@ -1213,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))
@@ -1575,7 +1547,7 @@ const resetForm = async () => {
     visitNo: '',
     specimenName: '血液',
     encounterId: props.patientInfo.encounterId || '',
-    executeTime: getDefaultExecuteTime(),
+    executeTime: null,
     applicationType: 0,
   })
   selectedInspectionItems.value = []
@@ -2013,7 +1985,7 @@ const loadApplicationToForm = async (row) => {
         visitNo: detail.visitNo,
         specimenName: detail.specimenName,
         encounterId: detail.encounterId,
-        executeTime: normalizeExecuteTime(detail.executeTime),
+        executeTime: detail.executeTime || null,
         applicationType: detail.applicationType ?? 0
       })
 

openhis-ui-vue3/src/views/doctorstation/components/pendingEmr/index.vue

@@ -89,14 +89,8 @@ const getList = async () => {
     const response = await listPendingEmr(queryParams)
     // 根据后端返回的数据结构调整
     if (response.code === 200) {
-      const data = response.data
+      emrList.value = response.data || []
-      if (data && data.rows !== undefined) {
+      total.value = Array.isArray(response.data) ? response.data.length : 0
-        emrList.value = data.rows || []
-        total.value = data.total || 0
-      } else {
-        emrList.value = Array.isArray(data) ? data : []
-        total.value = emrList.value.length
-      }
     } else {
       ElMessage.error(response.msg || '获取待写病历列表失败')
       emrList.value = []

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

@@ -18,12 +18,16 @@
       <!-- <el-table-column label="组套类型" align="center" prop="typeEnum_enumText" /> -->
       <el-table-column label="单次剂量" align="center" prop="rangeCode_dictText">
         <template #default="scope">
-          {{ formatHistoryDose(scope.row) }}
+          {{
+            scope.row.dose
+              ? formatNumber(scope.row.dose) + ' ' + scope.row.doseUnitCode_dictText
+              : ''
+          }}
         </template>
       </el-table-column>
       <el-table-column label="总量" align="center" prop="rangeCode_dictText">
         <template #default="scope">
-          {{ formatHistoryTotalQuantity(scope.row) }}
+          {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
         </template>
       </el-table-column>
       <el-table-column label="频次/用法" align="center" prop="rangeCode_dictText" width="200">
@@ -86,31 +90,6 @@ const queryParams = ref({
   typeEnum: 1,
 });
 
-function formatHistoryTotalQuantity(row) {
-  if (!row || row.quantity == null || row.quantity === '') return '';
-  const fromDict = row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
-  let u =
-    fromDict != null && String(fromDict).trim() !== ''
-    && String(fromDict).toLowerCase() !== 'null'
-      ? String(fromDict).trim()
-      : '';
-  if (!u) {
-    const t = Number(row.adviceType);
-    if (t === 3 || t === 6 || t === 23 || t === 5) u = '次';
-    else if (t === 4) u = '个';
-  }
-  return u ? `${row.quantity} ${u}` : String(row.quantity);
-}
-
-function formatHistoryDose(row) {
-  if (!row?.dose) return '';
-  const du = row.doseUnitCode_dictText;
-  if (du != null && String(du).trim() !== '' && String(du).toLowerCase() !== 'null') {
-    return formatNumber(row.dose) + ' ' + du;
-  }
-  return formatNumber(row.dose);
-}
-
 function handleOpen() {
   drawer.value = true;
   getList();

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

@@ -82,7 +82,7 @@
             <span>{{ index + 1 + '. ' }}</span>
             <span>{{ medItem.adviceName }}</span>
             <span>{{ '(' + medItem.volume + ')' }}</span>
-            <span>{{ formatPrintLineQuantity(medItem) }}</span>
+            <span>{{ medItem.quantity + ' ' + medItem.unitCode_dictText }}</span>
             <span>{{ '批次号：' + medItem.lotNumber }}</span>
             <div>
               <span>用法用量：</span>
@@ -161,22 +161,6 @@ const props = defineProps({
 const emit = defineEmits(['close']);
 
 //合计
-function formatPrintLineQuantity(row) {
-  if (row == null || row.quantity == null || row.quantity === '') return '';
-  const fromDict = row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
-  let u =
-    fromDict != null && String(fromDict).trim() !== ''
-    && String(fromDict).toLowerCase() !== 'null'
-      ? String(fromDict).trim()
-      : '';
-  if (!u) {
-    const t = Number(row.adviceType);
-    if (t === 3 || t === 6 || t === 23 || t === 5) u = '次';
-    else if (t === 4) u = '个';
-  }
-  return u ? `${row.quantity} ${u}` : String(row.quantity);
-}
-
 function getTotalPrice(item) {
   let totalPrice = new Decimal(0);
   item.prescriptionInfoDetailList.forEach((medItem) => {

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

@@ -686,15 +686,7 @@
             <span style="margin-left: 4px">{{ scope.row.doseUnitCode_dictText }}</span>
           </template>
           <span v-else>
-            {{
+            {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
-              scope.row.dose
-                ? scope.row.dose +
-                  (scope.row.doseUnitCode_dictText &&
-                  String(scope.row.doseUnitCode_dictText).toLowerCase() !== 'null'
-                    ? ' ' + scope.row.doseUnitCode_dictText
-                    : '')
-                : ''
-            }}
           </span>
         </template>
       </el-table-column>
@@ -711,10 +703,10 @@
               @change="calculateTotalPrice(scope.row, scope.$index)"
               @input="calculateTotalPrice(scope.row, scope.$index)"
             />
-            <span style="margin-left: 4px">{{ resolveTotalQuantityUnit(scope.row) }}</span>
+            <span style="margin-left: 4px">{{ scope.row.unitCode_dictText }}</span>
           </template>
           <span v-else>
-            {{ formatTotalQuantityWithUnit(scope.row) }}
+            {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
           </span>
         </template>
       </el-table-column>
@@ -925,39 +917,6 @@ const unitMap = ref({
   minUnit: 'minUnit',
   unit: 'unit',
 });
-
-/** 解析总量单位文案（无字典时：诊疗/手术/检查默认「次」，耗材默认「个」） */
-const resolveTotalQuantityUnit = (row) => {
-  if (row == null) return '';
-  const fromDict =
-    row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
-  let unitStr =
-    fromDict != null && String(fromDict).trim() !== ''
-      && String(fromDict).toLowerCase() !== 'null'
-      ? String(fromDict).trim()
-      : '';
-  if (!unitStr) {
-    const t = Number(row.adviceType);
-    // drord_doctor_type: 3=诊疗 4=耗材 5=会诊 6=手术；23=检查（特殊）
-    // 注意：2=中成药（药品），不可用「次」作为默认单位
-    if (t === 3 || t === 6 || t === 23 || t === 5) {
-      unitStr = '次';
-    } else if (t === 4) {
-      unitStr = '个';
-    }
-  }
-  return unitStr;
-};
-
-/** 总量列展示：避免 unitCode_dictText 为空时显示「1 null」 */
-const formatTotalQuantityWithUnit = (row) => {
-  if (row == null) return '';
-  const q = row.quantity;
-  if (q === undefined || q === null || q === '') return '';
-  const unitStr = resolveTotalQuantityUnit(row);
-  return unitStr ? `${q} ${unitStr}` : String(q);
-};
-
 const buttonDisabled = computed(() => {
   return !props.patientInfo;
 });
@@ -2755,8 +2714,7 @@ function handleEmrTreatment() {
         treatment += '诊疗[' + (index + 1) + ']' + '  ';
         treatment += item.adviceName + '  ';
         if (item.quantity) {
-          const u = resolveTotalQuantityUnit(item);
+          treatment += '数量：' + item.quantity + item.unitCode_dictText + '  ';
-          treatment += '数量：' + item.quantity + (u ? ' ' + u : '') + '  ';
         }
         treatment += '频次：' + item.rateCode_dictText + '  ';
         if (item.methodCode_dictText) {
@@ -3843,8 +3801,6 @@ function handleSaveHistory(value) {
     uniqueKey: undefined,
     dbOpType: value.requestId ? '2' : '1',
     minUnitQuantity: value.quantity * value.partPercent,
-    // 🔧 修复：确保 categoryEnum 被传递（耗材必填字段），避免后端 NPE
-    categoryEnum: value.categoryEnum || value.categoryCode,
     conditionId: conditionId.value,
     conditionDefinitionId: conditionDefinitionId.value,
     encounterDiagnosisId: encounterDiagnosisId.value,

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

@@ -856,7 +856,6 @@ function handleDelete(row) {
     }).then(() => {
       getList()
       proxy.$modal.msgSuccess('删除成功')
-      emit('saved') // 通知父组件刷新医嘱列表
     }).catch(error => {
       console.error('删除手术失败:', error)
       proxy.$modal.msgError('删除失败')
@@ -868,7 +867,6 @@ function handleDelete(row) {
     }).then(() => {
       getList()
       proxy.$modal.msgSuccess('手术已取消')
-      emit('saved') // 通知父组件刷新医嘱列表
     }).catch(error => {
       console.error('取消手术失败:', error)
       proxy.$modal.msgError('取消失败')

openhis-ui-vue3/src/views/doctorstation/pendingEmr.vue

@@ -113,17 +113,10 @@ const getList = async () => {
   loading.value = true
   try {
     const response = await listPendingEmr(queryParams)
+    // 根据后端返回的数据结构调整
     if (response.code === 200) {
-      const data = response.data
+      emrList.value = response.data || []
-      if (data && data.rows !== undefined) {
+      total.value = Array.isArray(response.data) ? response.data.length : 0
-        // 新分页格式 {rows, total}
-        emrList.value = data.rows || []
-        total.value = data.total || 0
-      } else {
-        // 兼容旧格式（数组）
-        emrList.value = Array.isArray(data) ? data : []
-        total.value = emrList.value.length
-      }
     } else {
       ElMessage.error(response.msg || '获取待写病历列表失败')
       emrList.value = []

openhis-ui-vue3/src/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue

@@ -58,11 +58,7 @@
           <el-table-column prop="busNo" label="单据号" align="center" width="150" />
           <el-table-column prop="applicantName" label="申请人" align="center" width="100" />
           <el-table-column prop="locationName" label="发药药房" align="center" />
-          <el-table-column prop="statusEnum_enumText" label="状态" align="center">
+          <el-table-column prop="statusEnum_enumText" label="状态" align="center" />
-            <template #default="scope">
-              {{ formatSummaryStatusText(scope.row) }}
-            </template>
-          </el-table-column>
           <el-table-column prop="applyTime" label="汇总日期" align="center" width="140">
             <template #default="scope">
               {{ scope.row.applyTime ? parseTime(scope.row.applyTime, '{y}-{m}-{d}') : '-' }}
@@ -143,32 +139,6 @@ import {getCurrentInstance, ref} from 'vue';
 import {getFromSummaryDetails, getFromSummaryInit, getFromSummaryList, totalSendDrug,} from './api.js';
 
 const { proxy } = getCurrentInstance();
-
-/** 发药汇总单状态展示（汇总申请→已提交，发药→已发药） */
-const SUMMARY_STATUS_DISPLAY = {
-  2: '已提交',
-  4: '已发药',
-};
-const LEGACY_SUMMARY_STATUS_TEXT = {
-  待配药: '已提交',
-  已发放: '已发药',
-};
-
-function formatSummaryStatusText(row) {
-  const code = Number(row?.statusEnum);
-  if (SUMMARY_STATUS_DISPLAY[code]) {
-    return SUMMARY_STATUS_DISPLAY[code];
-  }
-  return LEGACY_SUMMARY_STATUS_TEXT[row?.statusEnum_enumText] || row?.statusEnum_enumText || '-';
-}
-
-function mapSummaryStatusOptions(options = []) {
-  return options.map((item) => ({
-    ...item,
-    label: SUMMARY_STATUS_DISPLAY[item.value] ?? LEGACY_SUMMARY_STATUS_TEXT[item.label] ?? item.label,
-  }));
-}
-
 const statusEnumOptions = ref([]);
 const summaryList = ref([]);
 const queryParams = ref({
@@ -252,7 +222,7 @@ function handleSend(row) {
 const getStatusOption = async () => {
   try {
     const res = await getFromSummaryInit();
-    statusEnumOptions.value = mapSummaryStatusOptions(res.data.dispenseStatusOptions);
+    statusEnumOptions.value = res.data.dispenseStatusOptions;
   } catch (error) {}
 };
 getStatusOption();

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

@@ -23,7 +23,7 @@
 </template>
 
 <script setup lang="ts">
-import {computed, nextTick, ref} from 'vue';
+import {computed, nextTick, onMounted, ref} from 'vue';
 import {throttle} from 'lodash-es';
 import Table from '@/components/TableLayout/Table.vue';
 import {getAdviceBaseInfo} from './api';
@@ -204,6 +204,11 @@ defineExpose({
   handleKeyDown,
   refresh,
 });
+
+// 组件挂载时自动加载数据（el-popover 懒渲染，父组件 refresh 可能因时序问题未生效，onMounted 最可靠）
+onMounted(() => {
+  getList();
+});
 </script>
 
 <style scoped lang="scss">

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

@@ -250,11 +250,10 @@ export function getContract(params) {
 /**
  * 获取科室列表
  */
-export function getOrgTree(params = {}) {
+export function getOrgTree() {
   return request({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    params: { pageNo: 1, pageSize: 5000, ...params },
   });
 }
 

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>
@@ -179,11 +179,14 @@
 
         <div v-if="descJsonData && hasMatchedFields" class="applicationShow-container-content">
           <el-descriptions title="申请单描述" :column="2">
-            <template v-for="(value, key) in descJsonData" :key="key">
+            <el-descriptions-item
-              <el-descriptions-item v-if="isFieldMatched(key)" :label="getFieldLabel(key)">
+              v-for="key in orderedDescFieldKeys"
-                {{ transformField(key, value) || '-' }}
+              :key="key"
-              </el-descriptions-item>
+              v-if="descJsonData[key] != null && descJsonData[key] !== ''"
-            </template>
+              :label="getFieldLabel(key)"
+            >
+              {{ transformField(key, descJsonData[key]) || '-' }}
+            </el-descriptions-item>
           </el-descriptions>
         </div>
 
@@ -444,9 +447,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/summaryDrugApplication.vue

@@ -0,0 +1,20 @@
+<!--
+ * 住院医生站 — 汇总发药申请：复用药房「发药汇总单」能力
+ -->
+<template>
+  <div class="summary-drug-application">
+    <MedicationSummary />
+  </div>
+</template>
+
+<script setup>
+import MedicationSummary from '@/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue';
+</script>
+
+<style scoped>
+.summary-drug-application {
+  height: 100%;
+  min-height: 400px;
+  overflow: auto;
+}
+</style>

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

@@ -116,7 +116,7 @@ import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
 import {getSurgery} from './api';
-import {getDepartmentList} from '@/api/public.js';
+import {getOrgList} from '@/views/doctorstation/components/api.js';
 
 const { proxy } = getCurrentInstance();
 
@@ -182,32 +182,25 @@ const hasMatchedFields = computed(() => {
 
 /** 查询科室 */
 const getLocationInfo = async () => {
-  const res = await getDepartmentList();
+  const res = await getOrgList();
-  orgOptions.value = res.data || [];
+  orgOptions.value = res.data.records;
 };
 
 const recursionFun = (targetDepartment) => {
-  if (!targetDepartment || !orgOptions.value || orgOptions.value.length === 0) {
-    return '';
-  }
   let name = '';
-  // 统一处理：扁平列表和树形结构都适用
+  for (let index = 0; index < orgOptions.value.length; index++) {
-  const findInList = (list) => {
+    const obj = orgOptions.value[index];
-    for (const node of list) {
+    if (obj.id == targetDepartment) {
-      if (String(node.id) === String(targetDepartment)) {
+      name = obj.name;
-        name = node.name;
+    }
-        return true;
+    const subObjArray = obj['children'];
-      }
+    for (let index = 0; index < subObjArray.length; index++) {
-      // 树形结构：递归查找 children
+      const item = subObjArray[index];
-      if (node.children && node.children.length > 0) {
+      if (item.id == targetDepartment) {
-        if (findInList(node.children)) {
+        name = item.name;
-          return true;
-        }
       }
     }
-    return false;
+  }
-  };
-  findInList(orgOptions.value);
   return name;
 };
 

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">
@@ -115,28 +105,18 @@
             </template>
           </el-table-column>
           <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
-          <el-table-column label="操作" align="center" fixed="right" width="280">
+          <el-table-column label="操作" align="center" fixed="right" width="220">
             <template #default="scope">
-              <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
+              <!-- 待签发（status=0或null/undefined）：可修改、删除 -->
-              <template v-if="canManageRow(scope.row)">
+              <template v-if="!scope.row.status || scope.row.status == 0">
-                <template v-if="isPendingStatus(scope.row)">
+                <el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
-                  <el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
+                <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
-                  <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-                <template v-else-if="isWithdrawableStatus(scope.row)">
-                  <el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
-                </template>
               </template>
-              <!-- 报告已出：可查看报告 -->
+              <!-- 已签发（status=1）：可撤回 -->
-              <template v-else-if="isReportStatus(scope.row)">
+              <template v-else-if="scope.row.status == 1">
-                <el-button link type="success" @click="handleViewReport(scope.row)">查看报告</el-button>
-              </template>
-              <!-- 已签发：可查看详情、可撤回 -->
-              <template v-else-if="isIssuedStatus(scope.row)">
-                <el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
                 <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>
@@ -232,16 +212,13 @@
 </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 useUserStore from '@/store/modules/user';
+import {saveInspection} from '../order/applicationForm/api.js';
-import auth from '@/plugins/auth';
-
-const userStore = useUserStore();
 
 const { proxy } = getCurrentInstance();
 
@@ -293,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 = [];
     }
@@ -352,110 +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 isWithdrawableStatus = (row) => String(getBillStatus(row)) === '1';
-
-const isReportStatus = (row) => ['6', '8'].includes(String(getBillStatus(row)));
-
-/**
- * 是否可管理该申请单：申请者本人或管理员
- */
-const canManageRow = (row) => {
-  if (auth.hasRole('admin')) {
-    return true;
-  }
-  const currentPractitionerId = userStore.practitionerId;
-  const requesterId = row?.requesterId;
-  if (!currentPractitionerId || !requesterId) {
-    return false;
-  }
-  return String(currentPractitionerId) === String(requesterId);
-};
-
-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字符串
@@ -523,13 +409,8 @@ const hasMatchedFields = computed(() => {
 
 /** 查询科室 */
 const getLocationInfo = async () => {
-  try {
+  const res = await getDepartmentList();
-    const res = await getDepartmentList();
+  orgOptions.value = res.data || [];
-    orgOptions.value = Array.isArray(res.data) ? res.data : [];
-  } catch (e) {
-    console.warn('科室列表加载失败:', e.message);
-    orgOptions.value = [];
-  }
 };
 
 const recursionFun = (targetDepartment) => {
@@ -557,13 +438,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 = '急诊';
@@ -582,12 +457,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?.();
 };
 
 /**
@@ -614,9 +489,9 @@ const submitEditForm = () => {
  */
 const handleDelete = async (row) => {
   try {
-    await proxy.$modal?.confirm?.('确认作废该申请单吗？作废后不可撤销');
+    await proxy.$modal?.confirm?.(`确定要删除申请单 "${row.prescriptionNo}" 吗？此操作不可恢复。`);
   } catch {
-    return;
+    return; // 用户取消
   }
 
   try {
@@ -633,15 +508,13 @@ const handleDelete = async (row) => {
 };
 
 /**
- * 撤回检验申请单（已签发且未采证状态可撤回）
+ * 撤回检验申请单（已签发状态撤回至待签发）
  */
 const handleWithdraw = async (row) => {
   try {
-    await proxy.$modal?.confirm?.(
+    await proxy.$modal?.confirm?.(`确定要撤回申请单 "${row.prescriptionNo}" 吗？撤回后将恢复为待签发状态。`);
-      '确认撤回该申请单吗？撤回后申请单及关联医嘱将恢复为待签发状态，护士站将同步更新。'
-    );
   } catch {
-    return;
+    return; // 用户取消
   }
 
   try {
@@ -768,14 +641,6 @@ defineExpose({
   animation: rotating 2s linear infinite;
 }
 
-.report-status-tag {
-  cursor: pointer;
-  background-color: #f0f9eb !important;
-  border-color: #67c23a !important;
-  color: #529b2e !important;
-  font-weight: 600;
-}
-
 @keyframes rotating {
   0% {
     transform: rotate(0deg);

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

@@ -63,7 +63,7 @@
           <span class="medicine-info"> 诊断：{{ config.diagnosisName }} </span>
           <span class="medicine-info"> 皮试：{{ row.skinTestFlag_enumText }} </span>
           <span class="medicine-info"> 注射药品：{{ row.injectFlag_enumText }} </span>
-          <span class="total-amount">
+          <span class="total-amount" v-if="row.therapyEnum == '2'">
             总金额：{{ row.totalPrice ? Number(row.totalPrice).toFixed(2) + ' 元' : '0.00 元' }}
           </span>
         </div>
@@ -83,7 +83,7 @@
                 :controls="false"
                 style="width: 70px"
                 :ref="(el) => setInputRef('doseQuantity', el)"
-                @input="() => { convertValues(); calculateTotalAmount(); }"
+                @input="convertValues"
                 @keyup.enter.prevent="handleEnter('doseQuantity')"
               />
             </el-form-item>
@@ -110,7 +110,7 @@
                 :controls="false"
                 style="width: 70px; margin-left: 32px"
                 :ref="(el) => setInputRef('dose', el)"
-                @input="() => { convertDoseValues(); calculateTotalAmount(); }"
+                @input="convertDoseValues"
                 @keyup.enter.prevent="handleEnter('dose')"
               />
             </el-form-item>
@@ -119,7 +119,7 @@
               v-model="row.doseUnitCode"
               style="width: 70px"
               placeholder=" "
-              @change="() => { convertValues(); calculateTotalAmount(); }"
+              @change="convertValues"
             >
               <el-option
                 v-for="item in row.unitCodeList"
@@ -271,17 +271,13 @@
                   controls-position="right"
                   :controls="false"
                   :ref="(el) => setInputRef('firstDose', el)"
-                  @input="calculateTotalAmount"
                   @keyup.enter.prevent="handleEnter('firstDose')"
                 />
               </el-form-item>
-              <el-select v-model="row.doseUnitCode" style="width: 70px" placeholder=" ">
+              <el-select v-model="row.unitCode" style="width: 70px" placeholder=" ">
-                <el-option
+                <template v-for="item in row.unitCodeList" :key="item.value">
-                  v-for="item in row.unitCodeList"
+                  <el-option v-if="checkUnit(item)" :value="item.value" :label="item.label" />
-                  :value="item.value"
+                </template>
-                  :label="item.label"
-                  :key="item.value"
-                />
               </el-select>
             </template>
           </div>
@@ -430,7 +426,6 @@
 
 <script setup lang="ts">
 import {computed, getCurrentInstance, nextTick, onMounted, ref, watch} from 'vue';
-import Decimal from 'decimal.js';
 
 interface Config {
   diagnosisName: string; // 仅用于显示
@@ -628,18 +623,7 @@ const orgFallbackOption = (value: any) => {
 const convertValues = () => props.handlers.convertValue('doseQuantity', props.row, props.index);
 const convertDoseValues = () => props.handlers.convertValue('dose', props.row, props.index);
 const calculateTotalPrice = () => props.handlers.calculateTotal('price', props.row, props.index);
-// 直接用 row 计算总金额：数量 * 单价，避免父组件索引不匹配的问题
+const calculateTotalAmount = () => props.handlers.calculateTotal('amount', props.row, props.index);
-const calculateTotalAmount = () => {
-  nextTick(() => {
-    const row = props.row;
-    const qty = new Decimal(row.doseQuantity || 0);
-    // 根据首次用量单位类型决定使用哪个单价
-    const unitType = row.unitCodeList?.find((k) => k.value == row.doseUnitCode)?.type;
-    const price = unitType == 'unit' ? row.unitPrice : row.minUnitPrice;
-    const roundedPrice = new Decimal(price || 0).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-    row.totalPrice = qty.mul(roundedPrice).toDecimalPlaces(2, Decimal.ROUND_HALF_UP).toString();
-  });
-};
 const setInputRef = props.handlers.setInputRef;
 
 defineExpose({

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

@@ -24,20 +24,22 @@
           </el-col> -->
           <el-col :span="12">
             <el-form-item label="发往科室" prop="targetDepartment" style="width: 100%">
-              <el-select
+              <!-- <el-input v-model="form.targetDepartment" autocomplete="off" /> -->
+              <el-tree-select
+                clearable
+                style="width: 100%"
                 v-model="form.targetDepartment"
                 filterable
-                clearable
+                :data="orgOptions"
+                :props="{
+                  value: 'id',
+                  label: 'name',
+                  children: 'children',
+                }"
+                value-key="id"
+                check-strictly
                 placeholder="请选择科室"
-                style="width: 100%"
+              />
-              >
-                <el-option
-                  v-for="opt in flatOrgOptions"
-                  :key="opt.value"
-                  :label="opt.label"
-                  :value="opt.value"
-                />
-              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -76,33 +78,18 @@
   </div>
 </template>
 <script setup name="BloodTransfusion">
-import {computed, getCurrentInstance, nextTick, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
+import {getCurrentInstance, onBeforeMount, onMounted, reactive, ref} from 'vue';
-import {ElMessage} from 'element-plus';
 import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
-import request from '@/utils/request';
-import {getDiagnosisTreatmentOne} from '@/views/catalog/diagnosistreatment/components/diagnosistreatment';
 import {getEncounterDiagnosis} from '../../api.js';
 import {getApplicationList, saveBloodTransfusio} from './api';
 
 const { proxy } = getCurrentInstance();
-
-/** 科室树节点 id 统一为字符串，避免大整数精度丢失导致 tree-select 无法匹配 */
-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 findTreeItem = (list, id) => {
-  if (!list || list.length === 0 || id == null || id === '') return null;
+  if (!list || list.length === 0) return null;
-  const strId = String(id);
   for (const item of list) {
-    if (String(item.id) === strId) return item;
+    if (item.id == id) return item;
     if (item.children && item.children.length > 0) {
       const found = findTreeItem(item.children, id);
       if (found) return found;
@@ -110,149 +97,11 @@ const findTreeItem = (list, id) => {
   }
   return null;
 };
-
-/** 在科室树中解析 orgId（兼容 Long 转 Number 后的精度丢失） */
-const resolveOrgIdInTree = (rawOrgId) => {
-  if (rawOrgId == null || rawOrgId === '') return '';
-  const strOrgId = String(rawOrgId);
-  const findInTree = (nodes) => {
-    if (!nodes?.length) return null;
-    for (const node of nodes) {
-      if (String(node.id) === strOrgId) return String(node.id);
-      if (
-        typeof node.id === 'string' &&
-        node.id.length >= 16 &&
-        strOrgId.length >= 16 &&
-        node.id.substring(0, 15) === strOrgId.substring(0, 15)
-      ) {
-        return String(node.id);
-      }
-      if (node.children?.length) {
-        const found = findInTree(node.children);
-        if (found) return found;
-      }
-    }
-    return null;
-  };
-  return findInTree(orgOptions.value) || strOrgId;
-};
-
-const resolveTargetDepartmentId = (rawId) => {
-  if (rawId == null || rawId === '') return '';
-  const resolved = resolveOrgIdInTree(rawId);
-  const node = findTreeItem(orgOptions.value, resolved);
-  return node ? String(node.id) : resolved;
-};
-
-/** 诊疗目录「所属科室」→ AdviceBaseDto.orgId */
-const getBelongingOrgId = (item) => {
-  if (!item) return null;
-  return item.orgId ?? item.org_id ?? null;
-};
-
-/** 诊疗目录所属科室名称（字典翻译字段） */
-const getBelongingOrgName = (item) => {
-  if (!item) return '';
-  return item.orgId_dictText || item.orgName || item.org_name || '';
-};
-
-/** 按机构 ID 拉取科室名称（树中无节点时兜底） */
-const fetchOrgNameById = async (orgId) => {
-  if (orgId == null || orgId === '') return '';
-  const fromTree = findOrgName(orgId);
-  if (fromTree) return fromTree;
-  try {
-    const res = await request({
-      url: '/base-data-manage/organization/organization-getById',
-      method: 'get',
-      params: { orgId },
-    });
-    if (res.code === 200 && res.data?.name) {
-      return res.data.name;
-    }
-  } catch (e) {
-    console.error('查询科室名称失败', e);
-  }
-  return '';
-};
-
-/** 从机构树解析科室名称 */
-const findOrgName = (orgId) => {
-  if (orgId == null || orgId === '') return '';
-  const node = findTreeItem(orgOptions.value, orgId);
-  if (node?.name) return node.name;
-  const resolved = resolveOrgIdInTree(orgId);
-  const resolvedNode = findTreeItem(orgOptions.value, resolved);
-  return resolvedNode?.name || '';
-};
-
-/** 自动填充时缓存的科室名称 */
-const targetDepartmentName = ref('');
-
-/** 扁平化科室选项，保证 el-select 能稳定显示 label */
-const flatOrgOptions = computed(() => {
-  const options = [];
-  const seen = new Set();
-  const walk = (nodes) => {
-    for (const node of nodes || []) {
-      if (node?.id == null) continue;
-      const value = String(node.id);
-      if (seen.has(value)) continue;
-      seen.add(value);
-      options.push({ value, label: node.name || value });
-      if (node.children?.length) walk(node.children);
-    }
-  };
-  walk(orgOptions.value);
-  const curId = form.targetDepartment;
-  const curName = targetDepartmentName.value || findOrgName(curId);
-  if (curId && curName && !seen.has(String(curId))) {
-    options.unshift({ value: String(curId), label: curName });
-  }
-  return options;
-});
-
-/** 从诊疗目录详情补全所属科室（医嘱下拉接口不带 orgId_dictText） */
-const resolveProjectOrgInfo = async (item) => {
-  if (!item) return { orgId: null, orgName: '' };
-  let orgId = getBelongingOrgId(item);
-  let orgName = getBelongingOrgName(item);
-  if ((!orgId || !orgName) && item.adviceDefinitionId) {
-    try {
-      const res = await getDiagnosisTreatmentOne(item.adviceDefinitionId);
-      const detail = res?.data;
-      if (detail) {
-        orgId = orgId ?? detail.orgId ?? detail.org_id ?? null;
-        orgName = orgName || detail.orgId_dictText || detail.orgName || '';
-      }
-    } catch (e) {
-      console.error('查询诊疗目录所属科室失败', e);
-    }
-  }
-  if (orgId && !orgName) {
-    orgName = await fetchOrgNameById(orgId);
-  }
-  return { orgId, orgName };
-};
-
-/** 写入发往科室 */
-const applyTargetDepartment = async (belongOrgId, nameHint = '') => {
-  if (belongOrgId == null || belongOrgId === '') {
-    form.targetDepartment = '';
-    targetDepartmentName.value = '';
-    return;
-  }
-  const resolvedDeptId = resolveTargetDepartmentId(belongOrgId);
-  const deptName =
-    nameHint || findOrgName(belongOrgId) || findOrgName(resolvedDeptId) || (await fetchOrgNameById(belongOrgId));
-  targetDepartmentName.value = deptName;
-  form.targetDepartment = resolvedDeptId;
-};
 const emits = defineEmits(['submitOk']);
 const props = defineProps({});
 const state = reactive({});
-const applicationListAll = ref([]);
+const applicationListAll = ref();
-const applicationList = ref([]);
+const applicationList = ref();
 const loading = ref(false);
 const orgOptions = ref([]); // 科室选项
 const getList = () => {
@@ -269,48 +118,29 @@ const getList = () => {
     adviceTypes: [3], //1 药品 2耗材 3诊疗
   })
     .then((res) => {
-      if (res.code === 200 && Array.isArray(res.data?.records)) {
+      if (res.code === 200) {
-        const records = res.data.records.filter((item) => item.adviceDefinitionId != null);
+        applicationListAll.value = res.data.records;
-        applicationListAll.value = records;
+        applicationList.value = res.data.records.map((item) => {
-        applicationList.value = records.map((item) => {
           const priceInfo = item.priceList?.[0] || {};
           const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
           const unit = item.unitCode_dictText || item.unitCode || '';
-          const id = item.adviceDefinitionId;
           return {
-            adviceDefinitionId: id,
+            adviceDefinitionId: item.adviceDefinitionId,
             orgId: item.orgId,
             label: item.adviceName + ' (￥' + price + '/' + unit + ')',
-            key: id,
+            key: item.adviceDefinitionId,
           };
         });
       } else {
-        proxy.$message.error(res.message || '加载输血项目失败');
+        proxy.$message.error(res.message);
-        applicationListAll.value = [];
         applicationList.value = [];
       }
     })
     .finally(() => {
       loading.value = false;
-      if (transferValue.value.length > 0) {
-        nextTick(async () => {
-          const valid = await validateTransferOrgConsistency(transferValue.value);
-          if (valid) {
-            lastValidTransferValue.value = [...transferValue.value];
-            fillTargetDepartmentFromSelection(transferValue.value, 1);
-          } else {
-            transferValue.value = [];
-            lastValidTransferValue.value = [];
-          }
-        });
-      }
     });
 };
 const transferValue = ref([]);
-/** 上一次通过校验的已选项目（科室不一致时回滚到此状态） */
-const lastValidTransferValue = ref([]);
-const isRevertingTransfer = ref(false);
-let transferValidateSeq = 0;
 const form = reactive({
   // categoryType: '', // 项目类别
   targetDepartment: '', // 发往科室
@@ -327,140 +157,86 @@ const rules = reactive({});
 onBeforeMount(() => {});
 onMounted(() => {
   getList();
-  getLocationInfo();
 });
-const collectSelectedProjects = (selectProjectIds) => {
-  return (selectProjectIds || [])
-    .map((element) =>
-      applicationListAll.value.find((item) => String(item.adviceDefinitionId) === String(element))
-    )
-    .filter(Boolean);
-};
-
-/** 校验已选项目的所属科室是否一致（超过 1 项时才校验） */
-const validateTransferOrgConsistency = async (selectProjectIds) => {
-  const arr = collectSelectedProjects(selectProjectIds);
-  if (arr.length <= 1) {
-    return true;
-  }
-  const orgInfoList = await Promise.all(arr.map((item) => resolveProjectOrgInfo(item)));
-  const firstOrgId = orgInfoList[0]?.orgId;
-  return orgInfoList.every((info) => String(info?.orgId ?? '') === String(firstOrgId ?? ''));
-};
-
 /**
  * type(1：watch监听类型 2:点击保存类型)
- */
+ * selectProjectIds(选中项目的id数组)
-const fillTargetDepartmentFromSelection = async (selectProjectIds, type) => {
+ * */
-  const manualDept = type === 2 && form.targetDepartment ? form.targetDepartment : '';
+const projectWithDepartment = (selectProjectIds, type) => {
-  const arr = collectSelectedProjects(selectProjectIds);
+  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
-
+  let isRelease = true;
-  if (arr.length === 0) {
+  // 选中项目的数组
-    // 项目列表尚未加载完时，已选 ID 存在则先不清空（避免误清发往科室）
+  const arr = [];
-    if ((selectProjectIds || []).length > 0 && applicationListAll.value.length === 0) {
+  // 根据选中的项目id查找对应的项目
-      return type === 2 ? !!manualDept : true;
+  selectProjectIds.forEach((element) => {
+    const searchData = applicationList.value.find((item) => {
+      return element == item.adviceDefinitionId;
+    });
+    arr.push(searchData);
+  });
+  // 清空科室
+  form.targetDepartment = '';
+  if (arr.length > 0) {
+    const obj = arr[0];
+    // 判断科室是否相同
+    const isCompare = arr.every((item) => {
+      return item.orgId == obj.orgId;
+    });
+    if (!isCompare) {
+      ElMessage({
+        type: 'error',
+        message: '执行科室不同',
+      });
+      isRelease = false;
     }
-    form.targetDepartment = '';
+    // 选中项目中的执行科室id与全部科室数据做匹配
-    targetDepartmentName.value = '';
+    const findItem = findTreeItem(orgOptions.value, obj.orgId);
-    return type === 2 ? !!manualDept : true;
-  }
 
-  const orgInfoList = await Promise.all(arr.map((item) => resolveProjectOrgInfo(item)));
+    if (!findItem) {
-  const firstOrg = orgInfoList[0];
+      isRelease = false;
-  const belongOrgId = firstOrg?.orgId;
+      ElMessage({
-  const allSameOrg = orgInfoList.every((info) => String(info?.orgId ?? '') === String(belongOrgId ?? ''));
+        type: 'error',
-  if (!allSameOrg) {
+        message: '未找到项目执行的科室',
-    if (type === 2) {
-      ElMessage.error('所选项目的所属科室不一致，请分开申请');
-    }
-    return false;
-  }
-
-  if (belongOrgId == null || belongOrgId === '') {
-    if (type === 2 && manualDept) {
-      await applyTargetDepartment(manualDept, findOrgName(manualDept));
-      return true;
-    }
-    if (type === 2) {
-      ElMessage.warning('所选项目未在诊疗目录配置所属科室，请手动选择发往科室');
-      return false;
-    }
-    form.targetDepartment = '';
-    targetDepartmentName.value = '';
-    return true;
-  }
-
-  if (type === 2 && manualDept) {
-    await applyTargetDepartment(manualDept, findOrgName(manualDept));
-    return true;
-  }
-
-  await applyTargetDepartment(belongOrgId, firstOrg?.orgName || '');
-  return true;
-};
-
-// 选中项目：先校验所属科室一致，不通过则回滚穿梭框，不允许进入「已选择」
-watch(
-  () => transferValue.value,
-  async (newValue) => {
-    if (isRevertingTransfer.value) return;
-
-    const seq = ++transferValidateSeq;
-    const valid = await validateTransferOrgConsistency(newValue);
-    if (seq !== transferValidateSeq) return;
-
-    if (!valid) {
-      ElMessage.error('所选项目的所属科室不一致，请分开申请');
-      isRevertingTransfer.value = true;
-      transferValue.value = [...lastValidTransferValue.value];
-      await nextTick();
-      isRevertingTransfer.value = false;
-      return;
-    }
-
-    lastValidTransferValue.value = [...newValue];
-    await fillTargetDepartmentFromSelection(newValue, 1);
-  }
-);
-
-watch(
-  () => orgOptions.value,
-  () => {
-    if (transferValue.value.length > 0) {
-      nextTick(() => {
-        fillTargetDepartmentFromSelection(transferValue.value, 1);
       });
     }
-  },
+    if (type == 1) {
-  { deep: true }
+      if (isRelease) {
+        form.targetDepartment = findItem.id;
+      }
+    }
+  }
+  return isRelease;
+};
+// 监听选择项目变化
+watch(
+  () => transferValue.value,
+  (newValue) => {
+    projectWithDepartment(newValue, 1);
+  }
 );
-const submit = async () => {
+const submit = () => {
   if (transferValue.value.length == 0) {
     return proxy.$message.error('请选择申请单');
   }
-  if (!(await fillTargetDepartmentFromSelection(transferValue.value, 2))) {
+  if (!projectWithDepartment(transferValue.value, 2)) {
     return;
   }
-  if (!form.targetDepartment) {
-    return proxy.$message.error('请选择发往科室');
-  }
   let applicationListAllFilter = applicationListAll.value.filter((item) => {
-    return transferValue.value.some((id) => String(id) === String(item.adviceDefinitionId));
+    return transferValue.value.includes(item.adviceDefinitionId);
   });
   applicationListAllFilter = applicationListAllFilter.map((item) => {
-    const priceInfo = item.priceList?.[0] || {};
     return {
       adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
       quantity: 1, // /** 请求数量 */
-      unitCode: priceInfo.unitCode /** 请求单位编码 */,
+      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
-      unitPrice: priceInfo.price /** 单价 */,
+      unitPrice: item.priceList[0].price /** 单价 */,
-      totalPrice: priceInfo.price /** 总价 */,
+      totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: form.targetDepartment || item.positionId, //执行科室id
+      positionId: item.positionId, //执行科室id
       ybClassEnum: item.ybClassEnum, //类别医保编码
       conditionId: item.conditionId, //诊断ID
       encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
       adviceType: item.adviceType, ///** 医嘱类型 */
-      definitionId: priceInfo.definitionId, //费用定价主表ID */
+      definitionId: item.priceList[0].definitionId, //费用定价主表ID */
       definitionDetailId: item.definitionDetailId, //费用定价子表ID */
       accountId: patientInfo.value.accountId, // // 账户id
     };
@@ -478,22 +254,16 @@ const submit = async () => {
     if (res.code === 200) {
       proxy.$message.success(res.msg);
       applicationList.value = [];
-      applicationListAll.value = [];
-      transferValue.value = [];
-      lastValidTransferValue.value = [];
       emits('submitOk');
     } else {
       proxy.$message.error(res.message);
     }
   });
 };
-/** 查询科室（与检验申请单一致） */
+/** 查询科室 */
 const getLocationInfo = () => {
-  return getDepartmentList().then((res) => {
+  getDepartmentList().then((res) => {
-    orgOptions.value = normalizeOrgTreeIds(res?.data || []);
+    orgOptions.value = res.data || [];
-    if (transferValue.value.length > 0) {
-      nextTick(() => fillTargetDepartmentFromSelection(transferValue.value, 1));
-    }
   });
 };
 // 获取诊断目录
@@ -530,7 +300,7 @@ function getDiagnosisList() {
     }
   });
 }
-defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
+defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
 </script>
 <style lang="scss" scoped>
 .bloodTransfusion-container {
@@ -542,22 +312,8 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
     min-height: 300px;
   }
 
-  :deep(.el-transfer) {
+  .el-transfer {
     --el-transfer-panel-width: 480px !important;
-    display: flex !important;
-    flex-direction: row !important;
-  }
-
-  :deep(.el-transfer__buttons) {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    padding: 0 4px;
-  }
-
-  :deep(.el-transfer__button) {
-    margin: 4px 0;
   }
 
   .bloodTransfusion-form {

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

@@ -17,14 +17,17 @@
           style="width: 300px; margin-bottom: 10px"
         >
           <template #append>
-            <el-button @click="handleSearch" :loading="loading">搜索</el-button>
+            <el-button @click="handleSearch">搜索</el-button>
           </template>
         </el-input>
-        <span class="total-count">共 {{ totalCount }} 项</span>
+        <span v-if="!searchKey" class="total-count">共 {{ totalCount }} 项</span>
+        <span v-else class="total-count">搜索到 {{ filteredCount }} 项 / 共 {{ totalCount }} 项</span>
       </div>
       <el-transfer
         v-model="transferValue"
         :data="transferData"
+        filter-placeholder="项目代码/名称"
+        filterable
         :titles="['未选择', '已选择']"
       />
     </div>
@@ -131,11 +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 {getExaminationPage, saveInspection} from './api';
+import {getApplicationList, saveInspection} from './api';
-import {ActivityCategory} from '@/utils/medicalConstants';
+import {getOrgList} from '@/views/doctorstation/components/api.js';
-import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
 import {ElMessage} from 'element-plus';
 
@@ -166,13 +168,13 @@ const loading = ref(false);
 const orgOptions = ref([]);
 const searchKey = ref('');
 const totalCount = ref(0);
-const skipDeptAutoFill = ref(false);
 
 // 将已加载的全部数据转为 transfer 组件所需的格式
 const buildTransferData = (records) => {
   return records.map((item) => {
-    const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
+    const priceInfo = item.priceList?.[0] || {};
-    const unit = item.unitCodeDictText || item.unitCode || '';
+    const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
+    const unit = item.unitCode_dictText || item.unitCode || '';
     return {
       adviceDefinitionId: item.adviceDefinitionId,
       orgId: item.orgId,
@@ -182,8 +184,7 @@ const buildTransferData = (records) => {
   });
 };
 
-const selectedItemsCache = ref(new Map());
+// 加载全部数据（不分页，一次性拉取）
-
 const loadAllData = async () => {
   if (!patientInfo.value?.inHospitalOrgId) {
     applicationListAll.value = [];
@@ -191,12 +192,13 @@ const loadAllData = async () => {
   }
   loading.value = true;
   try {
-    const res = await getExaminationPage({
+    // 使用大 pageSize 一次性拉取所有启用状态的检验类诊疗项目
-      pageSize: 100,
+    const res = await getApplicationList({
+      pageSize: 9999,
       pageNo: 1,
-      categoryCode: ActivityCategory.PROOF,
+      categoryCode: '22',
       organizationId: patientInfo.value.inHospitalOrgId,
-      searchKey: searchKey.value,
+      adviceTypes: [3], // 1 药品 2 耗材 3 诊疗
     });
     if (res.code !== 200) {
       proxy.$message.error(res.message);
@@ -205,9 +207,6 @@ const loadAllData = async () => {
     }
     applicationListAll.value = res.data?.records || [];
     totalCount.value = res.data?.total || 0;
-    if (!searchKey.value) {
-      applyEditTransferSelection();
-    }
   } catch (e) {
     proxy.$message.error('获取检验项目列表失败');
     applicationListAll.value = [];
@@ -216,21 +215,33 @@ const loadAllData = async () => {
   }
 };
 
-const transferData = computed(() => buildTransferData(applicationListAll.value));
+// 根据搜索关键词过滤数据
+const filterData = (key) => {
+  if (!key || key.trim() === '') {
+    return applicationListAll.value;
+  }
+  const lowerKey = key.toLowerCase().trim();
+  return applicationListAll.value.filter((item) => {
+    return (
+      item.adviceName?.toLowerCase().includes(lowerKey) ||
+      item.pyStr?.toLowerCase().includes(lowerKey) ||
+      item.adviceBusNo?.toLowerCase().includes(lowerKey)
+    );
+  });
+};
+
+// transfer 组件实际显示的数据（受搜索词影响）
+const transferData = computed(() => buildTransferData(filterData(searchKey.value)));
+// 当前显示的条数
+const filteredCount = computed(() => filterData(searchKey.value).length);
 
 const getList = async () => {
   await loadAllData();
 };
 
-let searchTimer = null;
 const handleSearch = () => {
-  clearTimeout(searchTimer);
+  // 搜索时保持已选中的项目不受影响
-  searchTimer = setTimeout(() => {
-    loadAllData();
-  }, 300);
 };
-// 编辑初始化标志：避免 applyEditTransferSelection 设置 transferValue 时触发 projectWithDepartment 覆盖 descJson 中的科室值
-const isInitializing = ref(false);
 const transferValue = ref([]);
 const form = reactive({
   // categoryType: '', // 项目类别
@@ -248,31 +259,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();
 });
 /**
@@ -286,17 +273,13 @@ const projectWithDepartment = (selectProjectIds, type) => {
   const arr = [];
   // 根据选中的项目id查找对应的项目（从全部原始数据中查找）
   selectProjectIds.forEach((element) => {
-    let searchData = applicationListAll.value.find((item) => {
+    const searchData = applicationListAll.value.find((item) => {
       return element == item.adviceDefinitionId;
     });
-    if (!searchData) {
-      searchData = selectedItemsCache.value.get(element);
-    }
     if (searchData) {
       const priceInfo = searchData.priceList?.[0] || {};
-      const price = searchData.price != null ? Number(searchData.price).toFixed(2)
+      const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
-        : priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
+      const unit = searchData.unitCode_dictText || searchData.unitCode || '';
-      const unit = searchData.unitCodeDictText || searchData.unitCode_dictText || searchData.unitCode || '';
       arr.push({
         adviceDefinitionId: searchData.adviceDefinitionId,
         orgId: searchData.orgId,
@@ -305,9 +288,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) {
@@ -327,8 +309,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) {
         // 提交时用户未手动选择科室，才提示错误
@@ -344,10 +326,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;
       }
     }
   }
@@ -357,123 +339,47 @@ const projectWithDepartment = (selectProjectIds, type) => {
 watch(
   () => transferValue.value,
   (newValue) => {
-    if (skipDeptAutoFill.value) return;
-    if (isInitializing.value) return;
-    newValue.forEach((id) => {
-      if (!selectedItemsCache.value.has(id)) {
-        const item = applicationListAll.value.find((i) => i.adviceDefinitionId == id);
-        if (item) selectedItemsCache.value.set(id, item);
-      }
-    });
     projectWithDepartment(newValue, 1);
   }
 );
 
-/** 编辑弹窗：根据申请单明细把右侧「已选择」与 transferValue 对齐（依赖 applicationListAll 已加载） */
+// 编辑模式下，回显已有数据
-const applyEditTransferSelection = () => {
-  const newData = props.editData
-  if (!newData?.requestFormId || !newData.requestFormDetailList?.length) {
-    return
-  }
-  if (!applicationListAll.value.length) {
-    return
-  }
-  const selectedIds = []
-  for (const detail of newData.requestFormDetailList) {
-    const idFromDetail = detail.activityId ?? detail.adviceDefinitionId
-    let matched = null
-    if (idFromDetail != null && idFromDetail !== '') {
-      matched = applicationListAll.value.find(
-        (item) => String(item.adviceDefinitionId) === String(idFromDetail)
-      )
-    }
-    if (!matched && detail.adviceName) {
-      matched = applicationListAll.value.find((item) => item.adviceName === detail.adviceName)
-    }
-    if (!matched && detail.adviceName) {
-      const norm = (s) => String(s || '').trim()
-      matched = applicationListAll.value.find(
-        (item) => norm(item.adviceName) === norm(detail.adviceName)
-      )
-    }
-    if (matched) {
-      selectedIds.push(matched.adviceDefinitionId)
-    }
-  }
-  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 / 项目名称',
-      newData.requestFormDetailList
-    )
-  }
-}
-
-// 编辑模式下，回显已有数据（表单来自 descJson；项目选择在字典加载后由 applyEditTransferSelection 完成）
 watch(
   () => props.editData,
   (newData) => {
-    if (!newData || !newData.requestFormId) return
+    if (!newData || !newData.requestFormId) return;
 
+    // 解析 descJson 回填表单
     if (newData.descJson) {
       try {
-        const obj = JSON.parse(newData.descJson)
+        const obj = JSON.parse(newData.descJson);
         Object.keys(form).forEach((key) => {
           if (obj[key] !== undefined) {
-            form[key] = obj[key]
+            form[key] = obj[key];
           }
-        })
+        });
-        applyTargetDepartmentEcho()
       } catch (e) {
-        console.error('解析 descJson 失败:', e)
+        console.error('解析 descJson 失败:', e);
       }
     }
 
-    applyEditTransferSelection()
+    // 回填已选项目
+    if (newData.requestFormDetailList && newData.requestFormDetailList.length > 0) {
+      // 从全部数据中匹配已选项目
+      const selectedIds = [];
+      newData.requestFormDetailList.forEach((detail) => {
+        const matched = applicationListAll.value.find(
+          (item) => item.adviceName === detail.adviceName
+        );
+        if (matched) {
+          selectedIds.push(matched.adviceDefinitionId);
+        }
+      });
+      transferValue.value = selectedIds;
+    }
   },
-  { immediate: true, deep: true }
+  { immediate: true }
-)
-
-watch(
-  () => orgOptions.value,
-  () => {
-    applyTargetDepartmentEcho()
-  }
-)
-
-// 编辑模式下，项目字典首次加载完成后回显已选项目（搜索刷新不重置）
-watch(
-  () => applicationListAll.value,
-  () => {
-    if (!props.editData?.requestFormId) return;
-    if (!props.editData.requestFormDetailList?.length) return;
-    if (!applicationListAll.value.length) return;
-    if (searchKey.value) return;
-
-    const selectedIds = [];
-    props.editData.requestFormDetailList.forEach((detail) => {
-      const matched = applicationListAll.value.find(
-        (item) => item.adviceName === detail.adviceName
-      );
-      if (matched) {
-        selectedIds.push(matched.adviceDefinitionId);
-      }
-    });
-    isInitializing.value = true;
-    transferValue.value = selectedIds;
-    isInitializing.value = false;
-    applyEditTransferSelection();
-  }
 );
-
 const submit = () => {
   if (transferValue.value.length == 0) {
     return proxy.$message.error('请选择申请单');
@@ -481,29 +387,26 @@ const submit = () => {
   if (!projectWithDepartment(transferValue.value, 2)) {
     return;
   }
-  let applicationListAllFilter = transferValue.value.map((id) => {
+  let applicationListAllFilter = applicationListAll.value.filter((item) => {
-    let item = applicationListAll.value.find((i) => i.adviceDefinitionId == id);
+    return transferValue.value.includes(item.adviceDefinitionId);
-    if (!item) {
+  });
-      item = selectedItemsCache.value.get(id);
+  applicationListAllFilter = applicationListAllFilter.map((item) => {
-    }
-    if (!item) return null;
-    const priceInfo = item.priceList?.[0] || {};
     return {
       adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
       quantity: 1, // /** 请求数量 */
-      unitCode: item.unitCode || priceInfo.unitCode || '' /** 请求单位编码 */,
+      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
-      unitPrice: item.price ?? priceInfo.price ?? 0 /** 单价 */,
+      unitPrice: item.priceList[0].price /** 单价 */,
-      totalPrice: item.price ?? priceInfo.price ?? 0 /** 总价 */,
+      totalPrice: item.priceList[0].price /** 总价 */,
       positionId: form.targetDepartment || item.positionId, // 用户指定发往科室优先于项目默认执行科室
-      ybClassEnum: item.ybClassEnum || '', //类别医保编码
+      ybClassEnum: item.ybClassEnum, //类别医保编码
-      conditionId: item.conditionId || '', //诊断ID
+      conditionId: item.conditionId, //诊断ID
-      encounterDiagnosisId: item.encounterDiagnosisId || '', //就诊诊断id
+      encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
-      adviceType: item.adviceType || 3, ///** 医嘱类型 */
+      adviceType: item.adviceType, ///** 医嘱类型 */
-      definitionId: item.chargeItemDefinitionId || priceInfo.definitionId || '', //费用定价主表ID */
+      definitionId: item.priceList[0].definitionId, //费用定价主表ID */
-      definitionDetailId: item.definitionDetailId || priceInfo.definitionDetailId || '', //费用定价子表ID */
+      definitionDetailId: item.definitionDetailId, //费用定价子表ID */
       accountId: patientInfo.value.accountId, // // 账户id
     };
-  }).filter(Boolean);
+  });
   const params = {
     activityList: applicationListAllFilter,
     patientId: patientInfo.value.patientId, //患者ID
@@ -518,7 +421,6 @@ const submit = () => {
     if (res.code === 200) {
       proxy.$message.success(isEditMode.value ? '修改成功' : res.msg);
       transferValue.value = [];
-      selectedItemsCache.value.clear();
       emits('submitOk');
     } else {
       proxy.$message.error(res.message);
@@ -527,9 +429,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

@@ -207,7 +207,6 @@ import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
 import {getExaminationPage, saveCheckd} from './api';
-import {ActivityCategory} from '@/utils/medicalConstants';
 import {ElMessage, ElMessageBox} from 'element-plus';
 import {WarningFilled, Warning, Refresh, Files, Document, EditPen, Aim, DocumentCopy} from '@element-plus/icons-vue';
 
@@ -277,7 +276,6 @@ const getList = () => {
     pageNo: 1,
     pageSize: 5000,
     searchKey: '',
-    categoryCode: ActivityCategory.TEST,
   })
     .then((res) => {
       if (res.code === 200 && res.data?.records) {
@@ -430,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/applicationForm/surgery.vue

@@ -232,21 +232,64 @@ onMounted(() => {
  * type(1：watch监听类型 2:点击保存类型)
  * selectProjectIds(选中项目的id数组)
  * */
-const projectWithDepartment = (selectProjectIds) => {
+const projectWithDepartment = (selectProjectIds, type) => {
-  if (!selectProjectIds || selectProjectIds.length === 0) {
+  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
-    form.targetDepartment = '';
+  let isRelease = true;
+  // 选中项目的数组
+  const arr = [];
+  // 根据选中的项目id查找对应的项目
+  selectProjectIds.forEach((element) => {
+    const searchData = applicationList.value.find((item) => {
+      return element == item.adviceDefinitionId;
+    });
+    arr.push(searchData);
+  });
+  // 清空科室
+  form.targetDepartment = '';
+  if (arr.length > 0) {
+    const obj = arr[0];
+    // 判断科室是否相同
+    const isCompare = arr.every((item) => {
+      return item.orgId == obj.orgId;
+    });
+    if (!isCompare) {
+      ElMessage({
+        type: 'error',
+        message: '执行科室不同',
+      });
+      isRelease = false;
+    }
+    // 选中项目中的执行科室id与全部科室数据做匹配
+    const findItem = findTreeItem(orgOptions.value, obj.orgId);
+
+    if (!findItem) {
+      isRelease = false;
+      ElMessage({
+        type: 'error',
+        message: '未找到项目执行的科室',
+      });
+    }
+    if (type == 1) {
+      if (isRelease) {
+        form.targetDepartment = findItem.id;
+      }
+    }
   }
+  return isRelease;
 };
 // 监听选择项目变化
-watch(() => transferValue.value, (newValue) => {
+watch(
-  projectWithDepartment(newValue);
+  () => transferValue.value,
-});
+  (newValue) => {
+    projectWithDepartment(newValue, 1);
+  }
+);
 const submit = () => {
   if (transferValue.value.length == 0) {
-    return proxy.$message.error('请选择手术项目');
+    return proxy.$message.error('请选择申请单');
   }
-  if (!form.targetDepartment) {
+  if (!projectWithDepartment(transferValue.value, 2)) {
-    return proxy.$message.error('请选择发往科室');
+    return;
   }
   let applicationListAllFilter = applicationListAll.value.filter((item) => {
     return transferValue.value.includes(item.adviceDefinitionId);
@@ -259,7 +302,7 @@ const submit = () => {
       unitCode: item.unitCode,
       unitPrice: item.price,
       totalPrice: item.price,
-      positionId: form.targetDepartment || item.positionId, // 用户手动选择的发往科室优先于项目默认执行科室
+      positionId: item.positionId,
       definitionId: item.chargeItemDefinitionId,
       accountId: patientInfo.value.accountId,
     };

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

@@ -198,7 +198,7 @@
                     v-model="scope.row.adviceName"
                     placeholder="请选择项目"
                     @input="handleChange"
-                    @focus="handleFocus(scope.row, scope.$index)"
+                    @click="handleFocus(scope.row, scope.$index)"
                     @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
                     @keydown="
                       (e) => {
@@ -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([]);
@@ -607,26 +605,13 @@ function getListInfo(addNewRow) {
       prescriptionList.value = res.data
         .map((item) => {
           const parsedContent = JSON.parse(item.contentJson);
-          // 构造 unitCodeList，确保编辑时下拉框有正确的选项
-          console.log('【DEBUG】unitCode:', parsedContent?.unitCode, typeof parsedContent?.unitCode, 'unitCodeList:', JSON.stringify(parsedContent?.unitCodeList));
-          const unitCodeListData = parsedContent?.unitCodeList || [
-            { value: String(parsedContent?.unitCode ?? item.unitCode ?? ''), label: parsedContent?.unitCode_dictText ?? item.unitCode_dictText ?? '', type: 'unit' },
-            { value: String(parsedContent?.doseUnitCode ?? ''), label: parsedContent?.doseUnitCode_dictText ?? '', type: 'dose' },
-            { value: String(parsedContent?.minUnitCode ?? ''), label: parsedContent?.minUnitCode_dictText ?? '', type: 'minUnit' },
-          ];
           return {
             ...parsedContent,
             ...item,
-            // 🔧 修复：contentJson 中的 totalPrice 优先于 charge_item 表的 totalPrice
-            // charge_item.totalPrice 可能为 0 或 null（新建医嘱时），导致总金额显示为 "-"
-            totalPrice: parsedContent?.totalPrice || item.totalPrice,
             isEdit: false,
             showPopover: false,
             doseQuantity: parsedContent?.doseQuantity,
             doseUnitCode_dictText: parsedContent?.doseUnitCode_dictText,
-            // 确保 unitCode 为字符串类型，与 unitCodeList 的 option value 类型一致
-            unitCode: String(parsedContent?.unitCode ?? item.unitCode ?? ''),
-            unitCodeList: unitCodeListData,
             // 确保 therapyEnum 被正确设置，优先使用 contentJson 中的值
             therapyEnum: String(parsedContent?.therapyEnum ?? item.therapyEnum ?? '1'),
             // 🔧 修复：确保 orgId 为 String 类型，与 organization 树的 id 类型一致
@@ -640,10 +625,6 @@ function getListInfo(addNewRow) {
           };
         })
         .sort((a, b) => {
-          // 没有 requestTime 的项（新增/组套添加）排在最前面
-          if (!a.requestTime && !b.requestTime) return 0;
-          if (!a.requestTime) return -1;
-          if (!b.requestTime) return 1;
           return new Date(b.requestTime) - new Date(a.requestTime);
         });
       getGroupMarkers(); // 更新标记
@@ -810,7 +791,7 @@ function checkUnit(item, row) {
   }
 }
 
-// 行双击打开编辑块：待保存、待签发医嘱均可编辑；已签发/已完成/停止不允许编辑
+// 行双击打开编辑块，仅待发送的可编辑
 function clickRowDb(row, column, event) {
   // 检查点击的是否是复选框
   if (event && event.target.closest('.el-checkbox')) {
@@ -821,18 +802,14 @@ function clickRowDb(row, column, event) {
     return;
   }
   row.showPopover = false;
-  if (row.statusEnum == 1) {
+  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
+  if (row.statusEnum == 1 && !row.requestId) {
     // 确保治疗类型为字符串，方便与单选框 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('仅待保存或待签发医嘱允许编辑');
   }
 }
 
@@ -900,21 +877,31 @@ function handleDiagnosisChange(item) {
 function handleFocus(row, index) {
   rowIndex.value = index;
   row.showPopover = true;
-  // Bug #555: handleFocus 只负责开 popover 和初始化查询参数，搜索由 handleChange 统一处理
-  // 避免异步 refresh 用旧闭包 searchKey 覆盖 handleChange 的搜索结果
   const adviceType = row.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
-  let categoryCode = '';
+  // 用 adviceType + categoryCode 组合查找匹配的选项
-  if (row.adviceType !== undefined) {
+  const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType;
-    const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType;
+  const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-    const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
+  // If the row has an explicit adviceType (saved/existing row), use its own categoryCode.
-    categoryCode = selectedItem ? selectedItem.categoryCode : (row.categoryCode || '');
+  // If no type is selected (new row), use empty string for global search across all categories.
-  }
+  const categoryCode = selectedItem ? selectedItem.categoryCode : (row.adviceType != null ? (row.categoryCode || '') : '');
-  adviceQueryParams.value = { adviceType, categoryCode, searchKey: '' };
+  const searchKey = row.adviceName || '';
-  // handleFocus 打开 popover 时也要加载数据
+
-  const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
+  nextTick(() => {
-  if (tableRef && tableRef.refresh) {
+    nextTick(() => {
-    tableRef.refresh(adviceType, categoryCode, '');
+      const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
-  }
+      if (tableRef && tableRef.refresh) {
+        tableRef.refresh(adviceType, categoryCode, searchKey);
+      } else {
+        // fallback: 如果双重 nextTick 仍未挂载，延迟 100ms 再试
+        setTimeout(() => {
+          const tableRef2 = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
+          if (tableRef2 && tableRef2.refresh) {
+            tableRef2.refresh(adviceType, categoryCode, searchKey);
+          }
+        }, 100);
+      }
+    });
+  });
 }
 
 function handleBlur(row) {
@@ -923,24 +910,20 @@ function handleBlur(row) {
 
 function handleChange(value) {
   adviceQueryParams.value.searchKey = value;
-  // @focus 已先于 @input 执行，rowIndex 必定有效
+  // 搜索词变化时，调用当前行子组件的 refresh 方法
-  const currentIndex = rowIndex.value;
+  const index = rowIndex.value;
-  if (currentIndex < 0) return;
+  if (index >= 0) {
-  const row = filterPrescriptionList.value[currentIndex];
+    const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[index] : adviceTableRef.value;
-  // popover 被 blur 关闭后，用户继续输入时自行打开
+    if (tableRef && tableRef.refresh) {
-  if (!row.showPopover) {
+      const row = filterPrescriptionList.value[index];
-    row.showPopover = true;
+      const adviceType = row?.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
-  }
+      // 用 adviceType + categoryCode 组合查找匹配的选项
-  const tableRef = Array.isArray(adviceTableRef.value) ? adviceTableRef.value[currentIndex] : adviceTableRef.value;
-  if (tableRef && tableRef.refresh) {
-    const adviceType = row?.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
-    let categoryCode = '';
-    if (row?.adviceType !== undefined) {
       const selectValue = (adviceType == 1 && row?.categoryCode) ? '1-' + row.categoryCode : adviceType;
       const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-      categoryCode = selectedItem ? selectedItem.categoryCode : (adviceQueryParams.value.categoryCode || '');
+      // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+      const categoryCode = selectedItem ? selectedItem.categoryCode : (row?.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
+      tableRef.refresh(adviceType, categoryCode, value);
     }
-    tableRef.refresh(adviceType, categoryCode, value);
   }
 }
 
@@ -1199,7 +1182,7 @@ function handleSave() {
     // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
     loading.value = true;
     let list = saveList.map((item) => {
-      const parsedContent = item.contentJson ? JSON.parse(item.contentJson) : {};
+      const parsedContent = JSON.parse(item.contentJson);
       return {
         ...parsedContent,
         adviceType: item.adviceType,
@@ -1397,9 +1380,7 @@ function handleSaveSign(row, index) {
       }
     });
   } else {
-    // 仅通过【新增】按钮创建的医嘱保存后才自动添加下一行空医嘱
+    if (prescriptionList.value[0].adviceName) {
-    // 双击编辑已有"待保存"医嘱保存时，不应自动添加空行
-    if (isAdding.value && prescriptionList.value[0].adviceName) {
       handleAddPrescription();
     }
   }
@@ -1460,14 +1441,14 @@ function handleSaveBatch() {
 function setValue(row) {
   // 构造单位列表
   unitCodeList.value = [
-    { value: String(row.unitCode), label: row.unitCode_dictText, type: 'unit' },
+    { value: row.unitCode, label: row.unitCode_dictText, type: 'unit' },
     {
-      value: String(row.doseUnitCode),
+      value: row.doseUnitCode,
       label: row.doseUnitCode_dictText,
       type: 'dose',
     },
     {
-      value: String(row.minUnitCode),
+      value: row.minUnitCode,
       label: row.minUnitCode_dictText,
       type: 'minUnit',
     },
@@ -1533,8 +1514,8 @@ function setValue(row) {
     // dose: undefined, Removed to preserve dose value from group package
     unitCodeList: unitCodeList.value,
     doseUnitCode: row.doseUnitCode,
-    minUnitCode: String(row.minUnitCode),
+    minUnitCode: row.minUnitCode,
-    unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode) : String(row.unitCode),
+    unitCode: row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode,
     categoryEnum: row.categoryCode,
     definitionId: row.chargeItemDefinitionId,
     executeNum: 1,
@@ -1550,13 +1531,6 @@ function setValue(row) {
             ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
             : prevRow.minUnitPrice,
           positionName: selectedStock?.locationName,
-          totalPrice: row.quantity
-            ? (String(row.unitCode) == String(row.minUnitCode)
-              ? (row.quantity * (selectedStock
-                  ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
-                  : prevRow.minUnitPrice)).toFixed(6)
-              : (row.quantity * (selectedStock?.price ?? 0)).toFixed(6))
-            : undefined,
         }
       : {
           quantity: 1,
@@ -1577,24 +1551,11 @@ function handleSaveGroup(orderGroupList) {
 
   let successCount = 0;
 
-  // 收集所有要添加的新行，最后统一 unshift 到数组开头（置顶显示）
-  const newRows = [];
-
-  // 记录循环前的数组长度，用于清理循环中创建的临时行
-  const originalLength = prescriptionList.value.length;
-
   orderGroupList.forEach((item) => {
-    // 使用临时索引，先追加到末尾用于 setValue 填充
+    rowIndex.value = prescriptionList.value.length;
-    const tempIndex = prescriptionList.value.length;
-    prescriptionList.value[tempIndex] = {
-      uniqueKey: nextId.value++,
-      isEdit: false,
-      statusEnum: 1,
-    };
 
     if (!item) {
       console.warn('组套中的项目为空');
-      prescriptionList.value.splice(tempIndex, 1);
       return;
     }
 
@@ -1620,12 +1581,18 @@ function handleSaveGroup(orderGroupList) {
       therapyEnum: item.orderDetailInfos?.therapyEnum || '1',
     };
 
-    rowIndex.value = tempIndex;
+    // 预初始化空行（组套项带预填值，设为 false 让明细字段在表格中直接展示）
+    prescriptionList.value[rowIndex.value] = {
+      uniqueKey: nextId.value++,
+      isEdit: false,
+      statusEnum: 1,
+    };
+
     setValue(mergedDetail);
 
     // 创建新的处方项目
     const newRow = {
-      ...prescriptionList.value[tempIndex],
+      ...prescriptionList.value[rowIndex.value],
       patientId: patientInfo.value.patientId,
       encounterId: patientInfo.value.encounterId,
       accountId: accountId.value,
@@ -1644,14 +1611,11 @@ function handleSaveGroup(orderGroupList) {
       orgId: resolveOrgId(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
       // 🔧 修复：同时存储 orgName，确保树匹配不到时仍有中文名称可显示
       orgName: findOrgName(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
-      dbOpType: prescriptionList.value[tempIndex].requestId ? '2' : '1',
+      dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
       conditionId: conditionId.value,
       conditionDefinitionId: conditionDefinitionId.value,
       encounterDiagnosisId: encounterDiagnosisId.value,
-      diagnosisName: diagnosisName.value,
+      therapyEnum: prescriptionList.value[rowIndex.value]?.therapyEnum || mergedDetail.therapyEnum || '1',
-      therapyEnum: prescriptionList.value[tempIndex]?.therapyEnum || mergedDetail.therapyEnum || '1',
-      // 🔧 修复：确保组套医嘱的 categoryEnum 被正确映射，防止后端 NPE
-      categoryEnum: mergedDetail?.categoryEnum || mergedDetail?.categoryCode || item?.categoryCode,
     };
 
     // 计算价格和总量
@@ -1668,14 +1632,11 @@ function handleSaveGroup(orderGroupList) {
     }
 
     newRow.contentJson = JSON.stringify(newRow);
-    newRows.push(newRow);
+    prescriptionList.value[rowIndex.value] = newRow;
     successCount++;
   });
-
+  
-  // 清理循环中创建的临时行，统一添加到数组开头（置顶显示）
+  if (successCount > 0) {
-  if (newRows.length > 0) {
-    prescriptionList.value.splice(originalLength); // 移除循环中追加到末尾的临时行
-    prescriptionList.value.unshift(...newRows);
     proxy.$modal.msgSuccess(`成功添加 ${successCount} 个医嘱项`);
   }
 }
@@ -1695,8 +1656,6 @@ function handleSaveHistory(value) {
     encounterDiagnosisId: encounterDiagnosisId.value,
     // 确保 therapyEnum 被正确传递，默认为长期医嘱('1')
     therapyEnum: value.therapyEnum || '1',
-    // 🔧 修复：历史医嘱的 categoryCode(String) 映射为后端 categoryEnum(Integer)，防止 NPE
-    categoryEnum: value.categoryEnum || value.categoryCode,
     contentJson: JSON.stringify({
       ...value,
       therapyEnum: value.therapyEnum || '1',

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

@@ -22,6 +22,9 @@
             <el-tab-pane label="检查申请" name="examine">
               <ExamineApplication ref="examineApplicationRef" />
             </el-tab-pane>
+            <!-- <el-tab-pane label="汇总发药申请" name="summaryDrug">
+              <SummaryDrugApplication ref="summaryDrugApplicationRef" />
+            </el-tab-pane> -->
             <el-tab-pane label="手术申请" name="surgery">
               <SurgeryApplication ref="surgeryApplicationRef" />
             </el-tab-pane>

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

@@ -46,8 +46,7 @@
     <div style="display: flex; gap: 20px; height: 70vh">
       <div
         style="
-          width: 350px;
+          width: 250px;
-          min-width: 350px;
           border: 1px solid #e4e7ed;
           border-radius: 4px;
           display: flex;
@@ -71,35 +70,21 @@
               <span class="status-dot"></span>
               {{ getItemType_Text(item.adviceType) }}
             </div>
-            <el-tooltip :content="item.adviceName" placement="top" :show-after="500">
+            <div class="item-name">{{ item.adviceName }}</div>
-              <div class="item-name">{{ item.adviceName }}</div>
+            <div class="item-name">
-            </el-tooltip>
+              {{
-            <el-tooltip
-              :content="
                 item.priceList && item.priceList.length > 0
-                  ? (item.priceList[0].price / item.partPercent).toFixed(2) + '元/' + item.minUnitCode_dictText
+                  ? (item.priceList[0].price / item.partPercent).toFixed(2) +
+                    '元' +
+                    '/' +
+                    item.minUnitCode_dictText
                   : ''
-              "
+              }}
-              placement="top"
+            </div>
-              :show-after="500"
+            <div class="item-name" v-if="item.adviceType === 2">
-            >
+              库存数量：
-              <div class="item-name">
+              {{ handleQuantity(item) }}
-                {{
+            </div>
-                  item.priceList && item.priceList.length > 0
-                    ? (item.priceList[0].price / item.partPercent).toFixed(2) +
-                      '元' +
-                      '/' +
-                      item.minUnitCode_dictText
-                    : ''
-                }}
-              </div>
-            </el-tooltip>
-            <el-tooltip v-if="item.adviceType === 2" :content="'库存数量：' + handleQuantity(item)" placement="top" :show-after="500">
-              <div class="item-name">
-                库存数量：
-                {{ handleQuantity(item) }}
-              </div>
-            </el-tooltip>
           </div>
           <!-- 只显示暂无数据文本 -->
           <div
@@ -323,7 +308,7 @@
 import {computed, getCurrentInstance, onMounted, reactive, ref, watch} from 'vue';
 import {ElMessage} from 'element-plus';
 import {formatDateStr} from '@/utils/index';
-import {getAdviceBaseInfo, getDiseaseTreatmentInitLoc, getOrgList, getOrgLocConfig} from './api.js';
+import {getAdviceBaseInfo, getDiseaseTreatmentInitLoc, getOrgList} from './api.js';
 import {getOrderGroup} from '@/views/doctorstation/components/api.js';
 import useUserStore from '@/store/modules/user';
 
@@ -363,14 +348,13 @@ 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: '' }];
   }
   // 默认值
   return [
-    { label: '耗材', value: 2 },
+    { label: '耗材', value: 4 },
     { label: '诊疗', value: 3 },
     { label: '全部', value: '' },
   ];
@@ -381,7 +365,6 @@ const executeTime = ref('');
 const departmentOptions = ref([]);
 const AdviceBaseInfoList = ref([]);
 const locationOptions = ref([]);
-const consumableDefaultLocId = ref(null); // 患者科室耗材默认库房ID（来自取药科室配置）
 const searchText = ref('');
 const userId = ref('');
 const orgId = ref('');
@@ -390,8 +373,7 @@ const filterKeywords = ref({});
 const queryParams = ref({
   pageSize: 100,
   pageNum: 1,
-  // 默认加载全部类型（药品1+耗材2+诊疗3）
+  adviceTypes: '2,3',
-  adviceTypes: [1, 2, 3],
 });
 /**
  * 医嘱提交数据模型
@@ -487,8 +469,11 @@ onMounted(() => {
   const userStore = useUserStore();
   userId.value = userStore.id;
   orgId.value = userStore.orgId;
+  console.log(props.patientInfo, 'patientInfo in FeeDialog');
   console.log('initialData in FeeDialog');
-  // 数据加载由 watch(visible) 统一触发，避免 patientInfo 未就绪时调用报错
+  loadDepartmentOptions();
+  getAdviceBaseInfos();
+  getDiseaseInitLoc();
 });
 
 // 监听弹窗显示状态
@@ -497,12 +482,9 @@ watch(
   (visible) => {
     if (visible) {
       executeTime.value = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
-      consumableDefaultLocId.value = null; // 重置耗材默认库房，避免复用上次患者配置
+      // 弹窗打开时重新加载科室和位置选项，确保数据最新
-      // 弹窗打开时按当前患者科室重新加载，避免复用上一次患者/登录科室的结果
       loadDepartmentOptions();
-      getAdviceBaseInfos();
       getDiseaseInitLoc(16);
-      loadConsumableDefaultLoc();
     } else {
       resetData();
     }
@@ -531,16 +513,7 @@ watch(
     if (!locs || locs.length === 0) return;
     feeItemsList.value.forEach(item => {
       if (item.adviceType === 2 && !item.positionId) {
-        if (consumableDefaultLocId.value) {
+        item.positionId = String(locs[0].value);
-          const matched = locs.find(d => String(d.value) === consumableDefaultLocId.value);
-          if (matched) {
-            item.positionId = String(matched.value);
-          } else {
-            ElMessage.warning(`"${item.adviceName}" 未找到匹配的执行科室，请手动选择`);
-          }
-        } else {
-          ElMessage.warning(`"${item.adviceName}" 所在科室未配置耗材执行科室，请手动选择`);
-        }
       }
     });
   }
@@ -582,61 +555,26 @@ function loadDepartmentOptions() {
 function getAdviceBaseInfos() {
   adviceLoading.value = true;
   queryParams.value.searchKey = searchText.value;
-  // 字典值(3=诊疗,4=耗材)映射为后端adviceType(2=耗材,3=诊疗)
+  queryParams.value.adviceType = adviceType.value;
-  if (adviceType.value === 4) {
-    queryParams.value.adviceTypes = [2];
-  } else if (adviceType.value === 3) {
-    queryParams.value.adviceTypes = [3];
-  } else {
-    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) => {
-      const list = res.data?.records || [];
+      AdviceBaseInfoList.value = res.data?.records || [];
-      // 药品(1)和耗材(2)必须有库存才能展示，诊疗(3)无库存概念不过滤
-      AdviceBaseInfoList.value = list.filter(item => {
-        if (item.adviceType === 1 || item.adviceType === 2) {
-          return item.inventoryList && item.inventoryList.length > 0;
-        }
-        return true;
-      });
     })
     .finally(() => {
       adviceLoading.value = false;
     });
 }
 function getDiseaseInitLoc() {
-  // 16=药房，17=耗材库，合并后作为耗材执行科室下拉选项
+  getDiseaseTreatmentInitLoc(16)
-  Promise.all([
+    .then((response) => {
-    getDiseaseTreatmentInitLoc(16).catch(() => ({ data: { locationOptions: [] } })),
+      console.log('Disease Treatment Init Loc:', response);
-    getDiseaseTreatmentInitLoc(17).catch(() => ({ data: { locationOptions: [] } })),
+      locationOptions.value = response.data.locationOptions;
-  ]).then(([pharmacyRes, warehouseRes]) => {
-    const pharmacies = pharmacyRes.data?.locationOptions || [];
-    const warehouses = warehouseRes.data?.locationOptions || [];
-    locationOptions.value = [...pharmacies, ...warehouses];
-  });
-}
-
-/**
- * 查询患者科室的耗材默认库房（取药科室配置 itemCode=2）
- */
-function loadConsumableDefaultLoc() {
-  const deptId = props.patientInfo?.organizationId;
-  if (!deptId) {
-    consumableDefaultLocId.value = null;
-    return;
-  }
-  getOrgLocConfig({ organizationId: deptId, itemCode: '2', pageNo: 1, pageSize: 100 })
-    .then((res) => {
-      const records = res.data?.records || [];
-      consumableDefaultLocId.value = records.length > 0 ? String(records[0].defLocationId) : null;
     })
     .catch(() => {
-      consumableDefaultLocId.value = null;
+      console.warn('位置列表加载失败（可能无权限）');
+      locationOptions.value = [];
     });
 }
 // 下拉框模糊搜索过滤（自定义filter-method，配合element-plus filterable使用）
@@ -667,12 +605,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 缺失时用字典文本兜底
@@ -787,19 +719,8 @@ function selectChange(row) {
       defaultPositionId = String(departmentOptions.value[0].id);
     }
   } else if (row.adviceType === 2 && locationOptions.value.length > 0) {
-    // 耗材：必须从取药科室配置中匹配默认库房，未配置则提示用户
+    // 耗材：默认取第一个药房/耗材房
-    if (consumableDefaultLocId.value) {
+    defaultPositionId = String(locationOptions.value[0].value);
-      const matched = locationOptions.value.find(
-        d => String(d.value) === consumableDefaultLocId.value
-      );
-      if (matched) {
-        defaultPositionId = String(matched.value);
-      } else {
-        ElMessage.warning(`"${row.adviceName}" 未找到匹配的执行科室，请手动选择`);
-      }
-    } else {
-      ElMessage.warning(`"${row.adviceName}" 所在科室未配置耗材执行科室，请手动选择`);
-    }
   }
   //插入费用列表
   feeItemsList.value.push({
@@ -1077,8 +998,6 @@ function applyGroupSet() {
   font-weight: 600;
   color: #303133;
   margin-bottom: 8px;
-  overflow: hidden;
+  word-break: break-word;
-  text-overflow: ellipsis;
-  white-space: nowrap;
 }
 </style>

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/api.js

@@ -111,16 +111,6 @@ export function getDiseaseTreatmentInitLoc(id) {
     method: 'get',
   });
 }
-/**
- * 查询科室取药配置（耗材默认库房）
- */
-export function getOrgLocConfig(params) {
-  return request({
-    url: '/base-data-manage/org-loc/org-loc',
-    method: 'get',
-    params: params,
-  });
-}
 // 住院护士站费用明细
 export function getCostDetail(queryParams) {
   return request({

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/constants/navigation.js

@@ -29,6 +29,12 @@ export const inpatientNurseNavs = [
     icon: 'EditPen',
     accent: '#ff7a45',
   },
+  {
+    label: '汇总发药申请',
+    path: '/inHospital/statistics/drugDistribution',
+    icon: 'Collection',
+    accent: '#597ef7',
+  },
   {
     label: '住院记账',
     path: '/inHospital/statistics/InpatientBilling',

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

@@ -90,13 +90,6 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="医嘱状态" width="100" align="center">
-              <template #default="scope">
-                <el-tag :type="getStatusType(scope.row)" size="small">
-                  {{ getStatusDisplayText(scope.row) }}
-                </el-tag>
-              </template>
-            </el-table-column>
             <el-table-column label="医嘱内容" prop="adviceName">
               <template #default="scope">
                 <span>
@@ -176,43 +169,6 @@ import {formatDateStr} from '@/utils/index';
 import {getCurrentInstance, ref} from 'vue';
 import useUserStore from '@/store/modules/user';
 
-/** 发药状态 → 医嘱状态（药品医嘱状态映射表） */
-const DISPENSE_STATUS_TO_ADVICE_TEXT = {
-  2: '已执行',
-  8: '已提交',
-  4: '已发药',
-};
-
-function getStatusDisplayText(row) {
-  const params = row?.medicineSummaryParamList || [];
-  const pending = params.filter((p) => Number(p.dispenseStatus) !== 8);
-  if (pending.length === 0) {
-    return params.length ? '已提交' : '已执行';
-  }
-  const texts = [
-    ...new Set(
-      pending
-        .map((p) => DISPENSE_STATUS_TO_ADVICE_TEXT[Number(p.dispenseStatus)])
-        .filter(Boolean),
-    ),
-  ];
-  if (texts.length === 1) {
-    return texts[0];
-  }
-  return '已执行';
-}
-
-function getStatusType(row) {
-  const text = getStatusDisplayText(row);
-  if (text === '已发药') {
-    return 'success';
-  }
-  if (text === '已提交') {
-    return 'warning';
-  }
-  return 'primary';
-}
-
 const activeNames = ref([]);
 
 const userStore = useUserStore();
@@ -334,7 +290,6 @@ function handleMedicineSummary() {
   medicineSummary(ids).then((res) => {
     if (res.code == 200) {
       proxy.$message.success('操作成功');
-      handleGetPrescription();
     }
   });
 }

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

@@ -16,13 +16,7 @@
         <el-table-column label="药房" align="center" prop="locationName" />
         <el-table-column label="申请人" align="center" prop="applicantName" />
         <el-table-column label="领药人" align="center" prop="receiverName" />
-        <el-table-column label="医嘱状态" align="center" prop="statusEnum_enumText">
+        <el-table-column label="发药状态" align="center" prop="statusEnum_enumText" />
-          <template #default="scope">
-            <el-tag :type="getSummaryStatusType(scope.row)" size="small">
-              {{ formatSummaryStatusText(scope.row) }}
-            </el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="操作" width="100" align="center">
           <template #default="scope">
             <el-button link type="primary" @click="getDetail(scope.row)">详情</el-button>
@@ -58,35 +52,6 @@ import {getMedicineSummary, getMedicineSummaryDetail} from './api';
 import {patientInfoList} from '../../components/store/patient.js';
 import {getCurrentInstance, ref} from 'vue';
 
-const SUMMARY_STATUS_DISPLAY = {
-  2: '已提交',
-  4: '已发药',
-};
-
-const LEGACY_SUMMARY_STATUS_TEXT = {
-  待配药: '已提交',
-  已发放: '已发药',
-};
-
-function formatSummaryStatusText(row) {
-  const code = Number(row?.statusEnum);
-  if (SUMMARY_STATUS_DISPLAY[code]) {
-    return SUMMARY_STATUS_DISPLAY[code];
-  }
-  return LEGACY_SUMMARY_STATUS_TEXT[row?.statusEnum_enumText] || row?.statusEnum_enumText || '-';
-}
-
-function getSummaryStatusType(row) {
-  const text = formatSummaryStatusText(row);
-  if (text === '已发药') {
-    return 'success';
-  }
-  if (text === '已提交') {
-    return 'warning';
-  }
-  return 'info';
-}
-
 const medicineSummaryFormList = ref([]);
 const medicineSummaryFormDetails = ref([]);
 const dialogVisible = ref(false);

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

@@ -159,13 +159,6 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100" align="center">
-              <template #default="scope">
-                <el-tag :type="getStatusType(scope.row)" size="small">
-                  {{ getStatusDisplayText(scope.row) }}
-                </el-tag>
-              </template>
-            </el-table-column>
             <el-table-column label="医嘱内容" prop="adviceName">
               <template #default="scope">
                 <span>
@@ -236,80 +229,8 @@ import {adviceCancel, adviceExecute, adviceNoExecute, getPrescriptionList} from
 import {patientInfoList} from '../../components/store/patient.js';
 import {lotNumberMatch} from '@/api/public';
 import {formatDateStr} from '@/utils/index';
-import {RequestStatus} from '@/utils/medicalConstants';
 import {getCurrentInstance, nextTick, ref, provide} from 'vue';
 
-/** 请求状态 → 医嘱状态映射表（开具/签发/校对） */
-const REQUEST_STATUS_DISPLAY = {
-  [RequestStatus.DRAFT]: '待签发',
-  [RequestStatus.ACTIVE]: '已签发',
-  [RequestStatus.COMPLETED]: '已校对',
-};
-
-/** 发药状态 → 医嘱状态映射表（汇总申请/发药） */
-const DISPENSE_STATUS_DISPLAY = {
-  8: '已提交',
-  4: '已发药',
-};
-
-/** 执行页签对应的医嘱状态展示 */
-const STATUS_DISPLAY_BY_EXE_TAB = {
-  1: { text: '已校对', type: 'success' },
-  6: { text: '已执行', type: 'success' },
-  5: { text: '不执行', type: 'warning' },
-  9: { text: '取消执行', type: 'info' },
-};
-
-const LEGACY_STATUS_TEXT = {
-  待发送: '待签发',
-  已发送: '已签发',
-  '已发送/待执行': '已签发',
-  已完成: '已校对',
-  待配药: '已提交',
-  已汇总: '已提交',
-  已发放: '已发药',
-};
-
-function getStatusDisplayText(row) {
-  const dispenseCode = Number(row?.dispenseStatus);
-  if (DISPENSE_STATUS_DISPLAY[dispenseCode]) {
-    return DISPENSE_STATUS_DISPLAY[dispenseCode];
-  }
-  const tabText = STATUS_DISPLAY_BY_EXE_TAB[props.exeStatus]?.text;
-  if (tabText) {
-    return tabText;
-  }
-  const requestCode = Number(row?.requestStatus);
-  if (REQUEST_STATUS_DISPLAY[requestCode]) {
-    return REQUEST_STATUS_DISPLAY[requestCode];
-  }
-  return (
-    LEGACY_STATUS_TEXT[row?.requestStatus_enumText] ||
-    LEGACY_STATUS_TEXT[row?.dispenseStatus_enumText] ||
-    row?.requestStatus_enumText ||
-    row?.dispenseStatus_enumText ||
-    '-'
-  );
-}
-
-function getStatusType(row) {
-  const tabType = STATUS_DISPLAY_BY_EXE_TAB[props.exeStatus]?.type;
-  if (tabType) {
-    return tabType;
-  }
-  const status = row?.requestStatus;
-  const map = {
-    1: 'info',
-    2: 'primary',
-    3: 'success',
-    4: 'warning',
-    5: 'danger',
-    6: 'danger',
-    7: 'warning',
-  };
-  return map[status] || 'info';
-}
-
 const activeNames = ref([]);
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');

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

@@ -89,7 +89,7 @@ function handleClick(tabName) {
       // 执行状态待执行
       exeStatus.value = 1;
       // 请求状态已校对
-      requestStatus.value = RequestStatus.COMPLETED;
+      requestStatus.value = 3;
       break;
     case 'completed':
       exeStatus.value = 6;

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">
-                  {{ getStatusDisplayText(scope.row) }}
-                </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,11 +152,10 @@
   </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';
-import {RequestStatus} from '@/utils/medicalConstants';
 
 const activeNames = ref([]);
 const prescriptionList = ref([]);
@@ -173,35 +165,6 @@ const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
 const selectionTrigger = ref(0);
-
-/** 各页签对应的医嘱状态展示文案（与后端枚举值解耦，贴合校对业务语义） */
-const STATUS_DISPLAY_BY_TAB = {
-  [RequestStatus.ACTIVE]: { text: '已签发', type: 'primary' },
-  [RequestStatus.COMPLETED]: { text: '已校对', type: 'success' },
-  [RequestStatus.DRAFT]: { text: '待签发', type: 'info' },
-  [RequestStatus.STOPPED]: { text: '已停止', type: 'danger' },
-};
-
-const getStatusType = (status) => {
-  const tabType = STATUS_DISPLAY_BY_TAB[props.requestStatus]?.type;
-  if (tabType) return tabType;
-  const map = {
-    1: 'info',
-    2: 'primary',
-    3: 'success',
-    4: 'warning',
-    5: 'danger',
-    6: 'danger',
-    7: 'info',
-  };
-  return map[status] || 'info';
-};
-
-const getStatusDisplayText = (row) => {
-  const tabText = STATUS_DISPLAY_BY_TAB[props.requestStatus]?.text;
-  if (tabText) return tabText;
-  return row.requestStatus_enumText || '';
-};
 const hasDispensedSelected = computed(() => {
   selectionTrigger.value;
   return getSelectRows().some(item => item.dispenseStatus === 4);
@@ -219,16 +182,8 @@ function handleRadioChange() {
 
 function handleGetPrescription() {
   if (patientInfoList.value.length > 0) {
-    // 过滤掉 encounterId 无效的患者节点，防止后端 SQL 解析异常
-    const validEncounterIds = patientInfoList.value
-      .map((i) => i.encounterId)
-      .filter((id) => id !== undefined && id !== null && id !== '');
-    if (validEncounterIds.length === 0) {
-      proxy.$message.warning('请选择有效的患者');
-      return;
-    }
     loading.value = true;
-    let encounterIds = validEncounterIds.join(',');
+    let encounterIds = patientInfoList.value.map((i) => i.encounterId).join(',');
     getPrescriptionList({
       encounterIds: encounterIds,
       requestStatus: props.requestStatus,

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

@@ -82,16 +82,16 @@ function handleTabClick(tabName) {
 
   switch (activeTabName) {
     case 'unverified':
-      requestStatus.value = RequestStatus.ACTIVE;
+      requestStatus.value = 2;
       break;
     case 'verified':
-      requestStatus.value = RequestStatus.COMPLETED;
+      requestStatus.value = 3;
       break;
     case 'stopped':
-      requestStatus.value = RequestStatus.STOPPED;
+      requestStatus.value = 6;
       break;
     case 'cancelled':
-      requestStatus.value = RequestStatus.DRAFT;
+      requestStatus.value = 1;
       break;
   }
   // 调用子组件方法

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

@@ -777,9 +777,6 @@ const InputOptions = ref([
 // 日期范围 - 体征信息搜索时间
 const receptionTime = ref(null);
 
-// 按钮禁用状态（保存按钮依赖）
-const buttonDisabled = ref(false);
-
 // 表单数据 - 体征录入
 const formData = ref({
   recordingDate: '',
@@ -850,10 +847,26 @@ function getPatientList() {
       patientId: props.patientId
     }
   }).then((res) => {
-    if (res.code === 200 && res.data) {
+
-      patientList.value = Array.isArray(res.data) ? res.data : (res.data.data || []);
+    // 判断返回的数据结构
+    let data = res.data;
+    if (res.data && res.data.data && typeof res.data.data === 'object') {
+      // 如果是嵌套结构 {data: {data: Array(3)}}
+      data = res.data.data;
+    } else if (res.data && typeof res.data === 'object' && res.data.data !== undefined) {
+      // 如果是 {code: 200, msg: '操作成功', data: Array(3)}
+      data = res.data.data;
+    }
+
+    console.log('=== data 长度 ===', data?.length);
+
+    if (res.code === 200 && data) {
+      console.log('=== 准备赋值 patientList.value ===');
+      patientList.value = data;
+      console.log('=== patientList.value 赋值后 ===', patientList.value);
+      console.log('=== patientList.value 长度 ===', patientList.value?.length);
     } else {
-      patientList.value = [];
+      console.error('=== 查询失败或无数据 ===');
     }
   }).catch(err => {
     console.error('=== 查询报错 ===', err);
@@ -872,22 +885,8 @@ function getPatientDetial() {
   queryParams.value.patientId = props.patientId;
   // 默认查询今天的数据
   const today = moment().format('YYYY-MM-DD');
-  const now = moment();
   receptionTime.value = [today, today];
   formData.value.recordingDate = today;
-  // 自动填充最近的整点时间点（2/6/10/14/18/22点）
-  const hour = now.hour();
-  const timePoints = [2, 6, 10, 14, 18, 22];
-  let nearestHour = timePoints[0];
-  let minDiff = Math.abs(hour - nearestHour);
-  for (const tp of timePoints) {
-    const diff = Math.abs(hour - tp);
-    if (diff < minDiff) {
-      minDiff = diff;
-      nearestHour = tp;
-    }
-  }
-  formData.value.timePoint = String(nearestHour).padStart(2, '0') + '00';
   // 自动加载数据
   getPatientList();
   listPatient(queryParams.value).then((res) => {
@@ -968,29 +967,6 @@ function confirmCharge() {
     encounterId: props.patientInfo.encounterId,
   };
 
-  // 自动获取当前日期和时间
-  const now = moment();
-  if (!params.recordingDate) {
-    params.recordingDate = now.format('YYYY-MM-DD');
-    formData.value.recordingDate = params.recordingDate;
-  }
-  if (!params.timePoint) {
-    // 取最近的整点时间点（2/6/10/14/18/22点）
-    const hour = now.hour();
-    const timePoints = [2, 6, 10, 14, 18, 22];
-    let nearestHour = timePoints[0];
-    let minDiff = Math.abs(hour - nearestHour);
-    for (const tp of timePoints) {
-      const diff = Math.abs(hour - tp);
-      if (diff < minDiff) {
-        minDiff = diff;
-        nearestHour = tp;
-      }
-    }
-    params.timePoint = String(nearestHour).padStart(2, '0') + '00';
-    formData.value.timePoint = params.timePoint;
-  }
-
   // 收集所有录入的体征数据
   const vitalSignsCode = [];
   const vitalSignsValues = [];
@@ -1076,18 +1052,13 @@ function confirmCharge() {
     vitalSignsValues.push(params.stoolVolume);
   }
 
-  // 校验：没有录入任何体征数据时提示用户
-  if (vitalSignsCode.length === 0) {
-    proxy.$modal.msgWarning('请录入患者体征信息');
-    return;
-  }
-
   params.vitalSignsCode = vitalSignsCode;
   params.vitalSignsValues = vitalSignsValues;
+  params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');
 
   addVitalSigns(params).then(res => {
     if (res.code === 200) {
-      proxy.$modal.msgSuccess('保存成功');
+      proxy.msgSuccess('保存成功');
       // 保存成功后刷新列表
       getPatientList();
       // 清空表单
@@ -1117,9 +1088,6 @@ function confirmCharge() {
         stoolVolume: '',
       };
     }
-  }).catch(err => {
-    console.error('保存体征数据失败:', err);
-    proxy.$modal.msgError('保存失败，请重试');
   });
 }
 /** 重置操作表单 */