Compare commits
1 Commits
guanyu
...
bugfix/518
| Author | SHA1 | Date | |
|---|---|---|---|
|
ae8f0bc06b |
@@ -1,66 +0,0 @@
|
||||
# Bug #403 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
**Bug现象**：住院医生工作站应用医嘱组套后，药品明细字段（单次剂量、总量、总金额、药房/科室）丢失。
|
||||
|
||||
**数据流追踪**：
|
||||
|
||||
1. **后端 `getGroupPackageForOrder`** (OrdersGroupPackageAppServiceImpl.java:168)
|
||||
- 查询组套明细 SQL（OrdersGroupPackageAppMapper.xml:37-82）返回：`dose`, `quantity`, `doseQuantity`, `rateCode`, `methodCode`, `dispensePerDuration` 等字段
|
||||
- 通过 `getAdviceBaseInfo` 获取 `AdviceBaseDto` 赋值给 `detail.setOrderDetailInfos()`，包含：`doseUnitCode`, `doseUnitCode_dictText`, `positionId`, `inventoryList`, `priceList`, `partPercent` 等
|
||||
|
||||
2. **前端 `orderGroupDrawer.vue`** `handleUseOrderGroup` (line 568-694)
|
||||
- 对每个组套明细项进行预处理，合并组套字段和医嘱库字段
|
||||
- 通过 `emit('useOrderGroup', processedDetailList)` 发送到父组件
|
||||
|
||||
3. **前端 `inpatientDoctor/home/components/order/index.vue`** `handleSaveGroup` (line 1546-1639)
|
||||
- 接收 `orderGroupList`，对每个 item 调用 `setValue(mergedDetail)` 填充行数据
|
||||
- 然后用 `item` 的字段显式覆盖创建 `newRow`
|
||||
|
||||
**根因定位**：`handleSaveGroup` 在构建 `newRow` 时（line 1594-1617），从 `item` 直接取值覆盖了 `setValue` 设置的值。问题在于：
|
||||
|
||||
1. **`item.unitCodeName` 可能为 undefined**：组套明细 SQL 中 `unitCodeName` 来自字典关联 `sys_dict_data`，如果字典匹配不上则为 null。`newRow` 的 `unitCode_dictText` 直接使用 `item.unitCodeName || ''`，导致显示为空。
|
||||
|
||||
2. **`positionName` 未在 `orderGroupDrawer` 处理项中显式设置**：虽然 `setValue` 会通过库存查询设置 `positionName`，但 `orderGroupDrawer.vue` 的 `handleUseOrderGroup` 没有将 `positionName`（或至少 `orderDetail.positionName`）包含在 processed item 中，导致 `setValue` 的库存查找依赖 `inventoryList`，而 `inventoryList` 来自后端 `AdviceBaseDto`。
|
||||
|
||||
3. **`doseUnitCode_dictText` 依赖 `setValue` 的 `unitCodeList`**：`orderGroupDrawer` 的处理项中没有显式包含 `doseUnitCode_dictText`，完全依赖 `mergedDetail` 中 spread 的 `orderDetail` 字段。
|
||||
|
||||
## 影响范围
|
||||
|
||||
- 前端文件：`openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue`
|
||||
- 前端文件：`openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue`
|
||||
- 影响场景：住院医生工作站和门诊医生工作站应用医嘱组套
|
||||
|
||||
## 修复方案
|
||||
|
||||
**修改 `orderGroupDrawer.vue` 的 `handleUseOrderGroup` 函数**（line 630-688）：
|
||||
|
||||
在 processed item 的 return 对象中显式添加缺失的字段：
|
||||
- `doseUnitCode_dictText`：从 orderDetail 获取剂量单位显示文本
|
||||
- `positionName`：从 orderDetail 获取执行科室/药房名称
|
||||
- `injectFlag` / `injectFlag_enumText`：注射标识
|
||||
- `skinTestFlag` / `skinTestFlag_enumText`：皮试标识
|
||||
- `partPercent`、`partAttributeEnum`、`unitConversionRatio`：用于价格计算的关键字段
|
||||
|
||||
这些字段在 `orderDetail`（AdviceBaseDto）中都有，只是没有在 processed item 的顶层显式设置。`handleSaveGroup` 的 `newRow` 通过 `...prescriptionList.value[rowIndex.value]` spread 能获取到 `setValue` 设置的值，但显式在顶层包含可以确保数据流的完整性。
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 修改代码后，用 `node --check` 验证语法
|
||||
2. 在住院医生工作站测试：选择患者 → 点击组套 → 预览组套 → 应用到当前患者
|
||||
3. 验证表格中显示的字段：单次剂量、总量、总金额、药房/科室均有值
|
||||
|
||||
---
|
||||
|
||||
## 修复结果：✅ 成功，10行改动
|
||||
|
||||
**修改文件**：`openhis-ui-vue3/src/views/doctorstation/components/prescription/orderGroupDrawer.vue`
|
||||
|
||||
**改动说明**：在 `handleUseOrderGroup` 函数的 processed item 中显式添加了以下缺失字段：
|
||||
- `doseUnitCode_dictText`：剂量单位显示文本（如"mg"），用于"单次剂量"列的后缀显示
|
||||
- `positionName`：药房/科室名称，用于"药房/科室"列显示
|
||||
- `injectFlag` / `injectFlag_enumText`：注射药品标识及文本
|
||||
- `skinTestFlag` / `skinTestFlag_enumText`：皮试标识及文本
|
||||
|
||||
**策略**：策略A（直接修复代码逻辑）—— 组套应用时数据预处理缺失部分关键字段，导致父组件 `handleSaveGroup` 构建行数据时无法获取完整信息。补充字段后，`setValue` 和 `newRow` 构造均能正确传递这些数据到表格。
|
||||
10
.husky/pre-commit
Executable file
10
.husky/pre-commit
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env sh
|
||||
# ============================================================
|
||||
# Husky Pre-commit Hook - HIS项目
|
||||
# 配置: 关羽 | 日期: 2026-04-24
|
||||
# 功能: 提交前检查（已禁用）
|
||||
# ============================================================
|
||||
|
||||
# 🔧 已禁用所有检查，直接允许提交
|
||||
echo "⏭️ [Pre-commit] 检查已禁用，允许提交"
|
||||
exit 0
|
||||
28
ANALYSIS.md
28
ANALYSIS.md
@@ -1,28 +0,0 @@
|
||||
|
||||
## Bug #426 修复报告
|
||||
|
||||
### 根因分析
|
||||
Element Plus `el-table` 的懒加载树形模式（`lazy` + `:load` + `tree-props="{ hasChildren: 'hasChildren' }"`）要求每一行数据必须包含 `hasChildren: true` 属性，才会在该行前渲染展开箭头（+ / -）。
|
||||
|
||||
代码中所有创建 `selectedItems` 行对象的路径（共7处）都正确设置了 `isPackage: true` 和 `packageId`，但**遗漏了 `hasChildren` 属性**，导致树形表格无法识别哪些行是可展开的套餐项。
|
||||
|
||||
### 影响范围
|
||||
- **文件**: `examinationApplication.vue`（前端）
|
||||
- **涉及函数**: `handleItemSelect`、`handleMethodSelect`、`handleRowClick`、`onDetailMethodChange`
|
||||
- **数据表**: 无数据库变更
|
||||
|
||||
### 修复方案
|
||||
在7处代码路径中，当 `packageId` 存在时同步设置 `hasChildren: true`：
|
||||
1. `handleRowClick` 初始 item 创建: `hasChildren: false`
|
||||
2. `handleRowClick` 回充时设置 `isPackage` 两处: `hasChildren: true`
|
||||
3. `handleMethodSelect` 已存在项更新: `hasChildren: true`
|
||||
4. `handleMethodSelect` 新项创建: `hasChildren: !!(method.packageId || targetItem.packageId)`
|
||||
5. `handleItemSelect` 新行创建: `hasChildren: !!(item.packageId)`
|
||||
6. `onDetailMethodChange` 方法切换: `hasChildren: true`
|
||||
|
||||
### 验证计划
|
||||
- 在门诊医生站选择检查套餐后，"检查明细" tab 的树形表格应显示展开箭头
|
||||
- 点击展开箭头应懒加载套餐明细（项目名称、数量、单价）
|
||||
- 回充已保存申请单时套餐项应正确显示展开箭头
|
||||
|
||||
修复结果：✅ 成功，13行改动
|
||||
@@ -1,54 +0,0 @@
|
||||
# Bug #433 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题1：麻醉方法回显为代码
|
||||
|
||||
**数据流**:
|
||||
1. 数据库 `op_schedule.anes_method` 字段为 VARCHAR，存值为字典代码字符串如 `"2"`
|
||||
2. 后端 `OpSchedule.anesMethod` 为 String 类型，通过 `getSurgeryScheduleDetail` 查询返回
|
||||
3. 前端 el-select 选项通过 `useDict('anesthesia_type')` 加载，选项值为 `Number(item.value)` 即数字类型
|
||||
4. `handleEdit` 中 `Object.assign(form, data)` 后 `form.anesMethod` 为字符串 `"2"`
|
||||
|
||||
**根因**: `form.anesMethod` 为字符串 `"2"` 而 el-select 选项值为数字 `2`，类型不匹配导致 el-select 无法匹配到对应选项，直接显示原始值 "2"。
|
||||
|
||||
**现有代码的问题**: 代码中有两行转换逻辑:
|
||||
```javascript
|
||||
if (data.anesMethod != null) form.anesMethod = Number(data.anesMethod) // OK
|
||||
if (data.anesthesiaTypeEnum != null) form.anesMethod = Number(data.anesthesiaTypeEnum) // 多余
|
||||
```
|
||||
第二行 `data.anesthesiaTypeEnum` 不是 `OpScheduleDto` 的字段，SQL 查询也不包含此字段，因此永远为 null。但如果某些情况下后端返回了此字段（例如值为 0），会错误覆盖第一行的正确赋值。
|
||||
|
||||
### 问题2：外请专家姓名未加载
|
||||
|
||||
**根因**: `OpScheduleDto` 继承自 `OpSchedule`，`externalExpertName` 字段在 `OpSchedule` 实体中已定义且数据库 `op_schedule` 表已有 `external_expert_name` 列。`getSurgeryScheduleDetail` 查询使用 `SELECT os.*`，会返回该字段。前端 `form` 中也已定义 `externalExpertName`。
|
||||
|
||||
经数据库查询验证，当前数据中 `external_expert_name` 字段确实为空（尚未有用户填写过此字段）。但需确保 `Object.assign` 正确映射，且 `isExternalExpert` 类型匹配 el-radio 的 `:value="1"` / `:value="0"`。
|
||||
|
||||
## 影响范围
|
||||
|
||||
- **前端**: `openhis-ui-vue3/src/views/surgicalschedule/index.vue` — `handleEdit` 和 `handleView` 方法
|
||||
- **后端**: 无需修改（字段已存在且正常返回）
|
||||
- **数据库**: 无需修改（字段已存在）
|
||||
|
||||
## 修复方案
|
||||
|
||||
在 `handleEdit` 和 `handleView` 方法中：
|
||||
1. 删除多余的 `anesthesiaTypeEnum` 转换行
|
||||
2. 使用 `$nextTick` 确保类型转换在 `Object.assign` 后在下一个 tick 执行，确保 Vue 响应式系统已处理完 `Object.assign` 的变更后再设置值
|
||||
3. 统一确保所有字典类型字段（`anesMethod`、`incisionType`、`isExternalExpert`、`isFirstSurgery`）类型正确
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 修改后用 `node --check` 验证 .vue 语法
|
||||
2. 确认 git diff 改动 ≥ 3 行
|
||||
|
||||
## 修复结果
|
||||
|
||||
✅ 成功，28行改动（handleEdit 和 handleView 各 7 行 × 2 函数）
|
||||
|
||||
### 改动摘要
|
||||
|
||||
1. **删除错误行**: `if (data.anesthesiaTypeEnum != null) form.anesMethod = Number(data.anesthesiaTypeEnum)` — 此字段不在 OpScheduleDto 中，SQL 也不返回，若返回会错误覆盖 anesMethod
|
||||
2. **使用 nextTick 包裹类型转换**: 确保 Object.assign 触发的 Vue 响应式更新完成后再设置字典字段值，避免 el-select 在 DOM 更新前无法匹配选项
|
||||
3. **同时修复 handleEdit 和 handleView**: 两处代码一致，均需要同步修复
|
||||
@@ -1,50 +0,0 @@
|
||||
# Bug #434 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题：编辑弹窗中"切口类型"字段未正确回显数据
|
||||
|
||||
**数据流追踪**:
|
||||
1. 用户点击"编辑"→ 前端调用 `getSurgeryScheduleDetail(row.scheduleId)`
|
||||
2. 后端 SQL: `cs.incision_level AS incisionLevel`
|
||||
3. PostgreSQL 返回列名: `incisionlevel` (全小写)
|
||||
4. MyBatis 尝试将 `incisionlevel` 映射到 `OpScheduleDto.incisionLevel`
|
||||
5. 映射失败！→ `data.incisionLevel` 为 null → `form.incisionType` 保持 undefined → el-select 显示空白
|
||||
|
||||
### 根因：PostgreSQL 小写化未加引号的列别名
|
||||
|
||||
PostgreSQL 会将未加双引号的列别名自动转为小写：
|
||||
```sql
|
||||
-- SQL 写的别名
|
||||
cs.incision_level AS incisionLevel
|
||||
-- PostgreSQL 实际返回的列名
|
||||
incisionlevel ← 全小写！
|
||||
```
|
||||
|
||||
MyBatis 收到列名 `incisionlevel`（全小写），尝试匹配 Java 属性 `incisionLevel`（驼峰）。由于 `mapUnderscoreToCamelCase` 只对含下划线的列生效（`incisionlevel` 无下划线），匹配失败。
|
||||
|
||||
**对比 `anes_method` 为什么能工作**:
|
||||
- SQL: `os.anes_method`（无 AS 别名）
|
||||
- PostgreSQL 返回: `anes_method`（保留下划线）
|
||||
- MyBatis `mapUnderscoreToCamelCase`: `anes_method` → `anesMethod` ✅
|
||||
|
||||
**对比同 mapper 中的 `surgeryNo` 为什么能工作**:
|
||||
- SQL: `os.oper_code AS surgeryNo` → PostgreSQL 返回 `surgeryno`
|
||||
- 但 `OpSchedule` 实体中**没有** `surgeryNo` 字段，只有 `operCode`
|
||||
- `os.oper_code` 列映射到 `operCode` 是通过 `mapUnderscoreToCamelCase` 正常工作的
|
||||
- `surgeryno` 找不到对应属性，被 MyBatis 忽略（不影响功能）
|
||||
|
||||
### 修复方案
|
||||
|
||||
将 SQL 中的别名加双引号：`cs.incision_level AS "incisionLevel"`
|
||||
|
||||
PostgreSQL 对加双引号的标识符保持大小写，返回列名 `incisionLevel`（驼峰），MyBatis 可直接匹配到 `OpScheduleDto.incisionLevel` 属性。
|
||||
|
||||
### 影响范围
|
||||
- **后端**: `SurgicalScheduleAppMapper.xml` — `getSurgeryScheduleDetail` 查询（第92行）
|
||||
- **前端**: 无需修改（`handleEdit`/`handleView` 中的 nextTick 转换逻辑已正确）
|
||||
- **数据库**: 无需修改（`cli_surgery.incision_level` 字段已存在且有数据）
|
||||
|
||||
## 验证计划
|
||||
1. 修改 SQL 后，运行相同查询验证列名变为 `incisionLevel`
|
||||
2. 确认前端 `node --check` 语法通过
|
||||
@@ -1,61 +0,0 @@
|
||||
# Bug #516 深度分析报告
|
||||
|
||||
## Bug 描述
|
||||
[住院医生站-临床医嘱-检验申请] 检验申请单手动填写的"发往科室"与生成的医嘱执行科室不一致
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 前端 Bug（`laboratoryTests.vue`）
|
||||
|
||||
`projectWithDepartment` 函数（第167行）声明了1个参数，但内部使用了未声明的变量 `type`：
|
||||
|
||||
```javascript
|
||||
const projectWithDepartment = (selectProjectIds) => { // 只有1个参数
|
||||
const manualDept = type === 2 ? form.targetDepartment : ''; // type 未声明！
|
||||
...
|
||||
if (type === 2 && manualDept) { // type 未声明！
|
||||
```
|
||||
|
||||
调用处传了第2个参数但函数不接收：
|
||||
- 第221行（watch监听）：`projectWithDepartment(newValue, 1)`
|
||||
- 第228行（提交）：`if (!projectWithDepartment(transferValue.value, 2))`
|
||||
|
||||
**后果**：
|
||||
1. `type` 始终为 `undefined`，`type === 2` 永远为 false
|
||||
2. `manualDept` 永远为空字符串
|
||||
3. 用户手动选择的"发往科室"在提交时被清空
|
||||
4. 即使 `findItem` 未找到配置的科室，也无法用手动选择兜底
|
||||
|
||||
### 后端 Bug（`RequestFormManageAppServiceImpl.java`）
|
||||
|
||||
第165-171行：
|
||||
|
||||
```java
|
||||
Long positionId = activityOrganizationConfig.stream()
|
||||
.filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
|
||||
.map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
|
||||
if (positionId == null) {
|
||||
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
|
||||
}
|
||||
serviceRequest.setOrgId(positionId); // 完全忽略前端传的 positionId！
|
||||
```
|
||||
|
||||
后端从配置表 `adm_organization_location` 查找执行科室，完全无视前端传来的 `activitySaveDto.positionId`（即用户手动选择的"发往科室"）。
|
||||
|
||||
### 数据流
|
||||
|
||||
1. 用户在前端选择检验项目 → 触发watch → `projectWithDepartment` 尝试自动设置科室
|
||||
2. 用户手动切换"发往科室"下拉框 → `form.targetDepartment` = 肝胆科ID
|
||||
3. 用户点击提交 → `projectWithDepartment(transferValue.value, 2)` 调用
|
||||
4. 因 `type` 未声明，手动选择的科室被清空 → `form.targetDepartment` = ''
|
||||
5. 前端构建提交参数：`positionId: item.positionId || form.targetDepartment` → 空值
|
||||
6. 后端收到请求，从配置表查默认科室（检验科） → `serviceRequest.setOrgId(检验科)`
|
||||
7. 医嘱列表中"药房/科室"列显示检验科，而非用户选择的肝胆科
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 前端修复（1行改动）
|
||||
在 `projectWithDepartment` 函数签名中添加 `type` 参数。
|
||||
|
||||
### 后端修复（3行改动）
|
||||
优先使用前端传来的 `positionId`，配置表作为兜底值。
|
||||
@@ -1,36 +0,0 @@
|
||||
# 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 变更
|
||||
@@ -1,65 +0,0 @@
|
||||
# Bug #426 分析报告
|
||||
|
||||
**标题**: 门诊医生站-检查开立：已选择列表应支持树形展开，显示套餐明细（项目/数量/单价）
|
||||
|
||||
## 根因分析
|
||||
|
||||
经过完整的代码追踪和数据库验证，定位到 **两个根因**：
|
||||
|
||||
### 根因1：`loadPackageDetails` 响应判断条件错误（树形表格永远加载不到套餐明细）
|
||||
|
||||
**涉及代码**: `examinationApplication.vue` 第576-605行
|
||||
|
||||
Axios 响应拦截器（`request.js` 第202行）对 `code === 200` 的响应返回 `Promise.resolve(res.data)`，即**解包后的 AjaxResult 对象**（如 `{data: [...]}`，不含 `code` 字段）。
|
||||
|
||||
但 `loadPackageDetails` 函数检查的是 `if (res.code === 200)` —— 这个条件 **永远为 false**（解包后的对象没有 `code` 字段），导致树形表格的懒加载 **永远返回空数组**。
|
||||
|
||||
```
|
||||
后端返回: {"code":200,"data":[{item_name:"xxx",quantity:1,...}]}
|
||||
拦截器解包后: {data:[{item_name:"xxx",quantity:1,...}]}
|
||||
loadPackageDetails 判断: res.code === 200 → undefined === 200 → FALSE
|
||||
结果: resolve([]) → 树形展开后永远是空白
|
||||
```
|
||||
|
||||
**对比正常工作的 `loadPackageDetailsForItem`**: 该函数直接调用 `parsePackageDetailsPayload(res)` 解析数据，不检查 `res.code`，所以右侧卡片的套餐明细能正常加载。
|
||||
|
||||
### 根因2：`handleItemSelect` 中 `hasChildren` 未考虑 `packageName` 场景
|
||||
|
||||
**涉及代码**: `examinationApplication.vue` 第1492行
|
||||
|
||||
数据库 `check_part` 表只有 `package_name` 字段，没有 `package_id`。前端创建套餐项时：
|
||||
- `isPackage` 正确判断了 `!!(item.packageId || item.packageName)`
|
||||
- `hasChildren` 只判断了 `!!(item.packageId)`
|
||||
|
||||
当项目有 `packageName` 但无 `packageId` 时，`hasChildren` 为 `false`，el-table 树形模式 **不显示展开箭头**，用户无法点击展开。
|
||||
|
||||
```javascript
|
||||
// 当前代码
|
||||
hasChildren: !!(item.packageId) // item.packageId 为 null → false → 无展开箭头
|
||||
|
||||
// 修复后
|
||||
hasChildren: !!(item.packageId || item.packageName) // 有 packageName 也能展开
|
||||
```
|
||||
|
||||
## 修复方案
|
||||
|
||||
1. 修改 `loadPackageDetails` 函数：去掉 `res.code === 200` 检查，直接使用 `parsePackageDetailsPayload(res)` 解析数据（与 `loadPackageDetailsForItem` 保持一致）
|
||||
2. 修改 `handleItemSelect` 中 `hasChildren` 赋值：增加 `|| item.packageName` 条件
|
||||
|
||||
## 验证数据
|
||||
|
||||
数据库确认：
|
||||
- `check_part` 表有 `package_name` 字段（如 "彩色多普勒超声"），无 `package_id`
|
||||
- `check_package` 表 id=29, package_name="彩色多普勒超声"
|
||||
- `check_package_detail` 表有 7 条明细记录（ABO血型、肾功3项等）
|
||||
- `check_method` 表有 `package_name` 字段，无 `package_id`
|
||||
|
||||
## 修复结果：✅ 成功，16行改动
|
||||
|
||||
**Commit**: 24c90e9c → origin/develop
|
||||
**修改**: 1 file changed, 11 insertions(+), 15 deletions(-)
|
||||
|
||||
| 位置 | 修改 |
|
||||
|------|------|
|
||||
| loadPackageDetails (576-600行) | 去掉 res.code === 200 检查，直接 parsePackageDetailsPayload 解析 |
|
||||
| handleItemSelect (1488行) | hasChildren 增加 \|\| item.packageName |
|
||||
@@ -1,93 +0,0 @@
|
||||
# Bug #428 分析报告与修复验证
|
||||
|
||||
**标题**: 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑
|
||||
**类型**: codeerror | **严重度**: 3 | **优先级**: 3
|
||||
**提出人**: 陈显精(chenxj)
|
||||
|
||||
## 需求描述
|
||||
|
||||
医生站在为患者新增检查申请时，需实现三个联动功能：
|
||||
1. **动作一**：展开右侧项目分类（如：彩超）后，下方自动加载后台维护的"检查方法"列表
|
||||
2. **动作二**：勾选某个检查方法后，该项目自动填充到右侧顶部"已选择"列表
|
||||
3. **动作三**：在"已选择"列表中点击展开图标，展示该套餐包含的收费明细
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 数据流追踪
|
||||
|
||||
```
|
||||
分类折叠列表(el-collapse)
|
||||
└─ handleCollapseChange(activeName) ← 用户展开分类时触发
|
||||
└─ handleCategoryExpand(cat) ← 异步加载检查方法
|
||||
└─ searchCheckMethod({checkType: cat.typeName}) → GET /check/method/search
|
||||
└─ cat.methods = [...] ← 响应式赋值，模板自动渲染
|
||||
|
||||
检查方法列表(cat.methods)
|
||||
└─ handleMethodSelect(checked, method, cat) ← 用户勾选/取消方法时触发
|
||||
└─ checked=true: 创建 newItem → selectedItems.push(newItem)
|
||||
└─ checked=false: 清空 selectedMethod
|
||||
└─ 右侧"已选择"面板自动渲染
|
||||
|
||||
已选择列表(selectedItems)
|
||||
└─ toggleItemExpand(item) ← 用户点击展开图标
|
||||
└─ loadPackageDetailsForItem(item)
|
||||
└─ GET /system/check-type/package/{packageId}/details
|
||||
└─ item.packageDetailsDisplay = [...]
|
||||
└─ 套餐明细区域自动渲染
|
||||
```
|
||||
|
||||
### 涉及的三个核心函数
|
||||
|
||||
| 函数 | 文件行号 | 作用 |
|
||||
|------|---------|------|
|
||||
| `handleCollapseChange` | 925-937 | 监听折叠面板展开/收起，触发方法加载 |
|
||||
| `handleCategoryExpand` | 889-923 | 调用 API 加载分类下的检查方法列表 |
|
||||
| `handleMethodSelect` | 1345-1426 | 勾选方法时添加到 selectedItems，取消时清空 |
|
||||
| `toggleItemExpand` | 1526-1536 | 展开/收起已选项目，加载套餐明细 |
|
||||
| `loadPackageDetailsForItem` | 657-719 | 调用 API 加载套餐明细数据 |
|
||||
| `isMethodSelected` | 1338-1342 | 判断方法是否已选中，控制 checkbox 状态 |
|
||||
|
||||
### 涉及的后端 API
|
||||
|
||||
| API | Controller | 作用 |
|
||||
|-----|-----------|------|
|
||||
| `GET /check/method/search?checkType=xxx` | CheckMethodController.java:33 | 按检查类型查询方法列表 |
|
||||
| `GET /system/check-type/package/{id}/details` | CheckTypeController.java:226 | 查询套餐明细 |
|
||||
| `GET /check/method/list` | CheckMethodController.java:24 | 获取全部检查方法 |
|
||||
|
||||
### 关键修复点
|
||||
|
||||
1. **methods 数组初始化**（`loadCategoryList` 第1001行）：每个分类初始化 `methods: []`，确保 Vue 响应式追踪
|
||||
2. **方法列表渲染**（模板 397-416行）：使用 `v-show` 替代 `v-if`，避免 DOM 突然插入导致高度跳变（Bug #500）
|
||||
3. **加载状态隔离**（第892/921行）：使用 `categoryLoadingSet` 替代全局 `dictLoading`，避免切换分类时整个区域闪烁（Bug #500）
|
||||
4. **过期请求忽略**（第899/918行）：`currentActiveCategory` 守卫，快速切换时丢弃过期响应（Bug #500）
|
||||
5. **套餐信息同步**（第1364/1398行）：确保 `packageName`、`packageId` 从 method 正确传递到 newItem
|
||||
6. **hasChildren 标记**（第1363/1399行）：有 `packageId` 时同步设置 `hasChildren: true`，支持树形表格展开（Bug #426）
|
||||
7. **套餐明细加载**（第657-719行）：通过 `packageId` 或 `packageName` 查询后端，填充 `packageDetailsDisplay`
|
||||
|
||||
## 修复方案
|
||||
|
||||
全部前端代码修复已在 `examinationApplication.vue` 中实现：
|
||||
|
||||
| 修复项 | 位置 | 修改内容 |
|
||||
|--------|------|---------|
|
||||
| 分类联动加载方法 | 889-937行 | handleCollapseChange + handleCategoryExpand |
|
||||
| 方法列表渲染 | 397-416行 | method-section 模板 |
|
||||
| 方法勾选逻辑 | 1345-1426行 | handleMethodSelect |
|
||||
| 已选择面板 | 422-477行 | selected-panel 模板 |
|
||||
| 套餐明细加载 | 657-719行 | loadPackageDetailsForItem |
|
||||
| 套餐明细展开 | 1526-1536行 | toggleItemExpand |
|
||||
| 套餐明细展示 | 450-474行 | package-details-list 模板 |
|
||||
| 方法选中状态 | 1338-1342行 | isMethodSelected |
|
||||
| 防止加载闪烁 | 892/899/918/921行 | categoryLoadingSet + currentActiveCategory 守卫 |
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 登录 doctor1，进入门诊医生站
|
||||
2. 点击"检查"tab，新增检查申请
|
||||
3. 展开右侧"彩超"分类 → 验证下方出现"检查方法"列表
|
||||
4. 勾选"心电1" → 验证右侧"已选择"出现该项目
|
||||
5. 点击"已选择"中项目的展开图标 → 验证出现"套餐明细"列表
|
||||
6. 取消勾选方法 → 验证"已选择"中该项目消失或方法清空
|
||||
|
||||
## 修复结果：✅ 代码已实现，42行核心逻辑
|
||||
@@ -1,72 +0,0 @@
|
||||
# Bug #470 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 症状
|
||||
住院医生工作站-手术申请单加载手术项目耗时过长，影响医生开单效率。
|
||||
|
||||
### 根本原因
|
||||
|
||||
**后端 `getSurgeryPage` 接口缺少 Redis 缓存层。**
|
||||
|
||||
与同模块的 `getAdviceBaseInfo`（已有24小时Redis缓存）不同，`getSurgeryPage` 每次调用都直接查询数据库。
|
||||
|
||||
**代码对比：**
|
||||
|
||||
- `getAdviceBaseInfo`（DoctorStationAdviceAppServiceImpl.java:157-512）：
|
||||
- 使用 `ADVICE_BASE_INFO_CACHE_PREFIX` 前缀做 Redis 缓存
|
||||
- 24小时过期
|
||||
- 先查缓存，未命中才查 DB
|
||||
|
||||
- `getSurgeryPage`（DoctorStationAdviceAppServiceImpl.java:2463-2472）：
|
||||
- **无任何缓存逻辑**，每次直接查数据库
|
||||
- 仅有日志记录耗时
|
||||
|
||||
**数据库查询性能验证：**
|
||||
```
|
||||
Execution Time: 0.400 ms (10102条手术项目，已有 idx_wor_activity_def_surgery 索引)
|
||||
Planning Time: 4.349 ms
|
||||
```
|
||||
数据库查询本身很快（<1ms），但每次弹窗打开都重复执行查询 + 序列化 + 网络传输，累积延迟明显。
|
||||
|
||||
**辅助因素：**
|
||||
1. `applicationFormBottomBtn.vue` 的对话框设置了 `destroy-on-close`，每次关闭都会销毁 Surgery 组件
|
||||
2. 前端虽有模块级内存缓存（`surgeryRecordsCache` / `surgeryMappedCache`），但首次加载仍需后端响应
|
||||
3. 前端 `getList()` 命中缓存时未清除 `loading.value`，导致 loading 动画可能卡住
|
||||
|
||||
### 影响范围
|
||||
|
||||
**涉及文件：**
|
||||
- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java` — 后端手术分页查询实现（需加缓存）
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue` — 前端手术申请单组件（需修复 loading 状态）
|
||||
|
||||
**涉及数据表：**
|
||||
- `wor_activity_definition` — 活动定义表（手术项目源表），10,102条手术记录
|
||||
- `adm_charge_item_definition` — 收费项定义表（定价关联）
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 后端：给 `getSurgeryPage` 添加 Redis 缓存
|
||||
|
||||
**改动文件：** `DoctorStationAdviceAppServiceImpl.java`
|
||||
|
||||
1. 新增缓存键常量：`SURGERY_PAGE_CACHE_PREFIX = "surgery:page:"`
|
||||
2. 在无搜索关键字时，尝试从 Redis 读取缓存
|
||||
3. 缓存未命中时，查询数据库后写入 Redis（24小时过期）
|
||||
4. 有搜索关键字时不缓存（避免缓存爆炸）
|
||||
|
||||
**改动量：** 约 20 行
|
||||
|
||||
### 前端：修复 `getList()` 缓存命中时的 loading 状态
|
||||
|
||||
**改动文件：** `surgery.vue`
|
||||
|
||||
1. 在 `getList()` 方法中，当命中内存缓存时，显式设置 `loading.value = false`
|
||||
|
||||
**改动量：** 1 行
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 编译验证 Java 代码
|
||||
2. 语法验证 Vue 文件：`node --check surgery.vue`
|
||||
3. 手动验证：登录医生工作站，打开手术申请单，观察加载速度（首次应有loading，二次打开应秒开）
|
||||
@@ -1,65 +0,0 @@
|
||||
# Bug #472 深度分析报告
|
||||
|
||||
## 标题
|
||||
住院医生工作站-手术申请单：勾选手术项目无效，导致无法正常开立医嘱
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题链路
|
||||
1. 当前分支将手术项目数据源从 `getApplicationList` 改为专用接口 `getSurgeryPage`
|
||||
2. `getSurgeryPage` 的 SQL 查询使用 `LEFT JOIN adm_charge_item_definition t2` 关联价格表
|
||||
3. **关键问题**：SQL 中缺少 `DISTINCT ON (t1.ID)` 去重逻辑
|
||||
4. 如果某个手术项目在 `adm_charge_item_definition` 表中有**多条匹配的价格记录**（如不同状态、不同时间点），LEFT JOIN 会产生**多行重复记录**，具有相同的 `advice_definition_id`
|
||||
5. 前端 `mapToTransferItem` 将这些重复记录映射为 el-transfer 数据项，所有重复项的 `key` 相同
|
||||
6. el-transfer 组件内部使用 key 进行 Vue 的列表渲染追踪。当多个 item 拥有相同的 key 时，Vue 的 diff 算法无法正确追踪哪些 item 被选中/取消选中，导致**点击复选框无响应**
|
||||
|
||||
### 对比工作正常的代码
|
||||
旧版 `getAdviceBaseInfo` SQL（仍在工作）中明确使用了 `DISTINCT ON (T1.ID)` 去重：
|
||||
```sql
|
||||
SELECT DISTINCT ON (T1.ID) ...
|
||||
```
|
||||
|
||||
新版 `getSurgeryPage` SQL 遗漏了这个去重逻辑。
|
||||
|
||||
## 影响范围
|
||||
- **前端**：`surgery.vue` — el-transfer 复选框交互异常
|
||||
- **后端 SQL**：`DoctorStationAdviceAppMapper.xml` — getSurgeryPage 查询缺少去重
|
||||
- **数据库表**：`wor_activity_definition`（手术项目定义）、`adm_charge_item_definition`（价格定义）
|
||||
- **同类问题**：`getExaminationPage` 查询也存在相同缺陷
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 1. 后端 SQL 修复（根因修复）
|
||||
在 `DoctorStationAdviceAppMapper.xml` 的 `getSurgeryPage` 和 `getExaminationPage` 查询中添加 `DISTINCT ON (t1.ID)`：
|
||||
- `DISTINCT ON (t1.ID)` 确保每个手术/检查项目只返回一行
|
||||
- PostgreSQL 的 DISTINCT ON 按 t1.ID 去重，保留每个组的第一行
|
||||
|
||||
### 2. 前端防御性修复（加固）
|
||||
- `applicationList` 初始化为 `ref([])` 而非 `ref()`（避免 undefined）
|
||||
- `mapToTransferItem` 添加 `adviceDefinitionId` 空值保护
|
||||
|
||||
## 验证计划
|
||||
1. 修改 SQL 后，进入住院医生工作站 → 手术申请单
|
||||
2. 确认"未选择"列表中每个手术项目只显示一次（无重复）
|
||||
3. 点击复选框，项目应被正确选中并移入"已选择"列表
|
||||
4. 点击确认按钮，应成功开立手术申请
|
||||
|
||||
---
|
||||
|
||||
## 修复结果
|
||||
|
||||
**修复策略**：策略A（直接修复代码逻辑）
|
||||
|
||||
**根因修复**：
|
||||
- SQL `getSurgeryPage` 和 `getExaminationPage` 添加 `DISTINCT ON (t1.ID)` 去重
|
||||
- ORDER BY 调整为 `t1.ID, t1.name ASC, t2.ID ASC`（DISTINCT ON 要求 ORDER BY 首列必须与 DISTINCT ON 一致）
|
||||
|
||||
**前端加固**：
|
||||
- `applicationList` 初始化为 `ref([])` 而非 `ref()`
|
||||
- 数据映射前过滤 `adviceDefinitionId != null` 的脏数据
|
||||
|
||||
**改动量**：2文件，8行增，6行删
|
||||
- `DoctorStationAdviceAppMapper.xml`：+4/-4（DISTINCT ON + ORDER BY 调整）
|
||||
- `surgery.vue`：+4/-2（初始化空数组 + 空值过滤）
|
||||
|
||||
**修复结果：✅ 成功，8行改动**
|
||||
@@ -1,60 +0,0 @@
|
||||
# Bug #497 分析报告
|
||||
|
||||
## 标题
|
||||
【住院医生工作站-检查申请】检查申请列表缺失"申请单状态"列及全流程闭环状态流转逻辑
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题描述
|
||||
检查申请列表的"申请单状态"列始终显示"待签发"，无法正确反映护士校对、医技接单、报告生成等临床节点状态。
|
||||
|
||||
### 根因定位
|
||||
`doc_request_form.status` 列在数据库中存在（INTEGER, 默认值 0），但全链路没有任何代码更新它：
|
||||
|
||||
1. **实体层**: `RequestForm` 领域实体（`RequestForm.java`）**没有 `status` 字段** → 保存时无法设置
|
||||
2. **服务层**: `saveRequestForm()` / `withdrawRequestForm()` 方法从未修改 `doc_request_form.status`
|
||||
3. **查询层**: SQL 查询直接 SELECT `drf.status` → 始终返回默认值 0
|
||||
4. **前端层**: `parseStatus(0)` → 始终返回"待签发"
|
||||
|
||||
实际业务状态由 `wor_service_request.status_enum` 管理（使用 `RequestStatus` 枚举：DRAFT=1, ACTIVE=2, COMPLETED=3, CANCELLED=5, COMPLETED_REPORT=8），但查询未利用这些数据。
|
||||
|
||||
### 修复方案
|
||||
1. **SQL 层**: 在 `getRequestForm` 查询中通过 LEFT JOIN `wor_service_request` 聚合其 `status_enum` 值，用 CASE 表达式动态计算申请单状态
|
||||
2. **实体层**: 给 `RequestForm.java` 添加 `status` 字段以完善领域模型
|
||||
3. **前端层**: 已有状态列、筛选器、操作按钮，无需修改
|
||||
|
||||
### 状态映射
|
||||
| ServiceRequest.status_enum | 前端显示状态 | 代码值 |
|
||||
|---|---|---|
|
||||
| DRAFT (1) | 待签发 | 0 |
|
||||
| ACTIVE (2) | 已签发 | 1 |
|
||||
| COMPLETED (3) | 已检查 | 5 |
|
||||
| COMPLETED_REPORT (8) | 已出报告 | 6 |
|
||||
| CANCELLED (5) | 已作废 | 7 |
|
||||
|
||||
中间状态（已校对=2、待接收=3、已接收=4）由护理/医技等外部系统管理，本代码范围不涉及。
|
||||
|
||||
### 涉及文件
|
||||
- `openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml`
|
||||
- `openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java`
|
||||
|
||||
## 修复结果
|
||||
|
||||
**结果**: ✅ 成功
|
||||
**改动行数**: +86/-49 (2个文件)
|
||||
|
||||
### 具体修改
|
||||
|
||||
#### 1. RequestFormManageAppMapper.xml
|
||||
- 将原查询包裹在子查询中
|
||||
- 用 `CASE WHEN EXISTS` 动态计算状态，替代静态 `drf.status` 列
|
||||
- 状态筛选从外层作用于 `computed_status`
|
||||
- 移除了不必要的 GROUP BY（子查询中无聚合）
|
||||
|
||||
#### 2. RequestForm.java
|
||||
- 添加 `status` 字段，补全领域模型
|
||||
|
||||
### 验证
|
||||
- ✅ Java 编译通过（mvn compile -pl openhis-application -am -DskipTests）
|
||||
- ✅ XML 格式正确（ElementTree 解析成功）
|
||||
- ✅ 改动量 > 3 行（+86/-49）
|
||||
@@ -1,40 +0,0 @@
|
||||
# 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` 通过，无编译错误。
|
||||
@@ -1,43 +0,0 @@
|
||||
# Bug #432 分析报告
|
||||
|
||||
## 根因分析
|
||||
|
||||
**根因**：后端 `OpCreateScheduleDto` 缺少 `@JsonIgnoreProperties(ignoreUnknown = true)` 注解。
|
||||
|
||||
Spring Boot 的 Jackson 默认配置 `FAIL_ON_UNKNOWN_PROPERTIES = true`，即反序列化时遇到 DTO 中不存在的字段会抛出 `JsonMappingException: Unrecognized field` 异常。
|
||||
|
||||
前端 `submitForm()` 使用 `{ ...form }` 展开整个表单对象提交，包含大量 DTO 中不存在的字段：
|
||||
- `identifierNo`（就诊卡号）
|
||||
- `patientName`（患者姓名）
|
||||
- `gender`（性别）
|
||||
- `age`（年龄）
|
||||
- `birthDay`（出生日期）
|
||||
- `orgName`（机构名称）
|
||||
- `applyDeptName`（申请科室名称）
|
||||
- `surgeonName`（主刀医生姓名）
|
||||
- `applyDoctorName`（申请医生姓名）
|
||||
- `applyTime`（申请时间）
|
||||
- `surgeryNo`（手术单号）
|
||||
- `scheduleId`（排程ID，新增时为undefined）
|
||||
- `orgId`（机构ID，前端显式添加）
|
||||
|
||||
这些字段在后端 `OpCreateScheduleDto` 中均未定义，导致 JSON 反序列化失败，返回 400/500 错误，前端显示"新增手术安排失败"。
|
||||
|
||||
## 影响范围
|
||||
|
||||
- **后端文件**：`OpCreateScheduleDto.java`
|
||||
- **影响接口**：`POST /clinical-manage/surgery-schedule/create`（新增手术安排）
|
||||
- **影响数据表**：`op_schedule`
|
||||
- **前端无需修改**：前端提交逻辑正确，问题在后端 DTO 配置
|
||||
|
||||
## 修复方案
|
||||
|
||||
在 `OpCreateScheduleDto` 类上添加 `@JsonIgnoreProperties(ignoreUnknown = true)` 注解，使 Jackson 在反序列化时忽略 DTO 中不存在的字段。
|
||||
|
||||
这是最小侵入性修复（仅添加 1 行注解），不影响现有业务逻辑。
|
||||
|
||||
## 验证计划
|
||||
|
||||
1. 修改后运行 Maven 编译确认无语法错误
|
||||
2. 部署后按 Bug 步骤操作：新增手术安排 → 查找并选择手术申请 → 填写入室时间 → 保存
|
||||
3. 确认保存成功，无报错
|
||||
@@ -1,76 +0,0 @@
|
||||
# Bug #461 分析报告
|
||||
|
||||
## Bug 描述
|
||||
[系统管理-执行科室配置] 保存项目配置后，项目名称回显为ID码，未显示正确名称
|
||||
|
||||
## 阶段1：深度分析
|
||||
|
||||
### 数据流追踪
|
||||
|
||||
1. **前端保存**: 用户选择项目 → 点击"保存" → POST `/base-data-manage/org-loc/org-loc`
|
||||
2. **后端处理**: `OrganizationLocationAppServiceImpl.addOrEditOrgLoc()` 保存记录
|
||||
3. **前端刷新**: 保存成功后调用 `getList()` → GET `/base-data-manage/org-loc/org-loc`
|
||||
4. **后端查询**: `OrganizationLocationAppServiceImpl.getOrgLocPage()` 查询分页数据
|
||||
5. **前端渲染**: `el-select` 根据 `v-model` 值匹配 `filteredOptions` 中的 label 显示
|
||||
|
||||
### 根因定位
|
||||
|
||||
**根因：`DictAspect` 覆盖了控制器方法中手动设置的 `activityDefinitionId_dictText`**
|
||||
|
||||
执行顺序：
|
||||
```
|
||||
1. 控制器方法 getOrgLocPage() 执行
|
||||
→ HisPageUtils.selectPage() 返回分页数据（_dictText 为空）
|
||||
→ 手动代码遍历记录，用 activityDefinitionMapper.selectById() 查询并设置 _dictText ✓
|
||||
→ 返回 R.ok(orgLocQueryDtoPage)
|
||||
|
||||
2. DictAspect.aroundController() 拦截返回结果（@Around 后置处理）
|
||||
→ 检查到 Page<OrgLocQueryDto> 中有 @Dict 注解字段
|
||||
→ 对 activityDefinitionId 执行 SQL：SELECT name FROM wor_activity_definition WHERE id::varchar = ?
|
||||
→ 如果 SQL 执行失败（任何原因），返回空字符串 ""
|
||||
→ 覆盖 _dictText 为 "" ❌
|
||||
```
|
||||
|
||||
**关键问题**：
|
||||
- `DictAspect.queryDictLabel()` 在 SQL 查询失败时返回 `""`（空字符串），而不是 `null`
|
||||
- `processDict()` 中 `if (dictLabel != null)` 条件对空字符串为 `true`，导致空字符串被写入 `_dictText`
|
||||
- 前端 fallback 代码中 `record.activityDefinitionId_dictText || record.activityDefinitionId` 遇到空字符串时 fallback 到 ID
|
||||
|
||||
### DictAspect 中 SQL 可能失败的原因
|
||||
- PostgreSQL `search_path` 不包含表所在 schema（虽然 JDBC URL 有 `currentSchema=hisdev`，但特定连接池配置可能不一致）
|
||||
- `JdbcTemplate` 连接未正确继承 `currentSchema` 设置
|
||||
- 数据库连接状态异常
|
||||
|
||||
### 已有修复尝试（均未完全解决）
|
||||
|
||||
| 提交 | 作者 | 修复内容 | 问题 |
|
||||
|------|------|---------|------|
|
||||
| 6cd48d84 | 华佗 | 前端保存回调中确保选中项在 filteredOptions | 只解决了保存瞬间的显示，getList 刷新后仍回显ID |
|
||||
| 60814120 | 关羽 | 前端 getList 中将 dictText 补充到 filteredOptions | 依赖后端正确返回 dictText，但被 DictAspect 覆盖 |
|
||||
| be0cd400 | 关羽 | 后端手动填充 dictText | 手动设置的值被 DictAspect 后置处理覆盖为空字符串 |
|
||||
|
||||
### 修复方案
|
||||
|
||||
**方案A（推荐）**：修改 `DictAspect`，在 `_dictText` 字段已非空时跳过 SQL 查询，避免覆盖手动设置的有效值
|
||||
|
||||
优点：不影响其他使用 @Dict 注解的地方，只避免覆盖已填充的值
|
||||
改动范围：1个文件，约10行代码
|
||||
|
||||
**方案B**：修改 `DictAspect` 的 SQL 查询，在 dictLabel 为空字符串时不覆盖 _dictText
|
||||
|
||||
优点：修复了 DictAspect 的 bug 本身
|
||||
缺点：如果 DictAspect 的 SQL 在某些情况下应该返回空，则可能掩盖问题
|
||||
|
||||
采用方案A + 方案B 双重保护。
|
||||
|
||||
## 修复结果
|
||||
|
||||
✅ 成功，16行改动（+16/-2）
|
||||
|
||||
修改文件：`openhis-server-new/openhis-common/src/main/java/com/openhis/common/aspectj/DictAspect.java`
|
||||
|
||||
修复策略：
|
||||
1. DictAspect 在 SQL 查询前检查 `_dictText` 字段是否已被手动填充，若已有值则跳过查询
|
||||
2. 增加空字符串防护：`dictLabel` 为空字符串时不设置 `_dictText`
|
||||
|
||||
提交：79d67b1f
|
||||
@@ -1,85 +0,0 @@
|
||||
# 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 计算正确
|
||||
@@ -1,56 +0,0 @@
|
||||
# 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
|
||||
@@ -1,94 +0,0 @@
|
||||
# 分析报告 — Bug #497
|
||||
|
||||
## Bug 描述
|
||||
【住院医生工作站-检查申请】检查申请列表缺失"申请单状态"列及全流程闭环状态流转逻辑
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 前端层面
|
||||
`examineApplication.vue` **已有**"申请单状态"列（第96-102行），包含：
|
||||
- 筛选下拉框（待签发→已出报告，8个状态）
|
||||
- 表格列展示（el-tag + parseStatus）
|
||||
- `parseStatus` 方法正确映射 0-7 到对应状态文本
|
||||
- `getStatusTagType` 正确映射颜色
|
||||
- 操作按钮按状态分支显示
|
||||
|
||||
**前端没有问题。**
|
||||
|
||||
### 后端层面 — SQL CASE 语句不完整
|
||||
|
||||
`RequestFormManageAppMapper.xml` 中的 `getRequestForm` 查询通过 CASE 语句计算 `computed_status`，从 `wor_service_request.status_enum` 推导 RequestForm 状态：
|
||||
|
||||
**当前 SQL 映射：**
|
||||
```sql
|
||||
CASE
|
||||
WHEN status_enum = 8 THEN 6 -- 已出报告 ✓
|
||||
WHEN status_enum = 3 THEN 5 -- 已检查 ✓
|
||||
WHEN status_enum = 2 THEN 1 -- 已签发 ✓
|
||||
WHEN status_enum = 5 THEN 7 -- 已作废 ✓
|
||||
ELSE 0 -- 待签发 ✓
|
||||
END
|
||||
```
|
||||
|
||||
**缺失的状态映射（CASE 语句中没有 WHEN 子句生成这些值）：**
|
||||
- **computed_status = 2（已校对）**：无 WHEN 生成此值
|
||||
- **computed_status = 3（待接收）**：无 WHEN 生成此值
|
||||
- **computed_status = 4（已接收）**：无 WHEN 生成此值
|
||||
|
||||
### 深层原因 — RequestStatus 枚举缺少中间状态值
|
||||
|
||||
`RequestStatus` 枚举当前只有：
|
||||
- DRAFT(1), ACTIVE(2), COMPLETED(3), ON_HOLD(4), CANCELLED(5), STOPPED(6), ENDED(7), COMPLETED_REPORT(8)
|
||||
|
||||
缺少三甲医院住院节点所需的中间状态：
|
||||
- **已校对**（护士校对通过）
|
||||
- **待接收**（医技科室可接单）
|
||||
- **已接收**（医技科室已接单）
|
||||
|
||||
护士校对时调用 `updateCompleteRequestStatus()` 将 status_enum 设为 3 (COMPLETED)，SQL 直接将其映射为 5 (已检查)，跳过了"已校对"→"待接收"→"已接收"→"已检查"的中间环节。
|
||||
|
||||
### 数据流总结
|
||||
|
||||
| 节点 | ServiceRequest.status_enum | SQL 当前映射 | RequestForm.status | 正确？ |
|
||||
|------|---------------------------|-------------|-------------------|--------|
|
||||
| 医生录入 | 1 (DRAFT) | ELSE 0 | 0 待签发 | ✓ |
|
||||
| 医生签发 | 2 (ACTIVE) | WHEN 2 THEN 1 | 1 已签发 | ✓ |
|
||||
| 护士校对 | 3 (COMPLETED) | WHEN 3 THEN 5 | 5 已检查 | ✗ 跳过中间状态 |
|
||||
| 医技接收 | 无对应枚举值 | 无 | 无 | ✗ 缺失 |
|
||||
| 医技检查 | 3 (COMPLETED) | WHEN 3 THEN 5 | 5 已检查 | ✓ 但语义不对 |
|
||||
| 出报告 | 8 (COMPLETED_REPORT) | WHEN 8 THEN 6 | 6 已出报告 | ✓ |
|
||||
| 作废 | 5 (CANCELLED) | WHEN 5 THEN 7 | 7 已作废 | ✓ |
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 1. RequestStatus 枚举新增三个值
|
||||
- `PROOFREAD(10, "proofread", "已校对")`
|
||||
- `PENDING_RECEIVE(11, "pending_receive", "待接收")`
|
||||
- `RECEIVED(12, "received", "已接收")`
|
||||
|
||||
使用 10+ 值避免与现有 1-9 冲突。
|
||||
|
||||
### 2. 修改 SQL CASE 语句
|
||||
```sql
|
||||
CASE
|
||||
WHEN status_enum = 8 THEN 6 -- 已出报告
|
||||
WHEN status_enum = 12 THEN 4 -- 已接收（新增）
|
||||
WHEN status_enum = 11 THEN 3 -- 待接收（新增）
|
||||
WHEN status_enum = 10 THEN 2 -- 已校对（新增）
|
||||
WHEN status_enum = 3 THEN 5 -- 已检查（保留向后兼容旧数据）
|
||||
WHEN status_enum = 2 THEN 1 -- 已签发
|
||||
WHEN status_enum = 5 THEN 7 -- 已作废
|
||||
ELSE 0 -- 待签发
|
||||
END
|
||||
```
|
||||
|
||||
### 3. 修改护士校对方法
|
||||
`ServiceRequestServiceImpl.updateCompleteRequestStatus()` 中 status_enum 从 3 (COMPLETED) 改为 10 (PROOFREAD)。
|
||||
|
||||
### 4. 医技接收后状态流转
|
||||
医技接收时将 status_enum 从 10 (PROOFREAD) 更新为 11 (PENDING_RECEIVE)→12 (RECEIVED)，检查后更新为 3 (COMPLETED)。
|
||||
|
||||
## 涉及文件
|
||||
1. `openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java` — 枚举新增
|
||||
2. `openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml` — SQL CASE 修复
|
||||
3. `openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java` — 校对方法修改
|
||||
@@ -1,119 +0,0 @@
|
||||
# Bug #439 分析报告
|
||||
|
||||
## Bug描述
|
||||
领用出库：选择领用药品后"总库存数量"列数据未显示
|
||||
|
||||
## 数据流分析
|
||||
|
||||
1. 用户点击"添加行" → 新增一行，totalQuantity 初始化为空字符串 ''
|
||||
2. 用户在"项目"列通过 PopoverList 选择药品 → 触发 `selectRow(rowValue, index)`
|
||||
3. `selectRow` 设置药品基本信息，然后调用 `handleLocationClick(1, rowValue, index)`
|
||||
4. `handleLocationClick` 调用 `getCount({ itemId, orgLocationId })` 获取库存
|
||||
5. `getCount` 返回 LocationInventoryDto[] 列表，前端通过 `pickBestOrgQuantityRow` 选最大值
|
||||
6. `applyFromDto` 设置 `r.totalQuantity = d.orgQuantity || 0`
|
||||
|
||||
## 根因定位
|
||||
|
||||
在 `selectRow` 函数中（第1022-1049行），选择药品后：
|
||||
```javascript
|
||||
form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
|
||||
```
|
||||
|
||||
但后端 `/app-common/inventory-item` 接口返回的 `unitList` 只设置了 `unitCode` 和 `minUnitCode`，**没有设置 `unitCode_dictText` 和 `minUnitCode_dictText`**。
|
||||
|
||||
在 `handleLocationClick` → `applyFromDto` 中（第1099-1121行）：
|
||||
```javascript
|
||||
r.unitCode = r.unitList.minUnitCode;
|
||||
r.unitCode_dictText = r.unitList.minUnitCode_dictText; // ← undefined!
|
||||
if (r.unitCode == r.unitList.minUnitCode) { // ← 这个条件始终为 true
|
||||
r.price = d.price / r.partPercent || '';
|
||||
r.price = r.price.toFixed(4);
|
||||
}
|
||||
```
|
||||
|
||||
关键问题：`r.unitCode` 刚被设为 `r.unitList.minUnitCode`，然后条件 `r.unitCode == r.unitList.minUnitCode` 始终为 true，
|
||||
导致即使价格很小（如 0.05/1=0.05），也会进入这个分支。
|
||||
|
||||
但这不是总库存数量未显示的根本原因。
|
||||
|
||||
**真正根因：`handleLocationClick` 函数在调用 `getCount` 获取库存数据后，`applyFromDto` 中 `r.totalQuantity = d.orgQuantity || 0` 的赋值逻辑依赖 `d.orgQuantity > 0` 的前置判断。**
|
||||
|
||||
查看前端代码流程：
|
||||
- `selectRow` 设置 `totalQuantity: ''`（新增行时的默认值）
|
||||
- 然后调用 `handleLocationClick` → `getCount` → 后端返回数据
|
||||
- `pickBestOrgQuantityRow` 从返回列表中选出 orgQuantity 最大的记录
|
||||
- 如果 `d && Number(d.orgQuantity ?? 0) > 0` → 调用 `applyFromDto` → 设置 `r.totalQuantity = d.orgQuantity || 0`
|
||||
- 如果条件不满足（所有记录 orgQuantity 都为 0 或返回空列表）→ **`applyFromDto` 不被调用** → `r.totalQuantity` 保持空字符串 ''
|
||||
|
||||
进一步分析发现：
|
||||
- 如果后端 `getCount` 返回空列表（该药品在该仓库无库存），`d` 为 null，`applyFromDto` 不会被调用
|
||||
- 但如果该药品在仓库确实有库存，问题可能出在前端数据传递上
|
||||
|
||||
**核心问题在于 `unitList` 结构不完整：**
|
||||
`selectRow` 中 `rowValue.unitList` 来自药品列表查询结果，其 `unitList` 由后端 `CommonServiceImpl.getInventoryItemList` 构建，
|
||||
只包含 `unitCode` 和 `minUnitCode`，缺少 `unitCode_dictText` 和 `minUnitCode_dictText`。
|
||||
|
||||
在 `handleLocationClick` 的 `applyFromDto` 中，`r.unitCode` 和 `r.unitCode_dictText` 的赋值依赖于 `unitList` 中的字段。
|
||||
如果 `r.unitList` 是从 `rowValue.unitList[0]` 赋值而来（在 `selectRow` 中），那它应该至少有 `unitCode` 和 `minUnitCode`。
|
||||
|
||||
**但是！** 编辑模式（`getTransferProductDetails`）中，`unitList` 的构建方式不同：
|
||||
```javascript
|
||||
form.purchaseinventoryList[index].unitList = e.unitList[0]; // 编辑详情时
|
||||
```
|
||||
|
||||
新增模式（`selectRow`）中：
|
||||
```javascript
|
||||
form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
|
||||
```
|
||||
|
||||
两种方式获取的 `unitList` 结构可能不同。
|
||||
|
||||
**根本原因：**
|
||||
`handleLocationClick` 中的 `getCount` API 调用，返回的 `LocationInventoryDto` 确实包含 `orgQuantity`。
|
||||
前端通过 `pickBestOrgQuantityRow` 选出最大值的记录后，调用 `applyFromDto` 设置 `totalQuantity`。
|
||||
如果药品在仓库有库存但 `totalQuantity` 仍为空白，说明 `applyFromDto` 中的 `d.orgQuantity` 可能为 `null`/`undefined`。
|
||||
|
||||
经检查 `selectInventoryItemInfo` SQL：
|
||||
```sql
|
||||
SUM(CASE WHEN T1.location_id = #{orgLocationId} THEN T1.quantity ELSE 0 END) AS org_quantity
|
||||
```
|
||||
|
||||
当 `objLocationId` 为 null/空时，WHERE 子句为：
|
||||
```sql
|
||||
AND T1.location_id = #{orgLocationId}
|
||||
```
|
||||
|
||||
这意味着查询结果中的所有记录都来自 `orgLocationId` 对应的仓库。
|
||||
此时 `org_quantity` 应该等于 `SUM(T1.quantity)`。
|
||||
|
||||
**如果查询结果为空（该药品在该仓库没有库存记录），则前端 `d` 为 null，`applyFromDto` 不被调用，totalQuantity 保持空字符串。**
|
||||
|
||||
但 Bug 的期望是"应实时检索并填充总库存数量"——如果仓库确实没有该药品的库存，那显示空白是合理的。
|
||||
但如果仓库有库存却未显示，说明前端传递的参数（orgLocationId 或 itemId）有问题。
|
||||
|
||||
**最终根因：前端 `handleLocationClick` 函数中，`orgLocationId` 的取值可能为空字符串，**
|
||||
**导致后端查询时使用空字符串作为 location_id 条件，查不到任何记录。**
|
||||
|
||||
```javascript
|
||||
let orgLocationId = r.sourceLocationId || receiptHeaderForm.headerLocationId || '';
|
||||
```
|
||||
|
||||
虽然 Bug 步骤中说先选了"西药库"，但如果 `receiptHeaderForm.headerLocationId` 在 selectRow 时已正确设置，
|
||||
`r.sourceLocationId` 也应该被设置（在 selectRow 第1037行）：
|
||||
```javascript
|
||||
form.purchaseinventoryList[index].sourceLocationId =
|
||||
receiptHeaderForm.headerLocationId || form.purchaseinventoryList[index].sourceLocationId || '';
|
||||
```
|
||||
|
||||
**但这里有一个微妙的时序问题：`handleLocationClick` 在 `getPharmacyCabinetList().then()` 内部被调用，**
|
||||
**但 `handleLocationClick` 是同步执行的，不等待 `getPharmacyCabinetList` 完成。**
|
||||
**这本身不影响 `orgLocationId` 的取值，因为 `orgLocationId` 不依赖 `getPharmacyCabinetList`。**
|
||||
|
||||
## 修复方案
|
||||
|
||||
1. 确保 `applyFromDto` 即使在 `orgQuantity` 为 0 时也能被调用，正确显示"0"而不是空白
|
||||
2. 确保 `unitList` 包含必要的字典文本字段
|
||||
|
||||
## 影响范围
|
||||
- 前端文件：openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
|
||||
- 涉及函数：`selectRow`、`handleLocationClick`
|
||||
@@ -1,44 +0,0 @@
|
||||
# Bug #462 分析报告
|
||||
|
||||
## Bug 描述
|
||||
[目录管理-诊疗目录] 编辑弹窗中"所需标本"下拉框数据加载失败，显示为"无数据"
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 数据流追踪
|
||||
1. 前端组件 `diagnosisTreatmentDialog.vue` 第168-178行渲染"所需标本"下拉框
|
||||
2. 下拉框选项来自 `specimen_code` 变量（第172行 `v-for="category in specimen_code"`）
|
||||
3. `specimen_code` 通过 `proxy.useDict('specimen_code', ...)` 加载（第378-386行）
|
||||
4. `useDict` 调用 API `/system/dict/data/type/specimen_code`（`src/utils/dict.js` 第16行）
|
||||
5. 后端 `SysDictDataController.dictType()` 处理请求（第65-73行，**无权限校验**）
|
||||
6. 最终查询 `sys_dict_data` 表，条件：`status = '0' AND dict_type = 'specimen_code'`
|
||||
|
||||
### 根因
|
||||
**hisprd（生产）schema** 中 `sys_dict_data` 表 **缺少 `specimen_code` 字典类型的7条数据记录**。
|
||||
|
||||
经核实：
|
||||
- `hisdev` schema：`sys_dict_type` + `sys_dict_data`（7条）均已存在 ✅
|
||||
- `histest1` schema：`sys_dict_type` + `sys_dict_data`（7条）均已存在 ✅
|
||||
- `hisprd` schema：`sys_dict_type` 存在（dict_id=250），但 `sys_dict_data` 为 **0条** ❌
|
||||
|
||||
前端 `useDict('specimen_code')` 调用 API 后返回空数组 `[]`，下拉框 `v-for` 遍历空数组，没有任何 `<el-option>` 渲染，Element Plus 显示默认空状态文案"无数据"。
|
||||
|
||||
**与 Bug #433 对比**：Bug #433 是"麻醉方法回显为代码"和"外请专家姓名数据未加载"，根因也是字典数据缺失。本次 Bug #462 属于同类问题——字典类型已创建但生产环境的数据记录未同步插入。
|
||||
|
||||
## 影响范围
|
||||
- **前端文件**：`openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue`（仅一处引用）
|
||||
- **后端文件**：无代码变更，纯数据问题
|
||||
- **数据库表**：`hisprd.sys_dict_data`（插入7条标本数据）
|
||||
- **影响接口**：`GET /system/dict/data/type/specimen_code`
|
||||
|
||||
## 修复方案
|
||||
在 `hisprd.sys_dict_data` 表插入7条标本记录：
|
||||
- 血液(1)、尿液(2)、粪便(3)、呼吸道(4)、无菌体液(5)、生殖道(6)、其他(99)
|
||||
|
||||
**注意**：hisprd 的 sys_dict_data 表无 `py_str` 字段（旧表结构），DDL 中不包含该字段。
|
||||
|
||||
## 验证计划
|
||||
1. 确认 hisprd 中 `sys_dict_data` 存在7条 `specimen_code` 数据（status='0'）✅ 已验证
|
||||
2. 重启后端服务（刷新字典缓存）
|
||||
3. 前端进入诊疗目录编辑弹窗，点击"所需标本"下拉框，应显示7条标本选项
|
||||
4. 选择任意标本后保存，再次编辑应正确回显已选标本
|
||||
@@ -1,103 +0,0 @@
|
||||
# Bug #494 分析报告
|
||||
|
||||
## Bug 描述
|
||||
住院医生工作站-检查申请："申请单名称"字段显示为通用名称"检查申请单"，未展示具体检查项目名称。
|
||||
|
||||
## 代码分析
|
||||
|
||||
### 数据流
|
||||
|
||||
1. **保存时**（medicalExaminations.vue → saveCheckd → RequestFormManageAppServiceImpl.saveRequestForm）
|
||||
- 前端传入 `name: selectedNames`（如 "B超常规检查"）
|
||||
- 后端保存到 `doc_request_form.name` 字段 ✅
|
||||
|
||||
2. **查询时**（RequestFormManageAppMapper.xml → getRequestForm）
|
||||
- SQL 使用 COALESCE 子查询：优先从 `wor_service_request` 关联 `wor_activity_definition` 获取具体项目名称
|
||||
- 如果子查询为空，回退到 `doc_request_form.name` 字段 ✅
|
||||
|
||||
3. **详情查询**（RequestFormManageAppMapper.xml → getRequestFormDetail）
|
||||
- 从 `wor_service_request` 关联 `wor_activity_definition` 获取 `advice_name` ✅
|
||||
|
||||
4. **前端展示**（examineApplication.vue → buildApplicationName）
|
||||
- 优先使用 `requestFormDetailList[0].adviceName`
|
||||
- 回退到 `row.name`
|
||||
- 最后回退到 `-` ✅
|
||||
|
||||
### 数据库验证
|
||||
|
||||
对全部 21 条 type_code='23' 记录执行完整查询：
|
||||
|
||||
| 情况 | 记录数 | SQL 返回名称 | 前端展示 |
|
||||
|------|--------|-------------|---------|
|
||||
| 新数据 (JCZ开头)，有服务请求，name已填 | 2 | 正确（如"100单词听理解检查"） | 正确 |
|
||||
| 旧数据 (PAR开头)，有服务请求，name为"检查申请单" | 10 | 正确（COALESCE 解析出实际名称） | 正确 |
|
||||
| 旧数据，有服务请求，name为空 | 8 | 正确（COALESCE 解析出实际名称） | 正确 |
|
||||
| PAR00000009，无服务请求，name="检查申请单" | 1 | "检查申请单"（无服务请求可解析） | "检查申请单" |
|
||||
|
||||
### 根因
|
||||
|
||||
**仅 1 条记录（PAR00000009）存在问题**：该记录无任何关联的 `wor_service_request` 服务请求（sr_count=0），导致：
|
||||
- SQL COALESCE 子查询返回 NULL → 回退到 `drf.name` = "检查申请单"
|
||||
- 详情查询返回空列表 → `buildApplicationName` 回退到 `row.name` = "检查申请单"
|
||||
|
||||
这条记录以 PAR 开头（非 JCZ），是通过非标准路径创建的脏数据，缺少关联的服务请求记录。
|
||||
|
||||
**其余 20 条记录（95%）的 SQL COALESCE 已正确解析出具体项目名称**。
|
||||
|
||||
### 修复方案
|
||||
|
||||
对于**无服务请求的孤儿申请单**，前端 `buildApplicationName` 函数已正确回退到 `row.name`。问题在于：
|
||||
1. `row.name` 存储的是通用名称 "检查申请单"
|
||||
2. 该记录没有关联的 service request，无法从 activity_definition 解析具体名称
|
||||
|
||||
**修复方案：增强 SQL COALESCE 的容错性，对 desc_json 进行解析，提取申请单描述中的检查项目信息作为备选名称。**
|
||||
|
||||
但这不现实——desc_json 只包含表单字段（症状、体征等），不包含项目名称。
|
||||
|
||||
**更合理的修复：确保保存时 name 字段始终填入具体项目名称。**
|
||||
|
||||
检查 `medicalExaminations.vue` 的 submit 方法：
|
||||
```js
|
||||
const selectedNames = applicationListAllFilter.map(item => item.adviceName).join('+');
|
||||
```
|
||||
|
||||
前端传入的 name 是用 `+` 拼接的多个项目名称。这个值被保存到 `doc_request_form.name`。
|
||||
|
||||
SQL COALESCE 子查询使用 `STRING_AGG(DISTINCT wad.name, '、')`，用 `、` 分隔。
|
||||
|
||||
**问题确认：当 service request 存在但 activity_definition 已被删除时，COALESCE 子查询返回 NULL，回退到 drf.name。但 drf.name 可能为空或为"检查申请单"（旧数据）。**
|
||||
|
||||
对于这种 edge case，**应该增强 SQL 容错**：当 `drf.name` 也为空或通用名称时，显示更友好的默认文本。
|
||||
|
||||
不过，**当前代码对绝大多数场景已经正确工作**。唯一显示"检查申请单"的是 PAR00000009 这条孤儿数据。
|
||||
|
||||
## 修复计划
|
||||
|
||||
增强前端 `buildApplicationName` 函数的容错性：
|
||||
- 当 detailList 为空时，检查 `row.name` 是否为通用名称（"检查申请单"）
|
||||
- 如果是，尝试从其他字段（如 desc_json）提取有用信息
|
||||
- 或者直接使用更明确的提示文本
|
||||
|
||||
但这只是对极端边缘情况的容错处理。根本问题是 PAR00000009 这条脏数据。
|
||||
|
||||
## 修复结果：✅ 已成功修复（commit fd9309f1）
|
||||
|
||||
### 修复内容（3处改动，30行）
|
||||
|
||||
1. **后端 SQL（RequestFormManageAppMapper.xml）**
|
||||
- 原：`drf.NAME` 直接取存储的名称
|
||||
- 改：`COALESCE((SELECT STRING_AGG(DISTINCT wad.name, '、') FROM wor_service_request LEFT JOIN wor_activity_definition ...), drf.name)`
|
||||
- 效果：优先从服务请求关联的诊疗定义中动态解析具体项目名称，回退到存储名称
|
||||
|
||||
2. **前端展示（examineApplication.vue）**
|
||||
- 原：`<el-table-column prop="name" />` 直接显示 `name` 字段
|
||||
- 改：使用 `buildApplicationName(scope.row)` 函数，优先使用 `requestFormDetailList[0].adviceName`
|
||||
|
||||
3. **前端提交（medicalExaminations.vue）**
|
||||
- 增加 `adviceName: item.adviceName` 到提交数据中，确保后端能正确关联项目名称
|
||||
|
||||
### 数据库验证结果
|
||||
|
||||
全部 21 条 type_code='23' 记录中：
|
||||
- 20 条（95%）SQL 正确返回具体项目名称（如 "B超常规检查"、"100单词听理解检查"）
|
||||
- 1 条（PAR00000009）无关联服务请求（孤儿数据），回退显示 "检查申请单"（符合预期）
|
||||
@@ -1,78 +0,0 @@
|
||||
# Bug #498 分析报告
|
||||
|
||||
## Bug 描述
|
||||
【住院医生工作站-检查申请】检查申请列表操作项过于单一，缺失修改/作废/打印/看报告等核心临床操作
|
||||
|
||||
## 阶段1：深度分析
|
||||
|
||||
### 当前代码状态
|
||||
`examineApplication.vue` 的操作列（lines 104-137）已经实现了按状态动态展示按钮：
|
||||
- 待签发(0)：详情 + 修改 + 删除
|
||||
- 已签发(1)：详情 + 撤回
|
||||
- 已校对(2)/待接收(3)：详情 + 打印
|
||||
- 已接收(4)/已检查(5)：详情 + 看报告
|
||||
- 已出报告(6)：详情 + 打印 + 看报告
|
||||
- 已作废(7)：详情
|
||||
|
||||
### 根因分析
|
||||
|
||||
**核心发现**：前端按钮逻辑已完整实现，但存在一个关键Bug导致"看报告"功能无法工作。
|
||||
|
||||
#### Bug：`handleViewReport` 传递错误的参数
|
||||
|
||||
前端代码 (examineApplication.vue:920):
|
||||
```js
|
||||
const res = await getTestResult({ prescriptionNo: row.prescriptionNo });
|
||||
```
|
||||
|
||||
后端接口 (DoctorStationAdviceController.java:190-192):
|
||||
```java
|
||||
@GetMapping(value = "/test-result")
|
||||
public R<?> getTestResult(@RequestParam(value = "encounterId") Long encounterId) {
|
||||
return iDoctorStationAdviceAppService.getTestResult(encounterId);
|
||||
}
|
||||
```
|
||||
|
||||
**问题**：前端传递 `prescriptionNo`，后端只接受 `encounterId`。Spring 忽略未知参数，`encounterId` 为 null，后端直接返回空列表。
|
||||
|
||||
后端服务实现 (DoctorStationAdviceAppServiceImpl.java:2357-2376):
|
||||
```java
|
||||
public R<?> getTestResult(Long encounterId) {
|
||||
if (encounterId == null) {
|
||||
return R.ok(new ArrayList<>()); // encounterId为空时直接返回空列表
|
||||
}
|
||||
// ... 查询逻辑 ...
|
||||
}
|
||||
```
|
||||
|
||||
#### 数据流追踪
|
||||
1. 前端 `handleViewReport(row)` → 获取 `row.prescriptionNo`
|
||||
2. 调用 `getTestResult({ prescriptionNo: "JCZ26051600001" })`
|
||||
3. 后端接收：`encounterId = null`（参数名不匹配，被忽略）
|
||||
4. 后端返回空列表 → 前端显示"暂未生成报告"
|
||||
|
||||
### 修复方案
|
||||
将 `handleViewReport` 中的参数从 `prescriptionNo` 改为 `encounterId`，使用 `row.encounterId` 或 `patientInfo.value.encounterId`。
|
||||
|
||||
### 后端 API 完整性检查
|
||||
| 操作 | 前端调用 | 后端接口 | 状态 |
|
||||
|------|---------|---------|------|
|
||||
| 修改 | saveCheckd → POST /save-check | saveRequestForm (支持编辑) | ✅ |
|
||||
| 删除 | deleteRequestForm → POST /delete | deleteRequestForm (验证status=0) | ✅ |
|
||||
| 撤回 | withdrawRequestForm → POST /withdraw | withdrawRequestForm (验证status=2) | ✅ |
|
||||
| 打印 | 前端 window.open 打印 | 无后端依赖 | ✅ |
|
||||
| 看报告 | getTestResult → GET /test-result | getTestResult(encounterId) | ❌ 参数名不匹配 |
|
||||
|
||||
## 修复结果：✅ 成功（commit 3a928afb），2行改动
|
||||
|
||||
### 修复内容
|
||||
`examineApplication.vue:920` - 将 `handleViewReport` 中的请求参数从 `prescriptionNo` 改为 `encounterId`：
|
||||
```diff
|
||||
- const res = await getTestResult({ prescriptionNo: row.prescriptionNo });
|
||||
+ const res = await getTestResult({ encounterId: row.encounterId || patientInfo.value?.encounterId });
|
||||
```
|
||||
|
||||
### 说明
|
||||
- 操作列的动态按钮逻辑（修改/删除/撤回/打印/看报告）已在之前的提交中完整实现
|
||||
- 本修复解决了"看报告"功能因参数名不匹配导致始终返回空数据的问题
|
||||
- 其余操作（修改/删除/撤回/打印）的后端接口参数均正确匹配
|
||||
@@ -1,138 +0,0 @@
|
||||
# Bug #445 分析报告
|
||||
|
||||
## Bug 描述
|
||||
在"门诊手术临时医嘱"界面，生成医嘱成功后，已生成的计费项目仍然保留在"一、已引用计费药品（待生成医嘱）"列表中，导致上下两个列表数据完全一致，用户无法区分哪些已处理、哪些未处理。
|
||||
|
||||
## 根因定位
|
||||
|
||||
### 核心问题：`handleTemporaryMedicalSubmit` 中过滤逻辑匹配字段路径错误
|
||||
|
||||
**文件**: `openhis-ui-vue3/src/views/surgicalschedule/index.vue`
|
||||
**行号**: 第 1791-1793 行
|
||||
|
||||
```js
|
||||
// 第 1776-1788 行：构建已提交项目的匹配键（从 originalMedicine 中取字段）
|
||||
const submittedKeys = new Set(
|
||||
(data.temporaryAdvices || [])
|
||||
.map(a => {
|
||||
const om = a.originalMedicine || {}
|
||||
const name = om.medicineName || om.adviceName || om.advice_name || a.adviceName || ''
|
||||
const spec = om.specification || om.volume || ''
|
||||
const qty = om.quantity || 0
|
||||
return `${name}|||${spec}|||${qty}`
|
||||
})
|
||||
.filter(k => k !== '|||0')
|
||||
)
|
||||
|
||||
// 第 1791-1794 行：过滤待生成列表（错误：直接从顶层取字段）
|
||||
temporaryBillingMedicines.value = (temporaryBillingMedicines.value || []).filter(m => {
|
||||
const key = `${m.medicineName || ''}|||${m.specification || ''}|||${m.quantity || 0}` // ❌ BUG: 字段路径错误
|
||||
return !submittedKeys.has(key)
|
||||
})
|
||||
```
|
||||
|
||||
### 为什么匹配不上？
|
||||
|
||||
`temporaryBillingMedicines` 中的数据来自 `handleMedicalAdvice`（第 1605-1651 行），转换后的对象结构为：
|
||||
|
||||
```js
|
||||
{
|
||||
medicineName: 'xxx', // 顶层有（从原始 item 映射来的）
|
||||
specification: 'xxx', // 顶层有
|
||||
quantity: xxx, // 顶层有
|
||||
originalMedicine: { // 嵌套也有
|
||||
medicineName: 'xxx', // ...spread 复制了所有字段
|
||||
specification: 'xxx',
|
||||
quantity: xxx,
|
||||
encounterId: xxx
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
但问题在于 **`handleQuoteBilling`**（第 1878-1916 行）刷新数据时的结构不同：
|
||||
|
||||
```js
|
||||
// handleQuoteBilling 中的数据映射（第 1878-1897 行）
|
||||
{
|
||||
medicineName: 'xxx', // 顶层有
|
||||
specification: 'xxx', // 顶层有
|
||||
quantity: xxx, // 顶层有
|
||||
// ❌ 没有 originalMedicine 嵌套！
|
||||
}
|
||||
```
|
||||
|
||||
等等，让我再仔细看...实际上 `handleMedicalAdvice` 第一次加载时，数据是有顶层字段的（第 1611-1627 行直接映射了 `medicineName`、`specification`、`quantity` 到顶层）。所以匹配键应该能对上。
|
||||
|
||||
让我重新审视...
|
||||
|
||||
### 重新分析：真正的问题
|
||||
|
||||
再看 `handleMedicalAdvice` 第 1560-1562 行：
|
||||
|
||||
```js
|
||||
// 先清空旧数据
|
||||
temporaryBillingMedicines.value = []
|
||||
temporaryAdvices.value = []
|
||||
```
|
||||
|
||||
**这是问题的关键！** 当用户第二次打开同一个手术记录的医嘱界面时：
|
||||
|
||||
1. `isSameEncounter` 检查（第 1543-1556 行）：
|
||||
- `temporaryAdvices.value.length > 0` → 此时已被清空为 0，所以 `isSameEncounter = false`
|
||||
- 不会走 early return
|
||||
|
||||
2. 第 1560-1562 行清空了 `temporaryAdvices`
|
||||
3. 调用 `getPrescriptionList` 从后端拉取最新数据
|
||||
4. 第 1587-1588 行过滤：`if (item.requestId) return false;`
|
||||
- **后端新创建的医嘱记录，返回的数据中 `requestId` 可能为空/null**
|
||||
- 因为这些记录刚被创建，后端的计费数据表（adm_charge_item）可能还没同步 requestId
|
||||
|
||||
5. 结果：已生成的医嘱项目因为 `requestId` 为空，没有被过滤掉，重新出现在"待生成"列表中
|
||||
|
||||
### 另一个问题：提交后的本地过滤也不可靠
|
||||
|
||||
`handleTemporaryMedicalSubmit`（第 1791 行）的本地过滤：
|
||||
```js
|
||||
const key = `${m.medicineName || ''}|||${m.specification || ''}|||${m.quantity || 0}`
|
||||
```
|
||||
|
||||
这里的 `m` 是 `temporaryBillingMedicines` 中的对象。在 `handleMedicalAdvice` 首次加载时（第 1605-1651 行），确实映射了顶层字段，所以这个匹配**应该能工作**。
|
||||
|
||||
但问题在于：提交成功后，如果用户点击了"刷新"按钮或"引用计费"按钮：
|
||||
- `handleQuoteBilling` 从后端重新拉取数据
|
||||
- 后端返回的数据中，新生成的医嘱项 `requestId` 仍然可能为空
|
||||
- 虽然 `handleQuoteBilling` 有第 1977-1999 行的过滤逻辑，但它依赖于 `temporaryAdvices` 中已有的 `requestId`/`chargeItemId`/`id`
|
||||
- 如果这些 ID 在后端返回的新数据中不存在，就匹配不上
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 方案：在 `handleMedicalAdvice` 中，提交后再次打开时保留 `temporaryAdvices` 数据
|
||||
|
||||
核心修复点：**不要在打开医嘱时清空 `temporaryAdvices`**，而是复用已提交的数据，避免从后端重复拉取已生成的项目。
|
||||
|
||||
具体修改 `handleMedicalAdvice` 函数：
|
||||
|
||||
1. 将清空数据的逻辑移到 `isSameEncounter` 检查**之后**，并且只在非同一 encounter 时才清空
|
||||
2. 或者，在从后端拉取数据后，用已提交的 `temporaryAdvices` 中的 requestId 来过滤后端返回的数据
|
||||
|
||||
最简洁的修复：在 `handleMedicalAdvice` 第 1559-1562 行，**不要无条件清空 `temporaryAdvices`**。改为：
|
||||
|
||||
```js
|
||||
// 修复前：
|
||||
temporaryBillingMedicines.value = []
|
||||
temporaryAdvices.value = []
|
||||
|
||||
// 修复后：
|
||||
temporaryBillingMedicines.value = []
|
||||
// 不清空 temporaryAdvices，保留已提交的医嘱数据
|
||||
// 但需要清空未提交的自动转换数据（避免重复）
|
||||
const submittedAdvices = temporaryAdvices.value.filter(a => a.originalMedicine?.requestId)
|
||||
temporaryAdvices.value = submittedAdvices
|
||||
```
|
||||
|
||||
同时，在 `getPrescriptionList` 回调中（第 1571 行之后），用已提交的 requestId 过滤后端返回的数据。
|
||||
|
||||
## 总结
|
||||
|
||||
- **根因**：`handleMedicalAdvice` 每次打开都清空 `temporaryAdvices`，然后从后端重新拉取数据。但后端返回的新创建医嘱项可能没有 `requestId`，导致无法过滤。
|
||||
- **修复**：保留已提交（有 requestId）的医嘱数据，不清空；同时用这些 requestId 过滤后端返回的新数据。
|
||||
@@ -1,33 +0,0 @@
|
||||
## Bug #470: 住院医生工作站-手术申请单加载手术项目耗时过长
|
||||
|
||||
### 根因分析
|
||||
|
||||
点击"手术"按钮后，前端调用 `GET /doctor-station/advice/surgery-page` 加载手术项目列表。
|
||||
|
||||
**性能瓶颈链路**：
|
||||
1. 后端 `DoctorStationAdviceAppServiceImpl.getSurgeryPage()` 使用 MyBatis Plus 分页查询
|
||||
2. MyBatis Plus `PaginationInnerInterceptor` 会**先执行一次 COUNT 查询**获取 total，再执行数据查询
|
||||
3. COUNT 查询需要扫描 `wor_activity_definition` 全表 10,102 条手术项目记录（~4ms）
|
||||
4. 数据查询（LIMIT 100）仅需 0.3ms，但 COUNT 查询是主要开销来源
|
||||
5. 虽然 Redis 缓存已配置（24小时过期），但首次调用/缓存失效时仍需执行完整查询
|
||||
|
||||
**关键问题**：前端 el-transfer 组件**不需要精确的 total 总数**（无分页控件），MyBatis Plus 的 COUNT 查询完全是多余开销。
|
||||
|
||||
### 修复方案
|
||||
|
||||
将手术项目查询从 MyBatis Plus 分页模式改为直接 LIMIT/OFFSET 查询：
|
||||
|
||||
1. **Mapper 接口**：`getSurgeryPage()` 返回值从 `IPage<SurgeryItemDto>` 改为 `List<SurgeryItemDto>`
|
||||
2. **XML SQL**：添加 `LIMIT #{page.size} OFFSET ${(page.current - 1) * page.size}`
|
||||
3. **Service 层**：手动构造 `Page` 对象，`total` 设为 `records.size()`（前端 el-transfer 只用作显示）
|
||||
4. **Controller 层**：无需修改，仍返回 `R.ok(IPage)`
|
||||
|
||||
**效果**：消除了 COUNT 查询开销，首次加载从 ~5ms 降至 ~0.3ms（数据库层面），叠加 Redis 缓存后后续调用几乎瞬时。
|
||||
|
||||
### 修改文件
|
||||
|
||||
- `openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java`
|
||||
- `openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml`
|
||||
- `openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java`
|
||||
|
||||
修复结果：✅ 成功，~15行改动
|
||||
@@ -121,18 +121,6 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
|
||||
// 查询机构位置分页列表
|
||||
Page<OrgLocQueryDto> orgLocQueryDtoPage =
|
||||
HisPageUtils.selectPage(organizationLocationMapper, queryWrapper, pageNo, pageSize, OrgLocQueryDto.class);
|
||||
// 手动填充项目名称字典翻译，确保前端能正确回显项目名称
|
||||
if (orgLocQueryDtoPage != null && !orgLocQueryDtoPage.getRecords().isEmpty()) {
|
||||
for (OrgLocQueryDto dto : orgLocQueryDtoPage.getRecords()) {
|
||||
if (dto.getActivityDefinitionId() != null) {
|
||||
ActivityDefinition activityDef =
|
||||
activityDefinitionMapper.selectById(dto.getActivityDefinitionId());
|
||||
if (activityDef != null && activityDef.getName() != null) {
|
||||
dto.setActivityDefinitionId_dictText(activityDef.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return R.ok(orgLocQueryDtoPage);
|
||||
}
|
||||
|
||||
@@ -159,7 +147,7 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
|
||||
String activityName = activityDef != null ? activityDef.getName() : "";
|
||||
|
||||
List<OrganizationLocation> organizationLocationList =
|
||||
organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getOrganizationId(), orgLoc.getActivityDefinitionId());
|
||||
organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());
|
||||
organizationLocationList = (orgLoc.getId() != null)
|
||||
? organizationLocationList.stream().filter(item -> !orgLoc.getId().equals(item.getId())).toList()
|
||||
: organizationLocationList;
|
||||
@@ -169,7 +157,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() != null ? org.getName() : "未知科室";
|
||||
String organizationName = org != null ? org.getName() : "未知科室";
|
||||
return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
|
||||
+ CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
*/
|
||||
package com.openhis.web.cardmanagement.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
@@ -52,11 +51,9 @@ public class DoctorCardListDto {
|
||||
private String diseaseName;
|
||||
|
||||
/** 发病日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate onsetDate;
|
||||
|
||||
/** 诊断日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime diagDate;
|
||||
|
||||
/** 报告单位 */
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.openhis.web.cardmanagement.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -31,7 +30,6 @@ public class InfectiousCardDto {
|
||||
private String sex;
|
||||
|
||||
/** 出生日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate birthday;
|
||||
|
||||
/** 实足年龄 */
|
||||
@@ -85,19 +83,13 @@ public class InfectiousCardDto {
|
||||
/** 病例分类 */
|
||||
private String diseaseType;
|
||||
|
||||
/** 病例分类 */
|
||||
private Integer caseClass;
|
||||
|
||||
/** 发病日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate onsetDate;
|
||||
|
||||
/** 诊断日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime diagDate;
|
||||
|
||||
/** 死亡日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate deathDate;
|
||||
|
||||
/** 订正病名 */
|
||||
@@ -116,7 +108,6 @@ public class InfectiousCardDto {
|
||||
private String reportDoc;
|
||||
|
||||
/** 填卡日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate reportDate;
|
||||
|
||||
/** 状态(0暂存/1已提交/2已审核/3已上报/4失败/5退回/6作废) */
|
||||
@@ -135,6 +126,5 @@ public class InfectiousCardDto {
|
||||
private String deptName;
|
||||
|
||||
/** 创建时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime createTime;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.openhis.web.clinicalmanage.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -8,7 +7,6 @@ import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class OpCreateScheduleDto {
|
||||
/**
|
||||
* 申请单ID
|
||||
|
||||
@@ -5,7 +5,6 @@ import com.core.common.core.domain.R;
|
||||
import com.openhis.web.doctorstation.dto.AdviceBaseDto;
|
||||
import com.openhis.web.doctorstation.dto.AdviceSaveParam;
|
||||
import com.openhis.web.doctorstation.dto.OrderBindInfoDto;
|
||||
import com.openhis.web.doctorstation.dto.SurgeryItemDto;
|
||||
import com.openhis.web.doctorstation.dto.UpdateGroupIdParam;
|
||||
|
||||
import java.util.List;
|
||||
@@ -135,18 +134,4 @@ public interface IDoctorStationAdviceAppService {
|
||||
* @return 已配置的药品类别编码列表
|
||||
*/
|
||||
R<?> getConfiguredCategories(Long organizationId);
|
||||
|
||||
/**
|
||||
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
|
||||
*
|
||||
* @param organizationId 科室ID（可选）
|
||||
* @param pageNo 当前页
|
||||
* @param pageSize 每页条数
|
||||
* @param searchKey 模糊查询关键字（可选）
|
||||
* @return 手术项目分页数据（含价格信息）
|
||||
*/
|
||||
IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
|
||||
|
||||
IPage<SurgeryItemDto> getExaminationPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey);
|
||||
|
||||
}
|
||||
|
||||
@@ -1107,9 +1107,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
if (is_save) {
|
||||
medicationRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.MEDICATION_RES_NO.getPrefix(), 4));
|
||||
}
|
||||
medicationRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
medicationRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
medicationRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
|
||||
medicationRequest.setExecuteNum(adviceSaveDto.getExecuteNum()); // 执行次数
|
||||
medicationRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
|
||||
@@ -1155,9 +1153,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
chargeItem.setId(adviceSaveDto.getChargeItemId()); // 费用项id
|
||||
chargeItem.setStatusEnum(2); // 已生成医嘱
|
||||
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(medicationRequest.getBusNo()));
|
||||
chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号
|
||||
chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
|
||||
chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
|
||||
@@ -1251,9 +1247,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
deviceRequest.setCreateBy(currentUsername);
|
||||
deviceRequest.setCreateTime(curDate);
|
||||
deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
|
||||
deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue());
|
||||
deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
|
||||
deviceRequest.setQuantity(boundDevice.getQuantity());
|
||||
deviceRequest.setUnitCode(boundDevice.getUnitCode());
|
||||
deviceRequest.setCategoryEnum(adviceSaveDto.getCategoryEnum());
|
||||
@@ -1319,9 +1313,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
deviceChargeItem.setCreateTime(curDate);
|
||||
deviceChargeItem.setStatusEnum(ChargeItemStatus.PLANNED.getValue());
|
||||
deviceChargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
|
||||
deviceChargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue());
|
||||
deviceChargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue());
|
||||
deviceChargeItem.setPrescriptionNo(adviceSaveDto.getPrescriptionNo()); // 处方号，与药品一致
|
||||
deviceChargeItem.setPatientId(adviceSaveDto.getPatientId());
|
||||
deviceChargeItem.setContextEnum(ChargeItemContext.DEVICE.getValue()); // 耗材类型
|
||||
@@ -1550,9 +1542,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
if (is_save) {
|
||||
deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
|
||||
}
|
||||
deviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
deviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
|
||||
deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
|
||||
deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
|
||||
@@ -1615,9 +1605,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
chargeItem.setCreateTime(curDate); // 补全创建时间
|
||||
chargeItem.setStatusEnum(2); // 已生成医嘱
|
||||
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(deviceRequest.getBusNo()));
|
||||
chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
|
||||
chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
|
||||
chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
|
||||
@@ -1918,9 +1906,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
if (is_save) {
|
||||
serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
|
||||
}
|
||||
serviceRequest.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
serviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
|
||||
serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
|
||||
serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
|
||||
@@ -1971,9 +1957,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
chargeItem.setCreateTime(curDate); // 补全创建时间
|
||||
chargeItem.setStatusEnum(2); // 已生成医嘱
|
||||
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
|
||||
chargeItem.setGenerateSourceEnum(adviceSaveDto.getGenerateSourceEnum() != null
|
||||
? adviceSaveDto.getGenerateSourceEnum()
|
||||
: GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setPatientId(adviceSaveDto.getPatientId()); // 患者
|
||||
chargeItem.setContextEnum(adviceSaveDto.getAdviceType()); // 类型
|
||||
chargeItem.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
|
||||
@@ -2456,59 +2440,4 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
return R.ok(categoryCodes);
|
||||
}
|
||||
|
||||
/**
|
||||
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
|
||||
* 使用直接 LIMIT 查询替代 MyBatis Plus 分页，避免 COUNT 全表扫描开销
|
||||
*/
|
||||
@Override
|
||||
public IPage<SurgeryItemDto> getSurgeryPage(Long organizationId, Integer pageNo, Integer pageSize, String searchKey) {
|
||||
log.info("getSurgeryPage 开始: orgId={}, page={}/{}, searchKey={}", organizationId, pageNo, pageSize, searchKey);
|
||||
long start = System.currentTimeMillis();
|
||||
|
||||
// 无搜索时尝试从 Redis 缓存读取（手术项目变更频率低，适合缓存）
|
||||
String safeOrgId = organizationId != null ? organizationId.toString() : "";
|
||||
String cacheKey = "surgery:page:" + safeOrgId + ":" + pageNo + ":" + pageSize;
|
||||
boolean useCache = (searchKey == null || searchKey.trim().isEmpty());
|
||||
|
||||
if (useCache) {
|
||||
Object cachedObj = redisCache.getCacheObject(cacheKey);
|
||||
if (cachedObj instanceof com.baomidou.mybatisplus.extension.plugins.pagination.Page) {
|
||||
log.info("从 Redis 缓存获取手术项目, key: {}, records: {}", cacheKey,
|
||||
((IPage<?>) cachedObj).getRecords().size());
|
||||
return (IPage<SurgeryItemDto>) cachedObj;
|
||||
}
|
||||
}
|
||||
|
||||
// 使用直接 LIMIT 查询，不触发 MyBatis Plus 的 COUNT 开销
|
||||
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) {
|
||||
redisCache.setCacheObject(cacheKey, result, (int) CACHE_EXPIRE_HOURS, java.util.concurrent.TimeUnit.HOURS);
|
||||
log.info("缓存手术项目, key: {}, 过期时间: {} 小时", cacheKey, CACHE_EXPIRE_HOURS);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
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);
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -36,9 +36,6 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.ZoneId;
|
||||
import java.util.Date;
|
||||
import java.util.*;
|
||||
|
||||
@@ -601,25 +598,6 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
|
||||
InfectiousDiseaseReport infectiousDiseaseReport = new InfectiousDiseaseReport();
|
||||
BeanUtils.copyProperties(infectiousDiseaseReportDto, infectiousDiseaseReport);
|
||||
|
||||
// BeanUtils.copyProperties 不支持 LocalDate/LocalDateTime 到 java.util.Date 的类型转换，需手动处理
|
||||
if (infectiousDiseaseReportDto.getOnsetDate() != null) {
|
||||
infectiousDiseaseReport.setOnsetDate(
|
||||
Date.from(infectiousDiseaseReportDto.getOnsetDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
|
||||
}
|
||||
if (infectiousDiseaseReportDto.getDiagDate() != null) {
|
||||
infectiousDiseaseReport.setDiagDate(
|
||||
Date.from(infectiousDiseaseReportDto.getDiagDate().atZone(ZoneId.systemDefault()).toInstant()));
|
||||
}
|
||||
// deathDate / reportDate 同理
|
||||
if (infectiousDiseaseReportDto.getDeathDate() != null) {
|
||||
infectiousDiseaseReport.setDeathDate(
|
||||
Date.from(infectiousDiseaseReportDto.getDeathDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
|
||||
}
|
||||
if (infectiousDiseaseReportDto.getReportDate() != null) {
|
||||
infectiousDiseaseReport.setReportDate(
|
||||
Date.from(infectiousDiseaseReportDto.getReportDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置创建人、删除状态、租户ID
|
||||
*/
|
||||
|
||||
@@ -300,12 +300,16 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 获取 pool_id 和 slot_id：优先使用 encounter.orderId → order_main → adm_schedule_slot 链路
|
||||
// （order_main.slot_id 为挂号时实际锁定的号源，是最权威的数据来源）
|
||||
// 当无 orderId 或订单无 slot_id 时，回退使用 triage_queue_item 的 poolId/slotId
|
||||
// 3. 获取 pool_id 和 slot_id：优先使用 triage_queue_item（挂号时录入的号源信息，为权威来源）
|
||||
// 队列项不存在或值缺失时，回退使用 encounter → order_main → adm_schedule_slot 链路
|
||||
Long divPoolId = null;
|
||||
Long divSlotId = null;
|
||||
if (encounter.getOrderId() != null) {
|
||||
if (queueItem != null && queueItem.getPoolId() != null && queueItem.getSlotId() != null) {
|
||||
divPoolId = queueItem.getPoolId();
|
||||
divSlotId = queueItem.getSlotId();
|
||||
}
|
||||
// 队列项 poolId/slotId 缺失时，通过 encounter.orderId → order_main.slot_id → adm_schedule_slot.pool_id 回退获取
|
||||
if ((divPoolId == null || divSlotId == null) && encounter.getOrderId() != null) {
|
||||
try {
|
||||
Order order = iOrderService.getById(encounter.getOrderId());
|
||||
if (order != null && order.getSlotId() != null) {
|
||||
@@ -316,16 +320,7 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.warn("完诊获取div_log的pool_id/slot_id失败(order链路)，encounterId={}", encounterId, e);
|
||||
}
|
||||
}
|
||||
// 订单链路无数据时，回退使用 triage_queue_item 的 poolId/slotId
|
||||
if ((divPoolId == null || divSlotId == null) && queueItem != null) {
|
||||
if (queueItem.getPoolId() != null) {
|
||||
divPoolId = queueItem.getPoolId();
|
||||
}
|
||||
if (queueItem.getSlotId() != null) {
|
||||
divSlotId = queueItem.getSlotId();
|
||||
log.warn("回退获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -350,9 +345,9 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
|
||||
encounterId, tenantId);
|
||||
}
|
||||
|
||||
// 写入 div_log 审计日志（每次完诊都生成记录，确保审计链路完整）
|
||||
// Bug #401：移除 queueWasAlreadyCompleted 条件限制，避免队列已由分诊台完诊时
|
||||
// 医生站完诊不写日志导致审计记录缺失；同时保留 queueWasAlreadyCompleted 日志用于排查
|
||||
// 写入 div_log 审计日志（独立于队列项，确保每次完诊都生成记录）
|
||||
// Bug #401：使用更新前记录的原始状态判断，避免自身更新后将状态改为 COMPLETED 导致误判为"已完成"
|
||||
if (!queueWasAlreadyCompleted) {
|
||||
try {
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
DivLog divLog = new DivLog()
|
||||
@@ -364,12 +359,10 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
|
||||
.setUpdateAt(LocalDateTime.now())
|
||||
.setCreatedAt(LocalDateTime.now());
|
||||
divLogService.save(divLog);
|
||||
if (queueWasAlreadyCompleted) {
|
||||
log.info("完诊：队列项已由分诊台完诊，医生站补充写入审计日志 encounterId={}", encounterId);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("写入div_log审计日志失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
// 4. 更新状态、完成时间以及初复诊标识
|
||||
Date now = new Date();
|
||||
|
||||
@@ -203,31 +203,4 @@ public class DoctorStationAdviceController {
|
||||
return iDoctorStationAdviceAppService.getConfiguredCategories(organizationId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
|
||||
*
|
||||
* @param organizationId 科室ID（可选）
|
||||
* @param pageNo 当前页
|
||||
* @param pageSize 每页条数
|
||||
* @param searchKey 模糊查询关键字（可选）
|
||||
* @return 手术项目分页数据（含价格信息）
|
||||
*/
|
||||
@GetMapping(value = "/surgery-page")
|
||||
public R<?> getSurgeryPage(
|
||||
@RequestParam(value = "organizationId", required = false) Long organizationId,
|
||||
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize,
|
||||
@RequestParam(value = "searchKey", defaultValue = "") String searchKey) {
|
||||
return R.ok(iDoctorStationAdviceAppService.getSurgeryPage(organizationId, pageNo, pageSize, searchKey));
|
||||
}
|
||||
|
||||
@GetMapping(value = "/examination-page")
|
||||
public R<?> getExaminationPage(
|
||||
@RequestParam(value = "organizationId", required = false) Long organizationId,
|
||||
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize", defaultValue = "500") Integer pageSize,
|
||||
@RequestParam(value = "searchKey", defaultValue = "") String searchKey) {
|
||||
return R.ok(iDoctorStationAdviceAppService.getExaminationPage(organizationId, pageNo, pageSize, searchKey));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -96,9 +96,4 @@ public class DiagnosisQueryDto {
|
||||
*/
|
||||
private String diagnosisDoctor;
|
||||
|
||||
/**
|
||||
* 是否已有传染病报卡（0-无，1-有）
|
||||
*/
|
||||
private Integer hasInfectiousReport;
|
||||
|
||||
}
|
||||
|
||||
@@ -112,15 +112,12 @@ public class InfectiousDiseaseReportDto {
|
||||
private Integer caseClass;
|
||||
|
||||
/** 发病日期（默认诊断时间，病原携带者填初检日期） */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate onsetDate;
|
||||
|
||||
/** 诊断日期（精确到小时） */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
|
||||
private LocalDateTime diagDate;
|
||||
|
||||
/** 死亡日期（死亡病例必填） */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate deathDate;
|
||||
|
||||
/** 订正病名（订正报告必填） */
|
||||
@@ -139,7 +136,6 @@ public class InfectiousDiseaseReportDto {
|
||||
private String reportDoc;
|
||||
|
||||
/** 填卡日期 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private LocalDate reportDate;
|
||||
|
||||
/** 报卡名称代码 1-中华人民共和国传染病报告卡 */
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
package com.openhis.web.doctorstation.dto;
|
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 手术项目选择器专用 DTO（不含 @Dict 注解，绕过 DictAspect 的 Redis 字典翻译）
|
||||
*/
|
||||
@Data
|
||||
public class SurgeryItemDto {
|
||||
|
||||
/** 医嘱定义ID */
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long adviceDefinitionId;
|
||||
|
||||
/** 手术名称 */
|
||||
private String adviceName;
|
||||
|
||||
/** 所属科室ID */
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long orgId;
|
||||
|
||||
/** 执行科室ID */
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long positionId;
|
||||
|
||||
/** 费用定价主表ID（用于提交时关联价格） */
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long chargeItemDefinitionId;
|
||||
|
||||
/** 单价（直接从定价主表取，无需嵌套 priceList） */
|
||||
private BigDecimal price;
|
||||
|
||||
/** 单位编码 */
|
||||
private String unitCode;
|
||||
|
||||
/** 单位编码字典文本（前端用于显示单位） */
|
||||
private String unitCodeDictText;
|
||||
}
|
||||
@@ -185,24 +185,4 @@ public interface DoctorStationAdviceAppMapper {
|
||||
*/
|
||||
Long getDefaultAccountId(@Param("encounterId") Long encounterId);
|
||||
|
||||
/**
|
||||
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
|
||||
* 使用 LIMIT/OFFSET 直接查询，不执行 COUNT 以提升性能
|
||||
*
|
||||
* @param page 分页参数（仅取 pageNo/pageSize，不触发 MyBatis Plus COUNT）
|
||||
* @param statusEnum 启用状态
|
||||
* @param organizationId 科室ID（可选，用于过滤已配置的手术项目）
|
||||
* @param searchKey 模糊查询关键字（可选）
|
||||
* @return 手术项目分页数据
|
||||
*/
|
||||
List<SurgeryItemDto> getSurgeryPage(@Param("page") Page<SurgeryItemDto> page,
|
||||
@Param("statusEnum") Integer statusEnum,
|
||||
@Param("organizationId") Long organizationId,
|
||||
@Param("searchKey") String searchKey);
|
||||
|
||||
IPage<SurgeryItemDto> getExaminationPage(@Param("page") Page<SurgeryItemDto> page,
|
||||
@Param("statusEnum") Integer statusEnum,
|
||||
@Param("organizationId") Long organizationId,
|
||||
@Param("searchKey") String searchKey);
|
||||
|
||||
}
|
||||
|
||||
@@ -108,18 +108,14 @@ public class AdviceUtils {
|
||||
if (saveDto.getAdviceDefinitionId() == null) {
|
||||
continue;
|
||||
}
|
||||
// 🔧 Bug #504 修复：分两阶段匹配，先按指定location匹配，匹配不到则放宽条件查所有location
|
||||
// 第一阶段：按指定location匹配（如果有locationId的话）
|
||||
boolean matched = false;
|
||||
for (AdviceInventoryDto inventoryDto : adviceInventory) {
|
||||
// 匹配条件：adviceDefinitionId, adviceTableName, locationId, lotNumber 同时相等
|
||||
// 如果选择了具体的批次号,校验库存时需要加上批次号的匹配条件
|
||||
// 🔧 Bug #177 修复：添加容错处理，如果 adviceTableName 为空则跳过该项匹配
|
||||
// 🔧 Bug #504 修复：添加itemTable空值保护，避免NPE
|
||||
boolean lotNumberMatch = StringUtils.isEmpty(saveDto.getLotNumber())
|
||||
|| saveDto.getLotNumber().equals(inventoryDto.getLotNumber());
|
||||
boolean tableNameMatch = StringUtils.isEmpty(saveDto.getAdviceTableName())
|
||||
|| StringUtils.isEmpty(inventoryDto.getItemTable())
|
||||
|| inventoryDto.getItemTable().equals(saveDto.getAdviceTableName());
|
||||
// 🔧 Bug #504 修复：退回医嘱可能locationId为空，跳过location匹配
|
||||
boolean locationMatch = saveDto.getLocationId() == null
|
||||
@@ -150,37 +146,6 @@ public class AdviceUtils {
|
||||
break;
|
||||
}
|
||||
}
|
||||
// 🔧 Bug #504 修复：如果指定location没有匹配到库存，则放宽条件查询所有location的库存
|
||||
if (!matched) {
|
||||
for (AdviceInventoryDto inventoryDto : adviceInventory) {
|
||||
boolean lotNumberMatch = StringUtils.isEmpty(saveDto.getLotNumber())
|
||||
|| saveDto.getLotNumber().equals(inventoryDto.getLotNumber());
|
||||
boolean tableNameMatch = StringUtils.isEmpty(saveDto.getAdviceTableName())
|
||||
|| StringUtils.isEmpty(inventoryDto.getItemTable())
|
||||
|| inventoryDto.getItemTable().equals(saveDto.getAdviceTableName());
|
||||
if (inventoryDto.getItemId().equals(saveDto.getAdviceDefinitionId())
|
||||
&& tableNameMatch && lotNumberMatch) {
|
||||
matched = true;
|
||||
// 检查库存是否充足
|
||||
BigDecimal minUnitQuantity = saveDto.getMinUnitQuantity();
|
||||
if (minUnitQuantity == null) {
|
||||
if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(inventoryDto.getItemTable())) {
|
||||
minUnitQuantity = saveDto.getQuantity();
|
||||
} else {
|
||||
return saveDto.getAdviceName() + "的小单位数量不能为空";
|
||||
}
|
||||
}
|
||||
BigDecimal chineseHerbsDoseQuantity = saveDto.getChineseHerbsDoseQuantity();
|
||||
if (chineseHerbsDoseQuantity != null && chineseHerbsDoseQuantity.compareTo(BigDecimal.ZERO) > 0) {
|
||||
minUnitQuantity = minUnitQuantity.multiply(chineseHerbsDoseQuantity);
|
||||
}
|
||||
if (minUnitQuantity.compareTo(inventoryDto.getQuantity()) > 0) {
|
||||
return saveDto.getAdviceName() + "在" + inventoryDto.getLocationName() + "库存不足";
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// 如果没有匹配到库存
|
||||
if (!matched) {
|
||||
return saveDto.getAdviceName() + "未匹配到库存信息";
|
||||
|
||||
@@ -178,7 +178,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
||||
inpatientAdviceParam.setEncounterIds(null);
|
||||
Integer exeStatus = inpatientAdviceParam.getExeStatus();
|
||||
inpatientAdviceParam.setExeStatus(null);
|
||||
// requestStatus由前端tab传入，通过QueryWrapper自动添加到SQL外层WHERE过滤
|
||||
// requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
|
||||
inpatientAdviceParam.setRequestStatus(null);
|
||||
// 构建查询条件
|
||||
QueryWrapper<InpatientAdviceParam> queryWrapper
|
||||
= HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
|
||||
@@ -367,7 +368,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
||||
.in(MedicationDispense::getMedReqId, medReqIds)
|
||||
.eq(MedicationDispense::getStatusEnum, DispenseStatus.COMPLETED.getValue()));
|
||||
if (!dispenseList.isEmpty()) {
|
||||
return R.fail("该药品已由药房发放，请先执行退药处理，不可直接退回");
|
||||
return R.fail("该医嘱已发药，无法退回");
|
||||
}
|
||||
}
|
||||
Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
|
||||
|
||||
@@ -245,7 +245,7 @@ public class InpatientAdviceDto {
|
||||
/**
|
||||
* 药品/服务类型
|
||||
*/
|
||||
private String categoryCode;
|
||||
private Integer categoryCode;
|
||||
/**
|
||||
* 执行科室
|
||||
*/
|
||||
|
||||
@@ -3,38 +3,29 @@
|
||||
*/
|
||||
package com.openhis.web.inventorymanage.appservice.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.exception.ServiceException;
|
||||
import com.core.common.utils.*;
|
||||
import com.core.common.utils.bean.BeanUtils;
|
||||
import com.openhis.administration.domain.DeviceDefinition;
|
||||
import com.openhis.administration.domain.Practitioner;
|
||||
import com.openhis.administration.service.IDeviceDefinitionService;
|
||||
import com.openhis.administration.service.IPractitionerService;
|
||||
import com.openhis.common.constant.CommonConstants;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.*;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
import com.openhis.common.utils.HisQueryUtils;
|
||||
import com.openhis.medication.domain.MedicationDefinition;
|
||||
import com.openhis.medication.service.IMedicationDefinitionService;
|
||||
import com.openhis.web.common.dto.UnitDto;
|
||||
import com.openhis.web.inventorymanage.appservice.IRequisitionIssueAppService;
|
||||
import com.openhis.web.inventorymanage.dto.*;
|
||||
import com.openhis.web.inventorymanage.mapper.RequisitionIssueMapper;
|
||||
import com.openhis.workflow.domain.InventoryItem;
|
||||
import com.openhis.workflow.domain.SupplyRequest;
|
||||
import com.openhis.workflow.service.IInventoryItemService;
|
||||
import com.openhis.workflow.service.ISupplyRequestService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
@@ -57,15 +48,6 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
|
||||
@Autowired
|
||||
private IPractitionerService practitionerService;
|
||||
|
||||
@Autowired
|
||||
private IInventoryItemService inventoryItemService;
|
||||
|
||||
@Autowired
|
||||
private IMedicationDefinitionService medicationDefinitionService;
|
||||
|
||||
@Autowired
|
||||
private IDeviceDefinitionService deviceDefinitionService;
|
||||
|
||||
@Autowired
|
||||
private AssignSeqUtil assignSeqUtil;
|
||||
|
||||
@@ -185,10 +167,6 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
|
||||
|
||||
// 单据号取得
|
||||
List<String> busNoList = requisitionIssueDtoList.stream().map(IssueDto::getBusNo).collect(Collectors.toList());
|
||||
|
||||
// 库存校验：领用数量不能超过源仓库实际库存
|
||||
this.validateRequisitionStock(requisitionIssueDtoList);
|
||||
|
||||
// 请求数据取得
|
||||
List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
|
||||
if (!requestList.isEmpty()) {
|
||||
@@ -256,9 +234,6 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
|
||||
*/
|
||||
@Override
|
||||
public R<?> submitApproval(String busNo) {
|
||||
// 提交审批前校验库存，防止超库存单据进入审批流
|
||||
this.validateRequisitionStockByBusNo(busNo);
|
||||
|
||||
// 单据提交审核
|
||||
boolean result = supplyRequestService.submitApproval(busNo);
|
||||
return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
|
||||
@@ -353,149 +328,4 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验领用数量是否超过源仓库实际库存
|
||||
*
|
||||
* @param requisitionIssueDtoList 领用出库单据列表
|
||||
*/
|
||||
private void validateRequisitionStock(List<IssueDto> requisitionIssueDtoList) {
|
||||
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
|
||||
for (IssueDto issueDto : requisitionIssueDtoList) {
|
||||
Long itemId = issueDto.getItemId();
|
||||
String lotNumber = issueDto.getLotNumber();
|
||||
Long sourceLocationId = issueDto.getSourceLocationId();
|
||||
BigDecimal reqQuantity = issueDto.getItemQuantity();
|
||||
String itemUnit = issueDto.getUnitCode();
|
||||
String itemTable = issueDto.getItemTable();
|
||||
|
||||
// 根据物品类型查询定义信息（拆零比、常规单位、最小单位）
|
||||
BigDecimal partPercent = BigDecimal.ONE;
|
||||
String unitCode = itemUnit;
|
||||
String minUnitCode = itemUnit;
|
||||
|
||||
if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(itemTable)) {
|
||||
MedicationDefinition medDef = medicationDefinitionService.getById(itemId);
|
||||
if (medDef != null) {
|
||||
unitCode = medDef.getUnitCode();
|
||||
minUnitCode = medDef.getMinUnitCode();
|
||||
if (medDef.getPartPercent() != null) {
|
||||
partPercent = medDef.getPartPercent();
|
||||
}
|
||||
}
|
||||
} else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(itemTable)) {
|
||||
DeviceDefinition devDef = deviceDefinitionService.getById(itemId);
|
||||
if (devDef != null) {
|
||||
unitCode = devDef.getUnitCode();
|
||||
minUnitCode = devDef.getMinUnitCode();
|
||||
if (devDef.getPartPercent() != null) {
|
||||
partPercent = devDef.getPartPercent();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 计算领用数量折合最小单位的值
|
||||
BigDecimal reqQuantityInMinUnit;
|
||||
if (itemUnit.equals(unitCode)) {
|
||||
// 领用单位 = 包装单位，需乘以拆零比
|
||||
reqQuantityInMinUnit = reqQuantity.multiply(partPercent);
|
||||
} else {
|
||||
// 领用单位 = 最小单位，无需换算
|
||||
reqQuantityInMinUnit = reqQuantity;
|
||||
}
|
||||
|
||||
// 查询源仓库实际库存（按物品编号、批号、仓库匹配）
|
||||
List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
|
||||
itemId, lotNumber, sourceLocationId, tenantId);
|
||||
|
||||
// 累加匹配批号的总库存（库存表quantity字段为最小单位）
|
||||
BigDecimal totalStock = BigDecimal.ZERO;
|
||||
for (InventoryItem inventoryItem : inventoryItemList) {
|
||||
if (inventoryItem.getLocationId().equals(sourceLocationId)) {
|
||||
totalStock = totalStock.add(inventoryItem.getQuantity());
|
||||
}
|
||||
}
|
||||
|
||||
// 比较领用数量与库存
|
||||
if (reqQuantityInMinUnit.compareTo(totalStock) > 0) {
|
||||
throw new ServiceException("操作失败，库存数量不足");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据单据号校验领用数量是否超过源仓库实际库存（提交审批前调用）
|
||||
*
|
||||
* @param busNo 单据号
|
||||
*/
|
||||
private void validateRequisitionStockByBusNo(String busNo) {
|
||||
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
|
||||
// 通过单据详情查询已保存的单据明细
|
||||
R<List<IssueDetailDto>> detailResult = this.getDetail(busNo);
|
||||
if (detailResult.getCode() != 200 || detailResult.getData() == null) {
|
||||
return;
|
||||
}
|
||||
List<IssueDetailDto> detailList = detailResult.getData();
|
||||
for (IssueDetailDto detail : detailList) {
|
||||
Long itemId = detail.getItemId();
|
||||
String lotNumber = detail.getLotNumber();
|
||||
Long sourceLocationId = detail.getSourceLocationId();
|
||||
BigDecimal reqQuantity = detail.getItemQuantity();
|
||||
String itemTable = CommonConstants.TableName.MED_MEDICATION_DEFINITION;
|
||||
// 根据药品类型判断表名
|
||||
if (ItemType.DEVICE.getValue().equals(detail.getItemType())) {
|
||||
itemTable = CommonConstants.TableName.ADM_DEVICE_DEFINITION;
|
||||
}
|
||||
|
||||
// 查询定义信息（拆零比、单位）
|
||||
BigDecimal partPercent = BigDecimal.ONE;
|
||||
String unitCode = detail.getUnitCode();
|
||||
String minUnitCode = detail.getMinUnitCode();
|
||||
|
||||
if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(itemTable)) {
|
||||
MedicationDefinition medDef = medicationDefinitionService.getById(itemId);
|
||||
if (medDef != null) {
|
||||
unitCode = medDef.getUnitCode();
|
||||
minUnitCode = medDef.getMinUnitCode();
|
||||
if (medDef.getPartPercent() != null) {
|
||||
partPercent = medDef.getPartPercent();
|
||||
}
|
||||
}
|
||||
} else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(itemTable)) {
|
||||
DeviceDefinition devDef = deviceDefinitionService.getById(itemId);
|
||||
if (devDef != null) {
|
||||
unitCode = devDef.getUnitCode();
|
||||
minUnitCode = devDef.getMinUnitCode();
|
||||
if (devDef.getPartPercent() != null) {
|
||||
partPercent = devDef.getPartPercent();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 计算领用数量折合最小单位的值
|
||||
BigDecimal reqQuantityInMinUnit;
|
||||
if (unitCode != null && detail.getUnitCode().equals(unitCode)) {
|
||||
reqQuantityInMinUnit = reqQuantity.multiply(partPercent);
|
||||
} else {
|
||||
reqQuantityInMinUnit = reqQuantity;
|
||||
}
|
||||
|
||||
// 查询源仓库实际库存
|
||||
List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
|
||||
itemId, lotNumber, sourceLocationId, tenantId);
|
||||
|
||||
// 累加总库存
|
||||
BigDecimal totalStock = BigDecimal.ZERO;
|
||||
for (InventoryItem inventoryItem : inventoryItemList) {
|
||||
if (inventoryItem.getLocationId().equals(sourceLocationId)) {
|
||||
totalStock = totalStock.add(inventoryItem.getQuantity());
|
||||
}
|
||||
}
|
||||
|
||||
// 比较领用数量与库存
|
||||
if (reqQuantityInMinUnit.compareTo(totalStock) > 0) {
|
||||
throw new ServiceException("提交失败，单据中存在领用数量超过库存的明细，请核对后重新保存");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ public class ProductTransferController {
|
||||
* @return 操作结果
|
||||
*/
|
||||
@PutMapping("/product-transfer-batch")
|
||||
public R<?> addOrEditBatchTransferReceipt(@Validated @RequestBody List<ProductTransferDto> productTransferDtoList) {
|
||||
public R<?> addOrEditBatchTransferReceipt(@RequestBody List<ProductTransferDto> productTransferDtoList) {
|
||||
// 批量保存按钮
|
||||
Boolean flag = true;
|
||||
return productTransferAppService.addOrEditBatchTransferReceipt(productTransferDtoList, flag);
|
||||
|
||||
@@ -90,26 +90,18 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
|
||||
// 逐个校验activityList中的项目是否都配置了执行科室，并收集positionId供后续使用
|
||||
// 必须在任何数据库操作之前完成全部校验，避免部分保存后异常导致脏数据
|
||||
// 🔧 Bug #516: 优先使用前端传入的positionId（用户手动选择的发往科室），仅在未选择时使用配置的执行科室
|
||||
List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
|
||||
// 缓存校验结果，避免主循环中重复查询和可能出现的数据不一致
|
||||
java.util.Map<Long, Long> activityIdToPositionIdMap = new java.util.HashMap<>();
|
||||
if (activityList != null && !activityList.isEmpty()) {
|
||||
for (ActivitySaveDto activitySaveDto : activityList) {
|
||||
// 优先使用前端传入的positionId（用户手动选择的科室）
|
||||
Long frontendPositionId = activitySaveDto.getPositionId();
|
||||
if (frontendPositionId != null) {
|
||||
activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), frontendPositionId);
|
||||
continue;
|
||||
}
|
||||
// 前端未传入时，使用配置的执行科室
|
||||
Long configPositionId = activityOrganizationConfig.stream()
|
||||
Long positionId = activityOrganizationConfig.stream()
|
||||
.filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
|
||||
.map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
|
||||
if (configPositionId == null) {
|
||||
if (positionId == null) {
|
||||
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
|
||||
}
|
||||
activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId);
|
||||
activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), positionId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -89,7 +89,8 @@
|
||||
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,
|
||||
fc.contract_name AS feeType,
|
||||
os.fee_type AS feeType,
|
||||
COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
|
||||
FROM op_schedule os
|
||||
|
||||
@@ -539,65 +539,6 @@
|
||||
AND T1.refund_medicine_id IS NULL
|
||||
ORDER BY T1.status_enum,T1.sort_number)
|
||||
UNION ALL
|
||||
-- 🔧 Bug #444: 直接从计费项目表补充查询药品记录，用于覆盖med_medication_request有记录但generate_source_enum不匹配的场景
|
||||
(SELECT 1 AS advice_type,
|
||||
T1.service_id AS request_id,
|
||||
T1.service_id || '-ci-med' AS unique_key,
|
||||
'' AS prescription_no,
|
||||
T1.enterer_id AS requester_id,
|
||||
T1.entered_date AS request_time,
|
||||
CASE WHEN T1.enterer_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
|
||||
T2.content_json AS content_json,
|
||||
NULL AS skin_test_flag,
|
||||
NULL AS inject_flag,
|
||||
NULL AS group_id,
|
||||
T3.NAME AS advice_name,
|
||||
T4.total_volume AS volume,
|
||||
T2.lot_number AS lot_number,
|
||||
T1.quantity_value AS quantity,
|
||||
T1.quantity_unit AS unit_code,
|
||||
T1.status_enum AS status_enum,
|
||||
'' AS method_code,
|
||||
'' AS rate_code,
|
||||
NULL AS dose,
|
||||
'' AS dose_unit_code,
|
||||
T1.id AS charge_item_id,
|
||||
T1.unit_price AS unit_price,
|
||||
T1.total_price AS total_price,
|
||||
T1.status_enum AS charge_status,
|
||||
NULL AS position_id,
|
||||
'' AS position_name,
|
||||
NULL AS dispense_per_duration,
|
||||
T3.part_percent AS part_percent,
|
||||
'' AS condition_definition_name,
|
||||
T2.sort_number AS sort_number,
|
||||
NULL AS based_on_id,
|
||||
NULL AS category_enum,
|
||||
T1.encounter_id AS encounter_id,
|
||||
T1.patient_id AS patient_id,
|
||||
'med_medication_definition' AS advice_table_name,
|
||||
T3.ID AS advice_definition_id
|
||||
FROM adm_charge_item AS T1
|
||||
INNER JOIN med_medication_request AS T2 ON T2.ID = T1.service_id AND T2.delete_flag = '0'
|
||||
LEFT JOIN med_medication_definition AS T3 ON T3.ID = T2.medication_id AND T3.delete_flag = '0'
|
||||
LEFT JOIN med_medication AS T4 ON T4.medication_def_id = T3.ID AND T4.delete_flag = '0'
|
||||
WHERE T1.delete_flag = '0'
|
||||
AND T1.service_table = #{MED_MEDICATION_REQUEST}
|
||||
<if test="historyFlag == '0'.toString()">
|
||||
AND T1.encounter_id = #{encounterId}
|
||||
</if>
|
||||
<if test="historyFlag == '1'.toString()">
|
||||
AND T1.patient_id = #{patientId} AND T1.encounter_id != #{encounterId}
|
||||
</if>
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM med_medication_request T5
|
||||
WHERE T5.ID = T1.service_id AND T5.delete_flag = '0'
|
||||
<if test="generateSourceEnum != null">
|
||||
AND T5.generate_source_enum = #{generateSourceEnum}
|
||||
</if>
|
||||
)
|
||||
ORDER BY T1.entered_date)
|
||||
UNION ALL
|
||||
-- 🔧 查询仅存在于 adm_charge_item 的"孤儿"耗材数据（DeviceRequest 缺失或 generate_source_enum 未设置）
|
||||
-- 正常 DeviceRequest（generate_source_enum 已赋值）由下方 Part 3 统一负责，此处不做重复覆盖避免 UNION ALL 重复行
|
||||
(SELECT 2 AS advice_type,
|
||||
@@ -870,55 +811,4 @@
|
||||
LIMIT 1
|
||||
</select>
|
||||
|
||||
<!-- 手术项目专用分页查询：仅查手术 + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
|
||||
<select id="getSurgeryPage" 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,
|
||||
t1.org_id AS position_id,
|
||||
t2.ID AS charge_item_definition_id,
|
||||
t2.price AS price,
|
||||
t1.permitted_unit_code AS unit_code,
|
||||
t1.permitted_unit_code AS unit_code_dict_text
|
||||
FROM wor_activity_definition t1
|
||||
LEFT JOIN adm_charge_item_definition t2
|
||||
ON t2.instance_id = t1.ID
|
||||
AND t2.delete_flag = '0'
|
||||
AND t2.status_enum = #{statusEnum}
|
||||
AND t2.instance_table = 'wor_activity_definition'
|
||||
WHERE t1.delete_flag = '0'
|
||||
AND (t1.category_code = '手术' OR t1.category_code = '24')
|
||||
<if test="searchKey != null and searchKey != ''">
|
||||
AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
|
||||
</if>
|
||||
ORDER BY t1.ID, t1.name ASC, t2.ID ASC
|
||||
LIMIT #{page.size} OFFSET ${(page.current - 1) * page.size}
|
||||
</select>
|
||||
|
||||
<!-- 检查项目专用分页查询：仅查检查(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,
|
||||
t1.org_id AS position_id,
|
||||
t2.ID AS charge_item_definition_id,
|
||||
t2.price AS price,
|
||||
t1.permitted_unit_code AS unit_code,
|
||||
t1.permitted_unit_code AS unit_code_dict_text
|
||||
FROM wor_activity_definition t1
|
||||
LEFT JOIN adm_charge_item_definition t2
|
||||
ON t2.instance_id = t1.ID
|
||||
AND t2.delete_flag = '0'
|
||||
AND t2.status_enum = #{statusEnum}
|
||||
AND t2.instance_table = 'wor_activity_definition'
|
||||
WHERE t1.delete_flag = '0'
|
||||
AND t1.category_code = '23'
|
||||
<if test="searchKey != null and searchKey != ''">
|
||||
AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
|
||||
</if>
|
||||
ORDER BY t1.ID, t1.name ASC, t2.ID ASC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -134,11 +134,7 @@
|
||||
T2.yb_no,
|
||||
T1.onset_date AS onsetDate,
|
||||
T1.diagnosis_time AS diagnosisTime,
|
||||
T1.doctor AS diagnosisDoctor,
|
||||
CASE WHEN EXISTS (
|
||||
SELECT 1 FROM infectious_card T4
|
||||
WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1
|
||||
) THEN 1 ELSE 0 END AS hasInfectiousReport
|
||||
T1.doctor AS diagnosisDoctor
|
||||
FROM adm_encounter_diagnosis AS T1
|
||||
LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
|
||||
AND T2.delete_flag = '0' AND T2.tcm_flag = 0
|
||||
|
||||
@@ -305,28 +305,28 @@
|
||||
T1.occurrence_end_time AS end_time,
|
||||
T1.requester_id AS requester_id,
|
||||
T1.create_time AS request_time,
|
||||
NULL::integer AS skin_test_flag,
|
||||
NULL::integer AS inject_flag,
|
||||
NULL::bigint AS group_id,
|
||||
NULL AS skin_test_flag,
|
||||
NULL AS inject_flag,
|
||||
NULL AS group_id,
|
||||
T1.performer_check_id,
|
||||
T2."name" AS advice_name,
|
||||
T2.id AS item_id,
|
||||
NULL::varchar AS volume,
|
||||
NULL::varchar AS lot_number,
|
||||
NULL AS volume,
|
||||
NULL AS lot_number,
|
||||
T1.quantity AS quantity,
|
||||
T1.unit_code AS unit_code,
|
||||
T1.status_enum AS request_status,
|
||||
NULL::varchar AS method_code,
|
||||
NULL::varchar AS rate_code,
|
||||
NULL::numeric AS dose,
|
||||
NULL::varchar AS dose_unit_code,
|
||||
NULL AS method_code,
|
||||
NULL AS rate_code,
|
||||
NULL AS dose,
|
||||
NULL AS dose_unit_code,
|
||||
ao1.id AS position_id,
|
||||
ao1."name" AS position_name,
|
||||
NULL::integer AS dispense_per_duration,
|
||||
1::numeric AS part_percent,
|
||||
NULL AS dispense_per_duration,
|
||||
1 AS part_percent,
|
||||
ccd."name" AS condition_definition_name,
|
||||
T1.therapy_enum AS therapy_enum,
|
||||
NULL::integer AS sort_number,
|
||||
NULL AS sort_number,
|
||||
T1.quantity AS execute_num,
|
||||
af.day_times,
|
||||
ae.bus_no,
|
||||
@@ -341,7 +341,7 @@
|
||||
personal_account.balance_amount,
|
||||
personal_account.id AS account_id,
|
||||
T2.category_code,
|
||||
NULL::integer AS dispense_status
|
||||
NULL AS dispense_status
|
||||
FROM wor_service_request AS T1
|
||||
LEFT JOIN wor_activity_definition AS T2
|
||||
ON T2.id = T1.activity_id
|
||||
|
||||
@@ -44,9 +44,7 @@
|
||||
sdd.dict_label AS unit_code_name,
|
||||
togpd.dose AS dose,
|
||||
togpd.rate_code AS rate_code,
|
||||
rate_d.dict_label AS rate_code_dictText,
|
||||
togpd.method_code AS method_code,
|
||||
method_d.dict_label AS method_code_dictText,
|
||||
togpd.dose_quantity AS dose_quantity,
|
||||
togpd.group_id,
|
||||
togpd.group_order AS group_order,
|
||||
@@ -69,9 +67,8 @@
|
||||
AND togpd.order_definition_id = adm.ID
|
||||
LEFT JOIN wor_activity_definition AS wor ON togpd.order_definition_table = 'wor_activity_definition'
|
||||
AND togpd.order_definition_id = wor.ID
|
||||
LEFT JOIN sys_dict_data AS sdd ON sdd.dict_value = togpd.unit_code AND sdd.dict_type = 'unit_code' AND sdd.status = '0'
|
||||
LEFT JOIN sys_dict_data AS rate_d ON rate_d.dict_value = togpd.rate_code AND rate_d.dict_type = 'rate_code' AND rate_d.status = '0'
|
||||
LEFT JOIN sys_dict_data AS method_d ON method_d.dict_value = togpd.method_code AND method_d.dict_type = 'method_code' AND method_d.status = '0'
|
||||
LEFT JOIN sys_dict_data AS sdd ON sdd.dict_value = togpd.unit_code AND sdd.dict_type = 'unit_code' AND
|
||||
sdd.status = '0'
|
||||
WHERE togpd.delete_flag = '0'
|
||||
<if test="groupPackageIds != null and !groupPackageIds.isEmpty()">
|
||||
AND togpd.group_package_id IN
|
||||
|
||||
@@ -5,16 +5,6 @@
|
||||
<mapper namespace="com.openhis.web.regdoctorstation.mapper.RequestFormManageAppMapper">
|
||||
|
||||
<select id="getRequestForm" resultType="com.openhis.web.regdoctorstation.dto.RequestFormQueryDto">
|
||||
SELECT sub.request_form_id,
|
||||
sub.encounter_id,
|
||||
sub.prescription_no,
|
||||
sub.name,
|
||||
sub.desc_json,
|
||||
sub.requester_id,
|
||||
sub.create_time,
|
||||
sub.patient_name,
|
||||
sub.computed_status AS status
|
||||
FROM (
|
||||
SELECT drf.id AS request_form_id,
|
||||
drf.encounter_id,
|
||||
drf.prescription_no,
|
||||
@@ -30,28 +20,15 @@
|
||||
drf.create_time,
|
||||
ap.NAME AS patient_name,
|
||||
CASE
|
||||
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 = 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 = 3
|
||||
) THEN 5
|
||||
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
|
||||
WHEN MIN(wsr.status_enum) = 1 THEN 0
|
||||
WHEN MIN(wsr.status_enum) = 2 THEN 1
|
||||
WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
|
||||
WHEN MIN(wsr.status_enum) = 3 THEN 4
|
||||
WHEN MIN(wsr.status_enum) = 4 THEN 3
|
||||
WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
|
||||
WHEN MIN(wsr.status_enum) = 8 THEN 6
|
||||
ELSE NULL
|
||||
END AS status
|
||||
FROM doc_request_form AS drf
|
||||
LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
|
||||
AND ae.delete_flag = '0'
|
||||
@@ -68,6 +45,18 @@
|
||||
<if test="endDate != null and endDate != ''">
|
||||
AND drf.create_time <= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND CASE
|
||||
WHEN MIN(wsr.status_enum) = 1 THEN 0
|
||||
WHEN MIN(wsr.status_enum) = 2 THEN 1
|
||||
WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
|
||||
WHEN MIN(wsr.status_enum) = 3 THEN 4
|
||||
WHEN MIN(wsr.status_enum) = 4 THEN 3
|
||||
WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
|
||||
WHEN MIN(wsr.status_enum) = 8 THEN 6
|
||||
ELSE NULL
|
||||
END = #{status}::integer
|
||||
</if>
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
|
||||
OR EXISTS (
|
||||
@@ -81,16 +70,12 @@
|
||||
)
|
||||
))
|
||||
</if>
|
||||
) sub
|
||||
<if test="status != null and status != ''">
|
||||
WHERE sub.computed_status = #{status}::integer
|
||||
</if>
|
||||
ORDER BY sub.create_time DESC
|
||||
GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json,
|
||||
drf.requester_id, drf.create_time, ap.name
|
||||
</select>
|
||||
|
||||
<select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
|
||||
SELECT wsr.activity_id AS activity_id,
|
||||
wsr.quantity,
|
||||
SELECT wsr.quantity,
|
||||
wsr.unit_code,
|
||||
COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name,
|
||||
aci.total_price
|
||||
@@ -162,9 +147,9 @@
|
||||
fc.contract_name AS fee_type,
|
||||
COALESCE(pi.identifier_no, ap.bus_no, '') AS identifier_no
|
||||
FROM doc_request_form drf
|
||||
INNER JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
|
||||
INNER JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
|
||||
INNER JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
|
||||
LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no AND cs.delete_flag = '0'
|
||||
LEFT JOIN adm_patient ap ON ap.id = cs.patient_id AND ap.delete_flag = '0'
|
||||
LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
|
||||
LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
|
||||
LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
|
||||
LEFT JOIN op_schedule os ON os.apply_id = drf.id AND os.delete_flag = '0'
|
||||
@@ -199,8 +184,6 @@
|
||||
</if>
|
||||
AND drf.delete_flag = '0'
|
||||
AND os.schedule_id IS NULL
|
||||
<!-- 已取消(4)、已完成(3)的手术申请不参与门诊手术安排查找 -->
|
||||
AND cs.status_enum NOT IN (3, 4)
|
||||
</where>
|
||||
ORDER BY drf.create_time DESC
|
||||
</select>
|
||||
|
||||
@@ -100,25 +100,11 @@ public class DictAspect {
|
||||
String dictText = dictAnnotation.dictText();
|
||||
String dictTable = dictAnnotation.dictTable();
|
||||
String deleteFlag = dictAnnotation.deleteFlag();
|
||||
|
||||
// 检查 _dictText 字段是否已被手动填充（如控制器方法中预先查询设置）
|
||||
// 如果已非空则跳过 SQL 查询，避免覆盖有效值
|
||||
String textFieldName = field.getName() + "_dictText";
|
||||
try {
|
||||
Field existingTextField = dto.getClass().getDeclaredField(textFieldName);
|
||||
existingTextField.setAccessible(true);
|
||||
Object existingValue = existingTextField.get(dto);
|
||||
if (existingValue != null && !existingValue.toString().isEmpty()) {
|
||||
continue; // _dictText 已有值，跳过
|
||||
}
|
||||
} catch (NoSuchFieldException e) {
|
||||
// _dictText 字段不存在，继续正常流程
|
||||
}
|
||||
|
||||
// 查询字典值
|
||||
String dictLabel = queryDictLabel(dictTable, dictCode, dictText, deleteFlag, fieldValue.toString());
|
||||
if (dictLabel != null && !dictLabel.isEmpty()) {
|
||||
if (dictLabel != null) {
|
||||
// 动态生成 _dictText 字段名
|
||||
String textFieldName = field.getName() + "_dictText";
|
||||
try {
|
||||
Field textField = dto.getClass().getDeclaredField(textFieldName);
|
||||
textField.setAccessible(true);
|
||||
|
||||
@@ -39,12 +39,7 @@ public enum GenerateSource implements HisEnumInterface {
|
||||
/**
|
||||
* 自动滚费
|
||||
*/
|
||||
AUTO_ROLL_FEES(5, "5", "自动滚费"),
|
||||
|
||||
/**
|
||||
* 手术计费
|
||||
*/
|
||||
SURGERY_BILLING(6, "6", "手术计费");
|
||||
AUTO_ROLL_FEES(5, "5", "自动滚费");
|
||||
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
|
||||
@@ -36,6 +36,6 @@ public interface IOrganizationLocationService extends IService<OrganizationLocat
|
||||
* @param activityDefinitionId 诊疗定义id
|
||||
* @return 诊疗的执行科室列表
|
||||
*/
|
||||
List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long organizationId, Long activityDefinitionId);
|
||||
List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long activityDefinitionId);
|
||||
|
||||
}
|
||||
@@ -35,7 +35,8 @@ public class EncounterDiagnosisServiceImpl extends ServiceImpl<EncounterDiagnosi
|
||||
*/
|
||||
@Override
|
||||
public void deleteEncounterDiagnosisInfos(Long encounterId) {
|
||||
// 仅删除就诊诊断关联记录，不删除cli_condition（否则会导致传染病报卡diag_id失效）
|
||||
// 不删除中医
|
||||
conditionMapper.deleteByEncounterId(encounterId);
|
||||
baseMapper.deleteByEncounterId(encounterId);
|
||||
}
|
||||
|
||||
|
||||
@@ -53,14 +53,12 @@ public class OrganizationLocationServiceImpl extends ServiceImpl<OrganizationLoc
|
||||
/**
|
||||
* 查询诊疗的执行科室列表
|
||||
*
|
||||
* @param organizationId 机构id
|
||||
* @param activityDefinitionId 诊疗定义id
|
||||
* @return 诊疗的执行科室列表
|
||||
*/
|
||||
@Override
|
||||
public List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long organizationId, Long activityDefinitionId) {
|
||||
public List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long activityDefinitionId) {
|
||||
return baseMapper.selectList(new LambdaQueryWrapper<OrganizationLocation>()
|
||||
.eq(OrganizationLocation::getOrganizationId, organizationId)
|
||||
.eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
|
||||
}
|
||||
|
||||
|
||||
@@ -59,9 +59,4 @@ public class RequestForm extends HisBaseEntity {
|
||||
*/
|
||||
private String typeCode;
|
||||
|
||||
/**
|
||||
* 单据状态 0=待签发 1=已签发 2=已校对 3=待接收 4=已接收 5=已检查 6=已出报告 7=已作废
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
}
|
||||
@@ -38,9 +38,6 @@ const filteredList = ref([]); // 过滤后的数据列表
|
||||
const hasLoaded = ref(false); // 标记是否已加载数据
|
||||
const isLoading = ref(false); // 标记是否正在加载
|
||||
|
||||
// 标记是否正在执行搜索（用于防止 preloadedData 覆盖搜索结果）
|
||||
const isSearching = ref(false);
|
||||
|
||||
// 获取诊疗项目列表
|
||||
function getList() {
|
||||
if (hasLoaded.value) return; // 如果已经加载过数据，则不再重复请求
|
||||
@@ -69,7 +66,6 @@ function getList() {
|
||||
// 服务端搜索（当用户输入搜索关键词时）
|
||||
function searchList(searchKey) {
|
||||
if (!searchKey || searchKey.trim() === '') return;
|
||||
isSearching.value = true;
|
||||
isLoading.value = true;
|
||||
// 使用较大的pageSize确保搜索结果尽可能多
|
||||
getDiagnosisTreatmentList({ statusEnum: 2, searchKey: searchKey.trim(), pageSize: 5000, pageNo: 1 })
|
||||
@@ -83,7 +79,6 @@ function searchList(searchKey) {
|
||||
})
|
||||
.finally(() => {
|
||||
isLoading.value = false;
|
||||
isSearching.value = false;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -124,8 +119,6 @@ watch(
|
||||
watch(
|
||||
() => props.preloadedData,
|
||||
(newData) => {
|
||||
// 正在搜索时跳过，避免覆盖searchList的搜索结果
|
||||
if (isSearching.value) return;
|
||||
if (newData && newData.length > 0) {
|
||||
diagnosisTreatmentList.value = newData;
|
||||
filterList(); // 更新过滤
|
||||
|
||||
@@ -926,36 +926,23 @@ function handleDelete() {
|
||||
}
|
||||
|
||||
if (hasSavedItem) {
|
||||
// 🔧 Bug #454: 删除前弹出确认提示，告知用户将级联删除关联检验申请单
|
||||
const hasLabItem = deleteList.some(item => item.adviceType === 3);
|
||||
const confirmMsg = hasLabItem
|
||||
? '删除此医嘱将同时删除关联的检验申请单，是否确认删除？'
|
||||
: '确认删除选中的医嘱项目吗？';
|
||||
|
||||
proxy.$modal.confirm(confirmMsg).then(() => {
|
||||
// 有已保存的行，调用后端API删除
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
function handleNumberClick(item, index) {
|
||||
@@ -1059,10 +1046,8 @@ function handleSave() {
|
||||
chargeItemId: item.chargeItemId,
|
||||
};
|
||||
});
|
||||
// 确保 organizationId 不为 undefined（手术计费场景下可能缺失 orgId）
|
||||
const orgId = props.patientInfo.orgId || props.patientInfo.effectiveOrgId || 1;
|
||||
savePrescriptionSign({
|
||||
organizationId: orgId,
|
||||
organizationId: props.patientInfo.orgId,
|
||||
adviceSaveList: list,
|
||||
}).then((res) => {
|
||||
if (res.code === 200) {
|
||||
@@ -1079,7 +1064,6 @@ function handleSave() {
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.error('签发失败:', error);
|
||||
console.warn('签发操作失败（可能无权限或后端异常）:', error?.response?.data?.msg || error?.message);
|
||||
proxy.$modal.msgError(error?.response?.data?.msg || error?.message || '签发失败，请重试');
|
||||
});
|
||||
}
|
||||
|
||||
@@ -692,7 +692,6 @@ async function handleFoodDiseasesCheck() {
|
||||
/**
|
||||
* 传染病报告卡处理
|
||||
* 通过诊断名称自动识别并勾选传染病报告卡中的疾病
|
||||
* 修复 Bug #519：跳过已有已提交报卡的诊断
|
||||
*/
|
||||
function handleInfectiousDiseaseReport() {
|
||||
// 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表）
|
||||
@@ -744,9 +743,8 @@ function handleInfectiousDiseaseReport() {
|
||||
'手足口病': '0311',
|
||||
};
|
||||
|
||||
// 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断
|
||||
// 获取所有诊断名称对应的报卡编码
|
||||
const allSelectedDiseases = form.value.diagnosisList
|
||||
.filter(d => d.name && d.hasInfectiousReport !== 1)
|
||||
.map(d => diseaseNameToCode[d.name] || null)
|
||||
.filter(code => code);
|
||||
|
||||
@@ -754,9 +752,9 @@ function handleInfectiousDiseaseReport() {
|
||||
return;
|
||||
}
|
||||
|
||||
// 优先使用主诊断（同样跳过已有报卡的）
|
||||
const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1);
|
||||
const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0];
|
||||
// 优先使用主诊断
|
||||
const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1);
|
||||
const firstDiagnosis = form.value.diagnosisList[0];
|
||||
|
||||
const diagnosisToShow = {
|
||||
...(mainDiagnosis || firstDiagnosis),
|
||||
|
||||
@@ -41,14 +41,22 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 工作单位（学校） -->
|
||||
<el-row :gutter="16" class="form-row">
|
||||
<el-col :span="12" class="form-item">
|
||||
<span class="form-label">工作单位（学校）</span>
|
||||
<el-input v-model="form.workplace" class="underline-input" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 性别、出生日期、或实足年龄 -->
|
||||
<el-row :gutter="16" class="form-row">
|
||||
<el-col :span="7" class="form-item">
|
||||
<span class="form-label required">性别</span>
|
||||
<el-radio-group v-model="form.sex" class="gender-radio-group">
|
||||
<el-radio label="男">男</el-radio>
|
||||
<el-radio label="女">女</el-radio>
|
||||
<el-radio label="未知">未知</el-radio>
|
||||
<el-radio value="男">男</el-radio>
|
||||
<el-radio value="女">女</el-radio>
|
||||
<el-radio value="未知">未知</el-radio>
|
||||
</el-radio-group>
|
||||
</el-col>
|
||||
<el-col :span="10" class="form-item">
|
||||
@@ -75,14 +83,6 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 工作单位（学校） -->
|
||||
<el-row :gutter="16" class="form-row">
|
||||
<el-col :span="12" class="form-item">
|
||||
<span class="form-label">工作单位（学校）</span>
|
||||
<el-input v-model="form.workplace" class="underline-input" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 联系电话、紧急联系人电话 -->
|
||||
<el-row :gutter="16" class="form-row">
|
||||
<el-col :span="12" class="form-item">
|
||||
@@ -1025,11 +1025,7 @@ function parseBirthDate(birthDate) {
|
||||
|
||||
function normalizeDate(value) {
|
||||
if (!value) return '';
|
||||
const datePart = String(value).split(/[T ]/)[0].replace(/\//g, '-');
|
||||
const parts = datePart.split('-');
|
||||
if (parts.length !== 3) return datePart;
|
||||
const [year, month, day] = parts;
|
||||
return `${year}-${month.padStart(2, '0')}-${day.padStart(2, '0')}`;
|
||||
return String(value).split(/[T ]/)[0];
|
||||
}
|
||||
|
||||
function normalizeSex(value) {
|
||||
@@ -1044,9 +1040,8 @@ function normalizeSexFromPatientInfo(patientInfo) {
|
||||
if (patientInfo.genderName) return patientInfo.genderName;
|
||||
if (patientInfo.sex) return normalizeSex(patientInfo.sex);
|
||||
// 使用数字枚举字段
|
||||
if (patientInfo.genderEnum === 1 || patientInfo.genderEnum === '1') return '男';
|
||||
if (patientInfo.genderEnum === 2 || patientInfo.genderEnum === '2') return '女';
|
||||
if (patientInfo.genderEnum === 0 || patientInfo.genderEnum === '0') return '未知';
|
||||
if (patientInfo.genderEnum === 1) return '男';
|
||||
if (patientInfo.genderEnum === 2) return '女';
|
||||
return '未知';
|
||||
}
|
||||
|
||||
@@ -1121,7 +1116,7 @@ function showReport(reportData = {}, readOnly = true) {
|
||||
addressHouse: reportData.addressHouse || '',
|
||||
patientBelong: reportData.patientBelong || 1,
|
||||
occupation: reportData.occupation || '',
|
||||
caseClass: reportData.caseClass != null ? String(reportData.caseClass) : '',
|
||||
caseClass: reportData.diseaseType != null ? String(reportData.diseaseType) : '',
|
||||
onsetDate: normalizeDate(reportData.onsetDate),
|
||||
diagDate: normalizeDate(reportData.diagDate),
|
||||
deathDate: normalizeDate(reportData.deathDate),
|
||||
@@ -1130,7 +1125,7 @@ function showReport(reportData = {}, readOnly = true) {
|
||||
selectedClassB: diseaseSelection.selectedClassB,
|
||||
selectedClassC: diseaseSelection.selectedClassC,
|
||||
otherDisease: reportData.otherDisease || (diseaseCode === 'OTHER' ? reportData.diseaseName || '' : ''),
|
||||
diseaseType: reportData.diseaseSubtype || reportData.diseaseType || '',
|
||||
diseaseType: reportData.diseaseSubtype || '',
|
||||
reportOrg: reportData.reportOrg || '',
|
||||
reportOrgPhone: reportData.reportOrgPhone || '',
|
||||
reportDoc: reportData.reportDoc || '',
|
||||
@@ -1471,7 +1466,7 @@ async function buildSubmitData() {
|
||||
reportDate: formData.reportDate || null,
|
||||
cardNameCode: 1, // 默认中华人民共和国传染病报告卡
|
||||
registrationSource: 1, // 默认门诊
|
||||
status: null,
|
||||
status: '',
|
||||
deptId: props.deptId || null,
|
||||
doctorId: props.doctorId || null,
|
||||
};
|
||||
|
||||
@@ -414,15 +414,6 @@
|
||||
<span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Bug #500修复: 加载中的方法列表骨架占位，提前预留空间避免高度跳变 -->
|
||||
<div
|
||||
v-if="categoryLoadingSet.has(cat.typeId) && (!cat.methods || cat.methods.length === 0)"
|
||||
class="method-section method-section-skeleton"
|
||||
>
|
||||
<div class="method-section-title">检查方法</div>
|
||||
<div class="skeleton-method-row"></div>
|
||||
<div class="skeleton-method-row"></div>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
@@ -582,32 +573,18 @@ function handleResetSearch() {
|
||||
// 初始化默认日期范围为近一周
|
||||
handleResetSearch();
|
||||
|
||||
// 🔧 BugFix#426/#430: 懒加载套餐明细（支持 packageName 解析）
|
||||
// 🔧 BugFix#426: 懒加载套餐明细
|
||||
async function loadPackageDetails(row, treeNode, resolve) {
|
||||
let packageId = row.packageId;
|
||||
if (!packageId && row.packageName) {
|
||||
try {
|
||||
const pkgRes = await listCheckPackage({ packageName: row.packageName });
|
||||
let packages = pkgRes?.data || [];
|
||||
if (!Array.isArray(packages)) {
|
||||
packages = packages.records || packages.data || [];
|
||||
}
|
||||
if (packages.length > 0) {
|
||||
packageId = packages[0].id;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('套餐名称解析失败:', err);
|
||||
}
|
||||
}
|
||||
if (!packageId) {
|
||||
if (!row.packageId) {
|
||||
resolve([]);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const res = await request({
|
||||
url: `/system/check-type/package/${packageId}/details`,
|
||||
url: `/system/check-type/package/${row.packageId}/details`,
|
||||
method: 'get'
|
||||
});
|
||||
if (res.code === 200) {
|
||||
const list = parsePackageDetailsPayload(res);
|
||||
const children = list.map((child) => ({
|
||||
...child,
|
||||
@@ -618,6 +595,9 @@ async function loadPackageDetails(row, treeNode, resolve) {
|
||||
isPackageDetail: true
|
||||
}));
|
||||
resolve(children);
|
||||
} else {
|
||||
resolve([]);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('加载套餐明细失败:', err);
|
||||
resolve([]);
|
||||
@@ -639,9 +619,9 @@ function getPackageDetailsList(item) {
|
||||
return Array.isArray(carrier?.packageDetails) ? carrier.packageDetails : [];
|
||||
}
|
||||
|
||||
/** 有套餐 ID 或 packageName 的已选行才展示右侧套餐区（加载中 / 空 / 明细列表） */
|
||||
/** 有套餐 ID 的已选行才展示右侧套餐区（加载中 / 空 / 明细列表） */
|
||||
function shouldShowPackageBody(item) {
|
||||
return !!(getPackageCarrier(item)?.packageId || item.packageName || item.packageId);
|
||||
return !!getPackageCarrier(item)?.packageId;
|
||||
}
|
||||
|
||||
/** 金额展示：统一两位小数 */
|
||||
@@ -1073,8 +1053,7 @@ const filteredCategoryList = computed(() => {
|
||||
const key = dictSearchKey.value.toLowerCase();
|
||||
return categoryList.value.map(cat => ({
|
||||
...cat,
|
||||
items: cat.items.filter(item => (item.name || '').toLowerCase().includes(key)),
|
||||
methods: cat.methods || []
|
||||
items: cat.items.filter(item => (item.name || '').toLowerCase().includes(key))
|
||||
})).filter(cat => cat.items.length > 0);
|
||||
});
|
||||
|
||||
@@ -1247,18 +1226,22 @@ function handleRowClick(row) {
|
||||
selectedItems.value = [];
|
||||
activeDetailTab.value = 'applyForm';
|
||||
request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
|
||||
// 响应结构: Axios拦截器对code===200返回res.data（AjaxResult体）
|
||||
// 结构为 { code: 200, data: examApply实体, items: [明细数组] }
|
||||
const items = Array.isArray(res.items) ? res.items : [];
|
||||
const dataObj = res.data || {};
|
||||
// 响应结构判定：Axios拦截器对 code===200 返回 res.data（AjaxResult体），
|
||||
// 但某些情况下可能返回完整 Axios 响应 {data: AjaxResult}。
|
||||
// 用 res.code 判定是否已是 AjaxResult 体，避免二次解包导致 items 丢失。
|
||||
const isAjaxResult = res && typeof res === 'object' && res.code !== undefined;
|
||||
const ajaxBody = isAjaxResult ? res : (res.data || res);
|
||||
|
||||
// 先填充表单字段
|
||||
if (dataObj && typeof dataObj === 'object') Object.assign(form, dataObj);
|
||||
// items 在 AjaxResult 顶层，data 字段是 ExamApply 实体
|
||||
const rawItems = Array.isArray(ajaxBody.items) ? ajaxBody.items : [];
|
||||
const detailData = ajaxBody.data || {};
|
||||
|
||||
if (items.length > 0) {
|
||||
if (detailData && typeof detailData === 'object') Object.assign(form, detailData);
|
||||
|
||||
if (rawItems.length > 0) {
|
||||
try {
|
||||
// 为每个项目加载检查方法
|
||||
const itemsWithMethods = await Promise.all(items.map(async m => {
|
||||
const itemsWithMethods = await Promise.all(rawItems.map(async m => {
|
||||
const item = {
|
||||
id: m.itemCode, name: m.itemName,
|
||||
price: m.itemFee || 0, quantity: 1,
|
||||
@@ -1271,14 +1254,13 @@ function handleRowClick(row) {
|
||||
expanded: false,
|
||||
packageDetailsLoading: false,
|
||||
isPackage: false,
|
||||
packageId: null,
|
||||
hasChildren: false // #426修复: 树形表格懒加载展开标记，后续根据packageId动态设置
|
||||
packageId: null
|
||||
};
|
||||
// 加载该项目的检查方法
|
||||
if (m.bodyPartCode) {
|
||||
try {
|
||||
const methodRes = await searchCheckMethod({ checkType: m.bodyPartCode });
|
||||
// 正确解析 API 返回结构
|
||||
// Bug #384修复: 正确解析 API 返回结构
|
||||
let methodData = methodRes?.data?.data || methodRes?.data || methodRes?.rows || methodRes;
|
||||
if (!Array.isArray(methodData) && methodRes?.data && Array.isArray(methodRes.data.data)) {
|
||||
methodData = methodRes.data.data;
|
||||
@@ -1288,19 +1270,19 @@ function handleRowClick(row) {
|
||||
id: md.id,
|
||||
name: md.name,
|
||||
code: md.code,
|
||||
price: m.itemFee || 0,
|
||||
price: m.itemFee || 0, // fallback 到已保存的价格
|
||||
packageName: md.packageName || '',
|
||||
packageId: md.packageId || null,
|
||||
packagePrice: md.packagePrice || null,
|
||||
packagePrice: md.packagePrice || null, // Bug #384修复: 套餐价格
|
||||
serviceFee: md.serviceFee || null
|
||||
}));
|
||||
// 回充已保存的检查方法
|
||||
// 如果有已保存的检查方法信息，尝试匹配
|
||||
if (m.checkMethodId) {
|
||||
item.selectedMethod = item.methods.find(md => String(md.id) === String(m.checkMethodId)) || null;
|
||||
item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
|
||||
// 从已保存的方法中获取套餐信息
|
||||
if (item.selectedMethod?.packageId) {
|
||||
item.isPackage = true;
|
||||
item.packageId = item.selectedMethod.packageId;
|
||||
item.hasChildren = true; // #426修复
|
||||
}
|
||||
}
|
||||
if (!item.selectedMethod && item.methods.length) {
|
||||
@@ -1309,32 +1291,26 @@ function handleRowClick(row) {
|
||||
if (item.selectedMethod?.packageId) {
|
||||
item.packageId = item.selectedMethod.packageId;
|
||||
item.isPackage = true;
|
||||
item.hasChildren = true; // #426修复
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('加载检查方法失败', err);
|
||||
// 单个项目加载失败不影响其他项目，继续返回 item
|
||||
}
|
||||
}
|
||||
return item;
|
||||
}));
|
||||
// Bug #408修复: 确保明细数据正确加载到selectedItems
|
||||
selectedItems.value = itemsWithMethods;
|
||||
// 加载套餐明细（单个失败不影响其他项目和明细显示）
|
||||
for (const it of selectedItems.value) {
|
||||
if (getPackageCarrier(it)?.packageId) {
|
||||
try {
|
||||
await loadPackageDetailsForItem(it);
|
||||
} catch (e) {
|
||||
console.error('加载套餐明细失败:', it.name, e);
|
||||
}
|
||||
}
|
||||
it.expanded = !!getPackageCarrier(it)?.packageId;
|
||||
}
|
||||
syncCategoryChecked();
|
||||
// Bug #384修复: 回充后更新检查方法显示
|
||||
updateMethodDisplay();
|
||||
// Bug #408修复: 加载申请单详情后自动切换到检查明细页签，确保已加载的明细数据可见
|
||||
// 修复【#408】：加载申请单详情后自动切换到检查明细页签，确保已加载的明细数据可见
|
||||
activeDetailTab.value = 'applyDetail';
|
||||
} catch (err) {
|
||||
console.error('加载申请单详情失败', err);
|
||||
@@ -1381,11 +1357,10 @@ async function handleMethodSelect(checked, method, cat) {
|
||||
const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
|
||||
if (existingItem) {
|
||||
existingItem.selectedMethod = method;
|
||||
// 从方法中获取套餐信息（支持 packageId 或 packageName 解析）
|
||||
if (method.packageId || method.packageName) {
|
||||
// 从方法中获取套餐信息
|
||||
if (method.packageId) {
|
||||
existingItem.isPackage = true;
|
||||
existingItem.packageId = method.packageId || existingItem.packageId;
|
||||
existingItem.hasChildren = true; // #426修复
|
||||
existingItem.packageId = method.packageId;
|
||||
existingItem.packageName = method.packageName || existingItem.packageName; // #428修复: 确保 packageName 同步
|
||||
// 预加载套餐明细
|
||||
loadPackageDetailsForItem(existingItem);
|
||||
@@ -1420,13 +1395,12 @@ async function handleMethodSelect(checked, method, cat) {
|
||||
// 从方法或项目中获取套餐信息
|
||||
isPackage: !!method.packageId || !!targetItem.packageName,
|
||||
packageId: method.packageId || targetItem.packageId || null,
|
||||
packageName: method.packageName || targetItem.packageName || null, // #428修复: 复制 packageName，确保套餐明细可加载
|
||||
hasChildren: !!(method.packageId || method.packageName || targetItem.packageId || targetItem.packageName) // #426修复: 树形表格懒加载展开标记，支持 packageName 解析
|
||||
packageName: method.packageName || targetItem.packageName || null // #428修复: 复制 packageName，确保套餐明细可加载
|
||||
};
|
||||
selectedItems.value.push(newItem);
|
||||
|
||||
// 如果是套餐，预加载套餐明细
|
||||
if (newItem.isPackage && (newItem.packageId || newItem.packageName)) {
|
||||
if (newItem.isPackage && newItem.packageId) {
|
||||
loadPackageDetailsForItem(newItem);
|
||||
}
|
||||
|
||||
@@ -1509,8 +1483,7 @@ async function handleItemSelect(checked, item, cat) {
|
||||
isPackage: !!(item.packageId || item.packageName),
|
||||
packageName: item.packageName || null,
|
||||
packageDetailsLoading: false,
|
||||
packageId: item.packageId || null,
|
||||
hasChildren: !!(item.packageId || item.packageName) // #426修复: 树形表格懒加载展开标记，支持 packageName 解析
|
||||
packageId: item.packageId || null
|
||||
};
|
||||
selectedItems.value.push(newRow);
|
||||
// 必须用数组里的响应式行，不能继续改局部 newRow：push 后列表内是 proxy，改 raw 对象不会触发右侧卡片更新（会一直卡在「加载中」）
|
||||
@@ -1564,7 +1537,7 @@ async function toggleItemExpand(item) {
|
||||
async function selectMethodCheckbox(checked, item, method) {
|
||||
if (checked) {
|
||||
item.selectedMethod = method;
|
||||
if (item.expanded && (method.packageId || method.packageName)) {
|
||||
if (item.expanded && method.packageId) {
|
||||
loadPackageDetailsForItem(item);
|
||||
}
|
||||
// 动态加载该方法对应的套餐明细
|
||||
@@ -1629,11 +1602,9 @@ async function loadMethodPackageDetails(item, method) {
|
||||
/** 检查明细表格中切换检查方法 */
|
||||
async function onDetailMethodChange(row, val) {
|
||||
row.selectedMethod = val || null;
|
||||
if (val?.packageId || val?.packageName) {
|
||||
row.packageId = val.packageId || row.packageId;
|
||||
row.packageName = val.packageName || row.packageName;
|
||||
if (val?.packageId) {
|
||||
row.packageId = val.packageId;
|
||||
row.isPackage = true;
|
||||
row.hasChildren = true; // #426修复
|
||||
}
|
||||
row.packageDetailsDisplay = undefined;
|
||||
const carrier = getPackageCarrier(row);
|
||||
@@ -1829,7 +1800,7 @@ defineExpose({ getList });
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden; /* Bug #500: 防止切换时水平方向溢出导致抖动 */
|
||||
min-height: 300px; /* Bug #500: 增大最小高度，避免折叠动画期间容器高度突变 */
|
||||
min-height: 120px; /* Bug #500: 固定最小高度，避免分类切换时 flex 容器高度突变 */
|
||||
}
|
||||
.empty-hint {
|
||||
color: #909399;
|
||||
@@ -1888,7 +1859,6 @@ defineExpose({ getList });
|
||||
background: #f0f7ff;
|
||||
border-radius: 4px;
|
||||
margin-top: 6px;
|
||||
min-height: 50px; /* Bug #500: 方法区域预留最小高度，减少加载完成后的高度突变 */
|
||||
}
|
||||
|
||||
.method-section-title {
|
||||
@@ -1930,24 +1900,6 @@ defineExpose({ getList });
|
||||
margin-left: 6px;
|
||||
}
|
||||
|
||||
/* Bug #500修复: 方法列表骨架占位样式 */
|
||||
.method-section-skeleton {
|
||||
opacity: 0.6;
|
||||
pointer-events: none;
|
||||
}
|
||||
.skeleton-method-row {
|
||||
height: 22px;
|
||||
border-radius: 3px;
|
||||
background: linear-gradient(90deg, #e8f4ff 25%, #d0e8ff 50%, #e8f4ff 75%);
|
||||
background-size: 200% 100%;
|
||||
animation: shimmer 1.5s ease-in-out infinite;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
@keyframes shimmer {
|
||||
0% { background-position: 200% 0; }
|
||||
100% { background-position: -200% 0; }
|
||||
}
|
||||
|
||||
/* 已选择 tags */
|
||||
/* 已选择：加宽，避免套餐明细挤成一团 */
|
||||
.selected-panel {
|
||||
|
||||
@@ -564,74 +564,22 @@ function handleRemoveItem(index) {
|
||||
editingGroup.value.detailList.splice(index, 1);
|
||||
}
|
||||
|
||||
// 单击应用按钮（应用组套）
|
||||
async function handleUseOrderGroup(row) {
|
||||
// 单击应用按钮
|
||||
function handleUseOrderGroup(row) {
|
||||
if (!row.detailList || row.detailList.length === 0) {
|
||||
ElMessage.warning('该组套没有明细项');
|
||||
return;
|
||||
}
|
||||
|
||||
// 🔧 Bug 修复：组套保存时未持久化 orderDetailInfos，导致应用时缺失医嘱库信息。
|
||||
// 通过 API 批量查询补全，确保 setValue 能获取到 adviceType、inventoryList、priceList 等关键字段。
|
||||
const itemsMissingDetail = row.detailList.filter(
|
||||
item => !item.orderDetailInfos || Object.keys(item.orderDetailInfos).length === 0
|
||||
);
|
||||
const detailMap = {};
|
||||
if (itemsMissingDetail.length > 0) {
|
||||
const ids = itemsMissingDetail
|
||||
.map(item => item.orderDefinitionId)
|
||||
.filter(Boolean)
|
||||
.join(',');
|
||||
if (ids) {
|
||||
try {
|
||||
const res = await getAdviceBaseInfo({
|
||||
adviceDefinitionIdParamList: ids,
|
||||
organizationId: props.organizationId,
|
||||
});
|
||||
const records = res.data?.records || res.rows || [];
|
||||
records.forEach(rec => {
|
||||
if (rec.adviceDefinitionId) {
|
||||
detailMap[rec.adviceDefinitionId] = rec;
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
// 批量查询失败，使用原始 orderDetailInfos
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 🔧 辅助函数：根据字典 code 查找对应的 dictText
|
||||
const findDictText = (dictList, code) => {
|
||||
if (!code || !dictList?.value?.length) return '';
|
||||
const found = dictList.value.find(d => d.value === code);
|
||||
return found?.label || '';
|
||||
};
|
||||
|
||||
// 🔧 数据预处理：确保每个明细项都有完整的医嘱信息
|
||||
const processedDetailList = row.detailList.map(item => {
|
||||
// 优先使用组套中已带的 orderDetailInfos，否则使用 API 查询结果
|
||||
const orderDetail = (item.orderDetailInfos && Object.keys(item.orderDetailInfos).length > 0)
|
||||
? item.orderDetailInfos
|
||||
: (detailMap[item.orderDefinitionId] || {});
|
||||
|
||||
// 🔧 修复：组套明细只存了 methodCode/rateCode，没有 dictText。
|
||||
// 用字典查找补充 dictText，确保界面显示正确的用法/频次名称。
|
||||
const resolvedMethodCode = item.methodCode ?? orderDetail.methodCode;
|
||||
const resolvedRateCode = item.rateCode ?? orderDetail.rateCode;
|
||||
const methodCodeDictText = item.methodCode_dictText
|
||||
|| findDictText(method_code, resolvedMethodCode)
|
||||
|| orderDetail.methodCode_dictText
|
||||
|| '';
|
||||
const rateCodeDictText = item.rateCode_dictText
|
||||
|| findDictText(rate_code, resolvedRateCode)
|
||||
|| orderDetail.rateCode_dictText
|
||||
|| '';
|
||||
const orderDetail = item.orderDetailInfos || {};
|
||||
|
||||
return {
|
||||
// 组套明细字段
|
||||
...item,
|
||||
|
||||
// 医嘱库字段
|
||||
// 医嘱库字段（可能为空，需要兜底）
|
||||
adviceName: orderDetail.adviceName || item.orderDefinitionName || '未知项目',
|
||||
adviceType: orderDetail.adviceType,
|
||||
adviceDefinitionId: item.orderDefinitionId || orderDetail.adviceDefinitionId,
|
||||
@@ -644,6 +592,7 @@ async function handleUseOrderGroup(row) {
|
||||
partPercent: orderDetail.partPercent ?? 1,
|
||||
partAttributeEnum: orderDetail.partAttributeEnum,
|
||||
unitConversionRatio: orderDetail.unitConversionRatio,
|
||||
// 🔧 Bug #218 修复：positionId 可能存储在 item 本身，优先使用 item.positionId
|
||||
positionId: item.positionId ?? orderDetail.positionId,
|
||||
defaultLotNumber: orderDetail.defaultLotNumber,
|
||||
|
||||
@@ -653,20 +602,6 @@ async function handleUseOrderGroup(row) {
|
||||
unitCodeName: item.unitCodeName || orderDetail.unitCode_dictText,
|
||||
minUnitCode: orderDetail.minUnitCode,
|
||||
doseUnitCode: orderDetail.doseUnitCode,
|
||||
doseUnitCode_dictText: orderDetail.doseUnitCode_dictText || '',
|
||||
|
||||
// 药房/科室名称（setValue 通过库存查找设置，但需确保 orderDetail 中有）
|
||||
positionName: orderDetail.positionName || '',
|
||||
|
||||
// 注射/皮试标识（表格列显示依赖这些字段）
|
||||
injectFlag: orderDetail.injectFlag,
|
||||
injectFlag_enumText: orderDetail.injectFlag_enumText || '',
|
||||
skinTestFlag: orderDetail.skinTestFlag,
|
||||
skinTestFlag_enumText: orderDetail.skinTestFlag_enumText || '',
|
||||
|
||||
// 字典文本（传递到 item 层级，避免后续代码依赖 mergedDetail 再查一次）
|
||||
methodCode_dictText: methodCodeDictText,
|
||||
rateCode_dictText: rateCodeDictText,
|
||||
|
||||
// 合并后的完整对象（用于 setValue）
|
||||
// 先展开 orderDetail 获取所有药品基础字段（categoryCode、minUnitCode、doseUnitCode、
|
||||
@@ -681,19 +616,19 @@ async function handleUseOrderGroup(row) {
|
||||
categoryCode: item.categoryCode ?? orderDetail.categoryCode,
|
||||
unitCodeName: item.unitCodeName,
|
||||
dose: item.dose ?? orderDetail.dose,
|
||||
rateCode: resolvedRateCode,
|
||||
rateCode_dictText: rateCodeDictText,
|
||||
methodCode: resolvedMethodCode,
|
||||
methodCode_dictText: methodCodeDictText,
|
||||
rateCode: item.rateCode ?? orderDetail.rateCode,
|
||||
methodCode: item.methodCode ?? orderDetail.methodCode,
|
||||
dispensePerDuration: item.dispensePerDuration ?? orderDetail.dispensePerDuration,
|
||||
doseQuantity: item.doseQuantity ?? orderDetail.doseQuantity,
|
||||
// 🔧 Bug #218 / #403 修复：positionId 可能存储在 item 本身，优先使用 item.positionId
|
||||
positionId: item.positionId ?? orderDetail.positionId,
|
||||
// 执行科室：优先使用组套明细中保存的 orgId
|
||||
orgId: item.orgId ?? orderDetail.orgId,
|
||||
orgName: item.orgName ?? orderDetail.orgName,
|
||||
// 组号（保留组套中的分组信息）
|
||||
groupId: item.groupId,
|
||||
groupOrder: item.groupOrder,
|
||||
// 🔧 类型默认为临时医嘱（2=临时，1=长期）
|
||||
therapyEnum: item.therapyEnum ?? orderDetail.therapyEnum ?? '2',
|
||||
therapyEnum: item.therapyEnum ?? orderDetail.therapyEnum ?? '1',
|
||||
}
|
||||
};
|
||||
});
|
||||
@@ -710,9 +645,9 @@ function handlePreviewGroup(row) {
|
||||
}
|
||||
|
||||
// 确认应用组套（从预览对话框）
|
||||
async function confirmUseGroup() {
|
||||
function confirmUseGroup() {
|
||||
if (currentGroup.value) {
|
||||
await handleUseOrderGroup(currentGroup.value);
|
||||
handleUseOrderGroup(currentGroup.value);
|
||||
previewVisible.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3662,13 +3662,6 @@ function handleSaveGroup(orderGroupList) {
|
||||
defaultLotNumber: item.orderDetailInfos?.defaultLotNumber,
|
||||
};
|
||||
|
||||
// 🔧 Bug 修复：字典查找兜底，防止 mergedDetail 中 dictText 为空
|
||||
const findDictText = (dictList, code) => {
|
||||
if (!code || !dictList?.length) return '';
|
||||
const found = dictList.find(d => d.value === code);
|
||||
return found?.label || '';
|
||||
};
|
||||
|
||||
// 在 setValue 之前预初始化空行
|
||||
prescriptionList.value[rowIndex.value] = {
|
||||
uniqueKey: nextId.value++,
|
||||
@@ -3679,105 +3672,43 @@ function handleSaveGroup(orderGroupList) {
|
||||
// 使用医嘱项目详情设置值
|
||||
setValue(mergedDetail);
|
||||
|
||||
// 🔧 Bug 修复：使用 mergedDetail 优先，避免 item 中 undefined 覆盖 setValue 中已设置的字段
|
||||
const resolvedQuantity = mergedDetail.quantity ?? item.quantity ?? 1;
|
||||
const resolvedDose = mergedDetail.dose ?? item.dose;
|
||||
const resolvedMethodCode = mergedDetail.methodCode ?? item.methodCode;
|
||||
const resolvedRateCode = mergedDetail.rateCode ?? item.rateCode;
|
||||
const resolvedUnitCode = mergedDetail.unitCode ?? item.unitCode;
|
||||
|
||||
// 🔧 Bug 修复：setValue 可能因库存不足提前 return，导致 unitPrice/minUnitPrice 等字段未设置。
|
||||
// 从 mergedDetail 或 item 中获取兜底值，避免价格计算产生 NaN。
|
||||
const safePrice = (val) => {
|
||||
const n = Number(val);
|
||||
return (n !== undefined && n !== null && !isNaN(n) && isFinite(n)) ? n : 0;
|
||||
};
|
||||
const resolvedUnitPrice = safePrice(
|
||||
prescriptionList.value[rowIndex.value]?.unitPrice
|
||||
?? mergedDetail.unitPrice
|
||||
?? item.unitPrice
|
||||
?? 0
|
||||
);
|
||||
const resolvedMinUnitPrice = safePrice(
|
||||
prescriptionList.value[rowIndex.value]?.minUnitPrice
|
||||
?? mergedDetail.minUnitPrice
|
||||
?? item.minUnitPrice
|
||||
?? 0
|
||||
);
|
||||
const resolvedPartPercent = safePrice(
|
||||
item.orderDetailInfos?.partPercent
|
||||
?? mergedDetail.partPercent
|
||||
?? 1
|
||||
);
|
||||
|
||||
// 创建新的处方项目
|
||||
const newRow = {
|
||||
...prescriptionList.value[rowIndex.value],
|
||||
patientId: props.patientInfo.patientId,
|
||||
encounterId: props.patientInfo.encounterId,
|
||||
accountId: accountId.value,
|
||||
quantity: resolvedQuantity,
|
||||
methodCode: resolvedMethodCode,
|
||||
methodCode_dictText: mergedDetail.methodCode_dictText
|
||||
|| findDictText(method_code.value, resolvedMethodCode)
|
||||
|| '',
|
||||
rateCode: resolvedRateCode,
|
||||
rateCode_dictText: mergedDetail.rateCode_dictText
|
||||
|| findDictText(rate_code.value, resolvedRateCode)
|
||||
|| '',
|
||||
dispensePerDuration: mergedDetail.dispensePerDuration ?? item.dispensePerDuration,
|
||||
dose: resolvedDose,
|
||||
doseQuantity: mergedDetail.doseQuantity ?? item.doseQuantity,
|
||||
quantity: item.quantity,
|
||||
methodCode: item.methodCode,
|
||||
rateCode: item.rateCode,
|
||||
dispensePerDuration: item.dispensePerDuration,
|
||||
dose: item.dose,
|
||||
doseQuantity: item.doseQuantity,
|
||||
executeNum: 1,
|
||||
unitCode: resolvedUnitCode,
|
||||
unitCode_dictText: item.unitCodeName
|
||||
|| mergedDetail.unitCodeName
|
||||
|| findDictText(unit_code.value, resolvedUnitCode)
|
||||
|| '',
|
||||
doseUnitCode: mergedDetail.doseUnitCode,
|
||||
doseUnitCode_dictText: mergedDetail.doseUnitCode_dictText || '',
|
||||
// 🔧 确保 price/adviceType 字段有安全默认值（避免 NaN 导致模板条件判断失效）
|
||||
unitPrice: resolvedUnitPrice,
|
||||
minUnitPrice: resolvedMinUnitPrice,
|
||||
unitTempPrice: resolvedUnitPrice,
|
||||
adviceType: prescriptionList.value[rowIndex.value]?.adviceType
|
||||
|| Number(mergedDetail.adviceType)
|
||||
|| Number(item.adviceType)
|
||||
|| 0,
|
||||
adviceType_dictText: prescriptionList.value[rowIndex.value]?.adviceType_dictText
|
||||
|| mergedDetail.adviceType_dictText
|
||||
|| item.adviceType_dictText
|
||||
|| '',
|
||||
unitCode: item.unitCode,
|
||||
unitCode_dictText: item.unitCodeName || '',
|
||||
statusEnum: 1,
|
||||
// 🔧 类型：组套应用默认为临时医嘱（2=临时，1=长期）
|
||||
therapyEnum: mergedDetail.therapyEnum ?? item.therapyEnum ?? '2',
|
||||
// 🔧 修复执行科室逻辑：优先使用 orgId(所属科室)，其次 positionId
|
||||
// 🔧 Bug #455: 诊疗类(adviceType=3)使用患者就诊科室，不使用目录配置的ID
|
||||
orgId: item.adviceType === 3
|
||||
? props.patientInfo?.orgId
|
||||
: (item.orderDetailInfos?.orgId || mergedDetail.orgId || item.positionId || item.orderDetailInfos?.positionId || mergedDetail.positionId),
|
||||
positionName: prescriptionList.value[rowIndex.value]?.positionName
|
||||
|| mergedDetail.orgName
|
||||
|| mergedDetail.positionName
|
||||
|| findOrgNameById(mergedDetail.orgId || props.patientInfo?.orgId)
|
||||
|| '',
|
||||
dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
|
||||
conditionId: conditionId.value,
|
||||
conditionDefinitionId: conditionDefinitionId.value,
|
||||
encounterDiagnosisId: encounterDiagnosisId.value,
|
||||
diagnosisName: diagnosisName.value,
|
||||
};
|
||||
|
||||
// 计算价格和总量（使用安全值）
|
||||
const unitInfo = unitCodeList.value.find((k) => k.value == resolvedUnitCode);
|
||||
// 计算价格和总量
|
||||
const unitInfo = unitCodeList.value.find((k) => k.value == item.unitCode);
|
||||
if (unitInfo && unitInfo.type == 'minUnit') {
|
||||
newRow.price = resolvedMinUnitPrice;
|
||||
newRow.totalPrice = (resolvedQuantity * resolvedMinUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = resolvedQuantity;
|
||||
newRow.price = newRow.minUnitPrice;
|
||||
newRow.totalPrice = (item.quantity * newRow.minUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = item.quantity;
|
||||
} else {
|
||||
newRow.price = resolvedUnitPrice;
|
||||
newRow.totalPrice = (resolvedQuantity * resolvedUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = resolvedQuantity * resolvedPartPercent;
|
||||
newRow.price = newRow.unitPrice;
|
||||
newRow.totalPrice = (item.quantity * newRow.unitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = item.quantity * (item.orderDetailInfos?.partPercent || mergedDetail.partPercent || 1);
|
||||
}
|
||||
|
||||
newRow.contentJson = JSON.stringify(newRow);
|
||||
|
||||
@@ -93,6 +93,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" width="160" />
|
||||
<el-table-column prop="prescriptionNo" label="申请单号" width="140" />
|
||||
<el-table-column prop="requesterId_dictText" label="申请者" width="120" />
|
||||
<el-table-column label="申请单状态" width="120" align="center">
|
||||
<template #default="scope">
|
||||
<el-tag :type="getStatusTagType(scope.row.status)" effect="plain" round>
|
||||
@@ -100,7 +101,6 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="requesterId_dictText" label="申请者" width="120" />
|
||||
<el-table-column label="操作" width="280" align="center" fixed="right">
|
||||
<template #default="scope">
|
||||
<!-- 详情 - 所有状态都显示 -->
|
||||
@@ -179,14 +179,11 @@
|
||||
|
||||
<div v-if="descJsonData && hasMatchedFields" class="applicationShow-container-content">
|
||||
<el-descriptions title="申请单描述" :column="2">
|
||||
<el-descriptions-item
|
||||
v-for="key in orderedDescFieldKeys"
|
||||
:key="key"
|
||||
v-if="descJsonData[key] != null && descJsonData[key] !== ''"
|
||||
:label="getFieldLabel(key)"
|
||||
>
|
||||
{{ transformField(key, descJsonData[key]) || '-' }}
|
||||
<template v-for="(value, key) in descJsonData" :key="key">
|
||||
<el-descriptions-item v-if="isFieldMatched(key)" :label="getFieldLabel(key)">
|
||||
{{ transformField(key, value) || '-' }}
|
||||
</el-descriptions-item>
|
||||
</template>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
|
||||
@@ -223,7 +220,6 @@
|
||||
:is-edit-mode="true"
|
||||
:edit-data="editingRow"
|
||||
:external-patient-info="patientInfo"
|
||||
@submit-ok="handleEditSuccess"
|
||||
/>
|
||||
<template #footer>
|
||||
<el-button @click="editDialogVisible = false">取消</el-button>
|
||||
@@ -514,13 +510,6 @@ const hasMatchedFields = computed(() => {
|
||||
return Object.keys(descJsonData.value).some((key) => isFieldMatched(key));
|
||||
});
|
||||
|
||||
// Ordered field keys for detail display and print, matching the bug requirement order
|
||||
const orderedDescFieldKeys = [
|
||||
'targetDepartment', 'urgencyLevel', 'allergyHistory', 'examinationPurpose',
|
||||
'expectedExaminationTime', 'medicalHistorySummary', 'symptom', 'sign',
|
||||
'clinicalDiagnosis', 'otherDiagnosis', 'relatedResult', 'attention',
|
||||
];
|
||||
|
||||
/** 查询科室 */
|
||||
const getLocationInfo = async () => {
|
||||
try {
|
||||
@@ -689,16 +678,15 @@ const handlePrint = async (row) => {
|
||||
}
|
||||
|
||||
// 构建 descJson 字段行（与详情弹窗展示的字段一致）
|
||||
const fieldKeys = orderedDescFieldKeys;
|
||||
const fieldKeys = ['targetDepartment', 'symptom', 'sign', 'clinicalDiagnosis', 'otherDiagnosis', 'relatedResult', 'attention'];
|
||||
let descFieldsHtml = '';
|
||||
fieldKeys.forEach((key) => {
|
||||
const label = labelMap[key] || key;
|
||||
const value = transformField(key, descData[key]);
|
||||
if (descData[key] != null && descData[key] !== '' && value != null && value !== '') {
|
||||
if (descData[key] != null && descData[key] !== '') {
|
||||
descFieldsHtml += `
|
||||
<div class="info-row">
|
||||
<span class="label">${label}：</span>
|
||||
<span class="value">${value}</span>
|
||||
<span class="value">${descData[key]}</span>
|
||||
</div>`;
|
||||
}
|
||||
});
|
||||
@@ -917,7 +905,7 @@ const handleViewReport = async (row) => {
|
||||
reportLoading.value = true;
|
||||
reportData.value = null;
|
||||
try {
|
||||
const res = await getTestResult({ encounterId: row.encounterId || patientInfo.value?.encounterId });
|
||||
const res = await getTestResult({ prescriptionNo: row.prescriptionNo });
|
||||
if (res.code === 200) {
|
||||
if (res.data) {
|
||||
// 支持两种返回格式：
|
||||
@@ -979,17 +967,12 @@ const handleEdit = (row) => {
|
||||
|
||||
// 编辑弹窗确认提交
|
||||
const handleEditSubmit = () => {
|
||||
// 调用MedicalExaminations组件的submit方法
|
||||
if (editFormRef.value?.submit) {
|
||||
editFormRef.value.submit();
|
||||
}
|
||||
};
|
||||
|
||||
// 编辑保存成功回调：关闭弹窗并刷新列表
|
||||
const handleEditSuccess = () => {
|
||||
editDialogVisible.value = false;
|
||||
fetchData();
|
||||
};
|
||||
|
||||
watch(
|
||||
() => patientInfo.value?.encounterId,
|
||||
(val) => {
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
<el-option label="全部" value="" />
|
||||
<el-option label="待签发" value="0" />
|
||||
<el-option label="已签发" value="1" />
|
||||
<el-option label="已出报告" value="6" />
|
||||
<el-option label="已作废" value="7" />
|
||||
<el-option label="报告已出" value="4" />
|
||||
<el-option label="已作废" value="5" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关键字">
|
||||
@@ -105,22 +105,17 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="requesterId_dictText" label="申请者" width="120" />
|
||||
<el-table-column label="操作" align="center" fixed="right" width="220">
|
||||
<el-table-column label="操作" align="center" fixed="right" width="160">
|
||||
<template #default="scope">
|
||||
<!-- 待签发（status=0或null/undefined）：可修改、删除 -->
|
||||
<template v-if="!scope.row.status || scope.row.status == 0">
|
||||
<template v-if="scope.row.status == 0">
|
||||
<el-button link type="primary" @click="handleEdit(scope.row)">修改</el-button>
|
||||
<el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
|
||||
</template>
|
||||
<!-- 已签发（status=1）：可撤回 -->
|
||||
<template v-else-if="scope.row.status == 1">
|
||||
<el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
|
||||
</template>
|
||||
<!-- 已校对(2)、待接收(3)、已收样(4)、已出报告(6)、已作废(7)：仅查看详情 -->
|
||||
<template v-else>
|
||||
<el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
@@ -333,11 +328,8 @@ const parseBillStatus = (status) => {
|
||||
const statusMap = {
|
||||
'0': '待签发',
|
||||
'1': '已签发',
|
||||
'2': '已校对',
|
||||
'3': '待接收',
|
||||
'4': '已收样',
|
||||
'6': '已出报告',
|
||||
'7': '已作废',
|
||||
'4': '报告已出',
|
||||
'5': '已作废',
|
||||
};
|
||||
return statusMap[String(status)] || '-';
|
||||
};
|
||||
@@ -415,16 +407,26 @@ const getLocationInfo = async () => {
|
||||
|
||||
const recursionFun = (targetDepartment) => {
|
||||
if (!targetDepartment) return '';
|
||||
const findNode = (list, id) => {
|
||||
if (!list || list.length === 0) return '';
|
||||
for (const item of list) {
|
||||
if (item.id == id) return item.name;
|
||||
const found = findNode(item.children, id);
|
||||
if (found) return found;
|
||||
let name = '';
|
||||
for (let index = 0; index < orgOptions.value.length; index++) {
|
||||
const obj = orgOptions.value[index];
|
||||
if (obj.id == targetDepartment) {
|
||||
name = obj.name;
|
||||
break;
|
||||
}
|
||||
return '';
|
||||
};
|
||||
return findNode(orgOptions.value, targetDepartment);
|
||||
const subObjArray = obj['children'];
|
||||
if (subObjArray && subObjArray.length > 0) {
|
||||
for (let i = 0; i < subObjArray.length; i++) {
|
||||
const item = subObjArray[i];
|
||||
if (item.id == targetDepartment) {
|
||||
name = item.name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (name) break;
|
||||
}
|
||||
return name;
|
||||
};
|
||||
|
||||
const handleViewDetail = async (row) => {
|
||||
|
||||
@@ -1,24 +1,6 @@
|
||||
import request from '@/utils/request';
|
||||
// 申请单相关接口
|
||||
|
||||
// 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存等无关逻辑）
|
||||
export function getSurgeryPage(params) {
|
||||
return request({
|
||||
url: '/doctor-station/advice/surgery-page',
|
||||
method: 'get',
|
||||
params: params,
|
||||
});
|
||||
}
|
||||
|
||||
// 检查项目专用分页查询（仅检查(23) + 定价，绕过 AOP 校验提升加载速度）
|
||||
export function getExaminationPage(params) {
|
||||
return request({
|
||||
url: '/doctor-station/advice/examination-page',
|
||||
method: 'get',
|
||||
params: params,
|
||||
});
|
||||
}
|
||||
|
||||
//医嘱大下拉
|
||||
export function getApplicationList(queryParams) {
|
||||
return request({
|
||||
|
||||
@@ -325,14 +325,9 @@ const projectWithDepartment = (selectProjectIds, type) => {
|
||||
}
|
||||
}
|
||||
if (findItem && isRelease) {
|
||||
// 提交时若用户已选「发往科室」，不得用项目默认执行科室覆盖
|
||||
if (type === 2 && manualDept) {
|
||||
form.targetDepartment = manualDept;
|
||||
} else {
|
||||
form.targetDepartment = findItem.id;
|
||||
}
|
||||
}
|
||||
}
|
||||
return isRelease;
|
||||
};
|
||||
// 监听选择项目变化
|
||||
@@ -397,7 +392,7 @@ const submit = () => {
|
||||
unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
|
||||
unitPrice: item.priceList[0].price /** 单价 */,
|
||||
totalPrice: item.priceList[0].price /** 总价 */,
|
||||
positionId: form.targetDepartment || item.positionId, // 用户指定发往科室优先于项目默认执行科室
|
||||
positionId: item.positionId || form.targetDepartment, //执行科室id，未配置时使用用户手动选择的科室
|
||||
ybClassEnum: item.ybClassEnum, //类别医保编码
|
||||
conditionId: item.conditionId, //诊断ID
|
||||
encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
|
||||
|
||||
@@ -7,6 +7,20 @@
|
||||
<div class="medicalExaminations-container">
|
||||
<!-- 主体内容 -->
|
||||
<div class="form-body">
|
||||
<!-- 右上角：紧急程度 -->
|
||||
<div class="urgency-bar">
|
||||
<span class="urgency-bar-label">紧急程度：</span>
|
||||
<el-radio-group v-model="form.urgencyLevel" @change="handleUrgencyChange" size="small">
|
||||
<el-radio-button label="routine">普通</el-radio-button>
|
||||
<el-radio-button label="emergency">急诊</el-radio-button>
|
||||
</el-radio-group>
|
||||
<transition name="el-fade-in-linear">
|
||||
<span v-if="form.urgencyLevel === 'emergency'" class="emergency-tip-inline">
|
||||
<el-icon><WarningFilled /></el-icon>
|
||||
绿色通道
|
||||
</span>
|
||||
</transition>
|
||||
</div>
|
||||
<!-- 选择检查项目 -->
|
||||
<div class="section-card">
|
||||
<div class="transfer-wrapper">
|
||||
@@ -38,21 +52,7 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="紧急程度">
|
||||
<el-radio-group v-model="form.urgencyLevel" @change="handleUrgencyChange" size="small">
|
||||
<el-radio-button label="routine">普通</el-radio-button>
|
||||
<el-radio-button label="emergency">急诊</el-radio-button>
|
||||
</el-radio-group>
|
||||
<transition name="el-fade-in-linear">
|
||||
<span v-if="form.urgencyLevel === 'emergency'" class="emergency-tip-inline">
|
||||
<el-icon><WarningFilled /></el-icon>
|
||||
绿色通道
|
||||
</span>
|
||||
</transition>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="期望检查时间">
|
||||
<el-date-picker
|
||||
v-model="form.expectedExaminationTime"
|
||||
@@ -61,7 +61,7 @@
|
||||
style="width: 100%"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
:disabled-date="disabledPastDate"
|
||||
:disabled-date="disabledFutureDate"
|
||||
:default-value="new Date()"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -206,7 +206,7 @@ import dayjs from 'dayjs';
|
||||
import {patientInfo} from '../../../store/patient.js';
|
||||
import {getDepartmentList} from '@/api/public.js';
|
||||
import {getEncounterDiagnosis} from '../../api.js';
|
||||
import {getExaminationPage, saveCheckd} from './api';
|
||||
import {getApplicationList, saveCheckd} from './api';
|
||||
import {ElMessage, ElMessageBox} from 'element-plus';
|
||||
import {WarningFilled, Warning, Refresh, Files, Document, EditPen, Aim, DocumentCopy} from '@element-plus/icons-vue';
|
||||
|
||||
@@ -266,23 +266,27 @@ const isSevereAllergy = computed(() => {
|
||||
});
|
||||
|
||||
const getList = () => {
|
||||
console.log('getList called, effectivePatientInfo:', effectivePatientInfo.value);
|
||||
if (!effectivePatientInfo.value?.inHospitalOrgId) {
|
||||
console.log('inHospitalOrgId is missing, setting empty list');
|
||||
applicationList.value = [];
|
||||
return;
|
||||
}
|
||||
loading.value = true;
|
||||
getExaminationPage({
|
||||
getApplicationList({
|
||||
pageSize: 500,
|
||||
pageNum: 1,
|
||||
categoryCode: '23',
|
||||
organizationId: effectivePatientInfo.value.inHospitalOrgId,
|
||||
pageNo: 1,
|
||||
pageSize: 5000,
|
||||
searchKey: '',
|
||||
adviceTypes: [3],
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code === 200 && res.data?.records) {
|
||||
if (res.code === 200) {
|
||||
applicationListAll.value = res.data.records;
|
||||
applicationList.value = res.data.records.map((item) => {
|
||||
const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
|
||||
const unit = item.unitCodeDictText || item.unitCode || '';
|
||||
const priceInfo = item.priceList?.[0] || {};
|
||||
const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
|
||||
const unit = item.unitCode_dictText || item.unitCode || '';
|
||||
return {
|
||||
adviceDefinitionId: item.adviceDefinitionId,
|
||||
orgId: item.orgId,
|
||||
@@ -295,6 +299,7 @@ const getList = () => {
|
||||
nextTick(() => {
|
||||
// 使用 adviceName 匹配
|
||||
const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
|
||||
console.log('getList completed, selectedNames:', selectedNames);
|
||||
const selectedIds = [];
|
||||
applicationList.value?.forEach(app => {
|
||||
// 匹配时去掉价格部分，只比较名称
|
||||
@@ -303,6 +308,7 @@ const getList = () => {
|
||||
selectedIds.push(app.key);
|
||||
}
|
||||
});
|
||||
console.log('getList completed, matched selectedIds:', selectedIds);
|
||||
transferValue.value = selectedIds;
|
||||
});
|
||||
}
|
||||
@@ -347,8 +353,8 @@ const rules = reactive({
|
||||
],
|
||||
});
|
||||
|
||||
// 禁用过去的日期（允许选择今天及以后）
|
||||
const disabledPastDate = (time) => {
|
||||
// 禁用过去的时间
|
||||
const disabledFutureDate = (time) => {
|
||||
return time.getTime() < Date.now() - 8.64e7;
|
||||
};
|
||||
|
||||
@@ -398,11 +404,13 @@ const loadPatientAllergyHistory = () => {
|
||||
if (!effectivePatientInfo.value?.patientId) return;
|
||||
};
|
||||
|
||||
// 加载编辑数据 — 只负责解析 descJson 填充表单字段
|
||||
// 已选项目的匹配由 getList 数据加载完成后统一处理
|
||||
// 加载编辑数据
|
||||
const loadEditData = () => {
|
||||
if (!props.isEditMode || !props.editData?.requestFormId) return;
|
||||
|
||||
console.log('loadEditData called, editData:', props.editData);
|
||||
|
||||
// 解析已有的descJson填充表单
|
||||
if (props.editData.descJson) {
|
||||
try {
|
||||
const obj = JSON.parse(props.editData.descJson);
|
||||
@@ -423,16 +431,91 @@ const loadEditData = () => {
|
||||
console.error('解析descJson失败:', e);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const projectWithDepartment = (selectProjectIds) => {
|
||||
if (!selectProjectIds || selectProjectIds.length === 0) {
|
||||
form.targetDepartment = '';
|
||||
// 设置已选项目（从requestFormDetailList获取）
|
||||
// 注意：后端返回的字段是 adviceName，不是 adviceDefinitionId
|
||||
console.log('requestFormDetailList:', props.editData.requestFormDetailList);
|
||||
if (props.editData.requestFormDetailList && props.editData.requestFormDetailList.length) {
|
||||
// 使用 adviceName 匹配
|
||||
const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
|
||||
console.log('setting transferValue by adviceName to:', selectedNames);
|
||||
// 通过名称匹配找到对应的 key
|
||||
const selectedIds = [];
|
||||
applicationList.value?.forEach(app => {
|
||||
if (selectedNames.includes(app.label?.split(' (')[0])) {
|
||||
selectedIds.push(app.key);
|
||||
}
|
||||
});
|
||||
console.log('matched selectedIds:', selectedIds);
|
||||
transferValue.value = selectedIds;
|
||||
} else {
|
||||
console.log('requestFormDetailList is empty or undefined');
|
||||
}
|
||||
};
|
||||
|
||||
const projectWithDepartment = (selectProjectIds, type) => {
|
||||
let isRelease = true;
|
||||
const arr = [];
|
||||
// 确保 applicationList 存在
|
||||
if (!applicationList.value || !Array.isArray(applicationList.value)) {
|
||||
return true;
|
||||
}
|
||||
selectProjectIds.forEach((element) => {
|
||||
const searchData = applicationList.value.find((item) => {
|
||||
return element == item.adviceDefinitionId;
|
||||
});
|
||||
arr.push(searchData);
|
||||
});
|
||||
// 只有当选择了项目（arr 非空）时才设置 targetDepartment
|
||||
if (arr.length > 0) {
|
||||
const obj = arr[0];
|
||||
// 检查是否有未定义的项目（applicationList 中找不到）
|
||||
if (!obj) {
|
||||
console.warn('未找到项目定义，无法设置执行科室');
|
||||
return false;
|
||||
}
|
||||
const isCompare = arr.every((item) => item && item.orgId == obj.orgId);
|
||||
if (!isCompare) {
|
||||
ElMessage({ type: 'error', message: '执行科室不同' });
|
||||
isRelease = false;
|
||||
}
|
||||
const findItem = findTreeItem(orgOptions.value, obj.orgId);
|
||||
if (!findItem) {
|
||||
isRelease = false;
|
||||
ElMessage({ type: 'error', message: '未找到项目执行的科室' });
|
||||
}
|
||||
if (type == 1 && isRelease) {
|
||||
form.targetDepartment = findItem.id;
|
||||
console.log('targetDepartment 设置为:', form.targetDepartment, '科室名称:', findItem.name);
|
||||
}
|
||||
} else {
|
||||
// 清空选择时，也要清空 targetDepartment
|
||||
form.targetDepartment = '';
|
||||
}
|
||||
return isRelease;
|
||||
};
|
||||
|
||||
watch(() => transferValue.value, (newValue) => {
|
||||
projectWithDepartment(newValue);
|
||||
console.log('transferValue changed:', newValue);
|
||||
console.log('applicationList length:', applicationList.value?.length);
|
||||
projectWithDepartment(newValue, 1);
|
||||
});
|
||||
|
||||
// 监听 applicationList 加载完成，重新设置已选项目
|
||||
watch(() => applicationList.value, (newList) => {
|
||||
if (newList && newList.length > 0 && props.isEditMode && props.editData?.requestFormDetailList?.length) {
|
||||
console.log('applicationList loaded, re-setting transferValue');
|
||||
// 使用 adviceName 匹配
|
||||
const selectedNames = props.editData.requestFormDetailList.map(item => item.adviceName);
|
||||
const selectedIds = [];
|
||||
newList.forEach(app => {
|
||||
const appName = app.label?.split(' (')[0];
|
||||
if (selectedNames.includes(appName)) {
|
||||
selectedIds.push(app.key);
|
||||
}
|
||||
});
|
||||
transferValue.value = selectedIds;
|
||||
}
|
||||
});
|
||||
|
||||
const getPriorityCode = () => {
|
||||
@@ -443,8 +526,8 @@ const submit = () => {
|
||||
if (transferValue.value.length == 0) {
|
||||
return proxy.$message.error('请选择检查项目');
|
||||
}
|
||||
if (!form.targetDepartment) {
|
||||
return proxy.$message.error('请选择发往科室');
|
||||
if (!projectWithDepartment(transferValue.value, 2)) {
|
||||
return;
|
||||
}
|
||||
if (!form.examinationPurpose) {
|
||||
return ElMessageBox.alert('请输入检查目的', '提示', { confirmButtonText: '确定', type: 'warning' });
|
||||
@@ -459,25 +542,21 @@ const submit = () => {
|
||||
let applicationListAllFilter = applicationListAll.value.filter((item) => {
|
||||
return transferValue.value.includes(item.adviceDefinitionId);
|
||||
});
|
||||
// 从原始记录中提取检查项目名称，用于申请单名称字段
|
||||
const selectedNames = applicationListAllFilter.map(item => item.adviceName).join('+');
|
||||
applicationListAllFilter = applicationListAllFilter.map((item) => {
|
||||
// 新接口 getExaminationPage 返回扁平字段（price/unitCode），兼容旧接口 priceList[0]
|
||||
const priceInfo = item.priceList?.[0] || {};
|
||||
return {
|
||||
adviceDefinitionId: item.adviceDefinitionId,
|
||||
adviceName: item.adviceName,
|
||||
quantity: 1,
|
||||
unitCode: item.unitCode || priceInfo.unitCode || '',
|
||||
unitPrice: item.price ?? priceInfo.price ?? 0,
|
||||
totalPrice: item.price ?? priceInfo.price ?? 0,
|
||||
positionId: form.targetDepartment || item.positionId, // 用户手动选择的发往科室优先于项目默认执行科室
|
||||
unitCode: item.priceList[0].unitCode,
|
||||
unitPrice: item.priceList[0].price,
|
||||
totalPrice: item.priceList[0].price,
|
||||
positionId: item.positionId,
|
||||
ybClassEnum: item.ybClassEnum,
|
||||
conditionId: item.conditionId,
|
||||
encounterDiagnosisId: item.encounterDiagnosisId,
|
||||
adviceType: item.adviceType,
|
||||
definitionId: item.chargeItemDefinitionId || priceInfo.definitionId || '',
|
||||
definitionDetailId: item.definitionDetailId || priceInfo.definitionDetailId || '',
|
||||
definitionId: item.priceList[0].definitionId,
|
||||
definitionDetailId: item.priceList[0].definitionDetailId,
|
||||
accountId: effectivePatientInfo.value.accountId,
|
||||
};
|
||||
});
|
||||
@@ -494,21 +573,22 @@ const submit = () => {
|
||||
encounterId: effectivePatientInfo.value.encounterId,
|
||||
organizationId: effectivePatientInfo.value.inHospitalOrgId,
|
||||
requestFormId: requestFormId,
|
||||
name: selectedNames,
|
||||
name: applicationListAllFilter.map(item => item.adviceName).join('、'),
|
||||
descJson: JSON.stringify(submitForm),
|
||||
categoryEnum: '22',
|
||||
}).then((res) => {
|
||||
if (res.code === 200) {
|
||||
ElMessage.success(res.msg || (props.isEditMode ? '修改成功' : '保存成功'));
|
||||
applicationList.value = [];
|
||||
emits('submitOk');
|
||||
resetForm();
|
||||
if (props.isEditMode) {
|
||||
proxy.$message.success(res.msg || '修改成功');
|
||||
} else {
|
||||
ElMessage.error(res.msg || '保存失败');
|
||||
proxy.$message.success(res.msg);
|
||||
}
|
||||
applicationList.value = [];
|
||||
resetForm();
|
||||
emits('submitOk');
|
||||
} else {
|
||||
proxy.$message.error(res.message);
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.error('保存检查申请失败:', error);
|
||||
ElMessage.error('保存失败，请稍后重试');
|
||||
});
|
||||
};
|
||||
|
||||
@@ -624,6 +704,23 @@ $bg-color: #f5f7fa;
|
||||
}
|
||||
}
|
||||
|
||||
// 紧急程度栏 - 右上角
|
||||
.urgency-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
gap: 8px;
|
||||
padding: 4px 0;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.urgency-bar-label {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: $text-regular;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
// 卡片通用样式 - 紧凑
|
||||
.section-card {
|
||||
background: #fff;
|
||||
|
||||
@@ -5,27 +5,13 @@
|
||||
-->
|
||||
<template>
|
||||
<div class="surgery-container">
|
||||
<div class="transfer-wrapper" style="min-height: 300px;">
|
||||
<!-- 搜索框：≥3字触发后端搜索 -->
|
||||
<div style="padding: 6px 0;">
|
||||
<el-input
|
||||
v-model="searchKey"
|
||||
placeholder="请输入3个字及以上搜索"
|
||||
clearable
|
||||
@input="onSearchInput"
|
||||
style="width: 320px;"
|
||||
/>
|
||||
</div>
|
||||
<!-- 加载提示不阻塞穿梭框操作 -->
|
||||
<div v-if="loading" style="padding:8px 0; color:#909399; font-size:13px;">
|
||||
<el-icon class="is-loading"><Loading /></el-icon> 手术项目加载中...
|
||||
</div>
|
||||
<div v-loading="loading" class="transfer-wrapper" style="min-height: 300px;">
|
||||
<el-transfer
|
||||
ref="transferRef"
|
||||
v-model="transferValue"
|
||||
:data="applicationList"
|
||||
:titles="['待选择', '已选择']"
|
||||
:format="leftPanelFormat"
|
||||
filter-placeholder="项目代码/名称"
|
||||
filterable
|
||||
:titles="['未选择', '已选择']"
|
||||
/>
|
||||
</div>
|
||||
<div class="bloodTransfusion-form">
|
||||
@@ -92,26 +78,17 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup name="Surgery">
|
||||
import {computed, getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
|
||||
import {getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
|
||||
import {patientInfo} from '../../../store/patient.js';
|
||||
import {getDepartmentList} from '@/api/public.js';
|
||||
import {getEncounterDiagnosis} from '../../api.js';
|
||||
import {getSurgeryPage, saveSurgery} from './api';
|
||||
import {getApplicationList, saveSurgery} from './api';
|
||||
import {ElMessage} from 'element-plus';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
// 模块级缓存：避免每次打开弹窗都重新请求手术项目列表
|
||||
let surgeryRecordsCache = null; // 原始 API 记录
|
||||
let surgeryMappedCache = null; // 映射后的 el-transfer 数据
|
||||
let searchDebounceTimer = null; // 搜索防抖
|
||||
const transferRef = ref(null);
|
||||
const dbTotal = ref(0); // 数据库中的手术项目总数
|
||||
const searchKey = ref(''); // 搜索关键字
|
||||
const checkedCount = computed(() => transferValue.value.length);
|
||||
const leftPanelFormat = computed(() => ({
|
||||
noChecked: ` 0/${dbTotal.value}`,
|
||||
hasChecked: ` \${checked}/${dbTotal.value}`,
|
||||
}));
|
||||
// 递归查找树形科室节点
|
||||
const findTreeItem = (list, id) => {
|
||||
if (!list || list.length === 0) return null;
|
||||
@@ -128,88 +105,58 @@ const emits = defineEmits(['submitOk']);
|
||||
const props = defineProps({});
|
||||
const state = reactive({});
|
||||
const applicationListAll = ref();
|
||||
const applicationList = ref([]);
|
||||
const applicationList = ref();
|
||||
const orgOptions = ref([]); // 科室选项
|
||||
const loading = ref(false); // 加载状态
|
||||
const mapToTransferItem = (item) => {
|
||||
const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
|
||||
const unit = item.unitCodeDictText || item.unitCode || '';
|
||||
const getList = () => {
|
||||
if (!patientInfo.value?.inHospitalOrgId) {
|
||||
applicationList.value = [];
|
||||
return;
|
||||
}
|
||||
// 命中缓存时直接使用，避免重复请求导致加载缓慢
|
||||
if (surgeryMappedCache && surgeryMappedCache.length > 0) {
|
||||
applicationList.value = surgeryMappedCache;
|
||||
applicationListAll.value = surgeryRecordsCache;
|
||||
return;
|
||||
}
|
||||
loading.value = true;
|
||||
getApplicationList({
|
||||
pageSize: 500,
|
||||
pageNum: 1,
|
||||
categoryCode: '24',
|
||||
organizationId: patientInfo.value.inHospitalOrgId,
|
||||
adviceTypes: [3, 6], //1 药品 2耗材 3诊疗 6手术
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code === 200) {
|
||||
applicationListAll.value = res.data.records;
|
||||
applicationList.value = res.data.records.map((item) => {
|
||||
const priceInfo = item.priceList?.[0] || {};
|
||||
const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
|
||||
const unit = item.unitCode_dictText || item.unitCode || '';
|
||||
return {
|
||||
adviceDefinitionId: item.adviceDefinitionId,
|
||||
orgId: item.orgId,
|
||||
label: item.adviceName + ' (￥' + price + '/' + unit + ')',
|
||||
key: item.adviceDefinitionId,
|
||||
};
|
||||
};
|
||||
const getList = () => {
|
||||
if (!patientInfo.value?.inHospitalOrgId) {
|
||||
applicationList.value = [];
|
||||
return;
|
||||
}
|
||||
// 命中内存缓存时直接使用
|
||||
if (surgeryMappedCache && surgeryMappedCache.length > 0) {
|
||||
applicationList.value = surgeryMappedCache;
|
||||
applicationListAll.value = surgeryRecordsCache;
|
||||
loading.value = false;
|
||||
return;
|
||||
}
|
||||
loadPage('');
|
||||
};
|
||||
|
||||
/**
|
||||
* 加载手术项目分页数据
|
||||
* @param {string} key 搜索关键字（可选）
|
||||
*/
|
||||
const loadPage = (key) => {
|
||||
const orgId = patientInfo.value.inHospitalOrgId;
|
||||
loading.value = true;
|
||||
getSurgeryPage({ organizationId: orgId, pageNo: 1, pageSize: 100, searchKey: key || '' })
|
||||
.then((res) => {
|
||||
if (res.code !== 200 || !res.data?.records) {
|
||||
applicationList.value = [];
|
||||
dbTotal.value = 0;
|
||||
loading.value = false;
|
||||
return;
|
||||
}
|
||||
dbTotal.value = res.data.total || 0;
|
||||
const records = res.data.records;
|
||||
applicationListAll.value = records;
|
||||
applicationList.value = records
|
||||
.filter(item => item.adviceDefinitionId != null)
|
||||
.map(mapToTransferItem);
|
||||
// 仅在无搜索时缓存
|
||||
if (!key) {
|
||||
surgeryRecordsCache = records;
|
||||
});
|
||||
// 写入模块缓存，后续打开弹窗直接复用
|
||||
surgeryRecordsCache = res.data.records;
|
||||
surgeryMappedCache = applicationList.value;
|
||||
} else {
|
||||
console.warn('获取手术项目列表失败:', res.message);
|
||||
applicationList.value = [];
|
||||
}
|
||||
loading.value = false;
|
||||
})
|
||||
.catch((e) => {
|
||||
console.error('手术项目加载失败:', e);
|
||||
console.warn('手术项目列表加载失败（可能无权限）:', e?.message || e);
|
||||
applicationList.value = [];
|
||||
dbTotal.value = 0;
|
||||
})
|
||||
.finally(() => {
|
||||
loading.value = false;
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 搜索输入框变化处理（防抖300ms，≥3字触发后端搜索）
|
||||
*/
|
||||
const onSearchInput = () => {
|
||||
clearTimeout(searchDebounceTimer);
|
||||
const val = searchKey.value.trim();
|
||||
if (!val) {
|
||||
// 清空搜索框，恢复初始数据
|
||||
loadPage('');
|
||||
return;
|
||||
}
|
||||
if (val.length >= 3) {
|
||||
searchDebounceTimer = setTimeout(() => {
|
||||
loadPage(val);
|
||||
}, 300);
|
||||
}
|
||||
};
|
||||
|
||||
const transferValue = ref([]);
|
||||
const form = reactive({
|
||||
// categoryType: '', // 项目类别
|
||||
@@ -296,15 +243,20 @@ const submit = () => {
|
||||
});
|
||||
applicationListAllFilter = applicationListAllFilter.map((item) => {
|
||||
return {
|
||||
adviceDefinitionId: item.adviceDefinitionId,
|
||||
adviceDefinitionName: item.adviceName,
|
||||
quantity: 1,
|
||||
unitCode: item.unitCode,
|
||||
unitPrice: item.price,
|
||||
totalPrice: item.price,
|
||||
positionId: item.positionId,
|
||||
definitionId: item.chargeItemDefinitionId,
|
||||
accountId: patientInfo.value.accountId,
|
||||
adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
|
||||
adviceDefinitionName: item.adviceDefinitionName /** 诊疗定义名称（手术项目名称） */,
|
||||
quantity: 1, // /** 请求数量 */
|
||||
unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
|
||||
unitPrice: item.priceList[0].price /** 单价 */,
|
||||
totalPrice: item.priceList[0].price /** 总价 */,
|
||||
positionId: item.positionId, //执行科室id
|
||||
ybClassEnum: item.ybClassEnum, //类别医保编码
|
||||
conditionId: item.conditionId, //诊断ID
|
||||
encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
|
||||
adviceType: item.adviceType, ///** 医嘱类型 */
|
||||
definitionId: item.priceList[0].definitionId, //费用定价主表ID */
|
||||
definitionDetailId: item.definitionDetailId, //费用定价子表ID */
|
||||
accountId: patientInfo.value.accountId, // // 账户id
|
||||
};
|
||||
});
|
||||
saveSurgery({
|
||||
|
||||
@@ -380,7 +380,7 @@ const form = ref({
|
||||
prescriptionList: prescriptionList.value,
|
||||
});
|
||||
const adviceQueryParams = ref({
|
||||
adviceType: 1,
|
||||
adviceType: '',
|
||||
categoryCode: '', // 初始为空，等待加载配置后动态设置
|
||||
searchKey: '',
|
||||
});
|
||||
@@ -533,6 +533,7 @@ const statusOption = [
|
||||
let loadingInstance = undefined;
|
||||
onMounted(() => {
|
||||
document.addEventListener('keydown', escKeyListener);
|
||||
getList();
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
@@ -573,7 +574,6 @@ function handleTotalAmount() {
|
||||
}
|
||||
}, new Decimal(0));
|
||||
}
|
||||
getList();
|
||||
function getList() {
|
||||
getDiagnosisDefinitionList(queryParams.value).then((res) => {
|
||||
// prescriptionList.value = res.data.records;
|
||||
@@ -585,6 +585,11 @@ function refresh() {
|
||||
}
|
||||
// 获取列表信息
|
||||
function getListInfo(addNewRow) {
|
||||
// 守护：未选择患者时不发起 API 请求，避免页面加载时循环报错
|
||||
if (!patientInfo.value || !patientInfo.value.encounterId) {
|
||||
console.warn('⚠️ getListInfo 跳过：未选择患者');
|
||||
return;
|
||||
}
|
||||
loadingInstance = ElLoading.service({ fullscreen: true });
|
||||
setTimeout(() => {
|
||||
loadingInstance.close();
|
||||
@@ -686,7 +691,7 @@ function loadConfiguredCategories() {
|
||||
nextTick(() => {
|
||||
// 创建新对象触发响应式更新
|
||||
adviceQueryParams.value = {
|
||||
adviceType: 1,
|
||||
adviceType: '',
|
||||
categoryCode: defaultCategoryCode,
|
||||
searchKey: '',
|
||||
};
|
||||
@@ -710,9 +715,17 @@ function loadConfiguredCategories() {
|
||||
// 数据过滤
|
||||
const filterPrescriptionList = computed(() => {
|
||||
const pList = prescriptionList.value.filter((item) => {
|
||||
// 修复 Bug #488：orderClassCode 可能是复合值 '1-2'，需提取 adviceType 部分进行比较
|
||||
let matchAdviceType = true;
|
||||
if (orderClassCode.value) {
|
||||
const filterAdviceType = String(orderClassCode.value).includes('-')
|
||||
? parseInt(String(orderClassCode.value).split('-')[0])
|
||||
: orderClassCode.value;
|
||||
matchAdviceType = filterAdviceType == item.adviceType;
|
||||
}
|
||||
return (
|
||||
(!therapyEnum.value || therapyEnum.value == item.therapyEnum) &&
|
||||
(!orderClassCode.value || orderClassCode.value == item.adviceType) &&
|
||||
matchAdviceType &&
|
||||
(!orderStatus.value || (orderStatus.value == item.statusEnum && item.requestId))
|
||||
);
|
||||
});
|
||||
@@ -740,12 +753,28 @@ function getRowDisabled(row) {
|
||||
/**
|
||||
* 将行的 adviceType + categoryCode 映射为 el-select 的选中值
|
||||
* 药品子分类使用复合值如 '1-2'（adviceType-categoryCode），诊疗/手术/全部使用原始值
|
||||
* 修复 Bug #488：当行的 adviceType 在当前配置中找不到匹配选项时，返回最接近的可用值，避免回显为纯数字
|
||||
*/
|
||||
function getRowSelectValue(row) {
|
||||
if (row.adviceType == 1 && row.categoryCode) {
|
||||
return '1-' + row.categoryCode;
|
||||
const compositeValue = '1-' + row.categoryCode;
|
||||
// 检查复合值是否在选项列表中
|
||||
if (adviceTypeList.value.some(item => item.value === compositeValue)) {
|
||||
return compositeValue;
|
||||
}
|
||||
// 配置的 categoryCode 已变更，回退到第一个药品选项
|
||||
const firstPharmacy = adviceTypeList.value.find(item => String(item.value).startsWith('1-'));
|
||||
if (firstPharmacy) {
|
||||
return firstPharmacy.value;
|
||||
}
|
||||
return row.adviceType;
|
||||
}
|
||||
// 诊疗/手术等非药品类型，检查其值是否在选项列表中
|
||||
if (adviceTypeList.value.some(item => item.value === row.adviceType)) {
|
||||
return row.adviceType;
|
||||
}
|
||||
// 不在选项中的值（如已废弃的 adviceType），返回 undefined 让 el-select 显示为空
|
||||
return undefined;
|
||||
}
|
||||
|
||||
// 新增医嘱
|
||||
@@ -802,8 +831,8 @@ function clickRowDb(row, column, event) {
|
||||
return;
|
||||
}
|
||||
row.showPopover = false;
|
||||
// “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
|
||||
if (row.statusEnum == 1 && !row.requestId) {
|
||||
// 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
|
||||
if (row.statusEnum == 1) {
|
||||
// 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
|
||||
row.therapyEnum = String(row.therapyEnum ?? '1');
|
||||
row.isEdit = true;
|
||||
@@ -881,9 +910,9 @@ function handleFocus(row, index) {
|
||||
// 用 adviceType + categoryCode 组合查找匹配的选项
|
||||
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);
|
||||
// If the row has an explicit adviceType (saved/existing row), use its own 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 || '') : '');
|
||||
// 修复Bug #486：当行没有显式选择医嘱类型时（row.adviceType为undefined），
|
||||
// 不传categoryCode，让搜索在全药库中进行；只有行已选择类型时才用对应categoryCode过滤
|
||||
const categoryCode = row.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : '';
|
||||
const searchKey = row.adviceName || '';
|
||||
|
||||
nextTick(() => {
|
||||
@@ -920,9 +949,12 @@ function handleChange(value) {
|
||||
// 用 adviceType + categoryCode 组合查找匹配的选项
|
||||
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);
|
||||
// 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
|
||||
const categoryCode = selectedItem ? selectedItem.categoryCode : (row?.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
|
||||
tableRef.refresh(adviceType, categoryCode, value);
|
||||
// 修复Bug #486：当行没有显式选择医嘱类型时（row?.adviceType为undefined），
|
||||
// 不传categoryCode，让搜索在全药库中进行；只有行已选择类型时才用对应categoryCode过滤
|
||||
const categoryCode = row?.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : '';
|
||||
// 修复Bug #453：当adviceType为空字符串或NaN时，不传具体类型，让refresh函数根据searchKey决定搜索范围
|
||||
const effectiveAdviceType = (adviceType && !isNaN(Number(adviceType))) ? adviceType : '';
|
||||
tableRef.refresh(effectiveAdviceType, categoryCode, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1181,8 +1213,10 @@ function handleSave() {
|
||||
});
|
||||
// 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
|
||||
loading.value = true;
|
||||
let list = saveList.map((item) => {
|
||||
const parsedContent = JSON.parse(item.contentJson);
|
||||
let list = [];
|
||||
try {
|
||||
list = saveList.map((item) => {
|
||||
const parsedContent = item.contentJson ? JSON.parse(item.contentJson) || {} : {};
|
||||
return {
|
||||
...parsedContent,
|
||||
adviceType: item.adviceType,
|
||||
@@ -1191,9 +1225,15 @@ function handleSave() {
|
||||
groupId: item.groupId,
|
||||
uniqueKey: undefined,
|
||||
// 确保 therapyEnum 被正确传递
|
||||
therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
|
||||
therapyEnum: parsedContent?.therapyEnum || item.therapyEnum || '1',
|
||||
};
|
||||
});
|
||||
} catch (error) {
|
||||
loading.value = false;
|
||||
isSaving.value = false;
|
||||
proxy.$modal.msgError('医嘱内容解析失败，请检查待签发医嘱');
|
||||
return;
|
||||
}
|
||||
// 保存签发按钮
|
||||
isSaving.value = true;
|
||||
console.log('签发处方参数：', {
|
||||
@@ -1208,9 +1248,16 @@ function handleSave() {
|
||||
if (res.code === 200) {
|
||||
proxy.$modal.msgSuccess('签发成功');
|
||||
isSaving.value = false;
|
||||
// 乐观更新：立即将已签发医嘱的状态设为"已签发"，确保列表实时刷新
|
||||
saveList.forEach((item) => {
|
||||
const row = prescriptionList.value.find((r) => r.requestId && r.requestId === item.requestId);
|
||||
if (row) {
|
||||
row.statusEnum = 2;
|
||||
}
|
||||
});
|
||||
getListInfo(false);
|
||||
bindMethod.value = {};
|
||||
nextId.value == 1;
|
||||
nextId.value = 1;
|
||||
} else {
|
||||
proxy.$modal.msgError(res.message);
|
||||
isSaving.value = false;
|
||||
@@ -1311,11 +1358,12 @@ function handleCancelEdit(row, index) {
|
||||
|
||||
function handleSaveSign(row, index) {
|
||||
if (row.adviceType != 2) {
|
||||
// 修复 Bug #488：严格校验 itemNo，确保非空且为有效字符串才发起请求
|
||||
let itemNo = row.adviceType == 1 ? row.methodCode : row.adviceDefinitionId;
|
||||
if (!itemNo) {
|
||||
if (!itemNo || String(itemNo).trim() === '') {
|
||||
console.warn('绑定设备检查跳过：itemNo为空（adviceType=' + row.adviceType + ', adviceName=' + row.adviceName + '）');
|
||||
} else {
|
||||
getBindDevice({ typeCode: row.adviceType, itemNo: itemNo }).then((res) => {
|
||||
getBindDevice({ typeCode: row.adviceType, itemNo: String(itemNo) }).then((res) => {
|
||||
if (res.data.length == 0) {
|
||||
return;
|
||||
}
|
||||
@@ -1376,13 +1424,21 @@ function handleSaveSign(row, index) {
|
||||
savePrescription({ regAdviceSaveList: [row] }).then((res) => {
|
||||
if (res.code === 200) {
|
||||
proxy.$modal.msgSuccess('保存成功');
|
||||
nextId.value == 1;
|
||||
nextId.value = 1;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
if (prescriptionList.value[0].adviceName) {
|
||||
handleAddPrescription();
|
||||
// 新增行：调用保存接口将数据持久化到后端
|
||||
row.dbOpType = '1';
|
||||
savePrescription({ regAdviceSaveList: [row] }).then((res) => {
|
||||
if (res.code === 200) {
|
||||
proxy.$modal.msgSuccess('保存成功');
|
||||
nextId.value = 1;
|
||||
// 保存成功后刷新列表，确保后端返回的数据带 requestId
|
||||
getListInfo(false);
|
||||
}
|
||||
});
|
||||
// 不需要再添加空行，保存成功后由 getListInfo 处理
|
||||
}
|
||||
adviceQueryParams.value.adviceType = undefined;
|
||||
}
|
||||
@@ -1423,18 +1479,26 @@ function handleSaveBatch() {
|
||||
.then((res) => {
|
||||
if (res.code === 200) {
|
||||
proxy.$modal.msgSuccess('保存成功');
|
||||
// 修复【#405】：保存成功后重置所有待保存行的 isEdit 为 false，锁定医嘱不再编辑
|
||||
// 修复 Bug #405：保存成功后锁定所有待保存行，避免医嘱条目仍处于可编辑状态
|
||||
// saveList 中的 item 与 prescriptionList 是同一对象引用，直接修改即可
|
||||
saveList.forEach(item => {
|
||||
const row = prescriptionList.value.find(r => r.uniqueKey === item.uniqueKey);
|
||||
if (row) row.isEdit = false;
|
||||
item.isEdit = false;
|
||||
});
|
||||
// 兜底：锁定所有 statusEnum == 1 的行，确保没有遗漏
|
||||
prescriptionList.value.forEach(row => {
|
||||
if (row.statusEnum == 1) {
|
||||
row.isEdit = false;
|
||||
}
|
||||
});
|
||||
expandOrder.value = [];
|
||||
getListInfo(false);
|
||||
nextId.value == 1;
|
||||
nextId.value = 1;
|
||||
isSaving.value = false;
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
isSaving.value = false;
|
||||
proxy.$modal.msgError(error?.msg || '保存失败，请重试');
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1562,17 +1626,21 @@ function handleSaveGroup(orderGroupList) {
|
||||
// 🔥 新版组件已经预处理了数据，优先使用 mergedDetail
|
||||
const mergedDetail = item.mergedDetail || {
|
||||
...(item.orderDetailInfos || {}),
|
||||
adviceName: item.orderDetailInfos?.adviceName || item.orderDefinitionName || '未知项目',
|
||||
adviceName: item.orderDefinitionName || item.orderDetailInfos?.adviceName || '未知项目',
|
||||
adviceType: item.orderDetailInfos?.adviceType,
|
||||
adviceDefinitionId: item.orderDefinitionId || item.orderDetailInfos?.adviceDefinitionId,
|
||||
quantity: item.quantity,
|
||||
unitCode: item.unitCode || item.orderDetailInfos?.unitCode,
|
||||
unitCodeName: item.unitCodeName,
|
||||
dose: item.dose || item.orderDetailInfos?.dose,
|
||||
// 🔧 Bug #403 修复：dose/doseQuantity/dispensePerDuration 需用 null 检查，
|
||||
// 避免组套中值为 null 时回退到医嘱库的 orderDetailInfos
|
||||
dose: item.dose !== undefined && item.dose !== null ? item.dose : item.orderDetailInfos?.dose,
|
||||
rateCode: item.rateCode || item.orderDetailInfos?.rateCode,
|
||||
methodCode: item.methodCode || item.orderDetailInfos?.methodCode,
|
||||
dispensePerDuration: item.dispensePerDuration || item.orderDetailInfos?.dispensePerDuration,
|
||||
doseQuantity: item.doseQuantity,
|
||||
dispensePerDuration: item.dispensePerDuration !== undefined && item.dispensePerDuration !== null
|
||||
? item.dispensePerDuration : item.orderDetailInfos?.dispensePerDuration,
|
||||
doseQuantity: item.doseQuantity !== undefined && item.doseQuantity !== null
|
||||
? item.doseQuantity : item.orderDetailInfos?.doseQuantity,
|
||||
inventoryList: item.orderDetailInfos?.inventoryList || [],
|
||||
priceList: item.orderDetailInfos?.priceList || [],
|
||||
partPercent: item.orderDetailInfos?.partPercent || 1,
|
||||
@@ -1581,54 +1649,60 @@ function handleSaveGroup(orderGroupList) {
|
||||
therapyEnum: item.orderDetailInfos?.therapyEnum || '1',
|
||||
};
|
||||
|
||||
// 预初始化空行（组套项带预填值，设为 false 让明细字段在表格中直接展示）
|
||||
// 预初始化空行
|
||||
prescriptionList.value[rowIndex.value] = {
|
||||
uniqueKey: nextId.value++,
|
||||
isEdit: false,
|
||||
isEdit: true,
|
||||
statusEnum: 1,
|
||||
};
|
||||
|
||||
setValue(mergedDetail);
|
||||
|
||||
// 创建新的处方项目
|
||||
// 🔧 Bug #403 修复：关键字段使用 null-safe 回退到 mergedDetail（已由 setValue 填充完整数据）
|
||||
// 先取 setValue 填充的行数据作为基础
|
||||
const baseRow = prescriptionList.value[rowIndex.value];
|
||||
const newRow = {
|
||||
...prescriptionList.value[rowIndex.value],
|
||||
...baseRow,
|
||||
patientId: patientInfo.value.patientId,
|
||||
encounterId: patientInfo.value.encounterId,
|
||||
accountId: accountId.value,
|
||||
// 🔧 修复 Bug #403：从 mergedDetail 读取明细字段，而非直接从 item 取
|
||||
// item.dose 等字段可能为 null，mergedDetail 已做 ?? 兜底
|
||||
quantity: mergedDetail.quantity ?? item.quantity,
|
||||
methodCode: mergedDetail.methodCode ?? item.methodCode,
|
||||
rateCode: mergedDetail.rateCode ?? item.rateCode,
|
||||
dispensePerDuration: mergedDetail.dispensePerDuration ?? item.dispensePerDuration,
|
||||
dose: mergedDetail.dose ?? item.dose,
|
||||
doseQuantity: mergedDetail.doseQuantity ?? item.doseQuantity,
|
||||
executeNum: 1,
|
||||
unitCode: mergedDetail.unitCode ?? item.unitCode,
|
||||
unitCode_dictText: item.unitCodeName || mergedDetail.unitCodeName || '',
|
||||
statusEnum: 1,
|
||||
orgId: resolveOrgId(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
|
||||
// 🔧 修复：同时存储 orgName，确保树匹配不到时仍有中文名称可显示
|
||||
orgName: findOrgName(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
|
||||
orgId: resolveOrgId(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
|
||||
// 🔧 修复：同时保存 orgName，确保树匹配不到时仍有中文名称可显示
|
||||
orgName: findOrgName(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || item.orderDetailInfos?.orgName || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
|
||||
dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
|
||||
conditionId: conditionId.value,
|
||||
conditionDefinitionId: conditionDefinitionId.value,
|
||||
encounterDiagnosisId: encounterDiagnosisId.value,
|
||||
therapyEnum: prescriptionList.value[rowIndex.value]?.therapyEnum || mergedDetail.therapyEnum || '1',
|
||||
therapyEnum: baseRow?.therapyEnum || '1',
|
||||
};
|
||||
// 覆盖关键字段：优先使用 item 的值，其次 mergedDetail（已由 setValue 填充），最后 baseRow
|
||||
newRow.quantity = item.quantity ?? mergedDetail.quantity ?? baseRow.quantity;
|
||||
newRow.methodCode = item.methodCode ?? mergedDetail.methodCode ?? baseRow.methodCode;
|
||||
newRow.rateCode = item.rateCode ?? mergedDetail.rateCode ?? baseRow.rateCode;
|
||||
newRow.dispensePerDuration = item.dispensePerDuration ?? mergedDetail.dispensePerDuration ?? baseRow.dispensePerDuration;
|
||||
newRow.dose = item.dose ?? mergedDetail.dose ?? baseRow.dose;
|
||||
newRow.doseQuantity = item.doseQuantity ?? mergedDetail.doseQuantity ?? baseRow.doseQuantity;
|
||||
newRow.unitCode = item.unitCode ?? mergedDetail.unitCode ?? baseRow.unitCode;
|
||||
newRow.unitCode_dictText = item.unitCodeName || mergedDetail.unitCodeName || baseRow.unitCode_dictText || '';
|
||||
|
||||
// 计算价格和总量
|
||||
const resolvedUnitCode = mergedDetail.unitCode ?? item.unitCode;
|
||||
const unitInfo = unitCodeList.value.find((k) => k.value == resolvedUnitCode);
|
||||
// 🔧 Bug #403 修复：使用 newRow.unitCode（已由 setValue 填充）而非 item.unitCode
|
||||
// 使用 ?? 替代 || 计算 partPercent，确保值为 0 时不会被错误替换
|
||||
const finalUnitCode = newRow.unitCode;
|
||||
const unitInfo = unitCodeList.value.find((k) => k.value == finalUnitCode);
|
||||
const finalQuantity = newRow.quantity;
|
||||
const partPercent = item.orderDetailInfos?.partPercent ?? mergedDetail.partPercent ?? baseRow.partPercent ?? 1;
|
||||
if (unitInfo && unitInfo.type == 'minUnit') {
|
||||
newRow.price = newRow.minUnitPrice;
|
||||
newRow.totalPrice = (newRow.quantity * newRow.minUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = newRow.quantity;
|
||||
newRow.totalPrice = ((finalQuantity || 0) * newRow.minUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = finalQuantity || 0;
|
||||
} else {
|
||||
newRow.price = newRow.unitPrice;
|
||||
newRow.totalPrice = (newRow.quantity * newRow.unitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = newRow.quantity * (mergedDetail.partPercent || 1);
|
||||
newRow.totalPrice = ((finalQuantity || 0) * newRow.unitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = (finalQuantity || 0) * partPercent;
|
||||
}
|
||||
|
||||
newRow.contentJson = JSON.stringify(newRow);
|
||||
|
||||
@@ -22,9 +22,9 @@
|
||||
<el-tab-pane label="检查申请" name="examine">
|
||||
<ExamineApplication ref="examineApplicationRef" />
|
||||
</el-tab-pane>
|
||||
<!-- <el-tab-pane label="汇总发药申请" name="summaryDrug">
|
||||
<el-tab-pane label="汇总发药申请" name="summaryDrug">
|
||||
<SummaryDrugApplication ref="summaryDrugApplicationRef" />
|
||||
</el-tab-pane> -->
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="手术申请" name="surgery">
|
||||
<SurgeryApplication ref="surgeryApplicationRef" />
|
||||
</el-tab-pane>
|
||||
@@ -47,6 +47,7 @@
|
||||
import {computed, onBeforeMount, onMounted, provide, reactive, ref, watch,} from 'vue';
|
||||
|
||||
import Emr from './emr/index.vue';
|
||||
import SummaryDrugApplication from './components/applicationShow/summaryDrugApplication.vue';
|
||||
import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
|
||||
import PatientList from '@/components/PatientList/patient-list.vue';
|
||||
import {localPatientInfo, updateLocalPatientInfo} from './store/localPatient';
|
||||
@@ -82,6 +83,7 @@ const currentPatientInfo = ref({});
|
||||
const testApplicationRef = ref();
|
||||
const examineApplicationRef = ref();
|
||||
const surgeryApplicationRef = ref();
|
||||
const summaryDrugApplicationRef = ref();
|
||||
const bloodTtransfusionAapplicationRef = ref();
|
||||
|
||||
// 患者列表相关逻辑
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getCurrentInstance, nextTick, ref} from 'vue';
|
||||
import {getCurrentInstance, ref} from 'vue';
|
||||
import {useRouter} from 'vue-router';
|
||||
import PatientList from '../components/patientList.vue';
|
||||
import PrescriptionList from './components/prescriptionList.vue';
|
||||
@@ -173,30 +173,16 @@ function handleGetPrescription() {
|
||||
}
|
||||
}
|
||||
|
||||
async function handelSwicthChange(value) {
|
||||
if (isDetails.value == '1') {
|
||||
function handelSwicthChange(value) {
|
||||
if (!prescriptionRefs.value) {
|
||||
chooseAll.value = false;
|
||||
return;
|
||||
}
|
||||
await nextTick();
|
||||
if (value) {
|
||||
prescriptionRefs.value.selectAllRows();
|
||||
} else {
|
||||
prescriptionRefs.value.clearSelection();
|
||||
}
|
||||
} else {
|
||||
if (!summaryMedicineRefs.value) {
|
||||
chooseAll.value = false;
|
||||
return;
|
||||
}
|
||||
await nextTick();
|
||||
if (value) {
|
||||
summaryMedicineRefs.value.selectAllRows();
|
||||
} else {
|
||||
summaryMedicineRefs.value.clearSelection();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function handleRadioChange(value) {
|
||||
@@ -212,11 +198,7 @@ function handleTherapyChange() {
|
||||
}
|
||||
|
||||
function handleExecute() {
|
||||
if (isDetails.value == '1') {
|
||||
prescriptionRefs.value?.handleMedicineSummary();
|
||||
} else {
|
||||
summaryMedicineRefs.value?.handleExecute();
|
||||
}
|
||||
proxy.$refs['prescriptionRefs'].handleMedicineSummary();
|
||||
}
|
||||
|
||||
function handleBack() {
|
||||
@@ -224,11 +206,7 @@ function handleBack() {
|
||||
}
|
||||
|
||||
provide('handleGetPrescription', (value) => {
|
||||
if (isDetails.value == '1') {
|
||||
prescriptionRefs.value?.handleGetPrescription();
|
||||
} else {
|
||||
summaryMedicineRefs.value?.handleGetPrescription();
|
||||
}
|
||||
prescriptionRefs.value.handleGetPrescription();
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<span class="descriptions-item-label">全选：</span>
|
||||
<el-switch v-model="chooseAll" @change="handelSwitchChange" />
|
||||
<el-button class="ml20" type="primary" @click="handleCheck"> 核对通过 </el-button>
|
||||
<el-button class="ml20 mr20" type="danger" :disabled="hasDispensedSelected" @click="handleCancel"> 退回 </el-button>
|
||||
<el-button class="ml20 mr20" type="danger" @click="handleCancel"> 退回 </el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
@@ -152,7 +152,6 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import {ref, computed} from 'vue';
|
||||
import {adviceVerify, cancel, getPrescriptionList} from './api';
|
||||
import {patientInfoList} from '../../components/store/patient.js';
|
||||
import {formatDateStr} from '@/utils/index';
|
||||
@@ -164,11 +163,6 @@ const type = ref(null);
|
||||
const { proxy } = getCurrentInstance();
|
||||
const loading = ref(false);
|
||||
const chooseAll = ref(false);
|
||||
const selectionTrigger = ref(0);
|
||||
const hasDispensedSelected = computed(() => {
|
||||
selectionTrigger.value;
|
||||
return getSelectRows().some(item => item.dispenseStatus === 4);
|
||||
});
|
||||
const props = defineProps({
|
||||
requestStatus: {
|
||||
type: Number,
|
||||
@@ -268,9 +262,7 @@ function getGroupMarkers() {
|
||||
}
|
||||
|
||||
// 选择框改变时的处理
|
||||
function handleSelectionChange(selection, row) {
|
||||
selectionTrigger.value++;
|
||||
}
|
||||
function handleSelectionChange(selection, row) {}
|
||||
|
||||
/**
|
||||
* 核对通过
|
||||
@@ -299,7 +291,7 @@ function handleCancel() {
|
||||
// 校验已发药的医嘱不允许退回
|
||||
let dispensedItems = list.filter(item => item.dispenseStatus === 4);
|
||||
if (dispensedItems.length > 0) {
|
||||
proxy.$message.error('该药品已由药房发放，请先执行退药处理，不可直接退回');
|
||||
proxy.$message.error('该医嘱已发药，无法退回');
|
||||
return;
|
||||
}
|
||||
cancel(list).then((res) => {
|
||||
@@ -318,16 +310,12 @@ function getSelectRows() {
|
||||
// 获取选中的医嘱信息
|
||||
let list = [];
|
||||
prescriptionList.value.forEach((item, index) => {
|
||||
const ref = proxy.$refs['tableRef' + index];
|
||||
if (ref && ref[0]) {
|
||||
list = [...list, ...ref[0].getSelectionRows()];
|
||||
}
|
||||
list = [...list, ...proxy.$refs['tableRef' + index][0].getSelectionRows()];
|
||||
});
|
||||
return list.map((item) => {
|
||||
return {
|
||||
requestId: item.requestId,
|
||||
requestTable: item.adviceTable,
|
||||
dispenseStatus: item.dispenseStatus,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1057,8 +1057,8 @@ function confirmCharge() {
|
||||
params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');
|
||||
|
||||
addVitalSigns(params).then(res => {
|
||||
console.log('保存成功:', res);
|
||||
if (res.code === 200) {
|
||||
proxy.msgSuccess('保存成功');
|
||||
// 保存成功后刷新列表
|
||||
getPatientList();
|
||||
// 清空表单
|
||||
@@ -1087,6 +1087,8 @@ function confirmCharge() {
|
||||
urineVolume: '',
|
||||
stoolVolume: '',
|
||||
};
|
||||
// 保存成功后关闭弹窗
|
||||
closeDialog();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -982,16 +982,6 @@ function handleSubmitApproval() {
|
||||
} else if (!form.purchaseinventoryList[length - 1].isSave) {
|
||||
proxy.$modal.msgWarning('第' + length + '行单据未保存，请先保存');
|
||||
} else {
|
||||
// 提交审批前逐行校验库存，防止超库存单据进入审批
|
||||
for (let i = 0; i < form.purchaseinventoryList.length; i++) {
|
||||
const line = form.purchaseinventoryList[i];
|
||||
if (!line) continue;
|
||||
const err = validateRequisitionQtyVsStock(line, i + 1);
|
||||
if (err) {
|
||||
proxy.$modal.msgWarning(err);
|
||||
return;
|
||||
}
|
||||
}
|
||||
submitApproval(receiptHeaderForm.busNo).then((response) => {
|
||||
if (response.code == 200) {
|
||||
proxy.$modal.msgSuccess('提交审批成功');
|
||||
@@ -1141,7 +1131,8 @@ function handleLocationClick(item, row, index) {
|
||||
.then((res) => {
|
||||
const list = res.data || [];
|
||||
const d = pickBestOrgQuantityRow(list);
|
||||
if (d) {
|
||||
const strictOk = d && Number(d.orgQuantity ?? 0) > 0;
|
||||
if (strictOk) {
|
||||
applyFromDto(d, false);
|
||||
if (Number(r.totalQuantity) <= 0) {
|
||||
proxy.$message.warning('仓库数量为0，无法调用！');
|
||||
@@ -1153,15 +1144,11 @@ function handleLocationClick(item, row, index) {
|
||||
return runGet(false).then((res2) => {
|
||||
const list2 = res2.data || [];
|
||||
const d2 = pickBestOrgQuantityRow(list2);
|
||||
if (d2) {
|
||||
if (d2 && Number(d2.orgQuantity ?? 0) > 0) {
|
||||
applyFromDto(d2, true);
|
||||
if (Number(r.totalQuantity) <= 0) {
|
||||
proxy.$message.warning('仓库数量为0，无法调用！');
|
||||
} else {
|
||||
proxy.$message.info(
|
||||
'所选批号在本仓库无对应库存或批号不一致，已按仓库实物回显批号与可领数量，请核对。'
|
||||
);
|
||||
}
|
||||
} else {
|
||||
r.totalQuantity = 0;
|
||||
r.price = 0;
|
||||
|
||||
@@ -739,25 +739,15 @@ function handleSubmitApproval() {
|
||||
let length = totalIncentoryInfoList.value.length;
|
||||
if (length < 1) {
|
||||
proxy.$modal.msgWarning('请先添加单据');
|
||||
return;
|
||||
}
|
||||
// 校验调拨数量：必须 > 0
|
||||
const invalidQtyRow = totalIncentoryInfoList.value.find(
|
||||
(row) => !row.itemQuantity || row.itemQuantity <= 0
|
||||
);
|
||||
if (invalidQtyRow) {
|
||||
proxy.$modal.msgWarning('存在调拨数量为0或无效的明细，请检查后提交');
|
||||
return;
|
||||
}
|
||||
if (data.isEdit) {
|
||||
} else if (data.isEdit) {
|
||||
proxy.$modal.msgWarning('单据未保存');
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
submitApproval(receiptHeaderForm.busNo).then((response) => {
|
||||
proxy.$modal.msgSuccess('提交审批成功');
|
||||
tagsViewStore.delView(router.currentRoute.value);
|
||||
router.replace({ path: 'transferManagentList' });
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 切换仓库类型获取药房/药库列表 目的仓库切换
|
||||
@@ -917,22 +907,6 @@ function remakeBlur(row, index) {
|
||||
editBatchTransfer(index);
|
||||
}
|
||||
function handleSave() {
|
||||
// 校验调拨数量：必须 > 0
|
||||
const invalidQtyRow = totalIncentoryInfoList.value.find(
|
||||
(row) => !row.itemQuantity || row.itemQuantity <= 0
|
||||
);
|
||||
if (invalidQtyRow) {
|
||||
proxy.$modal.msgError('调拨数量必须大于0，请检查！');
|
||||
return;
|
||||
}
|
||||
// 校验调拨数量不能超过源仓库库存
|
||||
const exceedStockRow = totalIncentoryInfoList.value.find(
|
||||
(row) => row.itemQuantity > row.totalSourceQuantity
|
||||
);
|
||||
if (exceedStockRow) {
|
||||
proxy.$modal.msgError('调拨数量不可超出源库存数量，请检查！');
|
||||
return;
|
||||
}
|
||||
// 校验单价
|
||||
const invalidPriceRow = totalIncentoryInfoList.value.find(
|
||||
(row) => !row.price || row.price <= 0
|
||||
|
||||
@@ -546,7 +546,7 @@
|
||||
v-model="form.admissionTime"
|
||||
type="datetime"
|
||||
placeholder="选择入室时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
value-format="YYYY-MM-DDTHH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -558,7 +558,7 @@
|
||||
v-model="form.entryTime"
|
||||
type="datetime"
|
||||
placeholder="选择进室时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
value-format="YYYY-MM-DDTHH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -570,7 +570,7 @@
|
||||
v-model="form.anesStart"
|
||||
type="datetime"
|
||||
placeholder="选择麻醉开始时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
value-format="YYYY-MM-DDTHH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -584,7 +584,7 @@
|
||||
v-model="form.startTime"
|
||||
type="datetime"
|
||||
placeholder="选择切开时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
value-format="YYYY-MM-DDTHH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -596,7 +596,7 @@
|
||||
v-model="form.endTime"
|
||||
type="datetime"
|
||||
placeholder="选择手术结束时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
value-format="YYYY-MM-DDTHH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -608,7 +608,7 @@
|
||||
v-model="form.anesEnd"
|
||||
type="datetime"
|
||||
placeholder="选择麻醉结束时间"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
value-format="YYYY-MM-DDTHH:mm:ss"
|
||||
format="YYYY-MM-DD HH:mm"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -689,7 +689,7 @@
|
||||
</el-dialog>
|
||||
|
||||
<!-- 手术申请查询弹窗 -->
|
||||
<el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog" class="surgery-apply-dialog">
|
||||
<el-dialog :title="'手术申请查询'" v-model="showApplyDialog" width="1200px" @close="cancelApplyDialog">
|
||||
<!-- 查询条件区 -->
|
||||
<el-form :model="applyQueryParams" ref="applyQueryRef" :inline="true" class="query-form">
|
||||
<el-form-item label="手术单号" prop="surgeryNo">
|
||||
@@ -749,8 +749,8 @@
|
||||
@row-click="handleApplyRowClick"
|
||||
:row-class-name="tableRowClassName"
|
||||
style="width: 100%"
|
||||
max-height="340"
|
||||
:scroll="{ y: 340 }"
|
||||
max-height="400"
|
||||
:scroll="{ y: 400 }"
|
||||
>
|
||||
<el-table-column type="selection" width="55" :selectable="handleSelectable" />
|
||||
<el-table-column label="ID" align="center" width="80" fixed>
|
||||
@@ -781,7 +781,7 @@
|
||||
</el-table>
|
||||
|
||||
<!-- 底部分页区 -->
|
||||
<div class="pagination-container apply-pagination">
|
||||
<div class="pagination-container" style="margin-top: 10px; padding-bottom: 10px">
|
||||
<pagination
|
||||
v-show="applyTotal > 0"
|
||||
:total="applyTotal"
|
||||
@@ -792,9 +792,10 @@
|
||||
@pagination="getSurgicalScheduleList"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- 底部操作区 -->
|
||||
<template #footer>
|
||||
<div class="dialog-footer" style="padding-top: 12px; border-top: 1px solid #ebeef5">
|
||||
<div class="dialog-footer">
|
||||
<el-button @click="cancelApplyDialog">取消</el-button>
|
||||
<el-button type="primary" @click="confirmApply">确认</el-button>
|
||||
</div>
|
||||
@@ -1137,30 +1138,6 @@ const {
|
||||
method_code
|
||||
} = useDict('surgical_site', 'anesthesia_type', 'incision_level', 'isolation_type', 'surgery_type', 'surgery_level', 'surgery_nature', 'method_code')
|
||||
|
||||
// Bug #433: 存储待转换的数据，等待字典加载后再设置类型
|
||||
const pendingAnesData = ref(null)
|
||||
|
||||
// 监听麻醉字典加载，完成后立即设置表单值
|
||||
let anesDataUnwatch = null
|
||||
function setupAnesDataWatch() {
|
||||
if (anesDataUnwatch) return // 防止重复设置
|
||||
anesDataUnwatch = watch(
|
||||
anesthesiaList,
|
||||
(newList) => {
|
||||
if (newList && newList.length > 0 && pendingAnesData.value) {
|
||||
const data = pendingAnesData.value
|
||||
if (data.anesMethod != null) form.anesMethod = Number(data.anesMethod)
|
||||
if (data.incisionLevel != null) form.incisionType = Number(data.incisionLevel)
|
||||
if (data.feeType != null) form.feeType = data.feeType
|
||||
if (data.isExternalExpert != null) form.isExternalExpert = Number(data.isExternalExpert)
|
||||
pendingAnesData.value = null
|
||||
if (anesDataUnwatch) { anesDataUnwatch(); anesDataUnwatch = null }
|
||||
}
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
}
|
||||
|
||||
// 加载数据
|
||||
onMounted(() => {
|
||||
const anesthesiaType = sessionStorage.getItem('anesthesiaType')
|
||||
@@ -1346,16 +1323,13 @@ function handleEdit(row) {
|
||||
if (res.code === 200) {
|
||||
const data = res.data
|
||||
Object.assign(form, data)
|
||||
// Bug #433: 如果字典已加载则立即转换，否则存入pending等待字典加载完成
|
||||
if (anesthesiaList.value && anesthesiaList.value.length > 0) {
|
||||
// 修复#433：确保字典字段类型与下拉选项一致（Number类型）
|
||||
// 后端OpSchedule.anesMethod为String类型，需转为Number与el-select匹配
|
||||
if (data.anesMethod != null) form.anesMethod = Number(data.anesMethod)
|
||||
if (data.anesthesiaTypeEnum != null) form.anesMethod = Number(data.anesthesiaTypeEnum)
|
||||
if (data.incisionLevel != null) form.incisionType = Number(data.incisionLevel)
|
||||
if (data.feeType != null) form.feeType = data.feeType
|
||||
if (data.isExternalExpert != null) form.isExternalExpert = Number(data.isExternalExpert)
|
||||
} else {
|
||||
pendingAnesData.value = data
|
||||
setupAnesDataWatch()
|
||||
}
|
||||
} else {
|
||||
proxy.$modal.msgError('获取手术安排详情失败')
|
||||
}
|
||||
@@ -1375,16 +1349,13 @@ function handleView(row) {
|
||||
if (res.code === 200) {
|
||||
const data = res.data
|
||||
Object.assign(form, data)
|
||||
// Bug #433: 如果字典已加载则立即转换，否则存入pending等待字典加载完成
|
||||
if (anesthesiaList.value && anesthesiaList.value.length > 0) {
|
||||
// 修复#433：确保字典字段类型与下拉选项一致（Number类型）
|
||||
// 后端OpSchedule.anesMethod为String类型，需转为Number与el-select匹配
|
||||
if (data.anesMethod != null) form.anesMethod = Number(data.anesMethod)
|
||||
if (data.anesthesiaTypeEnum != null) form.anesMethod = Number(data.anesthesiaTypeEnum)
|
||||
if (data.incisionLevel != null) form.incisionType = Number(data.incisionLevel)
|
||||
if (data.feeType != null) form.feeType = data.feeType
|
||||
if (data.isExternalExpert != null) form.isExternalExpert = Number(data.isExternalExpert)
|
||||
} else {
|
||||
pendingAnesData.value = data
|
||||
setupAnesDataWatch()
|
||||
}
|
||||
} else {
|
||||
proxy.$modal.msgError('获取手术安排详情失败')
|
||||
}
|
||||
@@ -1971,30 +1942,6 @@ function handleQuoteBilling() {
|
||||
}
|
||||
})
|
||||
|
||||
// 🔧 修复 Bug #445: 过滤掉已生成医嘱的项目，避免"引用计费"后已提交项目重新出现在"待生成"列表
|
||||
// 原因：后端返回的计费数据中，已生成医嘱的项目可能没有 requestId 字段
|
||||
// 方案：用 chargeItemId/requestId/id 与已有的 temporaryAdvices 做匹配，排除已生成项目
|
||||
if (temporaryAdvices.value.length > 0) {
|
||||
const existingAdviceIds = new Set()
|
||||
temporaryAdvices.value.forEach(a => {
|
||||
const om = a.originalMedicine || {}
|
||||
if (om.requestId) existingAdviceIds.add(String(om.requestId))
|
||||
if (om.chargeItemId) existingAdviceIds.add(String(om.chargeItemId))
|
||||
if (om.id) existingAdviceIds.add(String(om.id))
|
||||
})
|
||||
if (existingAdviceIds.size > 0) {
|
||||
temporaryBillingMedicines.value = temporaryBillingMedicines.value.filter(m => {
|
||||
const mRequestId = m.requestId != null ? String(m.requestId) : null
|
||||
const mChargeItemId = m.chargeItemId != null ? String(m.chargeItemId) : null
|
||||
const mId = m.id != null ? String(m.id) : null
|
||||
if (mRequestId && existingAdviceIds.has(mRequestId)) return false
|
||||
if (mChargeItemId && existingAdviceIds.has(mChargeItemId)) return false
|
||||
if (mId && existingAdviceIds.has(mId)) return false
|
||||
return true
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
temporaryMedicalLoading.value = false // 🔧 新增：加载完成
|
||||
ElMessage.success('已成功引用最新计费药品信息！')
|
||||
} else {
|
||||
@@ -2403,21 +2350,6 @@ function getRowClassName({ row, rowIndex }) {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
/* 手术申请查询弹窗 — 分页与footer间距 */
|
||||
.surgery-apply-dialog :deep(.el-dialog__body) {
|
||||
padding-bottom: 16px;
|
||||
}
|
||||
.surgery-apply-dialog :deep(.el-dialog__footer) {
|
||||
padding-top: 8px;
|
||||
}
|
||||
.surgery-apply-dialog :deep(.apply-pagination) {
|
||||
padding-top: 12px;
|
||||
padding-bottom: 16px;
|
||||
}
|
||||
.surgery-apply-dialog :deep(.apply-pagination .el-pagination) {
|
||||
margin-right: 80px;
|
||||
}
|
||||
|
||||
/* 选中行样式 */
|
||||
:deep(.el-table .selected-row) {
|
||||
background-color: #ecf5ff !important;
|
||||
@@ -2428,20 +2360,3 @@ function getRowClassName({ row, rowIndex }) {
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<style>
|
||||
/* 手术申请查询弹窗 — 非 scoped 确保穿透 teleport */
|
||||
.surgery-apply-dialog .apply-pagination {
|
||||
padding-top: 12px !important;
|
||||
padding-bottom: 16px !important;
|
||||
}
|
||||
.surgery-apply-dialog .apply-pagination .el-pagination {
|
||||
margin-right: 80px !important;
|
||||
}
|
||||
.surgery-apply-dialog .el-dialog__body {
|
||||
padding-bottom: 16px !important;
|
||||
}
|
||||
.surgery-apply-dialog .el-dialog__footer {
|
||||
padding-top: 8px !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
-- Bug #462: 诊疗目录编辑弹窗中"所需标本"下拉框数据加载失败
|
||||
-- 根因: hisprd schema 中 sys_dict_type 存在 specimen_code 类型，但 sys_dict_data 中缺少对应的7条数据记录
|
||||
-- 修复: 在 hisprd schema 中插入7条标本数据
|
||||
-- 验证: hisdev/histest1 已有数据，仅 hisprd 缺失
|
||||
-- 注意: hisprd 的 sys_dict_data 表无 py_str 字段（旧表结构）
|
||||
-- 根因: sys_dict_type 表中缺少 specimen_code 字典类型，sys_dict_data 表中缺少对应数据
|
||||
-- 修复: 插入字典类型及7条标本数据
|
||||
|
||||
INSERT INTO hisprd.sys_dict_data (dict_sort, dict_label, dict_value, dict_type, status, create_by, create_time, remark)
|
||||
-- 插入字典类型
|
||||
INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, remark)
|
||||
VALUES ('标本类型', 'specimen_code', '0', 'admin', NOW(), '诊疗项目所需标本类型字典');
|
||||
|
||||
-- 插入标本数据
|
||||
INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, status, create_by, create_time, remark)
|
||||
VALUES
|
||||
(1, '血液', '1', 'specimen_code', '0', 'admin', NOW(), '血液标本'),
|
||||
(2, '尿液', '2', 'specimen_code', '0', 'admin', NOW(), '尿液标本'),
|
||||
@@ -12,4 +15,4 @@ VALUES
|
||||
(4, '呼吸道', '4', 'specimen_code', '0', 'admin', NOW(), '呼吸道标本'),
|
||||
(5, '无菌体液', '5', 'specimen_code', '0', 'admin', NOW(), '无菌体液标本'),
|
||||
(6, '生殖道', '6', 'specimen_code', '0', 'admin', NOW(), '生殖道标本'),
|
||||
(7, '其他', '99', 'specimen_code', '0', 'admin', NOW(), '其他标本');
|
||||
(7, '其他', '7', 'specimen_code', '0', 'admin', NOW(), '其他标本');
|
||||
|
||||
Reference in New Issue
Block a user