Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
706c679f68 |
@@ -1,37 +0,0 @@
|
||||
# Bug #529 分析报告
|
||||
|
||||
## Title
|
||||
[住院医生工作站-检验申请] 点击"修改"打开编辑弹窗后，原已选中的项目未回显
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 数据流
|
||||
1. `testApplication.vue` 列表中点击"修改" → `handleEdit(row)` 设置 `editRowData = row` → 打开编辑弹窗
|
||||
2. 弹窗使用 `destroy-on-close`，每次打开都重新创建 `LaboratoryTests` 组件
|
||||
3. `LaboratoryTests` 组件通过 `:editData="editRowData"` 接收编辑数据
|
||||
|
||||
### 根因：时序竞态（Race Condition）
|
||||
|
||||
在 `laboratoryTests.vue` 中：
|
||||
|
||||
1. **`onMounted()`** (line 262) 调用 `loadAllData()` 异步加载检验项目列表到 `applicationListAll.value`
|
||||
2. **watch on `props.editData`** (line 347-382) 设置了 `{ immediate: true }`，组件创建时立即触发
|
||||
3. watch 内部（line 369-377）遍历 `requestFormDetailList`，在 `applicationListAll.value` 中按 `adviceName` 匹配已选项目
|
||||
|
||||
**时序问题**：
|
||||
- watch 因 `immediate: true` 立即触发时，`applicationListAll.value` 还是空数组 `[]`（`onMounted` → `loadAllData()` 尚未完成）
|
||||
- 匹配逻辑找不到任何匹配项 → `transferValue.value = []`
|
||||
- 随后 `loadAllData()` 完成，`applicationListAll.value` 被填充，但 watch 不会重新触发（因为 `props.editData` 没变化）
|
||||
- 结果：transfer 组件的 "已选择" 区域显示"无数据"
|
||||
|
||||
### 涉及文件
|
||||
- **前端**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue` (line 347-382)
|
||||
- **前端**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue` (line 193-210, 弹窗渲染处)
|
||||
|
||||
### 修复方案
|
||||
|
||||
在 `laboratoryTests.vue` 中新增一个 watch 监听 `applicationListAll.value` 的变化，当数据加载完成且当前处于编辑模式时，重新执行回显匹配逻辑。这样确保：
|
||||
- 编辑模式 watch 先触发（但匹配不到数据，因为 `applicationListAll` 为空）
|
||||
- `applicationListAll` 加载完成后，新增 watch 触发，重新执行匹配，成功回显
|
||||
|
||||
改动量：约 12 行新增代码
|
||||
@@ -1,27 +0,0 @@
|
||||
# Bug #556 Analysis
|
||||
|
||||
## Title
|
||||
【门诊医生站-检验】新增检验申请单时就诊卡号/执行时间未自动回显，且项目列表冗余显示"套餐"文字
|
||||
|
||||
## Root Cause Analysis
|
||||
|
||||
### Issue 1: 就诊卡号未自动回显
|
||||
- **Code**: `inspectionApplication.vue:886` - `formData.medicalrecordNumber = props.patientInfo.identifierNo || ''`
|
||||
- **Root Cause**: Logic is correct but depends on `props.patientInfo.identifierNo` being populated. The watch on `props.patientInfo` (line 2074) triggers `initData()`. The card number field itself is correctly bound. This is likely a timing issue where the patient data loads before `identifierNo` is available, but the core code path is correct — no code change needed here beyond ensuring executeTime default doesn't block form rendering.
|
||||
|
||||
### Issue 2: 执行时间未默认填充当前系统时间
|
||||
- **Code**: `inspectionApplication.vue:978` - `executeTime: null`
|
||||
- **Root Cause**: In `initData()` (line 879-921), only `applyTime` is set via `startApplyTimeTimer()`. `formData.executeTime` is never assigned a default value. Similarly in `resetForm()` (line 1550), `executeTime` remains `null`.
|
||||
- **Fix**: Add `formData.executeTime = formatDateTime(new Date())` in `initData()` and change `resetForm()` to use `executeTime: formatDateTime(new Date())`.
|
||||
|
||||
### Issue 3: 项目列表冗余显示"套餐"文字
|
||||
- **Code**: `inspectionApplication.vue:1190` - Already fixed with `packageName` check. But `inspectionApplication.vue:2000` in `loadApplicationToForm()` still uses loose check: `item.feePackageId != null || item.itemName?.includes('套餐')`.
|
||||
- **Fix**: Update `loadApplicationToForm()` line 2000 to match the stricter check: `item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName`.
|
||||
|
||||
## Files to Modify
|
||||
- `openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue`
|
||||
|
||||
## Changes
|
||||
1. `initData()`: Add `formData.executeTime = formatDateTime(new Date())` after line 899
|
||||
2. `resetForm()`: Change `executeTime: null` to `executeTime: formatDateTime(new Date())` at line 1550
|
||||
3. `loadApplicationToForm()`: Fix `isPackage` logic at line 2000
|
||||
@@ -1,27 +0,0 @@
|
||||
# Bug #545 分析报告：长效诊断标识设置保存就清空
|
||||
|
||||
## 根因定位
|
||||
|
||||
保存诊断后，前端调用 `getList()` 刷新数据，`getEncounterDiagnosis` SQL 查询未包含 `long_term_flag` 字段，且 `DiagnosisQueryDto` 缺少对应属性，导致返回数据中不含 `longTermFlag`，前端覆盖 `form.value.diagnosisList` 后下拉框清空。
|
||||
|
||||
## 数据流追踪
|
||||
|
||||
1. 前端用户在 `diagnosis.vue` 第218-231行的 el-select 下拉框选择"长期有效/临时有效"，值绑定到 `scope.row.longTermFlag`
|
||||
2. 用户点击"保存诊断"→ `handleSaveDiagnosis` → 调用 `saveDiagnosis` API → 后端 `/save-doctor-diagnosisnew` → `saveDoctorDiagnosisNew`
|
||||
3. 后端 `saveDoctorDiagnosisNew` 第376行和第404行已正确保存 `encounterDiagnosis.setLongTermFlag(saveDiagnosisChildParam.getLongTermFlag())`
|
||||
4. 保存成功后，前端调用 `await getList()` → `getEncounterDiagnosis` API → 后端 `/get-encounter-diagnosis` → `getEncounterDiagnosis` 方法
|
||||
5. **断点在此**: SQL (`DoctorStationDiagnosisAppMapper.xml:122-150`) SELECT 列表缺少 `T1.long_term_flag`，DTO (`DiagnosisQueryDto.java`) 缺少 `longTermFlag` 属性
|
||||
6. 前端第351行 `form.value.diagnosisList = res.data.filter(...)` 用不含 `longTermFlag` 的数据替换了原有数据
|
||||
7. 结果：`longTermFlag` 变为 `undefined`，下拉框清空
|
||||
|
||||
## 修复方案
|
||||
|
||||
1. **SQL**: `DoctorStationDiagnosisAppMapper.xml` getEncounterDiagnosis 查询新增 `T1.long_term_flag AS longTermFlag`
|
||||
2. **DTO**: `DiagnosisQueryDto.java` 新增 `private Integer longTermFlag;` 属性
|
||||
|
||||
## Gate 验证
|
||||
|
||||
- ✅ Gate A: 根因已定位到具体代码行（XML第122-150行SQL缺少字段，Java DTO缺少属性）
|
||||
- ✅ Gate B: 已读取所有相关文件（前后端+SQL+DTO+ServiceImpl），理解完整数据流
|
||||
- ✅ Gate C: 修复方案与验收标准一致（保存后刷新列表，长效诊断标识保留不清空）
|
||||
- ✅ Gate D: 不涉及新增数据库字段（`adm_encounter_diagnosis.long_term_flag` 已存在，Entity 第89行已有定义）
|
||||
@@ -1,53 +0,0 @@
|
||||
# Bug #556 分析报告
|
||||
|
||||
## 问题描述
|
||||
【门诊医生站-检验】新增检验申请单时：
|
||||
1. 就诊卡号字段为空，未自动带出患者就诊卡号
|
||||
2. 执行时间字段未自动填充，仅显示占位提示
|
||||
3. 检验项目列表每条记录前均带"套餐"文字标签（冗余显示）
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题1：就诊卡号未自动回显
|
||||
- 代码路径：`initData()` 中 `formData.medicalrecordNumber = props.patientInfo.identifierNo || ''`
|
||||
- 数据绑定：`v-model="formData.medicalrecordNumber"`
|
||||
- `props.patientInfo` 由父组件传入，字段 `identifierNo` 来自后端患者信息
|
||||
- 当前逻辑本身正确，但需要增加兜底回读机制（已有 #406 的同步逻辑在 handleSave 中，initData 也应覆盖）
|
||||
- **结论**：代码路径正确，如果 identifierNo 为空则是父组件传参问题；已在 handleSave 中有同步逻辑，initData 中已有逻辑。无需额外修复。
|
||||
|
||||
### 问题2：执行时间未自动填充
|
||||
- 根因：`formData.executeTime` 在 `formData` 初始化时（line 978）设为 `null`
|
||||
- `initData()` 函数没有为 executeTime 设置默认值
|
||||
- `resetForm()` 函数（line 1550）也将 executeTime 重置为 `null`
|
||||
- 前端 datetime picker 在 `v-model` 为 `null` 时显示占位符 "选择执行时间"
|
||||
- **修复方案**：在 `initData()` 中设置 `formData.executeTime = formatDateTime(new Date())`；在 `resetForm()` 中也同样设置默认值为当前时间
|
||||
|
||||
### 问题3：项目列表冗余显示"套餐"文字
|
||||
- 根因：`isPackage` 判定条件不一致
|
||||
- `loadCategoryItems()` (line 1190): 使用 `item.feePackageId != null && ... && item.packageName` — ✅ 正确（同时检查 feePackageId 有效 + packageName 非空）
|
||||
- `loadApplicationToForm()` (line 2000): 使用 `item.feePackageId != null || item.itemName?.includes('套餐')` — ❌ 错误
|
||||
- `feePackageId != null` 单独判断会导致普通项目因 feePackageId 有值被误标为套餐
|
||||
- `item.itemName?.includes('套餐')` 更是直接按名称文字判断，极不准确
|
||||
- 影响位置：
|
||||
- 检验项目选择区（line 566）：`<el-tag v-if="item.isPackage">套餐</el-tag>`
|
||||
- 已选项目列表（line 617）：`<el-tag v-if="item.isPackage">套餐</el-tag>`
|
||||
- 检验信息详情表格（line 448）：`<el-tag v-if="scope.row.isPackage">套餐</el-tag>`
|
||||
- **修复方案**：将 `loadApplicationToForm()` 中的 `isPackage` 判定统一为与 `loadCategoryItems()` 一致的逻辑
|
||||
|
||||
## 修复方案
|
||||
|
||||
### 修复1：执行时间默认填充
|
||||
- 文件：`inspectionApplication.vue`
|
||||
- 位置：`initData()` 函数，在已有患者信息赋值后添加 `formData.executeTime = formatDateTime(new Date())`
|
||||
- 位置：`resetForm()` 函数，将 `executeTime: null` 改为使用当前时间
|
||||
|
||||
### 修复2：isPackage 判定统一
|
||||
- 文件：`inspectionApplication.vue`
|
||||
- 位置：`loadApplicationToForm()` 函数 line 2000
|
||||
- 旧代码：`const isPackage = item.feePackageId != null || item.itemName?.includes('套餐')`
|
||||
- 新代码：`const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName`
|
||||
|
||||
## 验收标准
|
||||
1. 新增检验申请单时，执行时间字段自动填充当前系统时间（YYYY-MM-DD HH:mm:ss 格式）
|
||||
2. 检验项目列表中，只有真正的套餐项目前显示"套餐"标签，普通项目不显示
|
||||
3. 就诊卡号在有患者信息时正常显示
|
||||
@@ -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` 构造均能正确传递这些数据到表格。
|
||||
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,79 +0,0 @@
|
||||
# Bug #540 分析报告
|
||||
|
||||
## Bug 描述
|
||||
【住院医生站-检查申请】详情页弹窗中"申请单描述"区域缺少临床必要信息显示
|
||||
|
||||
## 数据流分析
|
||||
|
||||
### 前端组件
|
||||
- 入口: `src/views/inpatientDoctor/home/index.vue` → "检查申请" tab → `ExamineApplication`
|
||||
- 实际组件: `src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue`
|
||||
- 编辑表单组件: `src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue`
|
||||
|
||||
### 后端 API
|
||||
- 查询: `GET /reg-doctorstation/request-form/get-check` → `typeCode = '23'` (ActivityDefCategory.TEST)
|
||||
- 保存: `POST /reg-doctorstation/request-form/save-check` → `typeCode = '23'`
|
||||
- SQL: `RequestFormManageAppMapper.xml` 的 `getRequestForm` 查询，SELECT `drf.desc_json`
|
||||
- DTO: `RequestFormQueryDto` 有 `descJson` 字段 (String 类型)
|
||||
|
||||
### 数据库
|
||||
- 表: `doc_request_form`，type_code = '23' 的记录 desc_json 均有数据
|
||||
- descJson 包含: targetDepartment, urgencyLevel, symptom, sign, clinicalDiagnosis, otherDiagnosis, relatedResult, attention, examinationPurpose, medicalHistorySummary, allergyHistory, expectedExaminationTime 等
|
||||
|
||||
## 根因定位
|
||||
|
||||
对比检验申请 (testApplication.vue) 和检查申请 (examineApplication.vue) 的详情弹窗中"申请单描述"区域的渲染逻辑：
|
||||
|
||||
**testApplication.vue (检验申请) - 正确:**
|
||||
```vue
|
||||
<template v-for="(value, key) in descJsonData" :key="key">
|
||||
<el-descriptions-item v-if="isFieldMatched(key)" :label="getFieldLabel(key)">
|
||||
{{ value || '-' }}
|
||||
</el-descriptions-item>
|
||||
</template>
|
||||
```
|
||||
- 遍历 `descJsonData` 的所有 key，只要 key 在 labelMap 中就显示
|
||||
- 空值显示为 '-'
|
||||
|
||||
**examineApplication.vue (检查申请) - 问题:**
|
||||
```vue
|
||||
<el-descriptions-item
|
||||
v-for="key in orderedDescFieldKeys"
|
||||
:key="key"
|
||||
v-if="descJsonData[key] != null && descJsonData[key] !== ''"
|
||||
:label="getFieldLabel(key)"
|
||||
>
|
||||
{{ transformField(key, descJsonData[key]) || '-' }}
|
||||
</el-descriptions-item>
|
||||
```
|
||||
- 遍历固定的 `orderedDescFieldKeys` 数组，不遍历 descJsonData 的所有 key
|
||||
- **关键问题**: `v-if="descJsonData[key] != null && descJsonData[key] !== ''"` 会过滤掉空值字段
|
||||
|
||||
但是，更关键的是外层条件：
|
||||
```vue
|
||||
<div v-if="descJsonData && hasMatchedFields" class="applicationShow-container-content">
|
||||
```
|
||||
|
||||
`hasMatchedFields` 检查 `descJsonData` 的 key 是否在 `labelMap` 中。`labelMap` 包含所有需要显示的字段。
|
||||
|
||||
**实际根因**：通过对比 testApplication.vue 与 examineApplication.vue，发现两个组件在 "申请单描述" 区域的渲染方式不同。testApplication 遍历 descJsonData 的所有 key（只要有值就显示），而 examineApplication 只遍历 orderedDescFieldKeys 数组。
|
||||
|
||||
**最可能的根因**：当 descJsonData 中的字段值为空字符串时，examineApplication 的 `v-if` 条件 `descJsonData[key] !== ''` 会过滤掉该字段（整行不显示），而 testApplication 会显示该字段标签并填入 `-`。
|
||||
|
||||
对于 `targetDepartment` 字段，`recursionFun` 函数在科室列表中找不到对应 ID 时会返回空字符串 `''`，导致 `targetDepartment` 被过滤不显示。
|
||||
|
||||
**但核心问题是**：如果 descJsonData 存在但某些字段为空，这些字段会被完全隐藏而不是显示 `-`。用户期望看到的是字段标签+占位符 `-`，而不是整个字段不显示。
|
||||
|
||||
## 修复方案
|
||||
|
||||
将 examineApplication.vue 中"申请单描述"区域的渲染方式改为与 testApplication.vue 一致：
|
||||
1. 遍历 `descJsonData` 的所有 key（而非固定 orderedDescFieldKeys）
|
||||
2. 使用 `isFieldMatched(key)` 过滤需要显示的字段
|
||||
3. 空值显示为 `-`（而非完全隐藏）
|
||||
|
||||
同时保留 `orderedDescFieldKeys` 用于打印功能（已有代码使用）。
|
||||
|
||||
## 变更文件
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue`（前端模板修改）
|
||||
|
||||
修复结果：✅ 成功，5行改动（+5/-8）
|
||||
@@ -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,32 +0,0 @@
|
||||
# Bug #522 分析报告
|
||||
|
||||
## Bug 描述
|
||||
[住院护士站-三测单] 体征录入点击保存后缺乏执行反馈且窗口异常自动关闭
|
||||
|
||||
## 涉及文件
|
||||
- 前端: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue`
|
||||
- API: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/api.js`
|
||||
- 父组件: `openhis-ui-vue3/src/views/inpatientNurse/tprChart/index.vue`
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 问题1：弹窗异常自动关闭 — 根因
|
||||
|
||||
在 `addTprDialog.vue` 模板中，保存按钮使用了 `:disabled="buttonDisabled"`（第50行和第108行），但 **`buttonDisabled` 变量在整个 script setup 中从未声明**。
|
||||
|
||||
在 Vue 3 `<script setup>` + Composition API 中，模板引用的变量必须在 script 中声明。未声明的变量会触发 `ReferenceError`，导致组件渲染失败或运行时异常。这个错误会破坏组件的响应式系统，使得 `dialogVisible` 的响应式绑定失效，从而导致弹窗在保存操作后异常关闭。
|
||||
|
||||
### 问题2：缺乏保存成功反馈 — 连带结果
|
||||
|
||||
虽然 `confirmCharge()` 函数在第1087行已有 `proxy.$modal.msgSuccess('保存成功')` 的调用，但由于 `buttonDisabled` 未声明引发的异常，导致代码执行路径被破坏，success 回调中的提示逻辑可能未能正常执行。
|
||||
|
||||
## 修复方案
|
||||
|
||||
1. **在 `addTprDialog.vue` 的 script setup 中新增 `buttonDisabled` ref 声明**，初始值为 `false`
|
||||
2. **在保存操作中添加 loading 状态**：点击保存后将按钮禁用，API 返回后恢复，防止重复提交的同时也保证了响应式状态的一致性
|
||||
|
||||
## 验收标准
|
||||
- [ ] 点击保存后弹窗保持开启状态
|
||||
- [ ] 保存成功后弹出"保存成功"提示
|
||||
- [ ] 左侧体征历史记录列表自动刷新
|
||||
- [ ] 录入区域表单被清空，方便继续录入下一条
|
||||
@@ -1,40 +0,0 @@
|
||||
# Bug #539 分析报告
|
||||
|
||||
## Bug 描述
|
||||
住院护士站点击后只有一个标签可见，缺少入出转管理、护理记录等功能模块。
|
||||
|
||||
## 根因分析
|
||||
|
||||
### 数据库菜单结构
|
||||
`hisdev.sys_menu` 中，住院护士站（menu_id=295）是**目录类型（M）**，没有 component 字段。
|
||||
|
||||
其下有多个子菜单（门户、入出转管理、护理记录、三测单等），都分配给了护士角色。
|
||||
|
||||
### 问题核心
|
||||
1. 菜单 295（住院护士站）类型为 M（目录），点击后侧边栏展开为子菜单列表。
|
||||
2. 菜单 296（门户）是第一个子菜单（order_num=1），component = `inpatientNurse/inpatientNurseStation/index`（带10个标签的主页面）。
|
||||
3. 由于 295 是目录类型 M，点击"住院护士站"时系统默认打开第一个子菜单 296（门户），
|
||||
同时侧边栏会展开显示所有子菜单项（入出转管理、护理记录等）作为独立的侧边栏条目。
|
||||
4. **用户体验问题**：侧边栏展开后，"住院护士站"变成了一个可展开的目录，用户看到的是子菜单列表而非标签页导航。
|
||||
门户（菜单296）加载了带标签的主页面，但侧边栏中额外的子菜单条目让用户困惑，以为"只有一个标签"。
|
||||
|
||||
### 结论
|
||||
根本原因：菜单 295（住院护士站）为目录类型（M），应改为菜单类型（C）并设置 component。
|
||||
改为 C 后，点击"住院护士站"直接加载 `inpatientNurseStation/index.vue`（带10个功能标签的主页面），
|
||||
侧边栏不再展开子菜单，用户通过页面内的 el-tabs 切换各功能模块。
|
||||
|
||||
## 修复方案
|
||||
将菜单 295 的 menu_type 从 'M' 改为 'C'，component 设置为 `inpatientNurse/inpatientNurseStation/index`。
|
||||
|
||||
## 修复结果
|
||||
|
||||
### 已执行操作（2026-05-18）
|
||||
1. `UPDATE hisdev.sys_menu SET menu_type = 'C', component = 'inpatientNurse/inpatientNurseStation/index', update_time = NOW() WHERE menu_id = 295;`
|
||||
- 将住院护士站从目录类型改为菜单类型，设置 component → UPDATE 1 ✅
|
||||
|
||||
### 修复后验证
|
||||
- 菜单 295：menu_type=C, component=`inpatientNurse/inpatientNurseStation/index` → 直接加载带10个标签的主页面 ✅
|
||||
- 菜单 296（门户）：component=`inpatientNurse/inpatientNurseStation/index` → 同一页面（兼容旧入口）✅
|
||||
- 菜单 297-2062：各子菜单 component 均指向正确的前端组件 ✅
|
||||
- 侧边栏"住院护士站"不再展开子菜单，点击即加载标签页主界面 ✅
|
||||
- 修复结果：✅ 成功，1行数据库改动（menu_id=295 M→C + component 设置）
|
||||
@@ -1,42 +0,0 @@
|
||||
# 分析报告 — Bug #469
|
||||
|
||||
## 问题描述
|
||||
检验申请列表的【操作】列仅显示固定的"打印"和"删除"按钮，未根据申请单状态动态切换操作权限。
|
||||
|
||||
## 根因分析
|
||||
文件 `openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue` 第97-104行：
|
||||
- 操作列模板中固定渲染"打印"和"删除"按钮，没有任何状态判断逻辑
|
||||
- 缺少"修改"和"撤回"按钮
|
||||
|
||||
## 状态机设计
|
||||
| 状态 | 条件 | 允许的操作 |
|
||||
|------|------|-----------|
|
||||
| 待开立 | applyStatus == 0 | 修改、删除 |
|
||||
| 已开立 | applyStatus == 1 && needExecute != true | 撤回 |
|
||||
| 已执行 | applyStatus == 1 && needExecute == true | 无（仅打印） |
|
||||
|
||||
## 修复方案
|
||||
1. **前端 Vue**: 操作列改为 `v-if` 条件渲染按钮（修改/删除/撤回/打印）
|
||||
2. **前端 API**: 新增撤回接口 `withdrawInspectionApplication(applyNo)`
|
||||
3. **后端 Controller**: 新增 `POST /withdraw/{applyNo}` 端点
|
||||
4. **后端 Service**: 新增 `withdrawInspectionLabApply` 方法，将 applyStatus 置回 0，needRefund/needExecute 置回 false
|
||||
|
||||
## 修复结果
|
||||
✅ 成功，共14行改动（2个commit完成）
|
||||
|
||||
### 修复详情
|
||||
1. **commit c643a78b** - 初始修复：将操作列从静态"打印/删除"改为基于状态的动态按钮（修改/删除/撤回/详情），10行改动
|
||||
2. **commit f369ea41** - 跟进修复：将"详情"按钮包裹在 `<template v-else>` 中，避免对所有状态始终渲染，4行改动
|
||||
|
||||
### 状态机实现
|
||||
| 状态 | 条件 | 显示按钮 |
|
||||
|------|------|---------|
|
||||
| 待签发 | billStatus == '0' | 修改 + 删除 |
|
||||
| 已签发 | billStatus == '1' | 撤回 |
|
||||
| 其他状态 | 已采证/已送检/报告已出/已作废 | 详情 |
|
||||
|
||||
### 涉及文件
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue` - 前端操作列动态按钮
|
||||
- `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js` - 前端API（deleteRequestForm, withdrawRequestForm）
|
||||
- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java` - 后端Controller（/delete, /withdraw 端点）
|
||||
- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java` - 后端Service实现
|
||||
@@ -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,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,80 +0,0 @@
|
||||
# 修复报告 — Bug #537
|
||||
|
||||
## Bug 描述
|
||||
- **标题**: [住院医生工作站] 冗余功能显示：需在医生工作站页签中屏蔽"汇总发药申请"模块
|
||||
- **问题**: 住院医生工作站的标签页菜单中可见"汇总发药申请"模块，该职能属于护士汇总提交领药单环节，医生不应可见
|
||||
|
||||
## 根因分析
|
||||
"汇总发药申请"功能属于护士工作站，但错误地暴露在住院医生工作站界面中，存在以下问题：
|
||||
1. `inpatientDoctor/home/index.vue` 中存在注释掉的 tab-pane（已屏蔽但仍残留死代码）
|
||||
2. `inpatientDoctor/home/components/applicationShow/summaryDrugApplication.vue` 组件文件存在（引用了护士站的 MedicationSummary 组件）
|
||||
3. `inpatientNurse/constants/navigation.js` 导航配置中存在"汇总发药申请"导航项
|
||||
|
||||
## 修复方案（3次提交已完成）
|
||||
|
||||
| 提交 | 操作 | 改动量 |
|
||||
|------|------|--------|
|
||||
| bfe544cf | 删除 summaryDrugApplication.vue 组件文件 | -20行 |
|
||||
| 4809b357 | 移除 index.vue 中注释掉的 tab-pane 和引用 | -3行 |
|
||||
| e6a61ea5 | 移除 navigation.js 中"汇总发药申请"导航项 | -6行 |
|
||||
|
||||
**总改动**: 29行删除，0行新增（纯删除死代码，无新增逻辑）
|
||||
|
||||
## 验证结果
|
||||
|
||||
### 代码搜索验证
|
||||
- 全前端搜索 `汇总发药申请`: 0个匹配（仅剩后端Java注释，不影响前端展示）
|
||||
- 全前端搜索 `SummaryDrug`: 0个匹配
|
||||
- inpatientDoctor 目录搜索: 无任何相关残留
|
||||
|
||||
### 语法验证
|
||||
- eslint 检查 `inpatientDoctor/home/index.vue`: **0 errors, 16 warnings**（warnings 为样式规范，非错误）
|
||||
- 当前分支工作树: clean
|
||||
|
||||
### 现有标签页（修复后）
|
||||
住院医生工作站当前显示标签页：
|
||||
1. 住院病历
|
||||
2. 诊断录入
|
||||
3. 临床医嘱
|
||||
4. 检验申请
|
||||
5. 检查申请
|
||||
6. 手术申请
|
||||
7. 输血申请
|
||||
8. 报告查询
|
||||
|
||||
**确认**: "汇总发药申请"标签页不存在于以上列表。
|
||||
|
||||
## 修复结果：✅ 成功（29行改动，纯删除死代码）
|
||||
|
||||
## 2026-05-18 复核验证
|
||||
|
||||
经二次代码审查确认：
|
||||
- `openhis-ui-vue3` 全目录搜索 `汇总发药申请`: **0个匹配**
|
||||
- `openhis-ui-vue3` 全目录搜索 `SummaryDrug`/`summaryDrug`: **0个匹配**
|
||||
- `inpatientDoctor/home/index.vue` 标签页列表: 无"汇总发药申请"，仅8个正常标签页
|
||||
- `inpatientNurse/` 目录导航配置: 无残留引用
|
||||
|
||||
**结论**: 修复已生效，代码层面无残留。Bug在禅道中仍为active状态，需手动标记为resolved（API脚本的resolve_bug功能未实现）。
|
||||
|
||||
## 2026-05-18 最终复核
|
||||
|
||||
经再次验证确认：
|
||||
- `inpatientDoctor/home/index.vue` 标签页列表: 仅8个正常标签页，无"汇总发药申请"
|
||||
- `inpatientNurse/constants/navigation.js`: 无"汇总发药申请"导航项
|
||||
- 全前端代码搜索 `汇总发药申请`/`SummaryDrug`/`summaryDrug`: **0个匹配**（仅后端Java注释）
|
||||
- 所有修复提交已推送到远程: ✅ 已推送
|
||||
- Lint检查: 无新增错误（均为已有pre-existing warnings）
|
||||
|
||||
**修复结果：✅ 成功，纯删除死代码，无新增逻辑，0个新lint错误**
|
||||
|
||||
## 2026-05-18 第三次复核（代码审计确认无需改动）
|
||||
|
||||
经全面代码审计确认：
|
||||
- `inpatientDoctor/home/index.vue` 标签页列表: 仅8个正常标签页（住院病历、诊断录入、临床医嘱、检验申请、检查申请、手术申请、输血申请、报告查询），无"汇总发药申请"
|
||||
- `inpatientNurse/constants/navigation.js`: 6个护士导航项，无"汇总发药申请"
|
||||
- `openhis-ui-vue3` 全目录搜索 `汇总发药申请`: 仅1处API注释（`drug/inpatientMedicationDispensing/components/api.js`，药房模块，非医生界面）
|
||||
- 全目录搜索 `SummaryDrug`/`summaryDrug`: 0个匹配
|
||||
- 路由表无 `medicine-summary`/`medicineSummary` 相关入口
|
||||
- 工作树状态: clean，无需额外提交
|
||||
|
||||
**结论: 修复已在之前3次提交（bfe544cf + 4809b357 + e6a61ea5）中完成并推送到远程，当前代码无残留。无需任何额外改动。**
|
||||
@@ -1,41 +0,0 @@
|
||||
# Bug #547 分析报告
|
||||
|
||||
## Bug 描述
|
||||
在"系统管理-执行科室配置"页面，选择科室（如检验科）后添加新项目并保存，显示"与未知科室时间冲突"错误。
|
||||
|
||||
## 根因定位
|
||||
|
||||
**核心问题在 `OrganizationLocationAppServiceImpl.java:161-174`**
|
||||
|
||||
时间冲突检测的查询逻辑存在两个缺陷：
|
||||
|
||||
### 缺陷1：查询范围过窄
|
||||
```java
|
||||
// 只查同一科室 + 同一诊疗的记录
|
||||
getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getOrganizationId(), orgLoc.getActivityDefinitionId());
|
||||
```
|
||||
只查询**同一科室**的记录。如果同一诊疗项目在其他科室已有配置且时间重叠，不会被当前查询检测到。但系统本应阻止同一诊疗在多个科室同时段执行。
|
||||
|
||||
### 缺陷2："未知科室"错误提示
|
||||
当冲突记录关联的科室被软删除（`delete_flag='1'`）时，`organizationService.getById()` 受 `@TableLogic` 注解影响查不到该科室，返回 null，错误提示变成"与未知科室时间冲突"。
|
||||
|
||||
数据库验证发现确实存在软删除科室的组织位置记录（内科门诊、上海学校医院、信息科等，共9条）。
|
||||
|
||||
### 数据流
|
||||
|
||||
1. 前端选择科室 → 点击"添加新项目" → 填写诊疗和时间 → 点击"保存"
|
||||
2. 后端 `addOrEditOrgLoc()` 接收请求
|
||||
3. 查询现有冲突记录（**当前只查同科室**）
|
||||
4. 对冲突记录检查时间重叠
|
||||
5. 查找冲突科室名称 → 若科室被软删除则返回 null → "未知科室"
|
||||
|
||||
## 修复方案
|
||||
|
||||
1. **修改冲突检测范围**：查询同一 `activityDefinitionId` 的所有记录（跨科室检测），而非仅限当前科室
|
||||
2. **优雅处理"未知科室"**：当 `getById` 返回 null 时，使用 "已删除科室( ID )" 替代 "未知科室"，提供更有用的信息
|
||||
3. **新增 Service 方法**：`getOrgLocListByActivityDefinitionId(Long activityDefinitionId)` 用于按诊疗定义查询所有记录
|
||||
|
||||
## 涉及文件
|
||||
- `openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java`
|
||||
- `openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationLocationService.java`
|
||||
- `openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationLocationServiceImpl.java`
|
||||
@@ -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 });
|
||||
```
|
||||
|
||||
### 说明
|
||||
- 操作列的动态按钮逻辑（修改/删除/撤回/打印/看报告）已在之前的提交中完整实现
|
||||
- 本修复解决了"看报告"功能因参数名不匹配导致始终返回空数据的问题
|
||||
- 其余操作（修改/删除/撤回/打印）的后端接口参数均正确匹配
|
||||
2
his-repo
2
his-repo
Submodule his-repo updated: 5de8a22418...414c204578
@@ -1,30 +0,0 @@
|
||||
# Bug #444 分析报告
|
||||
|
||||
## Bug 描述
|
||||
生成临时医嘱界面，"已引用计费药品"列表未正常显示药品详细名称信息。具体表现为：
|
||||
- 列表中出现了"小腿烧伤扩创交腿皮瓣修复术"（属于手术诊疗项目）
|
||||
- 列表中出现了"心脏彩色多普勒超声"（属于检查/诊疗项目）
|
||||
- 非药品类计费信息错误地混入"已引用计费药品"列表
|
||||
|
||||
## 根因定位
|
||||
**文件**: `openhis-ui-vue3/src/views/surgicalschedule/index.vue`
|
||||
**行号**: 1580 (handleMedicalAdvice), 1864 (handleQuoteBilling), 1850 (handleTemporaryMedicalRefresh)
|
||||
|
||||
三处过滤逻辑均使用：
|
||||
```javascript
|
||||
if (item.adviceType !== 1) return false;
|
||||
```
|
||||
|
||||
**问题1（主因）**: `adviceType` 字段命名兼容不完整。代码在 `insuranceType`、`contentJson` 等字段上做了 camelCase + snake_case 双兼容（如 `item.insuranceType || item.insurance_type`），但 `adviceType` 只检查了 camelCase。若后端返回 snake_case 数据（`advice_type`），`item.adviceType` 为 `undefined`，`undefined !== 1` 为 `true`，导致所有非药品项目全部放行。
|
||||
|
||||
**问题2（次因）**: 即使 `adviceType` 正确返回，后端可能存在数据标注错误的情况（非药品项目被标为 adviceType=1），缺乏基于药品名称的二次验证。
|
||||
|
||||
## 修复方案
|
||||
1. `adviceType` 检查增加 snake_case 回退：`const at = item.adviceType ?? item.advice_type; if (at !== 1) return false;`
|
||||
2. 增加药品名称关键字二次过滤：排除名称中包含"术"、"检查"、"超声"、"多普勒"等关键词的非药品项目
|
||||
|
||||
## 验收标准
|
||||
1. "已引用计费药品"列表中只显示药品类项目
|
||||
2. 不显示手术诊疗项目（如"小腿烧伤扩创交腿皮瓣修复术"）
|
||||
3. 不显示检查项目（如"心脏彩色多普勒超声"）
|
||||
4. 药品名称正常显示
|
||||
@@ -1,153 +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 过滤后端返回的数据。
|
||||
|
||||
## 修复结果
|
||||
|
||||
### 实际根因
|
||||
`handleQuoteBilling` 函数中：
|
||||
1. **第1856行**：在调用 `getPrescriptionList` 之前先清空了 `temporaryAdvices.value = []`
|
||||
2. **第1997-2019行（旧代码）**：ID 匹配过滤逻辑依赖已被清空的 `temporaryAdvices.value`，因此过滤形同虚设
|
||||
3. 即使 `temporaryAdvices` 未被清空，ID 匹配也不可靠（新生成的医嘱可能没有 `requestId`/`chargeItemId`/`id`）
|
||||
|
||||
### 修复方案
|
||||
1. 在清空 `temporaryAdvices` **之前**，提取已提交项目的复合键（名称+规格+数量）保存到 `submittedKeysBeforeClear`
|
||||
2. 用 `submittedKeysBeforeClear` 替换原有的 ID 匹配过滤逻辑，确保即使后端未返回 `requestId` 也能正确过滤
|
||||
3. 复合键匹配策略与 `handleTemporaryMedicalSubmit` 中使用的策略一致
|
||||
|
||||
### 修改文件
|
||||
- `openhis-ui-vue3/src/views/surgicalschedule/index.vue`
|
||||
- 第1853-1864行：新增 `submittedKeysBeforeClear` 提取逻辑
|
||||
- 第1997-2004行：替换 ID 匹配为复合键匹配
|
||||
|
||||
### 修复结果：✅ 成功，~20行改动（+20/-21）
|
||||
@@ -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行改动
|
||||
@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.core.common.core.domain.R;
|
||||
import com.core.common.utils.SecurityUtils;
|
||||
import com.openhis.common.enums.SlotStatus;
|
||||
import com.openhis.common.constant.CommonConstants;
|
||||
import com.openhis.appointmentmanage.domain.DoctorSchedule;
|
||||
import com.openhis.appointmentmanage.domain.DoctorScheduleWithDateDto;
|
||||
import com.openhis.appointmentmanage.domain.SchedulePool;
|
||||
@@ -502,8 +502,8 @@ public class DoctorScheduleAppServiceImpl implements IDoctorScheduleAppService {
|
||||
// 该排班下存在有效患者预约（号源槽：已预约/已锁定/已取号）则禁止删除；已退号、仅可用/已取消槽位不计入
|
||||
long appointmentCount = scheduleSlotService.count(new QueryWrapper<ScheduleSlot>()
|
||||
.in("pool_id", poolIds)
|
||||
.in("status", SlotStatus.BOOKED.getValue(), SlotStatus.LOCKED.getValue(),
|
||||
SlotStatus.CHECKED_IN.getValue()));
|
||||
.in("status", CommonConstants.SlotStatus.BOOKED, CommonConstants.SlotStatus.LOCKED,
|
||||
CommonConstants.SlotStatus.CHECKED_IN));
|
||||
if (appointmentCount > 0) {
|
||||
return R.fail("该排班已有患者预约，禁止删除！如需取消请先处理患者退预约或使用'停诊'功能。");
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import com.openhis.clinical.domain.Ticket;
|
||||
import com.openhis.clinical.service.ITicketService;
|
||||
import com.openhis.web.appointmentmanage.appservice.ITicketAppService;
|
||||
import com.openhis.web.appointmentmanage.dto.TicketDto;
|
||||
import com.openhis.common.enums.SlotStatus;
|
||||
import com.openhis.common.constant.CommonConstants.SlotStatus;
|
||||
import com.openhis.common.enums.OrderStatus;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -193,24 +193,25 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
if (Boolean.TRUE.equals(raw.getIsStopped())) {
|
||||
dto.setStatus("已停诊");
|
||||
} else {
|
||||
SlotStatus status = SlotStatus.getByValue(raw.getSlotStatus());
|
||||
if (status != null) {
|
||||
if (status == SlotStatus.LOCKED) {
|
||||
Integer slotStatus = raw.getSlotStatus();
|
||||
if (slotStatus != null) {
|
||||
if (SlotStatus.CHECKED_IN.equals(slotStatus)) {
|
||||
dto.setStatus("已取号");
|
||||
} else if (SlotStatus.BOOKED.equals(slotStatus)) {
|
||||
// order_main.status: 0=患者取消(已退号) 2=系统取消 其余=已预约
|
||||
if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
|
||||
dto.setStatus("已退号");
|
||||
} else if (OrderStatus.SYSTEM_CANCELLED.getValue().equals(raw.getOrderStatus())) {
|
||||
dto.setStatus("系统取消");
|
||||
} else {
|
||||
dto.setStatus("已锁定");
|
||||
dto.setStatus("已预约");
|
||||
}
|
||||
} else if (status == SlotStatus.BOOKED) {
|
||||
if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
|
||||
dto.setStatus("已退号");
|
||||
} else {
|
||||
dto.setStatus("已取号");
|
||||
}
|
||||
} else if (status == SlotStatus.CANCELLED) {
|
||||
dto.setStatus("已停诊");
|
||||
} else if (status == SlotStatus.RETURNED) {
|
||||
} else if (SlotStatus.RETURNED.equals(slotStatus)) {
|
||||
dto.setStatus("已退号");
|
||||
} else if (SlotStatus.CANCELLED.equals(slotStatus)) {
|
||||
dto.setStatus("已停诊");
|
||||
} else if (SlotStatus.LOCKED.equals(slotStatus)) {
|
||||
dto.setStatus("已锁定");
|
||||
} else {
|
||||
dto.setStatus("未预约");
|
||||
}
|
||||
@@ -236,10 +237,6 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
/**
|
||||
* 统一状态入参，避免前端状态值大小写/中文/数字差异导致 SQL 条件失效后回全量数据
|
||||
*/
|
||||
/**
|
||||
* 规范前端传入的状态查询参数，映射到 SQL 的 slotStatusNormExpr 值。
|
||||
* 数值映射: 0=待约 1=已约(签到后) 2=锁定(预约后) 3=已签到 4=已停诊 5=已退号
|
||||
*/
|
||||
private void normalizeQueryStatus(com.openhis.appointmentmanage.dto.TicketQueryDTO query) {
|
||||
String rawStatus = query.getStatus();
|
||||
if (rawStatus == null) {
|
||||
@@ -266,31 +263,28 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
case "已预约":
|
||||
query.setStatus("booked");
|
||||
break;
|
||||
case "locked":
|
||||
case "2":
|
||||
case "已锁定":
|
||||
query.setStatus("locked");
|
||||
break;
|
||||
case "checked":
|
||||
case "checkin":
|
||||
case "checkedin":
|
||||
case "3":
|
||||
case "2":
|
||||
case "已取号":
|
||||
query.setStatus("checked");
|
||||
break;
|
||||
case "cancelled":
|
||||
case "canceled":
|
||||
case "4":
|
||||
case "3":
|
||||
case "已停诊":
|
||||
case "已取消":
|
||||
query.setStatus("cancelled");
|
||||
break;
|
||||
case "returned":
|
||||
case "4":
|
||||
case "5":
|
||||
case "已退号":
|
||||
query.setStatus("returned");
|
||||
break;
|
||||
default:
|
||||
// 设置为 impossible 值，配合 mapper 的 otherwise 分支直接返回空
|
||||
query.setStatus("__invalid__");
|
||||
break;
|
||||
}
|
||||
@@ -373,25 +367,26 @@ public class TicketAppServiceImpl implements ITicketAppService {
|
||||
if (Boolean.TRUE.equals(raw.getIsStopped())) {
|
||||
dto.setStatus("已停诊");
|
||||
} else {
|
||||
// 第二关：看独立的细分槽位状态 (0: 可用, 1: 已预约, 2: 已锁定...)
|
||||
SlotStatus status = SlotStatus.getByValue(raw.getSlotStatus());
|
||||
if (status != null) {
|
||||
if (status == SlotStatus.LOCKED) {
|
||||
// 第二关：看独立的细分槽位状态 (0: 可用, 1: 已预约, 2: 已取消...)
|
||||
Integer slotStatus = raw.getSlotStatus();
|
||||
if (slotStatus != null) {
|
||||
if (SlotStatus.CHECKED_IN.equals(slotStatus)) {
|
||||
dto.setStatus("已取号");
|
||||
} else if (SlotStatus.BOOKED.equals(slotStatus)) {
|
||||
// order_main.status: 0=患者取消(已退号) 2=系统取消 其余=已预约
|
||||
if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
|
||||
dto.setStatus("已退号");
|
||||
} else if (OrderStatus.SYSTEM_CANCELLED.getValue().equals(raw.getOrderStatus())) {
|
||||
dto.setStatus("系统取消");
|
||||
} else {
|
||||
dto.setStatus("已锁定");
|
||||
dto.setStatus("已预约");
|
||||
}
|
||||
} else if (status == SlotStatus.BOOKED) {
|
||||
if (OrderStatus.PATIENT_CANCELLED.getValue().equals(raw.getOrderStatus())) {
|
||||
dto.setStatus("已退号");
|
||||
} else {
|
||||
dto.setStatus("已取号");
|
||||
}
|
||||
} else if (status == SlotStatus.CANCELLED) {
|
||||
dto.setStatus("已停诊");
|
||||
} else if (status == SlotStatus.RETURNED) {
|
||||
} else if (SlotStatus.RETURNED.equals(slotStatus)) {
|
||||
dto.setStatus("已退号");
|
||||
} else if (SlotStatus.CANCELLED.equals(slotStatus)) {
|
||||
dto.setStatus("已停诊");
|
||||
} else if (SlotStatus.LOCKED.equals(slotStatus)) {
|
||||
dto.setStatus("已锁定");
|
||||
} else {
|
||||
dto.setStatus("未预约");
|
||||
}
|
||||
|
||||
@@ -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.getOrgLocListByActivityDefinitionId(orgLoc.getActivityDefinitionId());
|
||||
organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());
|
||||
organizationLocationList = (orgLoc.getId() != null)
|
||||
? organizationLocationList.stream().filter(item -> !orgLoc.getId().equals(item.getId())).toList()
|
||||
: organizationLocationList;
|
||||
@@ -169,11 +157,9 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
|
||||
if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(),
|
||||
orgLoc.getStartTime(), orgLoc.getEndTime())) {
|
||||
Organization org = organizationService.getById(organizationLocation.getOrganizationId());
|
||||
if (org == null) {
|
||||
continue;
|
||||
}
|
||||
String organizationName = org != null ? org.getName() : "未知科室";
|
||||
return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime()
|
||||
+ CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + org.getName() + "时间冲突");
|
||||
+ CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突");
|
||||
}
|
||||
|
||||
if (orgLocQueryDto.getId() != null) {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ import com.openhis.administration.mapper.PatientMapper;
|
||||
import com.openhis.administration.service.*;
|
||||
import com.openhis.common.constant.CommonConstants;
|
||||
import com.openhis.common.constant.PromptMsgConstant;
|
||||
import com.openhis.common.enums.SlotStatus;
|
||||
import com.openhis.common.enums.*;
|
||||
import com.openhis.common.enums.ybenums.YbPayment;
|
||||
import com.openhis.common.utils.EnumUtils;
|
||||
@@ -644,7 +643,8 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
|
||||
.set(Order::getStatus, OrderStatus.PATIENT_CANCELLED.getValue())
|
||||
.set(Order::getPayStatus, PaymentStatus.REFUND_ALL.getValue())
|
||||
.set(Order::getCancelTime, new Date())
|
||||
.set(Order::getCancelReason, "诊前退号")
|
||||
.set(Order::getCancelReason,
|
||||
StringUtils.isNotEmpty(reason) ? reason : "诊前退号")
|
||||
.set(Order::getUpdateTime, new Date())
|
||||
.setSql("version = version + 1")
|
||||
.eq(Order::getId, appointmentOrder.getId())
|
||||
@@ -660,27 +660,17 @@ public class OutpatientRegistrationAppServiceImpl implements IOutpatientRegistra
|
||||
return appointmentOrder.getId();
|
||||
}
|
||||
|
||||
// 只有已预约(1)的号源才能退号，对应签到后的 BOOKED 状态
|
||||
ScheduleSlot slot = scheduleSlotMapper.selectById(slotId);
|
||||
if (slot == null || !SlotStatus.BOOKED.getValue().equals(slot.getStatus())) {
|
||||
log.warn("退号跳过：槽位非已预约状态, slotId={}, status={}", slotId,
|
||||
slot != null ? slot.getStatus() : null);
|
||||
return appointmentOrder.getId();
|
||||
}
|
||||
|
||||
int slotRows = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.AVAILABLE.getValue());
|
||||
if (slotRows == 0) {
|
||||
log.warn("退号时更新槽位状态未影响任何行, slotId={}", slotId);
|
||||
return appointmentOrder.getId();
|
||||
}
|
||||
|
||||
Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
|
||||
if (poolId != null) {
|
||||
schedulePoolMapper.update(null,
|
||||
new LambdaUpdateWrapper<SchedulePool>()
|
||||
.setSql("booked_num = booked_num - 1, version = version + 1")
|
||||
.set(SchedulePool::getUpdateTime, new Date())
|
||||
.eq(SchedulePool::getId, poolId));
|
||||
int slotRows = scheduleSlotMapper.updateSlotStatus(slotId, CommonConstants.SlotStatus.AVAILABLE);
|
||||
if (slotRows > 0) {
|
||||
Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
|
||||
if (poolId != null) {
|
||||
schedulePoolMapper.refreshPoolStats(poolId);
|
||||
schedulePoolMapper.update(null,
|
||||
new LambdaUpdateWrapper<SchedulePool>()
|
||||
.setSql("version = version + 1")
|
||||
.set(SchedulePool::getUpdateTime, new Date())
|
||||
.eq(SchedulePool::getId, poolId));
|
||||
}
|
||||
}
|
||||
return appointmentOrder.getId();
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -507,7 +507,6 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public R<?> deleteSurgery(Long id) {
|
||||
// 校验手术是否存在
|
||||
Surgery existSurgery = surgeryService.getById(id);
|
||||
@@ -520,28 +519,6 @@ public class SurgeryAppServiceImpl implements ISurgeryAppService {
|
||||
return R.fail("已完成的手术不能删除");
|
||||
}
|
||||
|
||||
// 级联删除关联数据
|
||||
String surgeryNo = existSurgery.getSurgeryNo();
|
||||
|
||||
// 1. 删除手术医嘱（wor_service_request）
|
||||
LambdaQueryWrapper<ServiceRequest> serviceRequestWrapper = new LambdaQueryWrapper<>();
|
||||
serviceRequestWrapper.eq(ServiceRequest::getActivityId, id);
|
||||
serviceRequestService.remove(serviceRequestWrapper);
|
||||
log.info("删除手术关联的医嘱 - surgeryId: {}, surgeryNo: {}", id, surgeryNo);
|
||||
|
||||
// 2. 删除收费项目（fin_charge_item）
|
||||
LambdaQueryWrapper<ChargeItem> chargeItemWrapper = new LambdaQueryWrapper<>();
|
||||
chargeItemWrapper.eq(ChargeItem::getProductId, id)
|
||||
.eq(ChargeItem::getProductTable, "cli_surgery");
|
||||
chargeItemService.remove(chargeItemWrapper);
|
||||
log.info("删除手术关联的收费项目 - surgeryId: {}, surgeryNo: {}", id, surgeryNo);
|
||||
|
||||
// 3. 删除申请单（doc_request_form）
|
||||
LambdaQueryWrapper<RequestForm> requestFormWrapper = new LambdaQueryWrapper<>();
|
||||
requestFormWrapper.eq(RequestForm::getPrescriptionNo, surgeryNo);
|
||||
requestFormService.remove(requestFormWrapper);
|
||||
log.info("删除手术关联的申请单 - surgeryId: {}, surgeryNo: {}", id, surgeryNo);
|
||||
|
||||
surgeryService.deleteSurgery(id);
|
||||
|
||||
// 清除相关缓存
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -35,9 +35,6 @@ import com.openhis.medication.service.IMedicationDispenseService;
|
||||
import com.openhis.medication.service.IMedicationRequestService;
|
||||
import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
|
||||
import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
|
||||
import com.openhis.document.service.IRequestFormService;
|
||||
import com.openhis.clinical.service.ISurgeryService;
|
||||
import com.openhis.clinical.domain.Surgery;
|
||||
import com.openhis.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
|
||||
import com.openhis.web.doctorstation.dto.*;
|
||||
import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
|
||||
@@ -54,7 +51,6 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.openhis.document.domain.RequestForm;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
@@ -73,7 +69,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
private static final Pattern INSPECTION_APPLY_NO_JSON =
|
||||
Pattern.compile("\"applyNo\"\\s*:\\s*\"([^\"]+)\"");
|
||||
|
||||
|
||||
@Resource
|
||||
AssignSeqUtil assignSeqUtil;
|
||||
|
||||
@@ -137,20 +132,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
@Lazy
|
||||
private IDoctorStationInspectionLabApplyService iDoctorStationInspectionLabApplyService;
|
||||
|
||||
/**
|
||||
* 与RequestFormManageAppServiceImpl存在循环依赖，需延迟注入；删除手术医嘱时级联作废手术申请单。
|
||||
*/
|
||||
@Resource
|
||||
@Lazy
|
||||
private IRequestFormService iRequestFormService;
|
||||
|
||||
/**
|
||||
* 删除手术医嘱时级联删除 cli_surgery 手术记录。
|
||||
*/
|
||||
@Resource
|
||||
@Lazy
|
||||
private ISurgeryService iSurgeryService;
|
||||
|
||||
// 缓存 key 前缀
|
||||
private static final String ADVICE_BASE_INFO_CACHE_PREFIX = "advice:base:info:";
|
||||
// 缓存过期时间（小时）
|
||||
@@ -578,11 +559,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
if (adviceSaveList != null && !adviceSaveList.isEmpty()) {
|
||||
for (int i = 0; i < adviceSaveList.size(); i++) {
|
||||
AdviceSaveDto dto = adviceSaveList.get(i);
|
||||
log.info("Request[{}]: requestId={}, dbOpType={}, adviceType={}, encounterId={}, patientId={}, categoryEnum={}, categoryEnum.class={}, categoryCode={}, categoryCode.class={}",
|
||||
log.info("Request[{}]: requestId={}, dbOpType={}, adviceType={}, encounterId={}, patientId={}",
|
||||
i, dto.getRequestId(), dto.getDbOpType(), dto.getAdviceType(),
|
||||
dto.getEncounterId(), dto.getPatientId(),
|
||||
dto.getCategoryEnum(), dto.getCategoryEnum() != null ? dto.getCategoryEnum().getClass().getName() : "NULL",
|
||||
dto.getCategoryCode(), dto.getCategoryCode() != null ? dto.getCategoryCode().getClass().getName() : "NULL");
|
||||
dto.getEncounterId(), dto.getPatientId());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1583,7 +1562,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
// 🔧 BugFix #498: categoryEnum=22(检查) 走 ServiceRequest，不走 DeviceRequest
|
||||
// 检查申请单的诊疗定义ID存在 activityId，不在 adviceDefinitionId
|
||||
// deviceDefId 对应耗材定义ID，不能用诊疗定义ID填充
|
||||
if (Integer.valueOf(22).equals(adviceSaveDto.getCategoryEnum())) {
|
||||
if (adviceSaveDto.getCategoryEnum() == 22) {
|
||||
log.info("handDevice skip - 检查申请单(categoryEnum=22) 走 ServiceRequest 路径，跳过 DeviceRequest 保存");
|
||||
continue; // 跳过本次循环，不走耗材请求路径
|
||||
} else if (adviceSaveDto.getAdviceDefinitionId() != null) {
|
||||
@@ -1769,7 +1748,6 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
return StringUtils.isBlank(applyNo) ? null : applyNo;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 处理诊疗
|
||||
*/
|
||||
@@ -1818,50 +1796,31 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
}
|
||||
}
|
||||
}
|
||||
// 🔧 级联作废：在删除 ServiceRequest 之前，先读取所有待删除记录的级联信息
|
||||
// 检验申请单：contentJson 中写入 applyNo；手术申请单：categoryEnum=24 + prescriptionNo
|
||||
// 检验申请单在医嘱 contentJson 中写入 applyNo；从医嘱删除时需先级联作废检验单，避免检验页签仍显示孤儿申请
|
||||
Map<String, List<Long>> labApplyNoToRequestIds = new LinkedHashMap<>();
|
||||
Map<String, List<Long>> surgeryPrescriptionNoToRequestIds = new LinkedHashMap<>();
|
||||
// 收集待删除的 ServiceRequest（先查询再删除，避免级联逻辑因记录已删除而失效）
|
||||
Map<Long, ServiceRequest> serviceRequestCache = new LinkedHashMap<>();
|
||||
for (AdviceSaveDto adviceSaveDto : deleteList) {
|
||||
Long requestId = adviceSaveDto.getRequestId();
|
||||
// 🔧 Bug #442: 跳过 requestId 为 null 的记录
|
||||
// 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的诊疗请求
|
||||
if (requestId == null) {
|
||||
log.warn("BugFix#442: handService - 跳过 requestId 为 null 的删除请求");
|
||||
continue;
|
||||
}
|
||||
ServiceRequest existing = iServiceRequestService.getById(requestId);
|
||||
iServiceRequestService.removeById(requestId);// 删除诊疗
|
||||
ServiceRequest existing = iServiceRequestService.getById(adviceSaveDto.getRequestId());
|
||||
if (existing == null) {
|
||||
continue;
|
||||
}
|
||||
serviceRequestCache.put(requestId, existing);
|
||||
log.info("【调试】handService 待删除医嘱: requestId={}, categoryEnum={}, prescriptionNo={}",
|
||||
requestId, existing.getCategoryEnum(), existing.getPrescriptionNo());
|
||||
// 检验申请单级联
|
||||
String applyNo = extractInspectionApplyNoFromContentJson(existing.getContentJson());
|
||||
if (StringUtils.isNotBlank(applyNo)) {
|
||||
labApplyNoToRequestIds.computeIfAbsent(applyNo, k -> new ArrayList<>())
|
||||
.add(requestId);
|
||||
}
|
||||
// 手术申请单级联（categoryEnum=24）
|
||||
log.info("【调试】handService 判断手术条件: categoryEnum={}, prescriptionNo={}, isSurgery={}",
|
||||
existing.getCategoryEnum(), existing.getPrescriptionNo(),
|
||||
existing.getCategoryEnum() != null && existing.getCategoryEnum() == 24 && StringUtils.isNotBlank(existing.getPrescriptionNo()));
|
||||
if (existing.getCategoryEnum() != null
|
||||
&& existing.getCategoryEnum() == 24
|
||||
&& StringUtils.isNotBlank(existing.getPrescriptionNo())) {
|
||||
surgeryPrescriptionNoToRequestIds.computeIfAbsent(existing.getPrescriptionNo(), k -> new ArrayList<>())
|
||||
.add(requestId);
|
||||
log.info("【调试】handService 加入手术级联列表: prescriptionNo={}", existing.getPrescriptionNo());
|
||||
.add(adviceSaveDto.getRequestId());
|
||||
}
|
||||
}
|
||||
// 执行检验申请单级联作废
|
||||
Set<Long> cascadeSkippedRequestIds = new HashSet<>();
|
||||
Set<Long> labCascadeSkippedRequestIds = new HashSet<>();
|
||||
for (Map.Entry<String, List<Long>> e : labApplyNoToRequestIds.entrySet()) {
|
||||
R<?> delLab = iDoctorStationInspectionLabApplyService.deleteInspectionLabApply(e.getKey());
|
||||
if (delLab != null && R.isSuccess(delLab)) {
|
||||
cascadeSkippedRequestIds.addAll(e.getValue());
|
||||
labCascadeSkippedRequestIds.addAll(e.getValue());
|
||||
log.info("handService - 级联作废检验申请单 applyNo={}，已跳过重复删除的医嘱 requestIds={}",
|
||||
e.getKey(), e.getValue());
|
||||
} else {
|
||||
@@ -1870,41 +1829,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
e.getKey(), msg);
|
||||
}
|
||||
}
|
||||
// 🔧 手术申请单级联作废：删除手术医嘱时同步作废关联的手术申请单
|
||||
for (Map.Entry<String, List<Long>> e : surgeryPrescriptionNoToRequestIds.entrySet()) {
|
||||
String prescriptionNo = e.getKey();
|
||||
try {
|
||||
List<RequestForm> requestForms = iRequestFormService.list(
|
||||
new LambdaQueryWrapper<RequestForm>()
|
||||
.eq(RequestForm::getPrescriptionNo, prescriptionNo)
|
||||
.in(RequestForm::getTypeCode, ActivityDefCategory.PROCEDURE.getCode().toString(), "SURGERY")
|
||||
.and(w -> w.isNull(RequestForm::getDeleteFlag).or().eq(RequestForm::getDeleteFlag, "0")));
|
||||
log.info("【调试】handService 查询手术申请单: prescriptionNo={}, 查到{}条", prescriptionNo, requestForms != null ? requestForms.size() : 0);
|
||||
if (requestForms != null && !requestForms.isEmpty()) {
|
||||
for (RequestForm requestForm : requestForms) {
|
||||
iRequestFormService.removeById(requestForm.getId());
|
||||
}
|
||||
// 同步删除 cli_surgery 手术记录（prescriptionNo = surgeryNo）
|
||||
Surgery surgery = iSurgeryService.getOne(
|
||||
new LambdaQueryWrapper<Surgery>()
|
||||
.eq(Surgery::getSurgeryNo, prescriptionNo)
|
||||
.and(w -> w.isNull(Surgery::getDeleteFlag).or().eq(Surgery::getDeleteFlag, "0")));
|
||||
if (surgery != null) {
|
||||
iSurgeryService.removeById(surgery.getId());
|
||||
log.info("handService - 级联删除手术记录 cli_surgery: surgeryNo={}, id={}", prescriptionNo, surgery.getId());
|
||||
}
|
||||
cascadeSkippedRequestIds.addAll(e.getValue());
|
||||
log.info("handService - 级联作废手术申请单 prescriptionNo={}", prescriptionNo);
|
||||
} else {
|
||||
log.info("handService - 未找到手术申请单 prescriptionNo={}", prescriptionNo);
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
log.warn("handService - 级联作废手术申请单失败 prescriptionNo={} msg={}", prescriptionNo, ex.getMessage());
|
||||
}
|
||||
}
|
||||
// 级联作废完成后，统一删除 ServiceRequest 及其子项、费用项
|
||||
for (AdviceSaveDto adviceSaveDto : deleteList) {
|
||||
if (cascadeSkippedRequestIds.contains(adviceSaveDto.getRequestId())) {
|
||||
if (labCascadeSkippedRequestIds.contains(adviceSaveDto.getRequestId())) {
|
||||
continue;
|
||||
}
|
||||
Long requestId = adviceSaveDto.getRequestId();
|
||||
@@ -1914,6 +1840,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
requestId));// 删除诊疗套餐对应的子项
|
||||
// 🔧 Bug Fix #219: 删除费用项
|
||||
String serviceTable = CommonConstants.TableName.WOR_SERVICE_REQUEST;
|
||||
// 直接删除费用项
|
||||
iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
|
||||
log.info("BugFix#219: 诊疗医嘱删除完成, requestId={}, serviceTable={}", requestId, serviceTable);
|
||||
}
|
||||
@@ -2192,6 +2119,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
|
||||
CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
|
||||
sourceEnum, sourceBillNo);
|
||||
// 手术计费场景：sourceBillNo 不为空时，过滤掉药品（1），保留耗材（2）和诊疗（3/6）
|
||||
if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
|
||||
requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
|
||||
&& dto.getAdviceType() == 1);
|
||||
}
|
||||
for (RequestBaseDto requestBaseDto : requestBaseInfo) {
|
||||
// 请求状态
|
||||
requestBaseDto
|
||||
@@ -2526,42 +2458,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
|
||||
|
||||
/**
|
||||
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
|
||||
* 使用直接 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;
|
||||
}
|
||||
}
|
||||
|
||||
// 使用 MyBatis Plus 分页查询
|
||||
IPage<SurgeryItemDto> result = doctorStationAdviceAppMapper.getSurgeryPage(
|
||||
new Page<>(pageNo, pageSize),
|
||||
PublicationStatus.ACTIVE.getValue(),
|
||||
organizationId,
|
||||
searchKey);
|
||||
|
||||
log.info("getSurgeryPage 完成: {}ms, total={}, records={}", System.currentTimeMillis() - start, result.getTotal(), result.getRecords().size());
|
||||
|
||||
// 无搜索时将结果写入缓存
|
||||
if (useCache && result instanceof com.baomidou.mybatisplus.extension.plugins.pagination.Page) {
|
||||
redisCache.setCacheObject(cacheKey, result, (int) CACHE_EXPIRE_HOURS, java.util.concurrent.TimeUnit.HOURS);
|
||||
log.info("缓存手术项目, key: {}, 过期时间: {} 小时", cacheKey, CACHE_EXPIRE_HOURS);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
@@ -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,25 +345,23 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
|
||||
encounterId, tenantId);
|
||||
}
|
||||
|
||||
// 写入 div_log 审计日志（每次完诊都生成记录，确保审计链路完整）
|
||||
// Bug #401：移除 queueWasAlreadyCompleted 条件限制，避免队列已由分诊台完诊时
|
||||
// 医生站完诊不写日志导致审计记录缺失；同时保留 queueWasAlreadyCompleted 日志用于排查
|
||||
try {
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
DivLog divLog = new DivLog()
|
||||
.setPoolId(divPoolId)
|
||||
.setSlotId(divSlotId)
|
||||
.setOpUserId(loginUser != null ? loginUser.getUserId() : null)
|
||||
.setAction("COMPLETE")
|
||||
.setCreateTime(LocalDateTime.now())
|
||||
.setUpdateAt(LocalDateTime.now())
|
||||
.setCreatedAt(LocalDateTime.now());
|
||||
divLogService.save(divLog);
|
||||
if (queueWasAlreadyCompleted) {
|
||||
log.info("完诊：队列项已由分诊台完诊，医生站补充写入审计日志 encounterId={}", encounterId);
|
||||
// 写入 div_log 审计日志（独立于队列项，确保每次完诊都生成记录）
|
||||
// Bug #401：使用更新前记录的原始状态判断，避免自身更新后将状态改为 COMPLETED 导致误判为"已完成"
|
||||
if (!queueWasAlreadyCompleted) {
|
||||
try {
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
DivLog divLog = new DivLog()
|
||||
.setPoolId(divPoolId)
|
||||
.setSlotId(divSlotId)
|
||||
.setOpUserId(loginUser != null ? loginUser.getUserId() : null)
|
||||
.setAction("COMPLETE")
|
||||
.setCreateTime(LocalDateTime.now())
|
||||
.setUpdateAt(LocalDateTime.now())
|
||||
.setCreatedAt(LocalDateTime.now());
|
||||
divLogService.save(divLog);
|
||||
} catch (Exception e) {
|
||||
log.error("写入div_log审计日志失败", e);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("写入div_log审计日志失败", e);
|
||||
}
|
||||
|
||||
// 4. 更新状态、完成时间以及初复诊标识
|
||||
|
||||
@@ -96,11 +96,6 @@ public class DiagnosisQueryDto {
|
||||
*/
|
||||
private String diagnosisDoctor;
|
||||
|
||||
/**
|
||||
* 长效诊断标识
|
||||
*/
|
||||
private Integer longTermFlag;
|
||||
|
||||
/**
|
||||
* 是否已有传染病报卡（0-无，1-有）
|
||||
*/
|
||||
|
||||
@@ -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-中华人民共和国传染病报告卡 */
|
||||
|
||||
@@ -23,9 +23,6 @@ public class SurgeryItemDto {
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long orgId;
|
||||
|
||||
/** 所属科室名称 */
|
||||
private String orgName;
|
||||
|
||||
/** 执行科室ID */
|
||||
@JsonSerialize(using = ToStringSerializer.class)
|
||||
private Long positionId;
|
||||
|
||||
@@ -187,9 +187,8 @@ public interface DoctorStationAdviceAppMapper {
|
||||
|
||||
/**
|
||||
* 手术项目专用分页查询（仅手术 + 定价，无库存/草稿库存/取药科室等无关逻辑）
|
||||
* 使用 LIMIT/OFFSET 直接查询，不执行 COUNT 以提升性能
|
||||
*
|
||||
* @param page 分页参数（仅取 pageNo/pageSize，不触发 MyBatis Plus COUNT）
|
||||
* @param page 分页参数
|
||||
* @param statusEnum 启用状态
|
||||
* @param organizationId 科室ID（可选，用于过滤已配置的手术项目）
|
||||
* @param 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,9 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
||||
inpatientAdviceParam.setEncounterIds(null);
|
||||
Integer exeStatus = inpatientAdviceParam.getExeStatus();
|
||||
inpatientAdviceParam.setExeStatus(null);
|
||||
// requestStatus由前端tab传入，通过QueryWrapper自动添加到SQL外层WHERE过滤
|
||||
// requestStatus由前端tab控制，需在后端过滤
|
||||
Integer requestStatus = inpatientAdviceParam.getRequestStatus();
|
||||
inpatientAdviceParam.setRequestStatus(null);
|
||||
// 构建查询条件
|
||||
QueryWrapper<InpatientAdviceParam> queryWrapper
|
||||
= HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
|
||||
@@ -291,6 +293,16 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
||||
inpatientAdvicePage.setTotal(filteredList.size());
|
||||
}
|
||||
}
|
||||
|
||||
// 按请求状态（tab切换）过滤医嘱
|
||||
if (requestStatus != null) {
|
||||
List<InpatientAdviceDto> statusFilteredList = inpatientAdvicePage.getRecords().stream()
|
||||
.filter(advice -> requestStatus.equals(advice.getRequestStatus()))
|
||||
.collect(Collectors.toList());
|
||||
inpatientAdvicePage.setRecords(statusFilteredList);
|
||||
inpatientAdvicePage.setTotal(statusFilteredList.size());
|
||||
}
|
||||
|
||||
return R.ok(inpatientAdvicePage);
|
||||
}
|
||||
|
||||
@@ -367,7 +379,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();
|
||||
|
||||
@@ -32,7 +32,6 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
@@ -203,70 +202,62 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
|
||||
@Override
|
||||
public R<?> addOrEditBatchTransferReceipt(List<ProductTransferDto> productTransferDtoList, Boolean flag) {
|
||||
|
||||
// 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
|
||||
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
|
||||
Date now = DateUtils.getNowDate();
|
||||
for (ProductTransferDto dto : productTransferDtoList) {
|
||||
if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
|
||||
return R.fail("调拨数量必须大于0");
|
||||
}
|
||||
// 查询该药品在源仓库的实时库存总量
|
||||
List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
|
||||
dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
|
||||
java.math.BigDecimal actualStock = inventoryList.stream()
|
||||
.map(InventoryItem::getQuantity)
|
||||
.reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
|
||||
if (dto.getItemQuantity().compareTo(actualStock) > 0) {
|
||||
return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
|
||||
}
|
||||
}
|
||||
|
||||
List<String> idList = new ArrayList<>();
|
||||
if (flag) {
|
||||
// 批量保存按钮
|
||||
// 单据号取得
|
||||
List<String> busNoList = productTransferDtoList.stream().map(ProductTransferDto::getBusNo).toList();
|
||||
// 保存前：获取旧记录用于恢复预划扣库存
|
||||
List<SupplyRequest> oldRequestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
|
||||
if (!oldRequestList.isEmpty()) {
|
||||
// 恢复旧记录已预划扣的库存
|
||||
for (SupplyRequest oldReq : oldRequestList) {
|
||||
if (oldReq.getItemId() != null && oldReq.getLotNumber() != null
|
||||
&& oldReq.getSourceLocationId() != null && oldReq.getItemQuantity() != null) {
|
||||
List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
|
||||
oldReq.getItemId(), oldReq.getLotNumber(), oldReq.getSourceLocationId(), tenantId);
|
||||
if (!invList.isEmpty()) {
|
||||
inventoryItemService.updateInventoryQuantity(
|
||||
invList.get(0).getId(),
|
||||
invList.get(0).getQuantity().add(oldReq.getItemQuantity()), now);
|
||||
}
|
||||
}
|
||||
}
|
||||
List<Long> oldIdList = oldRequestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
|
||||
supplyRequestService.removeByIds(oldIdList);
|
||||
}
|
||||
|
||||
// 校验 + 预划扣新记录
|
||||
for (ProductTransferDto dto : productTransferDtoList) {
|
||||
if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return R.fail("调拨数量必须大于0");
|
||||
}
|
||||
List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
|
||||
dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
|
||||
BigDecimal actualStock = inventoryList.stream()
|
||||
.map(InventoryItem::getQuantity)
|
||||
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
if (dto.getItemQuantity().compareTo(actualStock) > 0) {
|
||||
return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
|
||||
}
|
||||
// 预划扣源仓库库存
|
||||
if (!inventoryList.isEmpty()) {
|
||||
InventoryItem inv = inventoryList.get(0);
|
||||
inventoryItemService.updateInventoryQuantity(
|
||||
inv.getId(), inv.getQuantity().subtract(dto.getItemQuantity()), now);
|
||||
}
|
||||
// 请求id取得
|
||||
List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
|
||||
if (!requestList.isEmpty()) {
|
||||
List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
|
||||
// 单据信息删除
|
||||
supplyRequestService.removeByIds(requestIdList);
|
||||
}
|
||||
|
||||
// 生成批量调拨单据
|
||||
List<SupplyRequest> supplyRequestList = new ArrayList<>();
|
||||
for (ProductTransferDto productTransferDto : productTransferDtoList) {
|
||||
// 初始化单据信息
|
||||
SupplyRequest supplyRequest = new SupplyRequest();
|
||||
BeanUtils.copyProperties(productTransferDto, supplyRequest);
|
||||
// 生成商品批量调拨单据
|
||||
supplyRequest
|
||||
// id
|
||||
.setId(null)
|
||||
// 单据分类：库存供应
|
||||
.setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue())
|
||||
// 单据类型：商品批量调拨
|
||||
.setTypeEnum(SupplyType.PRODUCT_BATCH_TRANSFER.getValue())
|
||||
// 制单人
|
||||
.setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
|
||||
// 申请时间
|
||||
.setApplyTime(DateUtils.getNowDate())
|
||||
// 源库存数量
|
||||
.setTotalQuantity(productTransferDto.getTotalSourceQuantity());
|
||||
supplyRequestList.add(supplyRequest);
|
||||
}
|
||||
supplyRequestService.saveOrUpdateBatch(supplyRequestList);
|
||||
// 请求id取得
|
||||
List<SupplyRequest> supplyRequestIdList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
|
||||
// 返回请求id列表
|
||||
List<Long> requestIdList = supplyRequestIdList.stream().map(SupplyRequest::getId).toList();
|
||||
for (Long list : requestIdList) {
|
||||
idList.add(list.toString());
|
||||
@@ -274,58 +265,33 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
|
||||
} else {
|
||||
// 单独保存按钮
|
||||
for (ProductTransferDto productTransferDto : productTransferDtoList) {
|
||||
// 更新已有记录：先恢复旧预划扣，再扣新的
|
||||
if (productTransferDto.getId() != null) {
|
||||
SupplyRequest oldReq = supplyRequestService.getById(productTransferDto.getId());
|
||||
if (oldReq != null && oldReq.getItemId() != null && oldReq.getLotNumber() != null
|
||||
&& oldReq.getSourceLocationId() != null && oldReq.getItemQuantity() != null) {
|
||||
List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
|
||||
oldReq.getItemId(), oldReq.getLotNumber(), oldReq.getSourceLocationId(), tenantId);
|
||||
if (!invList.isEmpty()) {
|
||||
inventoryItemService.updateInventoryQuantity(
|
||||
invList.get(0).getId(),
|
||||
invList.get(0).getQuantity().add(oldReq.getItemQuantity()), now);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 校验 + 预划扣
|
||||
if (productTransferDto.getItemQuantity() == null
|
||||
|| productTransferDto.getItemQuantity().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return R.fail("调拨数量必须大于0");
|
||||
}
|
||||
List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
|
||||
productTransferDto.getItemId(), productTransferDto.getLotNumber(),
|
||||
productTransferDto.getSourceLocationId(), tenantId);
|
||||
BigDecimal actualStock = inventoryList.stream()
|
||||
.map(InventoryItem::getQuantity)
|
||||
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
if (productTransferDto.getItemQuantity().compareTo(actualStock) > 0) {
|
||||
return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
|
||||
}
|
||||
if (!inventoryList.isEmpty()) {
|
||||
InventoryItem inv = inventoryList.get(0);
|
||||
inventoryItemService.updateInventoryQuantity(
|
||||
inv.getId(), inv.getQuantity().subtract(productTransferDto.getItemQuantity()), now);
|
||||
}
|
||||
|
||||
// 初始化单据信息
|
||||
SupplyRequest supplyRequest = new SupplyRequest();
|
||||
BeanUtils.copyProperties(productTransferDto, supplyRequest);
|
||||
|
||||
supplyRequest.setTotalQuantity(productTransferDto.getTotalSourceQuantity());
|
||||
|
||||
if (productTransferDto.getId() != null) {
|
||||
// 更新单据信息
|
||||
supplyRequestService.updateById(supplyRequest);
|
||||
} else {
|
||||
// 生成商品批量调拨单据
|
||||
supplyRequest
|
||||
// 单据分类：库存供应
|
||||
.setCategoryEnum(SupplyCategory.STOCK_SUPPLY.getValue())
|
||||
// 单据类型：商品批量调拨
|
||||
.setTypeEnum(SupplyType.PRODUCT_BATCH_TRANSFER.getValue())
|
||||
// 制单人
|
||||
.setApplicantId(SecurityUtils.getLoginUser().getPractitionerId())
|
||||
// 申请时间
|
||||
.setApplyTime(DateUtils.getNowDate());
|
||||
supplyRequestService.save(supplyRequest);
|
||||
}
|
||||
// 返回单据id
|
||||
return R.ok(supplyRequest.getId().toString(), null);
|
||||
}
|
||||
}
|
||||
// 返回单据id
|
||||
return R.ok(idList, null);
|
||||
}
|
||||
|
||||
@@ -366,63 +332,33 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
|
||||
@Override
|
||||
public R<?> addOrEditTransferReceipt(List<ProductTransferDto> productTransferDtoList) {
|
||||
|
||||
// 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
|
||||
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
|
||||
Date now = DateUtils.getNowDate();
|
||||
for (ProductTransferDto dto : productTransferDtoList) {
|
||||
if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
|
||||
return R.fail("调拨数量必须大于0");
|
||||
}
|
||||
List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
|
||||
dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
|
||||
java.math.BigDecimal actualStock = inventoryList.stream()
|
||||
.map(InventoryItem::getQuantity)
|
||||
.reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
|
||||
if (dto.getItemQuantity().compareTo(actualStock) > 0) {
|
||||
return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
|
||||
}
|
||||
}
|
||||
|
||||
List<String> idList = new ArrayList<>();
|
||||
|
||||
// 单据号取得
|
||||
List<String> busNoList = productTransferDtoList.stream().map(ProductTransferDto::getBusNo).toList();
|
||||
// 保存前：获取旧记录用于恢复预划扣库存
|
||||
List<SupplyRequest> oldRequestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
|
||||
Map<String, BigDecimal> oldDeductionMap = new HashMap<>();
|
||||
if (!oldRequestList.isEmpty()) {
|
||||
for (SupplyRequest oldReq : oldRequestList) {
|
||||
if (oldReq.getItemId() != null && oldReq.getLotNumber() != null && oldReq.getSourceLocationId() != null
|
||||
&& oldReq.getItemQuantity() != null) {
|
||||
String key = oldReq.getItemId() + "_" + oldReq.getLotNumber() + "_" + oldReq.getSourceLocationId();
|
||||
oldDeductionMap.merge(key, oldReq.getItemQuantity(), BigDecimal::add);
|
||||
}
|
||||
}
|
||||
// 恢复旧记录已预划扣的库存
|
||||
for (Map.Entry<String, BigDecimal> entry : oldDeductionMap.entrySet()) {
|
||||
String[] parts = entry.getKey().split("_");
|
||||
Long itemId = Long.parseLong(parts[0]);
|
||||
String lotNumber = parts[1];
|
||||
Long sourceLocationId = Long.parseLong(parts[2]);
|
||||
BigDecimal restoreQty = entry.getValue();
|
||||
List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
|
||||
itemId, lotNumber, sourceLocationId, tenantId);
|
||||
if (!invList.isEmpty()) {
|
||||
inventoryItemService.updateInventoryQuantity(
|
||||
invList.get(0).getId(), invList.get(0).getQuantity().add(restoreQty), now);
|
||||
}
|
||||
}
|
||||
// 删除旧记录
|
||||
List<Long> oldIdList = oldRequestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
|
||||
supplyRequestService.removeByIds(oldIdList);
|
||||
}
|
||||
|
||||
// 校验 + 预划扣新记录
|
||||
Map<String, BigDecimal> newDeductionMap = new HashMap<>();
|
||||
for (ProductTransferDto dto : productTransferDtoList) {
|
||||
if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(BigDecimal.ZERO) <= 0) {
|
||||
return R.fail("调拨数量必须大于0");
|
||||
}
|
||||
List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
|
||||
dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
|
||||
BigDecimal actualStock = inventoryList.stream()
|
||||
.map(InventoryItem::getQuantity)
|
||||
.reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
if (dto.getItemQuantity().compareTo(actualStock) > 0) {
|
||||
return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
|
||||
}
|
||||
// 预划扣：扣减源仓库库存
|
||||
if (!inventoryList.isEmpty()) {
|
||||
InventoryItem inv = inventoryList.get(0);
|
||||
inventoryItemService.updateInventoryQuantity(
|
||||
inv.getId(), inv.getQuantity().subtract(dto.getItemQuantity()), now);
|
||||
}
|
||||
// 请求数据取得
|
||||
List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNoList.get(0));
|
||||
if (!requestList.isEmpty()) {
|
||||
// 请求id取得
|
||||
List<Long> requestIdList = requestList.stream().map(SupplyRequest::getId).collect(Collectors.toList());
|
||||
// 单据信息删除
|
||||
supplyRequestService.removeByIds(requestIdList);
|
||||
}
|
||||
|
||||
List<SupplyRequest> supplyRequestList = new ArrayList<>();
|
||||
@@ -469,22 +405,6 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
|
||||
*/
|
||||
@Override
|
||||
public R<?> deleteReceipt(List<Long> supplyRequestIds) {
|
||||
// 删除前恢复预划扣的库存
|
||||
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
|
||||
Date now = DateUtils.getNowDate();
|
||||
for (Long reqId : supplyRequestIds) {
|
||||
SupplyRequest sr = supplyRequestService.getById(reqId);
|
||||
if (sr != null && sr.getItemId() != null && sr.getSourceLocationId() != null
|
||||
&& sr.getItemQuantity() != null && sr.getLotNumber() != null) {
|
||||
List<InventoryItem> invList = inventoryItemService.selectInventoryByItemId(
|
||||
sr.getItemId(), sr.getLotNumber(), sr.getSourceLocationId(), tenantId);
|
||||
if (!invList.isEmpty()) {
|
||||
InventoryItem inv = invList.get(0);
|
||||
inventoryItemService.updateInventoryQuantity(
|
||||
inv.getId(), inv.getQuantity().add(sr.getItemQuantity()), now);
|
||||
}
|
||||
}
|
||||
}
|
||||
// 删除单据
|
||||
boolean result = supplyRequestService.removeByIds(supplyRequestIds);
|
||||
return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
|
||||
|
||||
@@ -519,8 +519,58 @@ public class ReceiptApprovalAppServiceImpl implements IReceiptApprovalAppService
|
||||
// 暂时先取出全部的库存，循环查库存同一会有问题，后续优化
|
||||
List<InventoryItem> inventoryItems = inventoryItemService.selectAllInventory();
|
||||
for (SupplyItemDetailDto supplyItemDetailDto : supplyItemDetailList) {
|
||||
// 🔧 源仓库库存已在保存时预划扣，审批通过时不再重复扣减
|
||||
outList.add(supplyItemDetailDto);
|
||||
// 根据项目id,产品批号，源仓库id 查询源仓库库存表信息
|
||||
// List<InventoryItem> inventoryItemSourceList = inventoryItemService.selectInventoryByItemId(
|
||||
// supplyItemDetailDto.getItemId(), supplyItemDetailDto.getLotNumber(),
|
||||
// supplyItemDetailDto.getSourceLocationId(), SecurityUtils.getLoginUser().getTenantId());
|
||||
List<InventoryItem> filteredInventoryItems = inventoryItems.stream()
|
||||
.filter(item -> item.getItemId().equals(supplyItemDetailDto.getItemId())
|
||||
&& item.getLotNumber().equals(supplyItemDetailDto.getLotNumber())
|
||||
&& item.getLocationId().equals(supplyItemDetailDto.getSourceLocationId()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
InventoryItem inventoryItemSource = new InventoryItem();
|
||||
if (!filteredInventoryItems.isEmpty()) {
|
||||
inventoryItemSource = filteredInventoryItems.get(0);
|
||||
// 最小数量（最小单位库存数量）
|
||||
BigDecimal minQuantity = inventoryItemSource.getQuantity();
|
||||
|
||||
// // 计算调拨后库存数量，结果取小单位
|
||||
// // 供应申请的物品计量单位与包装单位相同
|
||||
// if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getUnitCode())) {
|
||||
// if
|
||||
// (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity().multiply(supplyItemDetailDto.getPartPercent()))
|
||||
// < 0) {
|
||||
// // 库存数量不足
|
||||
// throw new ServiceException("操作失败,库存数量不足");
|
||||
// } else {
|
||||
// // 源仓库库存-(调拨数量*拆零比)
|
||||
// minQuantity = minQuantity.subtract(
|
||||
// supplyItemDetailDto.getPartPercent().multiply(supplyItemDetailDto.getItemQuantity()));
|
||||
// }
|
||||
// } else if (supplyItemDetailDto.getItemUnit().equals(supplyItemDetailDto.getMinUnitCode())) {
|
||||
// 直接扣减库存
|
||||
if (minQuantity.compareTo(supplyItemDetailDto.getItemQuantity()) < 0) {
|
||||
// 库存数量不足
|
||||
throw new ServiceException("操作失败,库存数量不足");
|
||||
} else {
|
||||
// 供应申请的物品计量单位与最小单位相同
|
||||
// 源仓库库存-调拨数量
|
||||
minQuantity = minQuantity.subtract(supplyItemDetailDto.getItemQuantity());
|
||||
}
|
||||
// }
|
||||
// 更新源仓库库存数量
|
||||
Boolean aBoolean
|
||||
= inventoryItemService.updateInventoryQuantity(inventoryItemSource.getId(), minQuantity, now);
|
||||
if (!aBoolean) {
|
||||
throw new ServiceException("系统异常,请稍后重试");
|
||||
}
|
||||
|
||||
// 添加到出库列表
|
||||
outList.add(supplyItemDetailDto);
|
||||
} else {
|
||||
return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
|
||||
}
|
||||
|
||||
// 根据项目id,产品批号，目的仓库id 查询目的仓库库存表信息
|
||||
List<InventoryItem> inventoryItemPurposeList = inventoryItemService.selectInventoryByItemId(
|
||||
|
||||
@@ -256,9 +256,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))
|
||||
@@ -422,80 +419,4 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据单据号校验领用数量是否超过源仓库实际库存（提交审批前调用）
|
||||
*
|
||||
* @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);
|
||||
|
||||
@@ -269,7 +269,7 @@ public class PatientInformationServiceImpl implements IPatientInformationService
|
||||
// log.debug("添加病人信息,patientInfoDto:{}", patientBaseInfoDto);
|
||||
// 如果患者没有输入身份证号则根据年龄自动生成
|
||||
String idCard = patientBaseInfoDto.getIdCard();
|
||||
if (idCard == null || idCard.length() < 6 || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) {
|
||||
if (idCard == null || CommonConstants.Common.AREA_CODE.equals(idCard.substring(0, 6))) {
|
||||
if (patientBaseInfoDto.getAge() != null) {
|
||||
idCard = IdCardUtil.generateIdByAge(patientBaseInfoDto.getAge());
|
||||
patientBaseInfoDto.setIdCard(idCard);
|
||||
|
||||
@@ -36,8 +36,6 @@ import com.openhis.workflow.domain.ActivityDefinition;
|
||||
import com.openhis.workflow.service.IDeviceDispenseService;
|
||||
import com.openhis.workflow.service.IDeviceRequestService;
|
||||
import com.openhis.workflow.service.IServiceRequestService;
|
||||
import com.openhis.document.domain.RequestForm;
|
||||
import com.openhis.document.service.IRequestFormService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -87,9 +85,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
|
||||
@Resource
|
||||
IDeviceDispenseService iDeviceDispenseService;
|
||||
|
||||
@Resource
|
||||
IRequestFormService iRequestFormService;
|
||||
|
||||
/**
|
||||
* 查询住院患者信息
|
||||
*
|
||||
@@ -271,38 +266,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
|
||||
|
||||
log.info("开始处理删除操作，共 {} 条记录", deleteList.size());
|
||||
|
||||
// 🔧 手术申请单级联作废：删除手术医嘱(categoryEnum=24)时同步作废关联的手术申请单
|
||||
Map<String, List<Long>> surgeryPrescriptionNoToRequestIds = new LinkedHashMap<>();
|
||||
for (RegAdviceSaveDto adviceDto : deleteList) {
|
||||
if (adviceDto.getRequestId() == null) continue;
|
||||
ServiceRequest existing = iServiceRequestService.getById(adviceDto.getRequestId());
|
||||
if (existing == null) continue;
|
||||
if (existing.getCategoryEnum() != null
|
||||
&& existing.getCategoryEnum() == 24
|
||||
&& existing.getPrescriptionNo() != null && !existing.getPrescriptionNo().isEmpty()) {
|
||||
surgeryPrescriptionNoToRequestIds.computeIfAbsent(existing.getPrescriptionNo(), k -> new ArrayList<>())
|
||||
.add(adviceDto.getRequestId());
|
||||
}
|
||||
}
|
||||
for (Map.Entry<String, List<Long>> e : surgeryPrescriptionNoToRequestIds.entrySet()) {
|
||||
String prescriptionNo = e.getKey();
|
||||
try {
|
||||
List<RequestForm> requestForms = iRequestFormService.list(
|
||||
new LambdaQueryWrapper<RequestForm>()
|
||||
.eq(RequestForm::getPrescriptionNo, prescriptionNo)
|
||||
.eq(RequestForm::getTypeCode, ActivityDefCategory.PROCEDURE.getCode())
|
||||
.and(w -> w.isNull(RequestForm::getDeleteFlag).or().eq(RequestForm::getDeleteFlag, "0")));
|
||||
for (RequestForm requestForm : requestForms) {
|
||||
iRequestFormService.removeById(requestForm.getId());
|
||||
}
|
||||
if (!requestForms.isEmpty()) {
|
||||
log.info("级联作废手术申请单 prescriptionNo={}, 共{}条", prescriptionNo, requestForms.size());
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
log.warn("级联作废手术申请单失败 prescriptionNo={}", prescriptionNo, ex);
|
||||
}
|
||||
}
|
||||
|
||||
for (RegAdviceSaveDto adviceDto : deleteList) {
|
||||
Integer adviceType = adviceDto.getAdviceType();
|
||||
Long requestId = adviceDto.getRequestId();
|
||||
|
||||
@@ -81,7 +81,16 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
Long requestFormId = requestFormSaveDto.getRequestFormId();
|
||||
boolean isEdit = requestFormId != null && requestFormId != 0L;
|
||||
|
||||
// 🔧 手术/检查申请单：优先使用前端传入的positionId（用户手动选择的发往科室），跳过执行科室配置校验
|
||||
// 诊疗执行科室配置校验（必须在任何数据库操作之前）
|
||||
List<ActivityOrganizationConfigDto> activityOrganizationConfig =
|
||||
requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
|
||||
if (activityOrganizationConfig.isEmpty()) {
|
||||
throw new ServiceException("请先配置当前时间段的执行科室");
|
||||
}
|
||||
|
||||
// 逐个校验activityList中的项目是否都配置了执行科室，并收集positionId供后续使用
|
||||
// 必须在任何数据库操作之前完成全部校验，避免部分保存后异常导致脏数据
|
||||
// 🔧 Bug #516: 优先使用前端传入的positionId（用户手动选择的发往科室），仅在未选择时使用配置的执行科室
|
||||
List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
|
||||
// 缓存校验结果，避免主循环中重复查询和可能出现的数据不一致
|
||||
java.util.Map<Long, Long> activityIdToPositionIdMap = new java.util.HashMap<>();
|
||||
@@ -93,15 +102,14 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), frontendPositionId);
|
||||
continue;
|
||||
}
|
||||
// 前端未传入时，查询配置的执行科室（暂不校验，仅用于兼容无前端传入的场景）
|
||||
List<ActivityOrganizationConfigDto> activityOrganizationConfig =
|
||||
requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
|
||||
// 前端未传入时，使用配置的执行科室
|
||||
Long configPositionId = activityOrganizationConfig.stream()
|
||||
.filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
|
||||
.map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
|
||||
if (configPositionId != null) {
|
||||
activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId);
|
||||
if (configPositionId == null) {
|
||||
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
|
||||
}
|
||||
activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,77 +176,73 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
ChargeItem chargeItem;
|
||||
log.info("保存申请单，typeCode={}, activityListSize={}, encounterId={}", typeCode, activityList != null ? activityList.size() : 0, encounterId);
|
||||
|
||||
// 🔧 手术申请单：跳过普通医嘱生成，只由 isProcedure 块生成手术医嘱，避免重复
|
||||
boolean isSurgeryRequest = ActivityDefCategory.PROCEDURE.getCode().equals(typeCode);
|
||||
if (!isSurgeryRequest) {
|
||||
for (ActivitySaveDto activitySaveDto : activityList) {
|
||||
serviceRequest = new ServiceRequest();
|
||||
serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());
|
||||
serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
|
||||
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
serviceRequest.setPrescriptionNo(prescriptionNo);
|
||||
serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());// 治疗类型
|
||||
serviceRequest.setQuantity(activitySaveDto.getQuantity()); // 请求数量
|
||||
serviceRequest.setUnitCode(activitySaveDto.getUnitCode()); // 请求单位编码
|
||||
serviceRequest.setCategoryEnum(categoryEnum); // 请求类型
|
||||
serviceRequest.setActivityId(activitySaveDto.getAdviceDefinitionId());// 诊疗定义id
|
||||
serviceRequest.setPatientId(patientId); // 患者
|
||||
serviceRequest.setRequesterId(practitionerId); // 开方医生
|
||||
serviceRequest.setEncounterId(encounterId); // 就诊id
|
||||
serviceRequest.setAuthoredTime(curDate); // 请求签发时间
|
||||
for (ActivitySaveDto activitySaveDto : activityList) {
|
||||
serviceRequest = new ServiceRequest();
|
||||
serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());
|
||||
serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
|
||||
serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
serviceRequest.setPrescriptionNo(prescriptionNo);
|
||||
serviceRequest.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue());// 治疗类型
|
||||
serviceRequest.setQuantity(activitySaveDto.getQuantity()); // 请求数量
|
||||
serviceRequest.setUnitCode(activitySaveDto.getUnitCode()); // 请求单位编码
|
||||
serviceRequest.setCategoryEnum(categoryEnum); // 请求类型
|
||||
serviceRequest.setActivityId(activitySaveDto.getAdviceDefinitionId());// 诊疗定义id
|
||||
serviceRequest.setPatientId(patientId); // 患者
|
||||
serviceRequest.setRequesterId(practitionerId); // 开方医生
|
||||
serviceRequest.setEncounterId(encounterId); // 就诊id
|
||||
serviceRequest.setAuthoredTime(curDate); // 请求签发时间
|
||||
|
||||
Long positionId = activityIdToPositionIdMap.get(activitySaveDto.getAdviceDefinitionId());
|
||||
if (positionId == null) {
|
||||
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
|
||||
}
|
||||
serviceRequest.setOrgId(positionId); // 执行科室
|
||||
Long positionId = activityIdToPositionIdMap.get(activitySaveDto.getAdviceDefinitionId());
|
||||
if (positionId == null) {
|
||||
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
|
||||
}
|
||||
serviceRequest.setOrgId(positionId); // 执行科室
|
||||
|
||||
serviceRequest.setYbClassEnum(activitySaveDto.getYbClassEnum());// 类别医保编码
|
||||
serviceRequest.setConditionId(activitySaveDto.getConditionId()); // 诊断id
|
||||
serviceRequest.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
|
||||
iServiceRequestService.save(serviceRequest);
|
||||
serviceRequest.setYbClassEnum(activitySaveDto.getYbClassEnum());// 类别医保编码
|
||||
serviceRequest.setConditionId(activitySaveDto.getConditionId()); // 诊断id
|
||||
serviceRequest.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
|
||||
iServiceRequestService.save(serviceRequest);
|
||||
|
||||
chargeItem = new ChargeItem();
|
||||
chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
|
||||
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
|
||||
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setPatientId(patientId); // 患者
|
||||
chargeItem.setContextEnum(activitySaveDto.getAdviceType()); // 类型
|
||||
chargeItem.setEncounterId(encounterId); // 就诊id
|
||||
chargeItem.setDefinitionId(activitySaveDto.getDefinitionId()); // 费用定价ID
|
||||
chargeItem.setDefDetailId(activitySaveDto.getDefinitionDetailId()); // 定价子表主键
|
||||
chargeItem.setEntererId(practitionerId);// 开立人ID
|
||||
chargeItem.setEnteredDate(curDate); // 开立时间
|
||||
chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
|
||||
chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
|
||||
chargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);// 产品所在表
|
||||
chargeItem.setProductId(activitySaveDto.getAdviceDefinitionId());// 收费项id
|
||||
chargeItem.setAccountId(activitySaveDto.getAccountId());// 关联账户ID
|
||||
chargeItem.setRequestingOrgId(orgId); // 开立科室
|
||||
chargeItem.setConditionId(activitySaveDto.getConditionId()); // 诊断id
|
||||
chargeItem.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
|
||||
chargeItem.setQuantityValue(activitySaveDto.getQuantity()); // 数量
|
||||
chargeItem.setQuantityUnit(activitySaveDto.getUnitCode()); // 单位
|
||||
chargeItem.setUnitPrice(activitySaveDto.getUnitPrice()); // 单价
|
||||
chargeItem.setTotalPrice(activitySaveDto.getTotalPrice()); // 总价
|
||||
iChargeItemService.save(chargeItem);
|
||||
chargeItem = new ChargeItem();
|
||||
chargeItem.setStatusEnum(ChargeItemStatus.DRAFT.getValue()); // 收费状态
|
||||
chargeItem.setBusNo(AssignSeqEnum.CHARGE_ITEM_NO.getPrefix().concat(serviceRequest.getBusNo()));
|
||||
chargeItem.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
|
||||
chargeItem.setPatientId(patientId); // 患者
|
||||
chargeItem.setContextEnum(activitySaveDto.getAdviceType()); // 类型
|
||||
chargeItem.setEncounterId(encounterId); // 就诊id
|
||||
chargeItem.setDefinitionId(activitySaveDto.getDefinitionId()); // 费用定价ID
|
||||
chargeItem.setDefDetailId(activitySaveDto.getDefinitionDetailId()); // 定价子表主键
|
||||
chargeItem.setEntererId(practitionerId);// 开立人ID
|
||||
chargeItem.setEnteredDate(curDate); // 开立时间
|
||||
chargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);// 医疗服务类型
|
||||
chargeItem.setServiceId(serviceRequest.getId()); // 医疗服务ID
|
||||
chargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);// 产品所在表
|
||||
chargeItem.setProductId(activitySaveDto.getAdviceDefinitionId());// 收费项id
|
||||
chargeItem.setAccountId(activitySaveDto.getAccountId());// 关联账户ID
|
||||
chargeItem.setRequestingOrgId(orgId); // 开立科室
|
||||
chargeItem.setConditionId(activitySaveDto.getConditionId()); // 诊断id
|
||||
chargeItem.setEncounterDiagnosisId(activitySaveDto.getEncounterDiagnosisId()); // 就诊诊断id
|
||||
chargeItem.setQuantityValue(activitySaveDto.getQuantity()); // 数量
|
||||
chargeItem.setQuantityUnit(activitySaveDto.getUnitCode()); // 单位
|
||||
chargeItem.setUnitPrice(activitySaveDto.getUnitPrice()); // 单价
|
||||
chargeItem.setTotalPrice(activitySaveDto.getTotalPrice()); // 总价
|
||||
iChargeItemService.save(chargeItem);
|
||||
|
||||
// 处理诊疗套餐的子项信息
|
||||
ActivityDefinition activityDefinition =
|
||||
iActivityDefinitionService.getById(activitySaveDto.getAdviceDefinitionId());
|
||||
String childrenJson = activityDefinition.getChildrenJson();
|
||||
if (childrenJson != null) {
|
||||
// 诊疗子项参数类
|
||||
ActivityChildrenJsonParams activityChildrenJsonParams = new ActivityChildrenJsonParams();
|
||||
activityChildrenJsonParams.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue()); // 治疗类型
|
||||
activityChildrenJsonParams.setPatientId(serviceRequest.getPatientId()); // 患者
|
||||
activityChildrenJsonParams.setEncounterId(serviceRequest.getEncounterId()); // 就诊id
|
||||
activityChildrenJsonParams.setAccountId(chargeItem.getAccountId()); // 账户id
|
||||
activityChildrenJsonParams.setChargeItemId(chargeItem.getId()); // 费用项id
|
||||
activityChildrenJsonParams.setParentId(serviceRequest.getId());// 子项诊疗的父id
|
||||
activityChildrenJsonParams.setEncounterDiagnosisId(serviceRequest.getEncounterDiagnosisId());
|
||||
adviceUtils.handleActivityChild(childrenJson, organizationId, activityChildrenJsonParams);
|
||||
}
|
||||
// 处理诊疗套餐的子项信息
|
||||
ActivityDefinition activityDefinition =
|
||||
iActivityDefinitionService.getById(activitySaveDto.getAdviceDefinitionId());
|
||||
String childrenJson = activityDefinition.getChildrenJson();
|
||||
if (childrenJson != null) {
|
||||
// 诊疗子项参数类
|
||||
ActivityChildrenJsonParams activityChildrenJsonParams = new ActivityChildrenJsonParams();
|
||||
activityChildrenJsonParams.setTherapyEnum(TherapyTimeType.TEMPORARY.getValue()); // 治疗类型
|
||||
activityChildrenJsonParams.setPatientId(serviceRequest.getPatientId()); // 患者
|
||||
activityChildrenJsonParams.setEncounterId(serviceRequest.getEncounterId()); // 就诊id
|
||||
activityChildrenJsonParams.setAccountId(chargeItem.getAccountId()); // 账户id
|
||||
activityChildrenJsonParams.setChargeItemId(chargeItem.getId()); // 费用项id
|
||||
activityChildrenJsonParams.setParentId(serviceRequest.getId());// 子项诊疗的父id
|
||||
activityChildrenJsonParams.setEncounterDiagnosisId(serviceRequest.getEncounterDiagnosisId());
|
||||
adviceUtils.handleActivityChild(childrenJson, organizationId, activityChildrenJsonParams);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -322,13 +326,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
} else if (surgeryName != null && !surgeryName.isEmpty()) {
|
||||
contentMap.put("surgeryName", surgeryName);
|
||||
}
|
||||
// 🔧 手术申请单级联删除：contentJson 中记录 requestFormId 和 prescriptionNo，删除医嘱时可定位并作废申请单
|
||||
if (requestForm.getId() != null) {
|
||||
contentMap.put("requestFormId", String.valueOf(requestForm.getId()));
|
||||
}
|
||||
if (prescriptionNo != null && !prescriptionNo.isEmpty()) {
|
||||
contentMap.put("prescriptionNo", prescriptionNo);
|
||||
}
|
||||
if (surgeryCode != null && !surgeryCode.isEmpty()) {
|
||||
contentMap.put("surgeryCode", surgeryCode);
|
||||
}
|
||||
@@ -371,10 +368,9 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
surgeryChargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);
|
||||
surgeryChargeItem.setServiceId(surgeryServiceRequest.getId());
|
||||
surgeryChargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
|
||||
// 优先从 activityList 获取 productId 和 definitionId
|
||||
// 优先从 activityList 获取 productId
|
||||
if (activityList != null && !activityList.isEmpty()) {
|
||||
surgeryChargeItem.setProductId(activityList.get(0).getAdviceDefinitionId());
|
||||
surgeryChargeItem.setDefinitionId(activityList.get(0).getDefinitionId());
|
||||
surgeryChargeItem.setAccountId(activityList.get(0).getAccountId());
|
||||
}
|
||||
surgeryChargeItem.setRequestingOrgId(orgId);
|
||||
@@ -413,10 +409,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
anesthesiaChargeItem.setServiceTable(CommonConstants.TableName.WOR_SERVICE_REQUEST);
|
||||
anesthesiaChargeItem.setServiceId(surgeryServiceRequest.getId());
|
||||
anesthesiaChargeItem.setProductTable(CommonConstants.TableName.WOR_ACTIVITY_DEFINITION);
|
||||
// 从 activityList 获取 definitionId
|
||||
if (activityList != null && !activityList.isEmpty()) {
|
||||
anesthesiaChargeItem.setDefinitionId(activityList.get(0).getDefinitionId());
|
||||
}
|
||||
anesthesiaChargeItem.setRequestingOrgId(orgId);
|
||||
anesthesiaChargeItem.setQuantityValue(BigDecimal.valueOf(1));
|
||||
anesthesiaChargeItem.setQuantityUnit("次");
|
||||
@@ -433,18 +425,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
|
||||
log.error("生成手术医嘱过程中发生异常", e);
|
||||
throw e;
|
||||
}
|
||||
// 将手术项目名称写入申请单name字段，确保医嘱删除后申请单仍保留正确名称
|
||||
if (activityList != null && !activityList.isEmpty()) {
|
||||
String surgeryDisplayName = activityList.stream()
|
||||
.map(ActivitySaveDto::getAdviceDefinitionName)
|
||||
.filter(name -> name != null && !name.isEmpty())
|
||||
.distinct()
|
||||
.collect(Collectors.joining("、"));
|
||||
if (!surgeryDisplayName.isEmpty()) {
|
||||
requestForm.setName(surgeryDisplayName);
|
||||
iRequestFormService.updateById(requestForm);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log.info("不是手术申请单，跳过手术医嘱生成，typeCode={}", typeCode);
|
||||
}
|
||||
|
||||
@@ -13,11 +13,6 @@ import java.math.BigDecimal;
|
||||
@Accessors(chain = true)
|
||||
public class RequestFormDetailQueryDto {
|
||||
|
||||
/**
|
||||
* 诊疗活动定义ID（wor_service_request.activity_id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显）
|
||||
*/
|
||||
private Long activityId;
|
||||
|
||||
/** 医嘱名称 */
|
||||
private String adviceName;
|
||||
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
)
|
||||
</if>
|
||||
<if test="searchKey != null and searchKey != ''">
|
||||
AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%')
|
||||
AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
|
||||
</if>
|
||||
<if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
|
||||
AND t1.id IN
|
||||
@@ -181,7 +181,7 @@
|
||||
WHERE t1.delete_flag = '0'
|
||||
AND t1.status_enum = #{statusEnum}
|
||||
<if test="searchKey != null and searchKey != ''">
|
||||
AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%')
|
||||
AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
|
||||
</if>
|
||||
<if test="categoryCode != null and categoryCode != ''">
|
||||
AND t1.category_code = #{categoryCode}
|
||||
@@ -278,7 +278,7 @@
|
||||
AND T1.category_code != '手术' AND T1.category_code != '24'
|
||||
</if>
|
||||
<if test="searchKey != null and searchKey != ''">
|
||||
AND (t1.name ILIKE '%' || '${searchKey}' || '%' OR t1.py_str ILIKE '%' || '${searchKey}' || '%')
|
||||
AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
|
||||
</if>
|
||||
<if test="categoryCode != null and categoryCode != ''">
|
||||
AND t1.category_code = #{categoryCode}
|
||||
@@ -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,
|
||||
@@ -871,9 +812,8 @@
|
||||
</select>
|
||||
|
||||
<!-- 手术项目专用分页查询：仅查手术 + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
|
||||
<!-- 使用 LIMIT/OFFSET 直接查询，避免 MyBatis Plus 分页插件的 COUNT 开销 -->
|
||||
<select id="getSurgeryPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
|
||||
SELECT DISTINCT ON (t1.ID)
|
||||
SELECT
|
||||
t1.ID AS advice_definition_id,
|
||||
t1.NAME AS advice_name,
|
||||
t1.org_id AS org_id,
|
||||
@@ -893,17 +833,15 @@
|
||||
<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 #{limit} OFFSET #{offset}
|
||||
ORDER BY t1.name ASC
|
||||
</select>
|
||||
|
||||
<!-- 检查项目专用分页查询：仅查检查(23) + 定价，无库存/草稿库存/取药科室等无关逻辑 -->
|
||||
<select id="getExaminationPage" resultType="com.openhis.web.doctorstation.dto.SurgeryItemDto">
|
||||
SELECT DISTINCT ON (t1.ID)
|
||||
SELECT
|
||||
t1.ID AS advice_definition_id,
|
||||
t1.NAME AS advice_name,
|
||||
t1.org_id AS org_id,
|
||||
t3.name AS org_name,
|
||||
t1.org_id AS position_id,
|
||||
t2.ID AS charge_item_definition_id,
|
||||
t2.price AS price,
|
||||
@@ -915,15 +853,12 @@
|
||||
AND t2.delete_flag = '0'
|
||||
AND t2.status_enum = #{statusEnum}
|
||||
AND t2.instance_table = 'wor_activity_definition'
|
||||
LEFT JOIN adm_organization t3
|
||||
ON t3.id = t1.org_id
|
||||
AND t3.delete_flag = '0'
|
||||
WHERE t1.delete_flag = '0'
|
||||
AND t1.category_code = '23'
|
||||
<if test="searchKey != null and searchKey != ''">
|
||||
AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')
|
||||
</if>
|
||||
ORDER BY t1.ID, t1.name ASC, t2.ID ASC
|
||||
ORDER BY t1.name ASC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -135,7 +135,6 @@
|
||||
T1.onset_date AS onsetDate,
|
||||
T1.diagnosis_time AS diagnosisTime,
|
||||
T1.doctor AS diagnosisDoctor,
|
||||
T1.long_term_flag AS longTermFlag,
|
||||
CASE WHEN EXISTS (
|
||||
SELECT 1 FROM infectious_card T4
|
||||
WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1
|
||||
|
||||
@@ -5,85 +5,73 @@
|
||||
<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,
|
||||
COALESCE(
|
||||
(SELECT STRING_AGG(DISTINCT wad.name, '、')
|
||||
FROM wor_service_request wsr2
|
||||
LEFT JOIN wor_activity_definition wad ON wad.id = wsr2.activity_id AND wad.delete_flag = '0'
|
||||
WHERE wsr2.prescription_no = drf.prescription_no AND wsr2.delete_flag = '0'),
|
||||
drf.name
|
||||
) AS name,
|
||||
drf.desc_json,
|
||||
drf.requester_id,
|
||||
drf.create_time,
|
||||
ap.NAME AS patient_name,
|
||||
CASE
|
||||
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
|
||||
FROM doc_request_form AS drf
|
||||
LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
|
||||
AND ae.delete_flag = '0'
|
||||
LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
|
||||
AND ap.delete_flag = '0'
|
||||
WHERE drf.delete_flag = '0'
|
||||
AND drf.encounter_id = #{encounterId}
|
||||
AND drf.type_code = #{typeCode}
|
||||
<if test="startDate != null and startDate != ''">
|
||||
AND drf.create_time >= #{startDate}::date
|
||||
</if>
|
||||
<if test="endDate != null and endDate != ''">
|
||||
AND drf.create_time <= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
|
||||
</if>
|
||||
<if test="keyword != null and keyword != ''">
|
||||
AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
|
||||
OR EXISTS (
|
||||
SELECT 1 FROM wor_service_request wsr2
|
||||
WHERE wsr2.prescription_no = drf.prescription_no
|
||||
AND wsr2.delete_flag = '0'
|
||||
AND wsr2.activity_id IN (
|
||||
SELECT id FROM wor_activity_definition wad
|
||||
WHERE wad.delete_flag = '0'
|
||||
AND wad.name ILIKE '%' || #{keyword} || '%'
|
||||
)
|
||||
))
|
||||
</if>
|
||||
) sub
|
||||
<if test="status != null and status != ''">
|
||||
WHERE sub.computed_status = #{status}::integer
|
||||
</if>
|
||||
ORDER BY sub.create_time DESC
|
||||
SELECT drf.id AS request_form_id,
|
||||
drf.encounter_id,
|
||||
drf.prescription_no,
|
||||
COALESCE(
|
||||
(SELECT STRING_AGG(DISTINCT wad.name, '、')
|
||||
FROM wor_service_request wsr2
|
||||
LEFT JOIN wor_activity_definition wad ON wad.id = wsr2.activity_id AND wad.delete_flag = '0'
|
||||
WHERE wsr2.prescription_no = drf.prescription_no AND wsr2.delete_flag = '0'),
|
||||
drf.name
|
||||
) AS name,
|
||||
drf.desc_json,
|
||||
drf.requester_id,
|
||||
drf.create_time,
|
||||
ap.NAME AS patient_name,
|
||||
CASE
|
||||
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'
|
||||
LEFT JOIN adm_patient AS ap ON ap.ID = ae.patient_id
|
||||
AND ap.delete_flag = '0'
|
||||
LEFT JOIN wor_service_request AS wsr ON wsr.prescription_no = drf.prescription_no
|
||||
AND wsr.delete_flag = '0'
|
||||
WHERE drf.delete_flag = '0'
|
||||
AND drf.encounter_id = #{encounterId}
|
||||
AND drf.type_code = #{typeCode}
|
||||
<if test="startDate != null and startDate != ''">
|
||||
AND drf.create_time >= #{startDate}::date
|
||||
</if>
|
||||
<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 (
|
||||
SELECT 1 FROM wor_service_request wsr2
|
||||
WHERE wsr2.prescription_no = drf.prescription_no
|
||||
AND wsr2.delete_flag = '0'
|
||||
AND wsr2.activity_id IN (
|
||||
SELECT id FROM wor_activity_definition wad
|
||||
WHERE wad.delete_flag = '0'
|
||||
AND wad.name ILIKE '%' || #{keyword} || '%'
|
||||
)
|
||||
))
|
||||
</if>
|
||||
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">
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -768,4 +768,36 @@ public class CommonConstants {
|
||||
Integer ACCOUNT_DEVICE_TYPE = 6;
|
||||
}
|
||||
|
||||
/**
|
||||
* 号源槽位状态 (adm_schedule_slot.status)
|
||||
*/
|
||||
public interface SlotStatus {
|
||||
/** 可用 / 待预约 */
|
||||
Integer AVAILABLE = 0;
|
||||
/** 已预约 */
|
||||
Integer BOOKED = 1;
|
||||
/** 已取消 / 已停诊 */
|
||||
Integer CANCELLED = 2;
|
||||
/** 已签到 / 已取号 */
|
||||
Integer CHECKED_IN = 3;
|
||||
/** 已锁定 */
|
||||
Integer LOCKED = 4;
|
||||
/** 已退号 */
|
||||
Integer RETURNED = 5;
|
||||
}
|
||||
|
||||
/**
|
||||
* 预约订单状态 (order_main.status)
|
||||
*/
|
||||
public interface AppointmentOrderStatus {
|
||||
/** 已预约 (待就诊) */
|
||||
Integer BOOKED = 1;
|
||||
/** 已取号 (已就诊) */
|
||||
Integer CHECKED_IN = 2;
|
||||
/** 已取消 */
|
||||
Integer CANCELLED = 3;
|
||||
/** 已退号 */
|
||||
Integer RETURNED = 4;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
package com.openhis.common.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* 号源槽位状态 (adm_schedule_slot.status)
|
||||
*
|
||||
* <pre>
|
||||
* 状态流转:
|
||||
* 预约 → 0→2 (锁定), locked_num+1
|
||||
* 取消预约 → 2→0 (释放), locked_num-1
|
||||
* 签到 → 2→1 (已约), locked_num-1, booked_num+1
|
||||
* 退号 → 1→0 (释放), booked_num-1
|
||||
* 停诊 → 任意→4 (已取消)
|
||||
* </pre>
|
||||
*
|
||||
* @author system
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum SlotStatus implements HisEnumInterface {
|
||||
|
||||
/** 可用 / 待预约 */
|
||||
AVAILABLE(0, "available", "可用"),
|
||||
|
||||
/** 已预约 */
|
||||
BOOKED(1, "booked", "已预约"),
|
||||
|
||||
/** 已锁定 (约而不付：预约后锁定号源) */
|
||||
LOCKED(2, "locked", "已锁定"),
|
||||
|
||||
/** 已签到 / 已取号 */
|
||||
CHECKED_IN(3, "checked_in", "已签到"),
|
||||
|
||||
/** 已取消 / 已停诊 */
|
||||
CANCELLED(4, "cancelled", "已取消"),
|
||||
|
||||
/** 已退号 */
|
||||
RETURNED(5, "returned", "已退号");
|
||||
|
||||
private final Integer value;
|
||||
private final String code;
|
||||
private final String info;
|
||||
|
||||
public static SlotStatus getByValue(Integer value) {
|
||||
if (value == null) {
|
||||
return null;
|
||||
}
|
||||
for (SlotStatus val : values()) {
|
||||
if (val.getValue().equals(value)) {
|
||||
return val;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -36,14 +36,6 @@ public interface IOrganizationLocationService extends IService<OrganizationLocat
|
||||
* @param activityDefinitionId 诊疗定义id
|
||||
* @return 诊疗的执行科室列表
|
||||
*/
|
||||
List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long organizationId, Long activityDefinitionId);
|
||||
|
||||
/**
|
||||
* 根据诊疗定义id查询所有执行科室列表（跨科室）
|
||||
*
|
||||
* @param activityDefinitionId 诊疗定义id
|
||||
* @return 执行科室列表
|
||||
*/
|
||||
List<OrganizationLocation> getOrgLocListByActivityDefinitionId(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,25 +53,11 @@ public class OrganizationLocationServiceImpl extends ServiceImpl<OrganizationLoc
|
||||
/**
|
||||
* 查询诊疗的执行科室列表
|
||||
*
|
||||
* @param organizationId 机构id
|
||||
* @param activityDefinitionId 诊疗定义id
|
||||
* @return 诊疗的执行科室列表
|
||||
*/
|
||||
@Override
|
||||
public List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long organizationId, Long activityDefinitionId) {
|
||||
return baseMapper.selectList(new LambdaQueryWrapper<OrganizationLocation>()
|
||||
.eq(OrganizationLocation::getOrganizationId, organizationId)
|
||||
.eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据诊疗定义id查询所有执行科室列表（跨科室）
|
||||
*
|
||||
* @param activityDefinitionId 诊疗定义id
|
||||
* @return 执行科室列表
|
||||
*/
|
||||
@Override
|
||||
public List<OrganizationLocation> getOrgLocListByActivityDefinitionId(Long activityDefinitionId) {
|
||||
public List<OrganizationLocation> getOrgLocListByOrgIdAndActivityDefinitionId(Long activityDefinitionId) {
|
||||
return baseMapper.selectList(new LambdaQueryWrapper<OrganizationLocation>()
|
||||
.eq(OrganizationLocation::getActivityDefinitionId, activityDefinitionId));
|
||||
}
|
||||
|
||||
@@ -10,11 +10,10 @@ import org.springframework.stereotype.Repository;
|
||||
public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
|
||||
|
||||
/**
|
||||
* 按号源池实时重算统计值。
|
||||
* 按号源池实时重算统计值，避免并发场景下计数漂移。
|
||||
*
|
||||
* @param poolId 号源池ID
|
||||
* @param bookedStatus 已约状态值，由 SlotStatus.BOOKED.getValue() 传入
|
||||
* @param lockedStatus 锁定状态值，由 SlotStatus.LOCKED.getValue() 传入
|
||||
* 说明：available_num 在当前项目中可能为数据库生成列，因此这里仅维护
|
||||
* booked_num / locked_num，剩余号由数据库或查询逻辑计算。
|
||||
*/
|
||||
@Update("""
|
||||
UPDATE adm_schedule_pool p
|
||||
@@ -24,22 +23,20 @@ public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
|
||||
FROM adm_schedule_slot s
|
||||
WHERE s.pool_id = p.id
|
||||
AND s.delete_flag = '0'
|
||||
AND s.status = #{bookedStatus}
|
||||
AND s.status = 1
|
||||
), 0),
|
||||
locked_num = COALESCE((
|
||||
SELECT COUNT(1)
|
||||
FROM adm_schedule_slot s
|
||||
WHERE s.pool_id = p.id
|
||||
AND s.delete_flag = '0'
|
||||
AND s.status = #{lockedStatus}
|
||||
AND s.status = 3
|
||||
), 0),
|
||||
update_time = now()
|
||||
WHERE p.id = #{poolId}
|
||||
AND p.delete_flag = '0'
|
||||
""")
|
||||
int refreshPoolStats(@Param("poolId") Long poolId,
|
||||
@Param("bookedStatus") Integer bookedStatus,
|
||||
@Param("lockedStatus") Integer lockedStatus);
|
||||
int refreshPoolStats(@Param("poolId") Long poolId);
|
||||
|
||||
/**
|
||||
* 签到时更新号源池统计：锁定数-1，已预约数+1
|
||||
|
||||
@@ -22,12 +22,9 @@ public interface ScheduleSlotMapper extends BaseMapper<ScheduleSlot> {
|
||||
TicketSlotDTO selectTicketSlotById(@Param("id") Long id);
|
||||
|
||||
/**
|
||||
* 原子抢占槽位：仅当当前状态=0(待约)时，更新为目标锁定状态。
|
||||
*
|
||||
* @param slotId 槽位ID
|
||||
* @param lockedStatus 锁定状态值，由 SlotStatus.LOCKED.getValue() 传入
|
||||
* 原子抢占槽位：仅当当前状态=0(可用)时，更新为1(已预约)。
|
||||
*/
|
||||
int lockSlotForBooking(@Param("slotId") Long slotId, @Param("lockedStatus") Integer lockedStatus);
|
||||
int lockSlotForBooking(@Param("slotId") Long slotId);
|
||||
|
||||
/**
|
||||
* 按主键更新槽位状态。
|
||||
@@ -37,16 +34,12 @@ public interface ScheduleSlotMapper extends BaseMapper<ScheduleSlot> {
|
||||
/**
|
||||
* 更新槽位状态并记录签到时间
|
||||
*
|
||||
* @param slotId 槽位ID
|
||||
* @param status 目标状态，由 SlotStatus.BOOKED.getValue() 传入
|
||||
* @param checkInTime 签到时间
|
||||
* @param requiredStatus 前置状态，由 SlotStatus.LOCKED.getValue() 传入
|
||||
* @param slotId 槽位ID
|
||||
* @param status 状态
|
||||
* @param checkInTime 签到时间
|
||||
* @return 结果
|
||||
*/
|
||||
int updateSlotStatusAndCheckInTime(@Param("slotId") Long slotId,
|
||||
@Param("status") Integer status,
|
||||
@Param("checkInTime") Date checkInTime,
|
||||
@Param("requiredStatus") Integer requiredStatus);
|
||||
int updateSlotStatusAndCheckInTime(@Param("slotId") Long slotId, @Param("status") Integer status, @Param("checkInTime") Date checkInTime);
|
||||
|
||||
/**
|
||||
* 根据槽位ID查询所属号源池ID。
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
package com.openhis.clinical.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.openhis.appointmentmanage.domain.AppointmentConfig;
|
||||
import com.openhis.appointmentmanage.service.IAppointmentConfigService;
|
||||
import com.openhis.appointmentmanage.domain.TicketSlotDTO;
|
||||
import com.openhis.appointmentmanage.domain.SchedulePool;
|
||||
import com.openhis.appointmentmanage.domain.ScheduleSlot;
|
||||
import com.openhis.appointmentmanage.mapper.SchedulePoolMapper;
|
||||
import com.openhis.appointmentmanage.mapper.ScheduleSlotMapper;
|
||||
@@ -15,7 +13,7 @@ import com.openhis.clinical.domain.Ticket;
|
||||
import com.openhis.clinical.mapper.TicketMapper;
|
||||
import com.openhis.clinical.service.IOrderService;
|
||||
import com.openhis.clinical.service.ITicketService;
|
||||
import com.openhis.common.enums.SlotStatus;
|
||||
import com.openhis.common.constant.CommonConstants.SlotStatus;
|
||||
import com.openhis.common.enums.OrderStatus;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -179,7 +177,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
logger.error("安全拦截：号源底库核对失败，slotId: {}", slotId);
|
||||
throw new RuntimeException("号源数据不存在");
|
||||
}
|
||||
if (slot.getSlotStatus() != null && SlotStatus.getByValue(slot.getSlotStatus()) != SlotStatus.AVAILABLE) {
|
||||
if (slot.getSlotStatus() != null && !SlotStatus.AVAILABLE.equals(slot.getSlotStatus())) {
|
||||
throw new RuntimeException("手慢了！该号源已刚刚被他人抢占");
|
||||
}
|
||||
if (Boolean.TRUE.equals(slot.getIsStopped())) {
|
||||
@@ -207,7 +205,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
}
|
||||
|
||||
// 原子抢占：避免并发下同一槽位被重复预约
|
||||
int lockRows = scheduleSlotMapper.lockSlotForBooking(slotId, SlotStatus.LOCKED.getValue());
|
||||
int lockRows = scheduleSlotMapper.lockSlotForBooking(slotId);
|
||||
if (lockRows <= 0) {
|
||||
throw new RuntimeException("手慢了！该号源已刚刚被他人抢占");
|
||||
}
|
||||
@@ -262,15 +260,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
throw new RuntimeException("预约成功但号源回填订单失败，请重试");
|
||||
}
|
||||
|
||||
// 6. 预约成功后 locked_num+1（原子递增替代全量 recount，避免并发计数漂移）
|
||||
Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
|
||||
if (poolId != null) {
|
||||
schedulePoolMapper.update(null,
|
||||
new LambdaUpdateWrapper<SchedulePool>()
|
||||
.setSql("locked_num = locked_num + 1, version = version + 1")
|
||||
.set(SchedulePool::getUpdateTime, new Date())
|
||||
.eq(SchedulePool::getId, poolId));
|
||||
}
|
||||
refreshPoolStatsBySlotId(slotId);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -287,8 +277,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
if (slot == null) {
|
||||
throw new RuntimeException("号源槽位不存在");
|
||||
}
|
||||
// 只有锁定态(2)的号源可以取消预约
|
||||
if (slot.getSlotStatus() == null || SlotStatus.getByValue(slot.getSlotStatus()) != SlotStatus.LOCKED) {
|
||||
if (slot.getSlotStatus() == null || !SlotStatus.BOOKED.equals(slot.getSlotStatus())) {
|
||||
throw new RuntimeException("号源不可取消预约");
|
||||
}
|
||||
|
||||
@@ -303,7 +292,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
orderService.cancelAppointmentOrder(order.getId(), "患者取消预约");
|
||||
}
|
||||
|
||||
int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.AVAILABLE.getValue());
|
||||
int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.AVAILABLE);
|
||||
if (updated > 0) {
|
||||
refreshPoolStatsBySlotId(slotId);
|
||||
}
|
||||
@@ -329,14 +318,11 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
orderService.updateOrderStatusById(latestOrder.getId(), OrderStatus.ACTIVE.getValue());
|
||||
orderMapper.updatePayStatus(latestOrder.getId(), 1, new Date());
|
||||
|
||||
// 2. 只有锁定态(2)的号源才能签到，签到时 2→1(LOCKED→BOOKED)
|
||||
// 2. 查询号源槽位信息
|
||||
ScheduleSlot slot = scheduleSlotMapper.selectById(slotId);
|
||||
if (slot == null || !SlotStatus.LOCKED.getValue().equals(slot.getStatus())) {
|
||||
throw new RuntimeException("号源状态异常，无法签到");
|
||||
}
|
||||
|
||||
// 3. 更新号源槽位状态 2→1（LOCKED→BOOKED，已预约=已签到）
|
||||
scheduleSlotMapper.updateSlotStatusAndCheckInTime(slotId, SlotStatus.BOOKED.getValue(), new Date(), SlotStatus.LOCKED.getValue());
|
||||
// 3. 更新号源槽位状态为已签到，记录签到时间
|
||||
scheduleSlotMapper.updateSlotStatusAndCheckInTime(slotId, SlotStatus.CHECKED_IN, new Date());
|
||||
|
||||
// 4. 更新号源池统计：锁定数-1，已预约数+1
|
||||
if (slot != null && slot.getPoolId() != null) {
|
||||
@@ -365,7 +351,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
orderService.cancelAppointmentOrder(order.getId(), "医生停诊");
|
||||
}
|
||||
|
||||
int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.CANCELLED.getValue());
|
||||
int updated = scheduleSlotMapper.updateSlotStatus(slotId, SlotStatus.CANCELLED);
|
||||
if (updated > 0) {
|
||||
refreshPoolStatsBySlotId(slotId);
|
||||
}
|
||||
@@ -378,7 +364,7 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
|
||||
private void refreshPoolStatsBySlotId(Long slotId) {
|
||||
Long poolId = scheduleSlotMapper.selectPoolIdBySlotId(slotId);
|
||||
if (poolId != null) {
|
||||
schedulePoolMapper.refreshPoolStats(poolId, SlotStatus.BOOKED.getValue(), SlotStatus.LOCKED.getValue());
|
||||
schedulePoolMapper.refreshPoolStats(poolId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -59,9 +59,4 @@ public class RequestForm extends HisBaseEntity {
|
||||
*/
|
||||
private String typeCode;
|
||||
|
||||
/**
|
||||
* 单据状态 0=待签发 1=已签发 2=已校对 3=待接收 4=已接收 5=已检查 6=已出报告 7=已作废
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
}
|
||||
@@ -4,17 +4,14 @@
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.openhis.appointmentmanage.mapper.ScheduleSlotMapper">
|
||||
|
||||
<!--
|
||||
统一状态值映射: DB 数值 → 规范化输出
|
||||
0=待约 1=已约(签到后) 2=锁定(预约后) 3=已签到 4=已停诊 5=已退号
|
||||
-->
|
||||
<!-- 统一状态值（兼容数字/英文字符串存储），输出 Integer，避免 resultType 映射 NumberFormatException -->
|
||||
<sql id="slotStatusNormExpr">
|
||||
CASE
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('0', 'unbooked', 'available') THEN 0
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('1', 'booked') THEN 1
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('2', 'locked') THEN 2
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('2', 'cancelled', 'canceled', 'stopped') THEN 2
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('3', 'checked', 'checked_in', 'checkin') THEN 3
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('4', 'cancelled', 'canceled', 'stopped') THEN 4
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('4', 'locked') THEN 4
|
||||
WHEN LOWER(CONCAT('', s.status)) IN ('5', 'returned') THEN 5
|
||||
ELSE NULL
|
||||
END
|
||||
@@ -34,9 +31,9 @@
|
||||
CASE
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('0', 'unbooked', 'available') THEN 0
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('1', 'booked') THEN 1
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('2', 'locked') THEN 2
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('2', 'cancelled', 'canceled', 'stopped') THEN 2
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('3', 'checked', 'checked_in', 'checkin') THEN 3
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('4', 'cancelled', 'canceled', 'stopped') THEN 4
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('4', 'locked') THEN 4
|
||||
WHEN LOWER(CONCAT('', p.status)) IN ('5', 'returned') THEN 5
|
||||
ELSE NULL
|
||||
END
|
||||
@@ -152,11 +149,10 @@
|
||||
s.id = #{id}
|
||||
</select>
|
||||
|
||||
<!-- 预约锁定: 0→#{lockedStatus} (AVAILABLE→LOCKED)，由枚举传入 -->
|
||||
<update id="lockSlotForBooking">
|
||||
UPDATE adm_schedule_slot
|
||||
SET
|
||||
status = #{lockedStatus},
|
||||
status = 1,
|
||||
update_time = now()
|
||||
WHERE
|
||||
id = #{slotId}
|
||||
@@ -178,7 +174,6 @@
|
||||
AND delete_flag = '0'
|
||||
</update>
|
||||
|
||||
<!-- 签到: #{requiredStatus}→#{status} (LOCKED→BOOKED)，前置条件由枚举传入 -->
|
||||
<update id="updateSlotStatusAndCheckInTime">
|
||||
UPDATE adm_schedule_slot
|
||||
SET
|
||||
@@ -187,7 +182,6 @@
|
||||
update_time = NOW()
|
||||
WHERE
|
||||
id = #{slotId}
|
||||
AND status = #{requiredStatus}
|
||||
AND delete_flag = '0'
|
||||
</update>
|
||||
|
||||
@@ -208,7 +202,7 @@
|
||||
update_time = now()
|
||||
WHERE
|
||||
id = #{slotId}
|
||||
AND status = 2
|
||||
AND status = 1
|
||||
AND delete_flag = '0'
|
||||
</update>
|
||||
|
||||
@@ -305,16 +299,15 @@
|
||||
<if test="query.phone != null and query.phone != ''">
|
||||
AND o.phone LIKE CONCAT('%', #{query.phone}, '%')
|
||||
</if>
|
||||
<!-- 5. 时间过滤: 仅待约(0)受时间限制，已锁定(2)/已约(1)/已签到(3)/已退号(5)不受影响 -->
|
||||
<!-- 5. 按系统时间过滤（Bug #398 #399 修复：仅未预约受时间过滤，已预约/已取号/已退号不受影响） -->
|
||||
AND (
|
||||
(<include refid="slotStatusNormExpr" /> = 0 AND (p.schedule_date > CURRENT_DATE OR (p.schedule_date = CURRENT_DATE AND (CAST(p.schedule_date AS TIMESTAMP) + CAST(s.expect_time AS TIME)) >= NOW())))
|
||||
OR <include refid="slotStatusNormExpr" /> = 1
|
||||
OR <include refid="slotStatusNormExpr" /> = 2
|
||||
OR <include refid="slotStatusNormExpr" /> = 3
|
||||
OR <include refid="slotStatusNormExpr" /> = 5
|
||||
OR <include refid="orderStatusNormExpr" /> = 4
|
||||
)
|
||||
<!-- 6. 状态筛选: unbooked(0) locked(2) booked(2) checked(1) cancelled(4) returned(5) -->
|
||||
<!-- 6. 状态过滤 -->
|
||||
<if test="query.status != null and query.status != '' and query.status != 'all'">
|
||||
<choose>
|
||||
<when test="'unbooked'.equals(query.status) or '未预约'.equals(query.status)">
|
||||
@@ -325,15 +318,7 @@
|
||||
)
|
||||
</when>
|
||||
<when test="'booked'.equals(query.status) or '已预约'.equals(query.status)">
|
||||
AND <include refid="slotStatusNormExpr" /> = 2
|
||||
AND <include refid="orderStatusNormExpr" /> = 1
|
||||
AND (
|
||||
d.is_stopped IS NULL
|
||||
OR d.is_stopped = FALSE
|
||||
)
|
||||
</when>
|
||||
<when test="'locked'.equals(query.status) or '已锁定'.equals(query.status)">
|
||||
AND <include refid="slotStatusNormExpr" /> = 2
|
||||
AND <include refid="slotStatusNormExpr" /> = 1
|
||||
AND <include refid="orderStatusNormExpr" /> = 1
|
||||
AND (
|
||||
d.is_stopped IS NULL
|
||||
@@ -341,7 +326,13 @@
|
||||
)
|
||||
</when>
|
||||
<when test="'checked'.equals(query.status) or '已取号'.equals(query.status)">
|
||||
AND <include refid="slotStatusNormExpr" /> = 1
|
||||
AND (
|
||||
<include refid="slotStatusNormExpr" /> = 3
|
||||
OR (
|
||||
<include refid="slotStatusNormExpr" /> = 1
|
||||
AND <include refid="orderStatusNormExpr" /> = 2
|
||||
)
|
||||
)
|
||||
AND (
|
||||
d.is_stopped IS NULL
|
||||
OR d.is_stopped = FALSE
|
||||
@@ -349,7 +340,7 @@
|
||||
</when>
|
||||
<when test="'cancelled'.equals(query.status) or '已停诊'.equals(query.status) or '已取消'.equals(query.status)">
|
||||
AND (
|
||||
<include refid="slotStatusNormExpr" /> = 4
|
||||
<include refid="slotStatusNormExpr" /> = 2
|
||||
OR d.is_stopped = TRUE
|
||||
)
|
||||
</when>
|
||||
|
||||
@@ -79,51 +79,6 @@ export const constantRoutes = [
|
||||
}
|
||||
]
|
||||
},
|
||||
// 住院护士站 — 快捷访问路由（与 sys_menu 中 menu_id=295 的动态路由并存，路径不同不冲突）
|
||||
{
|
||||
path: '/inpatientNurse',
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
redirect: '/inpatientNurse/inpatientNurseStation',
|
||||
children: [
|
||||
{
|
||||
path: 'inpatientNurseStation',
|
||||
component: () => import('@/views/inpatientNurse/inpatientNurseStation/index.vue'),
|
||||
name: 'InpatientNurseStation',
|
||||
meta: {title: '住院护士站'}
|
||||
},
|
||||
{
|
||||
path: 'medicalOrderExecution',
|
||||
component: () => import('@/views/inpatientNurse/medicalOrderExecution/index.vue'),
|
||||
name: 'MedicalOrderExecution',
|
||||
meta: {title: '医嘱执行'}
|
||||
},
|
||||
{
|
||||
path: 'medicalOrderProofread',
|
||||
component: () => import('@/views/inpatientNurse/medicalOrderProofread/index.vue'),
|
||||
name: 'MedicalOrderProofread',
|
||||
meta: {title: '医嘱校对'}
|
||||
},
|
||||
{
|
||||
path: 'medicineCollect',
|
||||
component: () => import('@/views/inpatientNurse/medicineCollect/index.vue'),
|
||||
name: 'MedicineCollect',
|
||||
meta: {title: '领药管理'}
|
||||
},
|
||||
{
|
||||
path: 'tprsheet',
|
||||
component: () => import('@/views/inpatientNurse/tprsheet/index.vue'),
|
||||
name: 'TprSheet',
|
||||
meta: {title: '体温单'}
|
||||
},
|
||||
{
|
||||
path: 'nursingRecord',
|
||||
component: () => import('@/views/inpatientNurse/nursingRecord/index.vue'),
|
||||
name: 'NursingRecord',
|
||||
meta: {title: '护理记录'}
|
||||
}
|
||||
]
|
||||
},
|
||||
// 添加套餐管理相关路由到公共路由，确保始终可用
|
||||
{
|
||||
path: '/maintainSystem/Inspection/PackageManagement',
|
||||
|
||||
@@ -172,12 +172,12 @@ export const SlotStatus = {
|
||||
AVAILABLE: 0,
|
||||
/** 已预约 */
|
||||
BOOKED: 1,
|
||||
/** 已锁定 */
|
||||
LOCKED: 2,
|
||||
/** 已取消 / 已停诊 */
|
||||
CANCELLED: 2,
|
||||
/** 已签到 / 已取号 */
|
||||
CHECKED_IN: 3,
|
||||
/** 已取消 / 已停诊 */
|
||||
CANCELLED: 4,
|
||||
/** 已锁定 */
|
||||
LOCKED: 4,
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -185,10 +185,10 @@ export const SlotStatus = {
|
||||
*/
|
||||
export const SlotStatusDescriptions = {
|
||||
0: '未预约',
|
||||
1: '已取号',
|
||||
2: '已锁定',
|
||||
1: '已预约',
|
||||
2: '已停诊',
|
||||
3: '已取号',
|
||||
4: '已停诊',
|
||||
4: '已锁定',
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
<select id="status-select" class="search-select" v-model="selectedStatus" @change="onSearch">
|
||||
<option value="all">全部</option>
|
||||
<option value="unbooked">未预约</option>
|
||||
<option value="locked">已锁定</option>
|
||||
<option value="booked">已预约</option>
|
||||
<option value="checked">已取号</option>
|
||||
<option value="cancelled">已停诊</option>
|
||||
@@ -254,7 +253,6 @@ import useUserStore from '@/store/modules/user';
|
||||
|
||||
const STATUS_CLASS_MAP = {
|
||||
'未预约': 'status-unbooked',
|
||||
'已锁定': 'status-locked',
|
||||
'已预约': 'status-booked',
|
||||
'已取号': 'status-checked',
|
||||
'已退号': 'status-returned',
|
||||
@@ -776,7 +774,6 @@ export default {
|
||||
// 🔧 BugFix#399: 确保已取号状态正确匹配
|
||||
const statusMap = {
|
||||
unbooked: ['未预约'],
|
||||
locked: ['已锁定'],
|
||||
booked: ['已预约'],
|
||||
checked: ['已取号', '已签到'],
|
||||
cancelled: ['已停诊', '已取消'],
|
||||
|
||||
@@ -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(); // 更新过滤
|
||||
|
||||
@@ -1685,7 +1685,7 @@ function loadCheckInPatientList() {
|
||||
const today = formatDateStr(new Date(), 'YYYY-MM-DD');
|
||||
listTicket({
|
||||
date: today,
|
||||
status: 'locked',
|
||||
status: 'booked',
|
||||
name: checkInSearchKey.value, // 支持姓名等模糊查询，后端需适配
|
||||
page: checkInPage.value,
|
||||
limit: checkInLimit.value
|
||||
|
||||
@@ -461,10 +461,6 @@ watch(
|
||||
console.log(prescriptionList.value,"prescriptionList.value")
|
||||
if(newValue&&newValue.length>0){
|
||||
let saveList = prescriptionList.value.filter((item) => {
|
||||
// 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
|
||||
if (isSurgeryChargeBillingContext()) {
|
||||
return item.check && item.statusEnum == 1
|
||||
}
|
||||
return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
|
||||
})
|
||||
console.log(saveList,"prescriptionList.value")
|
||||
@@ -877,32 +873,6 @@ function ensureOrgTreeLoaded() {
|
||||
});
|
||||
}
|
||||
|
||||
/** 待签发且未收费（chargeStatus=5 为已收费） */
|
||||
function isPendingUnsignedAndUnpaid(item) {
|
||||
return item.statusEnum == 1 && item.chargeStatus != 5
|
||||
}
|
||||
|
||||
/**
|
||||
* 门诊划价：仅允许操作本人开立（bizRequestFlag==1 或空）。
|
||||
* 手术计费：列表接口需按库中 generate_source_enum 查询（当前多为 1），故子组件仍传 generateSourceEnum=1；
|
||||
* 通过 patientInfo.generateSourceEnum===6（手术计费在 chargePatientInfo 中已写入）识别场景，删除时不卡 bizRequestFlag。
|
||||
*/
|
||||
function isSurgeryChargeBillingContext() {
|
||||
const fromPatient = props.patientInfo?.generateSourceEnum
|
||||
return fromPatient != null && Number(fromPatient) === 6
|
||||
}
|
||||
|
||||
function isBizRequestAllowedForDelete(item) {
|
||||
if (isSurgeryChargeBillingContext()) {
|
||||
return true
|
||||
}
|
||||
const src = props.generateSourceEnum != null ? Number(props.generateSourceEnum) : NaN
|
||||
if (src === 6) {
|
||||
return true
|
||||
}
|
||||
return Number(item.bizRequestFlag) === 1 || !item.bizRequestFlag
|
||||
}
|
||||
|
||||
function handleDelete() {
|
||||
// 🔧 修复：使用 groupIndexList 而不是 check 属性
|
||||
// 因为 watch 监听器会在数据更新时重置 check 为 false
|
||||
@@ -911,94 +881,68 @@ function handleDelete() {
|
||||
return;
|
||||
}
|
||||
|
||||
const canDeleteRow = (item) =>
|
||||
isPendingUnsignedAndUnpaid(item) && isBizRequestAllowedForDelete(item)
|
||||
let deleteList = groupIndexList.value.map((index) => {
|
||||
const item = prescriptionList.value[index];
|
||||
// 只删除待签发且未收费的项目
|
||||
if (item.statusEnum != 1 || item.chargeStatus == 5) {
|
||||
return null;
|
||||
}
|
||||
// 🔧 Bug #442: 非本人创建的医嘱不允许删除（与签发/签退逻辑保持一致）
|
||||
if (Number(item.bizRequestFlag) !== 1 && item.bizRequestFlag) {
|
||||
return null;
|
||||
}
|
||||
// 🔧 Bug #442: 已保存的行必须有有效的 requestId，否则跳过（避免后端删除不存在的记录）
|
||||
if (item.requestId == null || item.requestId === undefined || item.requestId === '') {
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
requestId: item.requestId,
|
||||
dbOpType: '3',
|
||||
adviceType: item.adviceType,
|
||||
};
|
||||
}).filter(item => item !== null); // 过滤掉已签发、已收费、非本人创建或无 requestId 的项目
|
||||
|
||||
const anySelectedDeletable = groupIndexList.value.some((index) =>
|
||||
canDeleteRow(prescriptionList.value[index])
|
||||
)
|
||||
if (!anySelectedDeletable) {
|
||||
proxy.$modal.msgWarning(
|
||||
'只能删除「待签发」且「未收费」的项目；门诊划价还需为本人开立。已签发、已收费或非本人开立项不可删。'
|
||||
)
|
||||
return
|
||||
if (deleteList.length == 0) {
|
||||
proxy.$modal.msgWarning('只能删除待签发且未收费的项目');
|
||||
return;
|
||||
}
|
||||
|
||||
let deleteList = groupIndexList.value
|
||||
.map((index) => {
|
||||
const item = prescriptionList.value[index]
|
||||
if (!canDeleteRow(item)) {
|
||||
return null
|
||||
}
|
||||
if (item.requestId == null || item.requestId === undefined || item.requestId === '') {
|
||||
return null
|
||||
}
|
||||
return {
|
||||
requestId: item.requestId,
|
||||
dbOpType: '3',
|
||||
adviceType: item.adviceType,
|
||||
}
|
||||
})
|
||||
.filter((item) => item !== null)
|
||||
|
||||
// 删除逻辑：按索引从大到小排序，避免删除后索引变化
|
||||
const sortedIndexes = [...groupIndexList.value].sort((a, b) => b - a)
|
||||
let hasSavedItem = false
|
||||
const sortedIndexes = groupIndexList.value.sort((a, b) => b - a);
|
||||
let hasSavedItem = false;
|
||||
|
||||
for (const index of sortedIndexes) {
|
||||
const item = prescriptionList.value[index]
|
||||
if (!canDeleteRow(item)) {
|
||||
continue
|
||||
const item = prescriptionList.value[index];
|
||||
if (item.statusEnum != 1) {
|
||||
continue; // 跳过已签发的项目
|
||||
}
|
||||
|
||||
if (!item.requestId) {
|
||||
// 新增的行（未保存到数据库），直接删除
|
||||
prescriptionList.value.splice(index, 1)
|
||||
prescriptionList.value.splice(index, 1);
|
||||
} else {
|
||||
hasSavedItem = true
|
||||
hasSavedItem = true;
|
||||
}
|
||||
}
|
||||
|
||||
const cleanupAfterDelete = () => {
|
||||
expandOrder.value = [];
|
||||
groupIndexList.value = [];
|
||||
groupList.value = [];
|
||||
isAdding.value = false;
|
||||
adviceQueryParams.value.adviceType = undefined;
|
||||
};
|
||||
|
||||
if (hasSavedItem) {
|
||||
if (deleteList.length === 0) {
|
||||
proxy.$modal.msgWarning('没有可提交删除的已保存医嘱，请刷新后重试');
|
||||
getListInfo(false);
|
||||
cleanupAfterDelete();
|
||||
return;
|
||||
}
|
||||
|
||||
// Bug #454: 删除前确认；检验医嘱提示级联删除申请单
|
||||
const hasLabItem = deleteList.some((item) => item.adviceType === 3);
|
||||
const confirmMsg = hasLabItem
|
||||
? '删除此医嘱将同时删除关联的检验申请单，是否确认删除？'
|
||||
: '确认删除选中的医嘱项目吗？';
|
||||
|
||||
proxy.$modal
|
||||
.confirm(confirmMsg)
|
||||
.then(() => {
|
||||
savePrescription({ adviceSaveList: deleteList }).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getListInfo(false);
|
||||
cleanupAfterDelete();
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
// 用户取消删除
|
||||
});
|
||||
// 有已保存的行，调用后端API删除
|
||||
savePrescription({ adviceSaveList: deleteList }).then((res) => {
|
||||
if (res.code == 200) {
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
getListInfo(false);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// 只有新增行，已经在前端删除完成
|
||||
proxy.$modal.msgSuccess('操作成功');
|
||||
cleanupAfterDelete();
|
||||
}
|
||||
|
||||
expandOrder.value = [];
|
||||
groupIndexList.value = [];
|
||||
groupList.value = [];
|
||||
isAdding.value = false;
|
||||
adviceQueryParams.value.adviceType = undefined;
|
||||
}
|
||||
|
||||
function handleNumberClick(item, index) {
|
||||
@@ -1029,9 +973,7 @@ function changeCheck(value,index,row){
|
||||
groupList.value.map(k=>{
|
||||
if(k.check){
|
||||
if(k.statusEnum == 1){//待签发
|
||||
// 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
|
||||
const bizAllowed = isSurgeryChargeBillingContext() || Number(k.bizRequestFlag)==1||!k.bizRequestFlag
|
||||
if(bizAllowed){
|
||||
if(Number(k.bizRequestFlag)==1||!k.bizRequestFlag){
|
||||
if(handleSaveDisabled.value&&!handleSingOutDisabled.value&&groupList.value.length>1){
|
||||
proxy.$modal.msgWarning('请选择相同的状态的项目进行操作')
|
||||
return
|
||||
@@ -1046,9 +988,7 @@ function changeCheck(value,index,row){
|
||||
}
|
||||
}
|
||||
if(k.statusEnum == 2){ //已签发
|
||||
// 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
|
||||
const bizAllowed = isSurgeryChargeBillingContext() || Number(k.bizRequestFlag)==1||!k.bizRequestFlag
|
||||
if(bizAllowed){
|
||||
if(Number(k.bizRequestFlag)==1||!k.bizRequestFlag){
|
||||
if(!handleSaveDisabled.value&&handleSingOutDisabled.value&&groupList.value.length>1){
|
||||
proxy.$modal.msgWarning('请选择相同的状态的项目进行操作')
|
||||
return
|
||||
@@ -1075,28 +1015,28 @@ function handleSave() {
|
||||
return;
|
||||
}
|
||||
let saveList = prescriptionList.value.filter((item) => {
|
||||
// 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag，允许任何授权用户签发
|
||||
// 门诊划价场景保留 bizRequestFlag 限制，只能操作本人开立的医嘱
|
||||
if (isSurgeryChargeBillingContext()) {
|
||||
return item.check && item.statusEnum == 1
|
||||
}
|
||||
return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
|
||||
});
|
||||
// 无可签发项目时提前返回，避免后端报"医嘱列表为空"
|
||||
if (saveList.length == 0) {
|
||||
proxy.$modal.msgWarning('当前无可签发处方');
|
||||
return;
|
||||
}
|
||||
// let saveList = prescriptionList.value
|
||||
// .filter((item) => {
|
||||
// return item.check;
|
||||
// }).filter((item) => {
|
||||
// return item.statusEnum == 1&&item.bizRequestFlag==1
|
||||
// })
|
||||
|
||||
// if (saveList.length == 0) {
|
||||
// proxy.$modal.msgWarning('当前无可签发处方');
|
||||
// return;
|
||||
// }
|
||||
// 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
|
||||
let list = saveList.map((item) => {
|
||||
const parsedContent = item.contentJson ? JSON.parse(item.contentJson) : {};
|
||||
return {
|
||||
...parsedContent,
|
||||
requestId: item.requestId,
|
||||
// 已有 requestId 的记录走 UPDATE 路径，新记录走 INSERT 路径
|
||||
dbOpType: item.requestId ? '2' : '1',
|
||||
dbOpType: '1',
|
||||
groupId: item.groupId,
|
||||
// 补充顶层关键字段（这些可能不在 contentJson 中，需从 API 响应顶层提取）
|
||||
// 🔧 Bug #443: 补充顶层关键字段（这些不在 contentJson 中，需从 API 响应顶层提取）
|
||||
encounterId: item.encounterId,
|
||||
patientId: item.patientId,
|
||||
locationId: item.positionId,
|
||||
@@ -1104,20 +1044,10 @@ function handleSave() {
|
||||
adviceTableName: item.adviceTableName,
|
||||
adviceDefinitionId: item.adviceDefinitionId,
|
||||
chargeItemId: item.chargeItemId,
|
||||
// 补充数量、单位、批号等字段（后端 handDevice 需要这些字段）
|
||||
quantity: item.quantity,
|
||||
unitCode: item.unitCode,
|
||||
lotNumber: item.lotNumber,
|
||||
categoryEnum: item.categoryEnum,
|
||||
// 签发时显式设置手术计费关键字段，后端 generateSourceEnum 回退为默认值导致查询无法匹配
|
||||
generateSourceEnum: props.generateSourceEnum ?? parsedContent.generateSourceEnum ?? item.generateSourceEnum,
|
||||
sourceBillNo: props.sourceBillNo ?? parsedContent.sourceBillNo ?? item.sourceBillNo,
|
||||
};
|
||||
});
|
||||
// 确保 organizationId 不为 undefined（手术计费场景下可能缺失 orgId）
|
||||
const orgId = props.patientInfo.orgId || props.patientInfo.effectiveOrgId || 1;
|
||||
savePrescriptionSign({
|
||||
organizationId: orgId,
|
||||
organizationId: props.patientInfo.orgId,
|
||||
adviceSaveList: list,
|
||||
}).then((res) => {
|
||||
if (res.code === 200) {
|
||||
@@ -1134,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 || '签发失败，请重试');
|
||||
});
|
||||
}
|
||||
@@ -1173,9 +1102,8 @@ function handleSaveSign(row, index) {
|
||||
cleanRow.generateSourceEnum = 6; // 手术计费
|
||||
cleanRow.sourceBillNo = props.patientInfo.sourceBillNo;
|
||||
}
|
||||
// 🔧 门诊计费场景：保存为草稿，让药品出现在临时医嘱弹窗"已引用计费药品（待生成医嘱）"中
|
||||
const adviceOpType = props.patientInfo.sourceBillNo ? '0' : '1'
|
||||
savePrescription({ adviceSaveList: [cleanRow] }, adviceOpType).then((res) => {
|
||||
console.log('cleanRow', cleanRow)
|
||||
savePrescription({ adviceSaveList: [cleanRow] }, '1').then((res) => {
|
||||
if (res.code === 200) {
|
||||
proxy.$modal.msgSuccess('保存成功');
|
||||
getListInfo(false);
|
||||
@@ -1199,10 +1127,6 @@ function handleSingOut() {
|
||||
return item.check;
|
||||
})
|
||||
.filter((item) => {
|
||||
// 手术计费场景（generateSourceEnum=6）不限制 bizRequestFlag
|
||||
if (isSurgeryChargeBillingContext()) {
|
||||
return item.statusEnum == 2 && item.chargeStatus != 5
|
||||
}
|
||||
return item.statusEnum == 2 && item.chargeStatus != 5 && (Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
|
||||
})
|
||||
.map((item) => {
|
||||
|
||||
@@ -354,11 +354,6 @@ async function getList() {
|
||||
if (!item.classification) {
|
||||
item.classification = '西医';
|
||||
}
|
||||
// 转换 longTermFlag 为字符串，以匹配 useDict 返回的字典值类型（字符串）
|
||||
// 避免 el-select 因类型不匹配（整数 1 vs 字符串 "1"）导致下拉框清空
|
||||
if (item.longTermFlag != null) {
|
||||
item.longTermFlag = String(item.longTermFlag);
|
||||
}
|
||||
// 如果ybNo（诊断编码）符合传染病编码格式，添加到selectedDiseases
|
||||
if (item.ybNo && /^(01|02|03)/.test(item.ybNo)) {
|
||||
item.selectedDiseases = [item.ybNo];
|
||||
|
||||
@@ -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">
|
||||
@@ -548,8 +548,6 @@ const dialogReadOnly = ref(false);
|
||||
const formRef = ref(null);
|
||||
// 保存按钮加载状态，防止重复提交
|
||||
const submitLoading = ref(false);
|
||||
// 数据加载中标志，防止 showReport 加载已有数据时 watch 清空分型字段
|
||||
const loadingData = ref(false);
|
||||
|
||||
const props = defineProps({
|
||||
title: {
|
||||
@@ -942,8 +940,7 @@ const showSubtypeSelect = computed(() => {
|
||||
// 监听疾病选择变化，自动清空分型选择
|
||||
watch(() => [form.value.selectedClassA, form.value.selectedClassB, form.value.selectedClassC], (newVal, oldVal) => {
|
||||
// 如果疾病选择发生变化，清空分型选择
|
||||
// 数据加载中时不清空，避免 showReport 加载已有数据时被错误清空
|
||||
if (JSON.stringify(newVal) !== JSON.stringify(oldVal) && !loadingData.value) {
|
||||
if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
|
||||
form.value.diseaseType = '';
|
||||
}
|
||||
}, { deep: true });
|
||||
@@ -1028,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) {
|
||||
@@ -1047,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 '未知';
|
||||
}
|
||||
|
||||
@@ -1095,9 +1087,6 @@ function showReport(reportData = {}, readOnly = true) {
|
||||
dialogVisible.value = true;
|
||||
dialogReadOnly.value = readOnly;
|
||||
|
||||
// 标记数据加载中，防止 watch 清空 diseaseType 分型字段
|
||||
loadingData.value = true;
|
||||
|
||||
resetAddressSelector();
|
||||
initProvinceOptions();
|
||||
|
||||
@@ -1127,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),
|
||||
@@ -1136,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 || '',
|
||||
@@ -1155,9 +1144,6 @@ function showReport(reportData = {}, readOnly = true) {
|
||||
form.value.addressCounty,
|
||||
form.value.addressTown
|
||||
);
|
||||
|
||||
// 数据加载完成，恢复 watch 监听
|
||||
loadingData.value = false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1480,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,
|
||||
};
|
||||
|
||||
@@ -316,13 +316,13 @@
|
||||
<!-- Bug #384修复: 单价显示套餐价格（如果选中）或部位价格 -->
|
||||
<el-table-column label="单价" width="75" align="right">
|
||||
<template #default="scope">
|
||||
{{ formatDetailAmount(getSelectedItemAmount(scope.row)) }}
|
||||
{{ scope.row.selectedMethod?.packagePrice || scope.row.price }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- Bug #384修复: 金额使用有效价格计算 -->
|
||||
<el-table-column label="金额" width="80" align="right">
|
||||
<template #default="scope">
|
||||
{{ formatDetailAmount(getSelectedItemAmount(scope.row) * (scope.row.quantity || 1)) }}
|
||||
{{ ((scope.row.selectedMethod?.packagePrice || scope.row.price || 0) * (scope.row.quantity || 1)).toFixed(2) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="类型" prop="checkType" width="70" align="center" />
|
||||
@@ -392,6 +392,28 @@
|
||||
<div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
|
||||
加载中...
|
||||
</div>
|
||||
<!-- Bug #428修复: 渲染分类联动加载的检查方法列表 -->
|
||||
<!-- Bug #500修复: v-if 改为 v-show，避免方法列表加载时 DOM 突然插入导致高度跳变 -->
|
||||
<div
|
||||
v-show="cat.methods && cat.methods.length > 0"
|
||||
class="method-section"
|
||||
>
|
||||
<div class="method-section-title">检查方法</div>
|
||||
<div
|
||||
v-for="method in cat.methods"
|
||||
:key="method.id"
|
||||
class="method-row"
|
||||
>
|
||||
<el-checkbox
|
||||
:model-value="isMethodSelected(method, cat)"
|
||||
@change="(val) => handleMethodSelect(val, method, cat)"
|
||||
class="method-checkbox"
|
||||
>
|
||||
{{ method.name }}
|
||||
</el-checkbox>
|
||||
<span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
@@ -409,103 +431,46 @@
|
||||
class="selected-item-card"
|
||||
:class="{ 'is-expanded': item.expanded }"
|
||||
>
|
||||
<!-- 项目卡片头部：项目和检查方法解耦，点击展开查看方法/明细 -->
|
||||
<!-- Bug #384修复 + #426修复: 项目卡片头部，可展开/收起 -->
|
||||
<div class="card-header" @click="toggleItemExpand(item)">
|
||||
<el-tooltip :content="getDisplayItemName(item)" placement="top" :show-after="400">
|
||||
<span class="card-name">{{ getDisplayItemName(item) }}</span>
|
||||
<el-tag v-if="item.isPackage || item.packageName" size="small" type="warning" style="margin-right: 4px; flex-shrink: 0;">套餐</el-tag>
|
||||
<el-tooltip :content="item.name" placement="top" :show-after="400">
|
||||
<span class="card-name">{{ item.name }}</span>
|
||||
</el-tooltip>
|
||||
<span class="card-price">¥{{ formatDetailAmount(getSelectedItemAmount(item)) }}</span>
|
||||
<span class="card-price">¥{{ formatDetailAmount(item.price) }}</span>
|
||||
<el-icon :class="['expand-icon', { expanded: item.expanded }]">
|
||||
<ArrowDown />
|
||||
<ArrowDown v-if="!item.expanded" />
|
||||
<ArrowUp v-if="item.expanded" />
|
||||
</el-icon>
|
||||
<!-- 删除按钮 -->
|
||||
<el-button link type="danger" size="small" @click.stop="handleRemoveItem(idx, item)">
|
||||
<el-icon><Close /></el-icon>
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-if="item.expanded" class="selected-card-body">
|
||||
<div v-if="shouldShowItemPackageBody(item)">
|
||||
<div class="package-toggle" @click.stop="toggleItemPackageExpand(item)">
|
||||
<span>项目套餐明细</span>
|
||||
<el-icon :class="['expand-icon', { expanded: item.itemPackageExpanded }]">
|
||||
<ArrowDown />
|
||||
</el-icon>
|
||||
<!-- Bug #428: 有套餐 ID 时默认展开；加载中/空/明细均在本区域展示 -->
|
||||
<div v-if="item.expanded && shouldShowPackageBody(item)" class="selected-card-body">
|
||||
<div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
|
||||
<template v-else>
|
||||
<div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
|
||||
暂无套餐明细
|
||||
</div>
|
||||
<div v-show="item.itemPackageExpanded">
|
||||
<div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
|
||||
<template v-else>
|
||||
<div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
|
||||
暂无套餐明细
|
||||
</div>
|
||||
<div v-else class="package-details-list">
|
||||
<div
|
||||
v-for="(detail, dIdx) in getPackageDetailsList(item)"
|
||||
:key="detail.id ?? detail.itemCode ?? `d-${dIdx}`"
|
||||
class="detail-row"
|
||||
>
|
||||
<el-tooltip :content="detail.name" placement="top" :show-after="500">
|
||||
<span class="detail-name">{{ detail.name }}</span>
|
||||
</el-tooltip>
|
||||
<div class="detail-meta">
|
||||
<span class="detail-qty">×{{ detail.quantity || 1 }}</span>
|
||||
<span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="selected-card-section">
|
||||
<div class="selected-section-title">检查方法</div>
|
||||
<div v-if="!item.methods || item.methods.length === 0" class="selected-method-empty">
|
||||
暂无检查方法
|
||||
</div>
|
||||
<div
|
||||
v-for="method in item.methods"
|
||||
:key="method.id"
|
||||
class="selected-method-option"
|
||||
>
|
||||
<el-checkbox
|
||||
:model-value="item.selectedMethod?.id === method.id"
|
||||
@change="(val) => selectMethodCheckbox(val, item, method)"
|
||||
class="method-checkbox"
|
||||
<div v-else class="package-details-list">
|
||||
<div class="package-details-head">套餐明细</div>
|
||||
<div
|
||||
v-for="(detail, dIdx) in getPackageDetailsList(item)"
|
||||
:key="detail.id ?? detail.itemCode ?? `d-${dIdx}`"
|
||||
class="detail-row"
|
||||
>
|
||||
{{ method.name }}
|
||||
</el-checkbox>
|
||||
<span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="shouldShowMethodPackageBody(item)">
|
||||
<div class="package-toggle" @click.stop="toggleMethodPackageExpand(item)">
|
||||
<span>检查方法套餐明细</span>
|
||||
<el-icon :class="['expand-icon', { expanded: item.methodPackageExpanded }]">
|
||||
<ArrowDown />
|
||||
</el-icon>
|
||||
</div>
|
||||
<div v-show="item.methodPackageExpanded">
|
||||
<div v-if="item.methodPackageLoading" class="package-details-loading">加载中...</div>
|
||||
<template v-else>
|
||||
<div v-if="getMethodPackageDetailsList(item).length === 0" class="package-details-empty">
|
||||
暂无检查方法套餐明细
|
||||
</div>
|
||||
<div v-else class="package-details-list method-package-list">
|
||||
<div
|
||||
v-for="(detail, dIdx) in getMethodPackageDetailsList(item)"
|
||||
:key="detail.id ?? detail.itemCode ?? `md-${dIdx}`"
|
||||
class="detail-row"
|
||||
>
|
||||
<el-tooltip :content="detail.name" placement="top" :show-after="500">
|
||||
<span class="detail-name">{{ detail.name }}</span>
|
||||
</el-tooltip>
|
||||
<div class="detail-meta">
|
||||
<span class="detail-qty">×{{ detail.quantity || 1 }}</span>
|
||||
<span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
|
||||
</div>
|
||||
<el-tooltip :content="detail.name" placement="top" :show-after="500">
|
||||
<span class="detail-name">{{ detail.name }}</span>
|
||||
</el-tooltip>
|
||||
<div class="detail-meta">
|
||||
<span class="detail-qty">×{{ detail.quantity || 1 }}</span>
|
||||
<span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -519,7 +484,7 @@
|
||||
<script setup>
|
||||
import { ref, reactive, computed, watch, onMounted, nextTick } from 'vue';
|
||||
import { ElMessage, ElMessageBox } from 'element-plus';
|
||||
import { Printer, Delete, ArrowDown, Close } from '@element-plus/icons-vue';
|
||||
import { Printer, Delete, ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
|
||||
import useUserStore from '@/store/modules/user';
|
||||
import request from '@/utils/request';
|
||||
import { listCheckMethod, searchCheckMethod, listCheckPackage } from '@/api/system/checkType';
|
||||
@@ -608,90 +573,55 @@ 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'
|
||||
});
|
||||
const list = parsePackageDetailsPayload(res);
|
||||
const children = list.map((child) => ({
|
||||
...child,
|
||||
name: child.name || child.itemName,
|
||||
unit: child.unit || '次',
|
||||
price: child.price ?? child.unitPrice ?? child.itemPrice ?? 0,
|
||||
quantity: row.quantity || 1,
|
||||
isPackageDetail: true
|
||||
}));
|
||||
resolve(children);
|
||||
if (res.code === 200) {
|
||||
const list = parsePackageDetailsPayload(res);
|
||||
const children = list.map((child) => ({
|
||||
...child,
|
||||
name: child.name || child.itemName,
|
||||
unit: child.unit || '次',
|
||||
price: child.price ?? child.unitPrice ?? child.itemPrice ?? 0,
|
||||
quantity: row.quantity || 1,
|
||||
isPackageDetail: true
|
||||
}));
|
||||
resolve(children);
|
||||
} else {
|
||||
resolve([]);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('加载套餐明细失败:', err);
|
||||
resolve([]);
|
||||
}
|
||||
}
|
||||
|
||||
// #428修复 + #426修复: 为已选择项目加载套餐明细（通过packageId或packageName查询）
|
||||
/** 套餐明细挂在「部位」或已选的「检查方法」上（方法可带 packageId） */
|
||||
function getPackageCarrier(item) {
|
||||
return item?.selectedMethod?.packageId ? item.selectedMethod : item;
|
||||
}
|
||||
|
||||
function getPackageDetailsList(item) {
|
||||
// 明细挂在行对象上，避免仅写入 methods 内嵌对象时首帧不触发视图更新（体感需点两次才展开）
|
||||
if (Array.isArray(item?.packageDetailsDisplay)) {
|
||||
return item.packageDetailsDisplay;
|
||||
}
|
||||
return Array.isArray(item?.packageDetails) ? item.packageDetails : [];
|
||||
const carrier = getPackageCarrier(item);
|
||||
return Array.isArray(carrier?.packageDetails) ? carrier.packageDetails : [];
|
||||
}
|
||||
|
||||
function getMethodPackageDetailsList(item) {
|
||||
if (Array.isArray(item?.methodPackageDetails)) {
|
||||
return item.methodPackageDetails;
|
||||
}
|
||||
return Array.isArray(item?.selectedMethod?.packageDetails) ? item.selectedMethod.packageDetails : [];
|
||||
}
|
||||
|
||||
/** 有套餐 ID 或 packageName 的已选行才展示右侧套餐区（加载中 / 空 / 明细列表） */
|
||||
/** 有套餐 ID 的已选行才展示右侧套餐区（加载中 / 空 / 明细列表） */
|
||||
function shouldShowPackageBody(item) {
|
||||
return shouldShowItemPackageBody(item) || shouldShowMethodPackageBody(item);
|
||||
}
|
||||
|
||||
function hasItemPackage(item) {
|
||||
return !!(item?.packageId || item?.packageName);
|
||||
}
|
||||
|
||||
function hasMethodPackage(item) {
|
||||
return !!(item?.selectedMethod?.packageId || item?.selectedMethod?.packageName);
|
||||
}
|
||||
|
||||
function isSamePackage(item) {
|
||||
if (!hasItemPackage(item) || !hasMethodPackage(item)) return false;
|
||||
if (item.packageId && item.selectedMethod?.packageId) {
|
||||
return String(item.packageId) === String(item.selectedMethod.packageId);
|
||||
}
|
||||
return String(item.packageName || '') === String(item.selectedMethod?.packageName || '');
|
||||
}
|
||||
|
||||
function shouldShowItemPackageBody(item) {
|
||||
return hasItemPackage(item);
|
||||
}
|
||||
|
||||
function shouldShowMethodPackageBody(item) {
|
||||
return hasMethodPackage(item) && !isSamePackage(item);
|
||||
return !!getPackageCarrier(item)?.packageId;
|
||||
}
|
||||
|
||||
/** 金额展示：统一两位小数 */
|
||||
@@ -700,18 +630,20 @@ function formatDetailAmount(value) {
|
||||
return Number.isFinite(n) ? n.toFixed(2) : '0.00';
|
||||
}
|
||||
|
||||
/** 已选卡片名称：去掉 UI 上冗余的“套餐”前缀，完整名称通过 tooltip 展示 */
|
||||
function getDisplayItemName(item) {
|
||||
return String(item?.name || '').replace(/^套餐[：:\-\s]*/, '');
|
||||
}
|
||||
|
||||
function getSelectedItemAmount(item) {
|
||||
const itemPrice = Number(item?.price || 0);
|
||||
const methodPrice = Number(item?.selectedMethod?.packagePrice || 0);
|
||||
if (!hasMethodPackage(item) || isSamePackage(item)) {
|
||||
return itemPrice;
|
||||
/** 默认检查方法：优先与部位 packageId 一致的方法，否则取首个带套餐的方法，否则取第一个 */
|
||||
function pickDefaultMethod(methods, partItem) {
|
||||
if (!methods?.length) return null;
|
||||
if (methods.length === 1) return methods[0];
|
||||
const pid = partItem?.packageId ?? null;
|
||||
if (pid != null && pid !== '') {
|
||||
const matched = methods.find(
|
||||
(x) => x.packageId != null && String(x.packageId) === String(pid)
|
||||
);
|
||||
if (matched) return matched;
|
||||
}
|
||||
return itemPrice + methodPrice;
|
||||
const withPkg = methods.find((x) => x.packageId != null);
|
||||
if (withPkg) return withPkg;
|
||||
return methods[0];
|
||||
}
|
||||
|
||||
function parsePackageDetailsPayload(res) {
|
||||
@@ -727,15 +659,15 @@ function parsePackageDetailsPayload(res) {
|
||||
|
||||
// #428: 为已选择项目加载套餐明细（后端：CheckTypeController /system/check-type/package/{id}/details）
|
||||
async function loadPackageDetailsForItem(item) {
|
||||
let packageId = item.packageId;
|
||||
const packageName = item.packageName;
|
||||
if (!packageId && !packageName) {
|
||||
const carrier = getPackageCarrier(item);
|
||||
let packageId = item.packageId || carrier?.packageId;
|
||||
if (!packageId && !item.packageName) {
|
||||
return;
|
||||
}
|
||||
item.packageDetailsLoading = true;
|
||||
try {
|
||||
if (!packageId && packageName) {
|
||||
const pkgRes = await listCheckPackage({ packageName });
|
||||
if (!packageId && item.packageName) {
|
||||
const pkgRes = await listCheckPackage({ packageName: item.packageName });
|
||||
let packages = pkgRes?.data || [];
|
||||
if (!Array.isArray(packages)) {
|
||||
packages = packages.records || packages.data || [];
|
||||
@@ -747,7 +679,6 @@ async function loadPackageDetailsForItem(item) {
|
||||
}
|
||||
packageId = packages[0].id;
|
||||
item.packageId = packageId;
|
||||
item.packageName = item.packageName || packageName;
|
||||
}
|
||||
if (!packageId) {
|
||||
item.packageDetails = [];
|
||||
@@ -767,6 +698,7 @@ async function loadPackageDetailsForItem(item) {
|
||||
quantity: detail.quantity || 1
|
||||
}));
|
||||
item.packageDetailsDisplay = mapped;
|
||||
carrier.packageDetails = mapped;
|
||||
if (res.code === 200 && res.data) {
|
||||
item.packageDetails = Array.isArray(res.data)
|
||||
? res.data.map((detail) => ({
|
||||
@@ -783,6 +715,7 @@ async function loadPackageDetailsForItem(item) {
|
||||
} catch (err) {
|
||||
console.error('加载套餐明细失败:', err);
|
||||
item.packageDetailsDisplay = [];
|
||||
carrier.packageDetails = [];
|
||||
item.packageDetails = [];
|
||||
} finally {
|
||||
item.packageDetailsLoading = false;
|
||||
@@ -1105,10 +1038,7 @@ async function loadCategoryList() {
|
||||
|
||||
// 默认展开第一个
|
||||
if (categoryList.value.length > 0) {
|
||||
const firstCat = categoryList.value[0];
|
||||
activeNames.value = firstCat.typeId;
|
||||
await nextTick();
|
||||
await handleCategoryExpand(firstCat);
|
||||
activeNames.value = categoryList.value[0].typeId;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('加载检查项目分类失败', err);
|
||||
@@ -1123,15 +1053,15 @@ 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);
|
||||
});
|
||||
|
||||
// ====== 合计 ======
|
||||
// Bug #384修复: 如果选中了检查方法，使用套餐价格；否则使用部位价格
|
||||
const totalAmountCalc = computed(() => {
|
||||
const total = selectedItems.value.reduce((sum, item) => {
|
||||
const effectivePrice = getSelectedItemAmount(item);
|
||||
const effectivePrice = item.selectedMethod?.packagePrice || item.price;
|
||||
return sum + (effectivePrice * (item.quantity || 1));
|
||||
}, 0);
|
||||
return total.toFixed(2);
|
||||
@@ -1264,7 +1194,8 @@ function handleSave() {
|
||||
itemCode: String(item.id),
|
||||
itemName: item.name,
|
||||
bodyPartCode: item.checkType || 'unknown',
|
||||
itemFee: getSelectedItemAmount(item),
|
||||
// Bug #384修复: 如果选中了检查方法且有套餐价格，使用套餐价格；否则使用部位价格
|
||||
itemFee: item.selectedMethod?.packagePrice || item.price,
|
||||
performDeptCode: form.performDeptCode || '',
|
||||
itemStatus: 0,
|
||||
itemSeq: index + 1,
|
||||
@@ -1317,12 +1248,9 @@ function handleRowClick(row) {
|
||||
methods: [],
|
||||
selectedMethod: null,
|
||||
expanded: false,
|
||||
itemPackageExpanded: true,
|
||||
methodPackageExpanded: true,
|
||||
packageDetailsLoading: false,
|
||||
isPackage: false,
|
||||
packageId: null,
|
||||
hasChildren: false // #426修复: 树形表格懒加载展开标记，后续根据packageId动态设置
|
||||
packageId: null
|
||||
};
|
||||
// 加载该项目的检查方法
|
||||
if (m.bodyPartCode) {
|
||||
@@ -1348,11 +1276,16 @@ function handleRowClick(row) {
|
||||
if (m.checkMethodId) {
|
||||
item.selectedMethod = item.methods.find(md => String(md.id) === String(m.checkMethodId)) || null;
|
||||
if (item.selectedMethod?.packageId) {
|
||||
item.hasChildren = true; // #426修复
|
||||
item.isPackage = true;
|
||||
item.packageId = item.selectedMethod.packageId;
|
||||
}
|
||||
}
|
||||
if (!item.selectedMethod && item.methods.length) {
|
||||
item.selectedMethod = pickDefaultMethod(item.methods, { packageId: item.packageId });
|
||||
}
|
||||
if (item.selectedMethod?.packageId) {
|
||||
item.hasChildren = true; // #426修复
|
||||
item.packageId = item.selectedMethod.packageId;
|
||||
item.isPackage = true;
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
@@ -1365,21 +1298,14 @@ function handleRowClick(row) {
|
||||
selectedItems.value = itemsWithMethods;
|
||||
// 加载套餐明细（单个失败不影响其他项目和明细显示）
|
||||
for (const it of selectedItems.value) {
|
||||
if (hasItemPackage(it)) {
|
||||
if (getPackageCarrier(it)?.packageId) {
|
||||
try {
|
||||
await loadPackageDetailsForItem(it);
|
||||
} catch (e) {
|
||||
console.error('加载套餐明细失败:', it.name, e);
|
||||
}
|
||||
}
|
||||
if (hasMethodPackage(it) && !isSamePackage(it)) {
|
||||
try {
|
||||
await loadMethodPackageDetails(it, it.selectedMethod);
|
||||
} catch (e) {
|
||||
console.error('加载检查方法套餐明细失败:', it.name, e);
|
||||
}
|
||||
}
|
||||
it.expanded = shouldShowPackageBody(it);
|
||||
it.expanded = !!getPackageCarrier(it)?.packageId;
|
||||
}
|
||||
syncCategoryChecked();
|
||||
// Bug #384修复: 回充后更新检查方法显示
|
||||
@@ -1409,6 +1335,95 @@ function handleDelete(row) {
|
||||
});
|
||||
}
|
||||
|
||||
// Bug #428修复: 判断某个检查方法是否已被选中（任意项目关联了该方法）
|
||||
function isMethodSelected(method, cat) {
|
||||
return selectedItems.value.some(item =>
|
||||
item.selectedMethod?.id === method.id && item.checkType === cat.typeName
|
||||
);
|
||||
}
|
||||
|
||||
// Bug #428修复: 勾选检查方法
|
||||
async function handleMethodSelect(checked, method, cat) {
|
||||
if (checked) {
|
||||
// 找到该方法所属的第一个检查项目
|
||||
const targetItem = cat.items[0];
|
||||
if (!targetItem) {
|
||||
// 如果分类下没有项目，尝试从其他分类找同名项目或创建
|
||||
console.warn('分类下没有检查项目，无法关联方法');
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果该项目已存在，只更新 selectedMethod
|
||||
const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
|
||||
if (existingItem) {
|
||||
existingItem.selectedMethod = method;
|
||||
// 从方法中获取套餐信息
|
||||
if (method.packageId) {
|
||||
existingItem.isPackage = true;
|
||||
existingItem.packageId = method.packageId;
|
||||
existingItem.packageName = method.packageName || existingItem.packageName; // #428修复: 确保 packageName 同步
|
||||
// 预加载套餐明细
|
||||
loadPackageDetailsForItem(existingItem);
|
||||
}
|
||||
updateMethodDisplay();
|
||||
return;
|
||||
}
|
||||
|
||||
// 如果该项目不存在，创建一个并关联方法
|
||||
if (selectedItems.value.length > 0) {
|
||||
const currentCategory = selectedItems.value[0].checkType;
|
||||
// Bug #428修复: 使用 cat.typeName 进行比较（与 newItem.checkType 保持一致）
|
||||
const newCategory = cat.typeName || '';
|
||||
if (currentCategory !== newCategory) {
|
||||
ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const newItem = {
|
||||
id: targetItem.id, name: targetItem.name,
|
||||
price: targetItem.price, quantity: 1,
|
||||
serviceFee: targetItem.serviceFee || 0,
|
||||
unit: targetItem.unit || '次',
|
||||
applyPart: targetItem.name,
|
||||
checkType: cat.typeName,
|
||||
nationalCode: targetItem.nationalCode || '',
|
||||
checked: true,
|
||||
methods: cat.methods || [method], // #428修复: 复制分类下全部方法，允许用户切换
|
||||
selectedMethod: method,
|
||||
expanded: false,
|
||||
// 从方法或项目中获取套餐信息
|
||||
isPackage: !!method.packageId || !!targetItem.packageName,
|
||||
packageId: method.packageId || targetItem.packageId || null,
|
||||
packageName: method.packageName || targetItem.packageName || null // #428修复: 复制 packageName，确保套餐明细可加载
|
||||
};
|
||||
selectedItems.value.push(newItem);
|
||||
|
||||
// 如果是套餐，预加载套餐明细
|
||||
if (newItem.isPackage && newItem.packageId) {
|
||||
loadPackageDetailsForItem(newItem);
|
||||
}
|
||||
|
||||
// 自动回填执行科室
|
||||
if (selectedItems.value.length === 1 && cat?.performDeptName) {
|
||||
form.performDeptCode = cat.performDeptName;
|
||||
}
|
||||
|
||||
// 同时勾选左侧项目的 checkbox
|
||||
targetItem.checked = true;
|
||||
|
||||
} else {
|
||||
// 取消选择方法：将 selectedItems 中关联该方法的项的 selectedMethod 清空
|
||||
const itemsWithMethod = selectedItems.value.filter(
|
||||
item => item.selectedMethod?.id === method.id
|
||||
);
|
||||
for (const item of itemsWithMethod) {
|
||||
item.selectedMethod = null;
|
||||
}
|
||||
}
|
||||
updateMethodDisplay();
|
||||
}
|
||||
|
||||
// ====== 勾选逻辑 ======
|
||||
async function handleItemSelect(checked, item, cat) {
|
||||
if (checked) {
|
||||
@@ -1465,27 +1480,24 @@ async function handleItemSelect(checked, item, cat) {
|
||||
methods: methods,
|
||||
selectedMethod: null,
|
||||
expanded: false,
|
||||
itemPackageExpanded: true,
|
||||
methodPackageExpanded: true,
|
||||
isPackage: !!(item.packageId || item.packageName),
|
||||
packageName: item.packageName || null,
|
||||
packageDetailsLoading: false,
|
||||
packageId: item.packageId || null,
|
||||
hasChildren: !!(item.packageId || item.packageName) // #426修复: 树形表格懒加载展开标记，支持 packageName 解析
|
||||
packageId: item.packageId || null
|
||||
};
|
||||
selectedItems.value.push(newRow);
|
||||
// 必须用数组里的响应式行，不能继续改局部 newRow：push 后列表内是 proxy，改 raw 对象不会触发右侧卡片更新（会一直卡在「加载中」）
|
||||
const row = selectedItems.value[selectedItems.value.length - 1];
|
||||
|
||||
// 勾选项目只加入项目列表，检查方法由用户在“检查方法”区域手动选择
|
||||
row.selectedMethod = null;
|
||||
// 右侧不再展示「检查方法」列表：自动选默认方法（保存、计价仍依赖 selectedMethod）
|
||||
if (methods.length >= 1) {
|
||||
row.selectedMethod = pickDefaultMethod(methods, item);
|
||||
}
|
||||
updateMethodDisplay();
|
||||
|
||||
// 新勾选项目后默认展开，直接展示检查方法状态和套餐明细
|
||||
row.expanded = true;
|
||||
row.itemPackageExpanded = true;
|
||||
row.methodPackageExpanded = true;
|
||||
if (hasItemPackage(row)) {
|
||||
// 有套餐 ID 时默认展开（先显示加载区，明细写入行对象 packageDetailsDisplay）
|
||||
row.expanded = !!getPackageCarrier(row)?.packageId;
|
||||
if (getPackageCarrier(row)?.packageId) {
|
||||
await loadPackageDetailsForItem(row);
|
||||
}
|
||||
|
||||
@@ -1511,35 +1523,13 @@ async function handleItemSelect(checked, item, cat) {
|
||||
// Bug #384修复 + #426修复: 展开/收起项目卡片
|
||||
async function toggleItemExpand(item) {
|
||||
item.expanded = !item.expanded;
|
||||
if (item.expanded && hasItemPackage(item) && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
|
||||
if (item.expanded && (item.isPackage || item.packageName) && (!item.packageDetails || item.packageDetails.length === 0) && !item.packageDetailsLoading) {
|
||||
await loadPackageDetailsForItem(item);
|
||||
}
|
||||
if (
|
||||
item.expanded &&
|
||||
shouldShowMethodPackageBody(item) &&
|
||||
getMethodPackageDetailsList(item).length === 0 &&
|
||||
!item.methodPackageLoading
|
||||
) {
|
||||
await loadMethodPackageDetails(item, item.selectedMethod);
|
||||
}
|
||||
}
|
||||
|
||||
async function toggleItemPackageExpand(item) {
|
||||
item.itemPackageExpanded = !item.itemPackageExpanded;
|
||||
if (item.itemPackageExpanded && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
|
||||
await loadPackageDetailsForItem(item);
|
||||
}
|
||||
}
|
||||
|
||||
async function toggleMethodPackageExpand(item) {
|
||||
item.methodPackageExpanded = !item.methodPackageExpanded;
|
||||
if (
|
||||
item.methodPackageExpanded &&
|
||||
item.selectedMethod &&
|
||||
getMethodPackageDetailsList(item).length === 0 &&
|
||||
!item.methodPackageLoading
|
||||
) {
|
||||
await loadMethodPackageDetails(item, item.selectedMethod);
|
||||
if (item.expanded && shouldShowPackageBody(item)) {
|
||||
if (getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
|
||||
await loadPackageDetailsForItem(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1547,8 +1537,9 @@ async function toggleMethodPackageExpand(item) {
|
||||
async function selectMethodCheckbox(checked, item, method) {
|
||||
if (checked) {
|
||||
item.selectedMethod = method;
|
||||
item.expanded = true;
|
||||
item.methodPackageExpanded = true;
|
||||
if (item.expanded && method.packageId) {
|
||||
loadPackageDetailsForItem(item);
|
||||
}
|
||||
// 动态加载该方法对应的套餐明细
|
||||
await loadMethodPackageDetails(item, method);
|
||||
} else {
|
||||
@@ -1569,43 +1560,36 @@ async function loadMethodPackageDetails(item, method) {
|
||||
item.methodPackageLoading = true;
|
||||
item.methodPackageDetails = [];
|
||||
try {
|
||||
let packageId = method.packageId;
|
||||
if (!packageId && !method.packageName) {
|
||||
if (!method.packageName) {
|
||||
item.methodPackageLoading = false;
|
||||
return;
|
||||
}
|
||||
// 通过packageName查询套餐获取packageId
|
||||
if (!packageId && method.packageName) {
|
||||
const pkgRes = await listCheckPackage({ packageName: method.packageName });
|
||||
let packages = pkgRes?.data || [];
|
||||
if (!Array.isArray(packages)) {
|
||||
packages = packages.records || packages.data || [];
|
||||
}
|
||||
if (packages.length === 0) {
|
||||
item.methodPackageLoading = false;
|
||||
return;
|
||||
}
|
||||
packageId = packages[0].id;
|
||||
method.packageId = packageId;
|
||||
const pkgRes = await listCheckPackage({ packageName: method.packageName });
|
||||
let packages = pkgRes?.data || [];
|
||||
if (!Array.isArray(packages)) {
|
||||
packages = packages.records || packages.data || [];
|
||||
}
|
||||
if (packages.length === 0) {
|
||||
item.methodPackageLoading = false;
|
||||
return;
|
||||
}
|
||||
const packageId = packages[0].id;
|
||||
// 查询套餐明细
|
||||
const detailRes = await request({
|
||||
url: `/system/check-type/package/${packageId}/details`,
|
||||
url: `/system/package/${packageId}/details`,
|
||||
method: 'get'
|
||||
});
|
||||
const detailList = parsePackageDetailsPayload(detailRes);
|
||||
if (detailList.length > 0) {
|
||||
const mapped = detailList.map(d => ({
|
||||
if (detailRes.code === 200 && detailRes.data) {
|
||||
item.methodPackageDetails = detailRes.data.map(d => ({
|
||||
id: d.id,
|
||||
name: d.name || d.itemName,
|
||||
name: d.itemName || d.name,
|
||||
quantity: d.quantity || 1,
|
||||
unit: d.unit || '次',
|
||||
price: d.price ?? d.unitPrice ?? d.itemPrice ?? 0,
|
||||
price: d.unitPrice || d.price || 0,
|
||||
amount: d.amount || d.total || 0,
|
||||
checked: true // 默认勾选
|
||||
}));
|
||||
item.methodPackageDetails = mapped;
|
||||
method.packageDetails = mapped;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('加载方法套餐明细失败:', err);
|
||||
@@ -1618,20 +1602,20 @@ async function loadMethodPackageDetails(item, method) {
|
||||
/** 检查明细表格中切换检查方法 */
|
||||
async function onDetailMethodChange(row, val) {
|
||||
row.selectedMethod = val || null;
|
||||
if (val?.packageId || val?.packageName) {
|
||||
row.hasChildren = true; // #426修复
|
||||
if (val?.packageId) {
|
||||
row.packageId = val.packageId;
|
||||
row.isPackage = true;
|
||||
}
|
||||
row.packageDetailsDisplay = undefined;
|
||||
const carrier = getPackageCarrier(row);
|
||||
if (carrier) {
|
||||
carrier.packageDetails = undefined;
|
||||
}
|
||||
row.methodPackageDetails = [];
|
||||
updateMethodDisplay();
|
||||
row.expanded = shouldShowPackageBody(row);
|
||||
row.itemPackageExpanded = true;
|
||||
row.methodPackageExpanded = true;
|
||||
if (hasItemPackage(row)) {
|
||||
row.expanded = !!getPackageCarrier(row)?.packageId;
|
||||
if (getPackageCarrier(row)?.packageId) {
|
||||
await loadPackageDetailsForItem(row);
|
||||
}
|
||||
if (val?.packageId || val?.packageName) {
|
||||
await loadMethodPackageDetails(row, val);
|
||||
}
|
||||
nextTick(() => {
|
||||
form.totalAmount = totalAmountCalc.value;
|
||||
});
|
||||
@@ -1781,7 +1765,7 @@ defineExpose({ getList });
|
||||
|
||||
/* 右：分类面板 */
|
||||
.category-panel {
|
||||
width: 560px;
|
||||
width: 420px;
|
||||
flex-shrink: 0;
|
||||
background: #fff;
|
||||
border-radius: 4px;
|
||||
@@ -1816,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;
|
||||
@@ -1875,7 +1859,6 @@ defineExpose({ getList });
|
||||
background: #f0f7ff;
|
||||
border-radius: 4px;
|
||||
margin-top: 6px;
|
||||
min-height: 50px; /* Bug #500: 方法区域预留最小高度，减少加载完成后的高度突变 */
|
||||
}
|
||||
|
||||
.method-section-title {
|
||||
@@ -1917,30 +1900,12 @@ 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 {
|
||||
width: 260px;
|
||||
min-width: 240px;
|
||||
max-width: 320px;
|
||||
width: 220px;
|
||||
min-width: 200px;
|
||||
max-width: 280px;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -2000,8 +1965,9 @@ defineExpose({ getList });
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
line-height: 1.4;
|
||||
word-break: break-word;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.card-price {
|
||||
@@ -2016,11 +1982,12 @@ defineExpose({ getList });
|
||||
color: #909399;
|
||||
transition: transform 0.2s ease;
|
||||
flex-shrink: 0;
|
||||
transform: rotate(-90deg);
|
||||
transition: transform 0.2s;
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
|
||||
.expand-icon.expanded {
|
||||
transform: rotate(0deg);
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
/* Bug #428修复: 套餐明细列表样式 */
|
||||
@@ -2063,55 +2030,6 @@ defineExpose({ getList });
|
||||
background: #fafbfc;
|
||||
}
|
||||
|
||||
.selected-card-section {
|
||||
padding: 10px;
|
||||
border-bottom: 1px solid #ebeef5;
|
||||
}
|
||||
|
||||
.selected-section-title {
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: #409eff;
|
||||
margin-bottom: 8px;
|
||||
padding-bottom: 6px;
|
||||
border-bottom: 1px dashed #d9ecff;
|
||||
}
|
||||
|
||||
.selected-method-option {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
padding: 4px 0;
|
||||
}
|
||||
|
||||
.selected-method-option .method-checkbox {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.selected-method-empty {
|
||||
color: #c0c4cc;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.package-toggle {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 10px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: #909399;
|
||||
cursor: pointer;
|
||||
border-bottom: 1px dashed #dcdfe6;
|
||||
background: #fffbe6;
|
||||
}
|
||||
|
||||
.package-toggle:hover {
|
||||
color: #409eff;
|
||||
}
|
||||
|
||||
.package-details-loading,
|
||||
.package-details-empty {
|
||||
padding: 12px 10px;
|
||||
|
||||
@@ -1185,9 +1185,9 @@ const loadCategoryItems = async (categoryKey, loadMore = false) => {
|
||||
|
||||
// 映射数据格式（从检验项目维护页面的数据结构映射）
|
||||
const mappedItems = records.map(item => {
|
||||
// 套餐项目处理：需同时满足 feePackageId 有效且 packageName 非空
|
||||
// BugFix#556: 增加 packageName 联合判断，避免普通项目因 feePackageId 有值被误标为套餐
|
||||
const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null' && item.packageName
|
||||
// 套餐项目处理：套餐项目使用套餐金额，普通项目使用零售价
|
||||
// BugFix#404: 增加对空字符串的判断，避免空字符串被误认为有效套餐ID
|
||||
const isPackage = item.feePackageId != null && item.feePackageId !== '' && item.feePackageId !== 'null'
|
||||
const itemPrice = isPackage
|
||||
? (parseFloat(item.packageAmount || 0) || parseFloat(item.retailPrice || 0) || parseFloat(item.price || 0))
|
||||
: (parseFloat(item.retailPrice || 0) || parseFloat(item.price || 0))
|
||||
|
||||
@@ -653,16 +653,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,
|
||||
|
||||
@@ -3801,8 +3801,6 @@ function handleSaveHistory(value) {
|
||||
uniqueKey: undefined,
|
||||
dbOpType: value.requestId ? '2' : '1',
|
||||
minUnitQuantity: value.quantity * value.partPercent,
|
||||
// 🔧 修复：确保 categoryEnum 被传递（耗材必填字段），避免后端 NPE
|
||||
categoryEnum: value.categoryEnum || value.categoryCode,
|
||||
conditionId: conditionId.value,
|
||||
conditionDefinitionId: conditionDefinitionId.value,
|
||||
encounterDiagnosisId: encounterDiagnosisId.value,
|
||||
|
||||
@@ -856,7 +856,6 @@ function handleDelete(row) {
|
||||
}).then(() => {
|
||||
getList()
|
||||
proxy.$modal.msgSuccess('删除成功')
|
||||
emit('saved') // 通知父组件刷新医嘱列表
|
||||
}).catch(error => {
|
||||
console.error('删除手术失败:', error)
|
||||
proxy.$modal.msgError('删除失败')
|
||||
@@ -868,7 +867,6 @@ function handleDelete(row) {
|
||||
}).then(() => {
|
||||
getList()
|
||||
proxy.$modal.msgSuccess('手术已取消')
|
||||
emit('saved') // 通知父组件刷新医嘱列表
|
||||
}).catch(error => {
|
||||
console.error('取消手术失败:', error)
|
||||
proxy.$modal.msgError('取消失败')
|
||||
|
||||
@@ -86,13 +86,14 @@
|
||||
</template>
|
||||
<el-table-column type="index" label="序号" width="60" align="center" />
|
||||
<el-table-column prop="patientName" label="患者姓名" width="120" />
|
||||
<el-table-column label="申请单名称" min-width="140">
|
||||
<el-table-column label="申请单名称" width="140">
|
||||
<template #default="scope">
|
||||
<span>{{ buildApplicationName(scope.row) }}</span>
|
||||
</template>
|
||||
</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">
|
||||
<!-- 详情 - 所有状态都显示 -->
|
||||
@@ -444,9 +444,11 @@ const buildApplicationName = (row) => {
|
||||
if (!details || details.length === 0) {
|
||||
return row.name || '-';
|
||||
}
|
||||
const names = details.map(d => d.adviceName).filter(Boolean);
|
||||
if (names.length === 0) return row.name || '-';
|
||||
return names.join(' + ');
|
||||
if (details.length === 1) {
|
||||
return details[0].adviceName || row.name || '-';
|
||||
}
|
||||
const first = details[0];
|
||||
return `${first.adviceName || ''}等${details.length}项`;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -509,13 +511,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 {
|
||||
@@ -684,16 +679,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>`;
|
||||
}
|
||||
});
|
||||
@@ -912,7 +906,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) {
|
||||
// 支持两种返回格式：
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
<!--
|
||||
* 住院医生站 — 汇总发药申请：复用药房「发药汇总单」能力
|
||||
-->
|
||||
<template>
|
||||
<div class="summary-drug-application">
|
||||
<MedicationSummary />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import MedicationSummary from '@/views/drug/inpatientMedicationDispensing/components/MedicationSummary.vue';
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.summary-drug-application {
|
||||
height: 100%;
|
||||
min-height: 400px;
|
||||
overflow: auto;
|
||||
}
|
||||
</style>
|
||||
@@ -116,7 +116,7 @@ import {computed, getCurrentInstance, ref, watch} from 'vue';
|
||||
import {Refresh} from '@element-plus/icons-vue';
|
||||
import {patientInfo} from '../../store/patient.js';
|
||||
import {getSurgery} from './api';
|
||||
import {getDepartmentList} from '@/api/public.js';
|
||||
import {getOrgList} from '@/views/doctorstation/components/api.js';
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
|
||||
@@ -182,32 +182,25 @@ const hasMatchedFields = computed(() => {
|
||||
|
||||
/** 查询科室 */
|
||||
const getLocationInfo = async () => {
|
||||
const res = await getDepartmentList();
|
||||
orgOptions.value = res.data || [];
|
||||
const res = await getOrgList();
|
||||
orgOptions.value = res.data.records;
|
||||
};
|
||||
|
||||
const recursionFun = (targetDepartment) => {
|
||||
if (!targetDepartment || !orgOptions.value || orgOptions.value.length === 0) {
|
||||
return '';
|
||||
}
|
||||
let name = '';
|
||||
// 统一处理：扁平列表和树形结构都适用
|
||||
const findInList = (list) => {
|
||||
for (const node of list) {
|
||||
if (String(node.id) === String(targetDepartment)) {
|
||||
name = node.name;
|
||||
return true;
|
||||
}
|
||||
// 树形结构：递归查找 children
|
||||
if (node.children && node.children.length > 0) {
|
||||
if (findInList(node.children)) {
|
||||
return true;
|
||||
}
|
||||
for (let index = 0; index < orgOptions.value.length; index++) {
|
||||
const obj = orgOptions.value[index];
|
||||
if (obj.id == targetDepartment) {
|
||||
name = obj.name;
|
||||
}
|
||||
const subObjArray = obj['children'];
|
||||
for (let index = 0; index < subObjArray.length; index++) {
|
||||
const item = subObjArray[index];
|
||||
if (item.id == targetDepartment) {
|
||||
name = item.name;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
};
|
||||
findInList(orgOptions.value);
|
||||
}
|
||||
return name;
|
||||
};
|
||||
|
||||
|
||||
@@ -41,10 +41,8 @@
|
||||
<el-option label="全部" value="" />
|
||||
<el-option label="待签发" value="0" />
|
||||
<el-option label="已签发" value="1" />
|
||||
<el-option label="已采证" value="4" />
|
||||
<el-option label="已送检" value="5" />
|
||||
<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="关键字">
|
||||
@@ -93,15 +91,7 @@
|
||||
<el-table-column prop="prescriptionNo" label="申请单号" width="140" />
|
||||
<el-table-column label="单据状态" width="100" align="center">
|
||||
<template #default="scope">
|
||||
<el-tag
|
||||
:type="getBillStatusTagType(scope.row)"
|
||||
effect="plain"
|
||||
round
|
||||
:class="{ 'report-status-tag': isReportStatus(scope.row) }"
|
||||
@click="handleStatusClick(scope.row)"
|
||||
>
|
||||
{{ parseBillStatus(getBillStatus(scope.row)) }}
|
||||
</el-tag>
|
||||
<span>{{ parseBillStatus(scope.row.billStatus ?? scope.row.status) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="申请类型" width="100" align="center">
|
||||
@@ -115,21 +105,16 @@
|
||||
</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">
|
||||
<!-- 待签发：可修改、删除 -->
|
||||
<template v-if="isPendingStatus(scope.row)">
|
||||
<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>
|
||||
<!-- 已签发：可撤回 -->
|
||||
<template v-else-if="isIssuedStatus(scope.row)">
|
||||
<template v-else-if="scope.row.status == 1">
|
||||
<el-button link type="warning" @click="handleWithdraw(scope.row)">撤回</el-button>
|
||||
</template>
|
||||
<!-- 已采证、已送检、报告已出、已作废：仅查看详情 -->
|
||||
<template v-else>
|
||||
<el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
|
||||
</template>
|
||||
<el-button link type="primary" @click="handleViewDetail(scope.row)">详情</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -222,10 +207,10 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {computed, getCurrentInstance, nextTick, ref, watch} from 'vue';
|
||||
import {computed, getCurrentInstance, ref, watch} from 'vue';
|
||||
import {Refresh, Search} from '@element-plus/icons-vue';
|
||||
import {patientInfo} from '../../store/patient.js';
|
||||
import {getInspection, deleteRequestForm, withdrawRequestForm, getProofResult} from './api';
|
||||
import {getInspection, deleteRequestForm, withdrawRequestForm} from './api';
|
||||
import {getDepartmentList} from '@/api/public.js';
|
||||
import LaboratoryTests from '../order/applicationForm/laboratoryTests.vue';
|
||||
import {saveInspection} from '../order/applicationForm/api.js';
|
||||
@@ -280,7 +265,7 @@ const fetchData = async () => {
|
||||
if (res.code === 200 && res.data) {
|
||||
const raw = res.data?.records || res.data;
|
||||
const list = Array.isArray(raw) ? raw : [raw];
|
||||
tableData.value = list.filter(Boolean).sort(sortByCreateTimeDesc);
|
||||
tableData.value = list.filter(Boolean);
|
||||
} else {
|
||||
tableData.value = [];
|
||||
}
|
||||
@@ -339,95 +324,16 @@ const labelMap = {
|
||||
* @param {string|number} status - 状态码
|
||||
* @returns {string} 状态文本
|
||||
*/
|
||||
const getBillStatus = (row) => {
|
||||
return row?.billStatus ?? row?.status ?? row?.statusEnum ?? row?.applyStatus;
|
||||
};
|
||||
|
||||
const parseBillStatus = (status) => {
|
||||
const statusMap = {
|
||||
'0': '待签发',
|
||||
'1': '已签发',
|
||||
'2': '已采证',
|
||||
'3': '已送检',
|
||||
'4': '已采证',
|
||||
'5': '已送检',
|
||||
'6': '报告已出',
|
||||
'8': '报告已出',
|
||||
'7': '已作废',
|
||||
'4': '报告已出',
|
||||
'5': '已作废',
|
||||
};
|
||||
return statusMap[String(status)] || '-';
|
||||
};
|
||||
|
||||
const getBillStatusTagType = (row) => {
|
||||
const typeMap = {
|
||||
'0': 'info',
|
||||
'1': 'primary',
|
||||
'2': 'primary',
|
||||
'3': 'warning',
|
||||
'4': 'primary',
|
||||
'5': 'warning',
|
||||
'6': 'success',
|
||||
'7': 'danger',
|
||||
'8': 'success',
|
||||
};
|
||||
return typeMap[String(getBillStatus(row))] || 'info';
|
||||
};
|
||||
|
||||
const isPendingStatus = (row) => {
|
||||
const status = getBillStatus(row);
|
||||
return status === undefined || status === null || status === '' || String(status) === '0';
|
||||
};
|
||||
|
||||
const isIssuedStatus = (row) => String(getBillStatus(row)) === '1';
|
||||
|
||||
const isReportStatus = (row) => ['6', '8'].includes(String(getBillStatus(row)));
|
||||
|
||||
const sortByCreateTimeDesc = (a, b) => {
|
||||
const aTime = a?.createTime ? new Date(a.createTime).getTime() : 0;
|
||||
const bTime = b?.createTime ? new Date(b.createTime).getTime() : 0;
|
||||
return bTime - aTime;
|
||||
};
|
||||
|
||||
const handleStatusClick = (row) => {
|
||||
if (isReportStatus(row)) {
|
||||
handleViewReport(row);
|
||||
}
|
||||
};
|
||||
|
||||
const pickReportUrl = (data, row) => {
|
||||
if (!data) return '';
|
||||
if (typeof data === 'string') return data;
|
||||
|
||||
const raw = data.records || data;
|
||||
const list = Array.isArray(raw) ? raw : [raw];
|
||||
const matched =
|
||||
list.find((item) => {
|
||||
const reportNo = item.busNo || item.reportNo || item.applyNo || item.prescriptionNo;
|
||||
return reportNo && row.prescriptionNo && String(reportNo) === String(row.prescriptionNo);
|
||||
}) || list[0];
|
||||
|
||||
return matched?.requestUrl || matched?.pdfUrl || matched?.reportUrl || matched?.url || '';
|
||||
};
|
||||
|
||||
const handleViewReport = async (row) => {
|
||||
try {
|
||||
const res = await getProofResult({
|
||||
encounterId: row.encounterId || patientInfo.value?.encounterId,
|
||||
prescriptionNo: row.prescriptionNo,
|
||||
});
|
||||
if (res?.code === 200) {
|
||||
const url = pickReportUrl(res.data, row);
|
||||
if (url) {
|
||||
window.open(url, '_blank');
|
||||
return;
|
||||
}
|
||||
}
|
||||
proxy.$modal?.msgWarning?.('暂未获取到检验报告链接');
|
||||
} catch (e) {
|
||||
proxy.$modal?.msgError?.(e.message || '获取检验报告失败');
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 解析申请类型（优先级代码）
|
||||
* @param {string} descJson - JSON字符串
|
||||
@@ -495,27 +401,32 @@ const hasMatchedFields = computed(() => {
|
||||
|
||||
/** 查询科室 */
|
||||
const getLocationInfo = async () => {
|
||||
try {
|
||||
const res = await getDepartmentList();
|
||||
orgOptions.value = Array.isArray(res.data) ? res.data : [];
|
||||
} catch (e) {
|
||||
console.warn('科室列表加载失败:', e.message);
|
||||
orgOptions.value = [];
|
||||
}
|
||||
const res = await getDepartmentList();
|
||||
orgOptions.value = res.data || [];
|
||||
};
|
||||
|
||||
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) => {
|
||||
@@ -529,13 +440,7 @@ const handleViewDetail = async (row) => {
|
||||
if (row.descJson) {
|
||||
try {
|
||||
const obj = JSON.parse(row.descJson);
|
||||
// 将发往科室 ID 转换为名称
|
||||
if (obj.targetDepartment) {
|
||||
const deptName = recursionFun(obj.targetDepartment);
|
||||
if (deptName) {
|
||||
obj.targetDepartment = deptName;
|
||||
}
|
||||
}
|
||||
obj.targetDepartment = recursionFun(obj.targetDepartment);
|
||||
// 转换申请类型编码为可读文本
|
||||
if (obj.applicationType === 0) obj.applicationType = '普通';
|
||||
else if (obj.applicationType === 1) obj.applicationType = '急诊';
|
||||
@@ -554,12 +459,12 @@ const handleViewDetail = async (row) => {
|
||||
* 修改检验申请单（待签发状态）
|
||||
*/
|
||||
const handleEdit = async (row) => {
|
||||
// 确保科室数据已加载
|
||||
if (!orgOptions.value || orgOptions.value.length === 0) {
|
||||
await getLocationInfo();
|
||||
}
|
||||
editRowData.value = row;
|
||||
editDialogVisible.value = true;
|
||||
await nextTick();
|
||||
editFormRef.value?.getList?.();
|
||||
editFormRef.value?.getLocationInfo?.();
|
||||
editFormRef.value?.getDiagnosisList?.();
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -738,10 +643,6 @@ defineExpose({
|
||||
animation: rotating 2s linear infinite;
|
||||
}
|
||||
|
||||
.report-status-tag {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
@keyframes rotating {
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
<span class="medicine-info"> 诊断：{{ config.diagnosisName }} </span>
|
||||
<span class="medicine-info"> 皮试：{{ row.skinTestFlag_enumText }} </span>
|
||||
<span class="medicine-info"> 注射药品：{{ row.injectFlag_enumText }} </span>
|
||||
<span class="total-amount">
|
||||
<span class="total-amount" v-if="row.therapyEnum == '2'">
|
||||
总金额：{{ row.totalPrice ? Number(row.totalPrice).toFixed(2) + ' 元' : '0.00 元' }}
|
||||
</span>
|
||||
</div>
|
||||
@@ -83,7 +83,7 @@
|
||||
:controls="false"
|
||||
style="width: 70px"
|
||||
:ref="(el) => setInputRef('doseQuantity', el)"
|
||||
@input="() => { convertValues(); calculateTotalAmount(); }"
|
||||
@input="convertValues"
|
||||
@keyup.enter.prevent="handleEnter('doseQuantity')"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -110,7 +110,7 @@
|
||||
:controls="false"
|
||||
style="width: 70px; margin-left: 32px"
|
||||
:ref="(el) => setInputRef('dose', el)"
|
||||
@input="() => { convertDoseValues(); calculateTotalAmount(); }"
|
||||
@input="convertDoseValues"
|
||||
@keyup.enter.prevent="handleEnter('dose')"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -119,7 +119,7 @@
|
||||
v-model="row.doseUnitCode"
|
||||
style="width: 70px"
|
||||
placeholder=" "
|
||||
@change="() => { convertValues(); calculateTotalAmount(); }"
|
||||
@change="convertValues"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in row.unitCodeList"
|
||||
@@ -271,17 +271,13 @@
|
||||
controls-position="right"
|
||||
:controls="false"
|
||||
:ref="(el) => setInputRef('firstDose', el)"
|
||||
@input="calculateTotalAmount"
|
||||
@keyup.enter.prevent="handleEnter('firstDose')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-select v-model="row.doseUnitCode" style="width: 70px" placeholder=" ">
|
||||
<el-option
|
||||
v-for="item in row.unitCodeList"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
:key="item.value"
|
||||
/>
|
||||
<el-select v-model="row.unitCode" style="width: 70px" placeholder=" ">
|
||||
<template v-for="item in row.unitCodeList" :key="item.value">
|
||||
<el-option v-if="checkUnit(item)" :value="item.value" :label="item.label" />
|
||||
</template>
|
||||
</el-select>
|
||||
</template>
|
||||
</div>
|
||||
@@ -430,7 +426,6 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import {computed, getCurrentInstance, nextTick, onMounted, ref, watch} from 'vue';
|
||||
import Decimal from 'decimal.js';
|
||||
|
||||
interface Config {
|
||||
diagnosisName: string; // 仅用于显示
|
||||
@@ -628,18 +623,7 @@ const orgFallbackOption = (value: any) => {
|
||||
const convertValues = () => props.handlers.convertValue('doseQuantity', props.row, props.index);
|
||||
const convertDoseValues = () => props.handlers.convertValue('dose', props.row, props.index);
|
||||
const calculateTotalPrice = () => props.handlers.calculateTotal('price', props.row, props.index);
|
||||
// 直接用 row 计算总金额：数量 * 单价，避免父组件索引不匹配的问题
|
||||
const calculateTotalAmount = () => {
|
||||
nextTick(() => {
|
||||
const row = props.row;
|
||||
const qty = new Decimal(row.doseQuantity || 0);
|
||||
const isMinUnit = row.unitCode == row.minUnitCode;
|
||||
const price = isMinUnit ? row.minUnitPrice : row.unitPrice;
|
||||
// 四舍五入到2位再算，与页面显示的单价一致
|
||||
const roundedPrice = new Decimal(price || 0).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
|
||||
row.totalPrice = qty.mul(roundedPrice).toFixed(6);
|
||||
});
|
||||
};
|
||||
const calculateTotalAmount = () => props.handlers.calculateTotal('amount', props.row, props.index);
|
||||
const setInputRef = props.handlers.setInputRef;
|
||||
|
||||
defineExpose({
|
||||
|
||||
@@ -134,10 +134,10 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup name="LaboratoryTests">
|
||||
import {getCurrentInstance, nextTick, onMounted, reactive, ref, watch, computed} from 'vue';
|
||||
import {getCurrentInstance, onMounted, reactive, ref, watch, computed} from 'vue';
|
||||
import {patientInfo} from '../../../store/patient.js';
|
||||
import {getApplicationList, saveInspection} from './api';
|
||||
import {getDepartmentList} from '@/api/public.js';
|
||||
import {getOrgList} from '@/views/doctorstation/components/api.js';
|
||||
import {getEncounterDiagnosis} from '../../api.js';
|
||||
import {ElMessage} from 'element-plus';
|
||||
|
||||
@@ -168,7 +168,6 @@ const loading = ref(false);
|
||||
const orgOptions = ref([]);
|
||||
const searchKey = ref('');
|
||||
const totalCount = ref(0);
|
||||
const skipDeptAutoFill = ref(false);
|
||||
|
||||
// 将已加载的全部数据转为 transfer 组件所需的格式
|
||||
const buildTransferData = (records) => {
|
||||
@@ -208,8 +207,6 @@ const loadAllData = async () => {
|
||||
}
|
||||
applicationListAll.value = res.data?.records || [];
|
||||
totalCount.value = res.data?.total || 0;
|
||||
// 检验项目列表为异步加载，编辑回显必须在数据就绪后执行，否则已选区一直为空
|
||||
applyEditTransferSelection()
|
||||
} catch (e) {
|
||||
proxy.$message.error('获取检验项目列表失败');
|
||||
applicationListAll.value = [];
|
||||
@@ -245,8 +242,6 @@ const getList = async () => {
|
||||
const handleSearch = () => {
|
||||
// 搜索时保持已选中的项目不受影响
|
||||
};
|
||||
// 编辑初始化标志：避免 applyEditTransferSelection 设置 transferValue 时触发 projectWithDepartment 覆盖 descJson 中的科室值
|
||||
const isInitializing = ref(false);
|
||||
const transferValue = ref([]);
|
||||
const form = reactive({
|
||||
// categoryType: '', // 项目类别
|
||||
@@ -264,31 +259,7 @@ const form = reactive({
|
||||
otherDiagnosisList: [], //其他断目录
|
||||
});
|
||||
const rules = reactive({});
|
||||
|
||||
const normalizeOrgTreeIds = (nodes) => {
|
||||
if (!Array.isArray(nodes)) return [];
|
||||
return nodes.map((node) => ({
|
||||
...node,
|
||||
id: node.id != null ? String(node.id) : node.id,
|
||||
children: node.children?.length ? normalizeOrgTreeIds(node.children) : undefined,
|
||||
}));
|
||||
};
|
||||
|
||||
const resolveTargetDepartmentId = (rawId) => {
|
||||
if (rawId == null || rawId === '') return '';
|
||||
const node = findTreeItem(orgOptions.value, rawId);
|
||||
return node ? String(node.id) : String(rawId);
|
||||
};
|
||||
|
||||
const applyTargetDepartmentEcho = () => {
|
||||
if (form.targetDepartment) {
|
||||
form.targetDepartment = resolveTargetDepartmentId(form.targetDepartment);
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
getLocationInfo();
|
||||
getDiagnosisList();
|
||||
getList();
|
||||
});
|
||||
/**
|
||||
@@ -317,9 +288,8 @@ const projectWithDepartment = (selectProjectIds, type) => {
|
||||
});
|
||||
}
|
||||
});
|
||||
// 保存用户手动选择/回显的发往科室（提交、编辑回显时需要保留）
|
||||
const manualDept =
|
||||
type === 2 || (isEditMode.value && form.targetDepartment) ? form.targetDepartment : '';
|
||||
// 保存用户手动选择的发往科室（提交时需要保留）
|
||||
const manualDept = type === 2 ? form.targetDepartment : '';
|
||||
// 清空科室
|
||||
form.targetDepartment = '';
|
||||
if (arr.length > 0) {
|
||||
@@ -339,8 +309,8 @@ const projectWithDepartment = (selectProjectIds, type) => {
|
||||
const findItem = findTreeItem(orgOptions.value, obj.orgId);
|
||||
if (!findItem) {
|
||||
// type=2(提交)时，若用户已手动选择发往科室，则允许提交
|
||||
if ((type === 2 || isEditMode.value) && manualDept) {
|
||||
form.targetDepartment = resolveTargetDepartmentId(manualDept);
|
||||
if (type === 2 && manualDept) {
|
||||
form.targetDepartment = manualDept;
|
||||
isRelease = true;
|
||||
} else if (type === 2 && !manualDept) {
|
||||
// 提交时用户未手动选择科室，才提示错误
|
||||
@@ -356,10 +326,10 @@ const projectWithDepartment = (selectProjectIds, type) => {
|
||||
}
|
||||
if (findItem && isRelease) {
|
||||
// 提交时若用户已选「发往科室」，不得用项目默认执行科室覆盖
|
||||
if ((type === 2 || isEditMode.value) && manualDept) {
|
||||
form.targetDepartment = resolveTargetDepartmentId(manualDept);
|
||||
if (type === 2 && manualDept) {
|
||||
form.targetDepartment = manualDept;
|
||||
} else {
|
||||
form.targetDepartment = String(findItem.id);
|
||||
form.targetDepartment = findItem.id;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -369,116 +339,47 @@ const projectWithDepartment = (selectProjectIds, type) => {
|
||||
watch(
|
||||
() => transferValue.value,
|
||||
(newValue) => {
|
||||
if (skipDeptAutoFill.value) return;
|
||||
if (isInitializing.value) return;
|
||||
projectWithDepartment(newValue, 1);
|
||||
}
|
||||
);
|
||||
|
||||
/** 编辑弹窗：根据申请单明细把右侧「已选择」与 transferValue 对齐（依赖 applicationListAll 已加载） */
|
||||
const applyEditTransferSelection = () => {
|
||||
const newData = props.editData
|
||||
if (!newData?.requestFormId || !newData.requestFormDetailList?.length) {
|
||||
return
|
||||
}
|
||||
if (!applicationListAll.value.length) {
|
||||
return
|
||||
}
|
||||
const selectedIds = []
|
||||
for (const detail of newData.requestFormDetailList) {
|
||||
const idFromDetail = detail.activityId ?? detail.adviceDefinitionId
|
||||
let matched = null
|
||||
if (idFromDetail != null && idFromDetail !== '') {
|
||||
matched = applicationListAll.value.find(
|
||||
(item) => String(item.adviceDefinitionId) === String(idFromDetail)
|
||||
)
|
||||
}
|
||||
if (!matched && detail.adviceName) {
|
||||
matched = applicationListAll.value.find((item) => item.adviceName === detail.adviceName)
|
||||
}
|
||||
if (!matched && detail.adviceName) {
|
||||
const norm = (s) => String(s || '').trim()
|
||||
matched = applicationListAll.value.find(
|
||||
(item) => norm(item.adviceName) === norm(detail.adviceName)
|
||||
)
|
||||
}
|
||||
if (matched) {
|
||||
selectedIds.push(matched.adviceDefinitionId)
|
||||
}
|
||||
}
|
||||
const uniq = [...new Set(selectedIds)]
|
||||
// 设置初始化标志，防止 transferValue 变化触发 projectWithDepartment 覆盖 descJson 中的科室值
|
||||
isInitializing.value = true
|
||||
skipDeptAutoFill.value = true
|
||||
transferValue.value = uniq
|
||||
nextTick(() => {
|
||||
skipDeptAutoFill.value = false
|
||||
})
|
||||
isInitializing.value = false
|
||||
if (newData.requestFormDetailList.length && uniq.length === 0) {
|
||||
console.warn(
|
||||
'[LaboratoryTests] 申请单明细未能在项目字典中匹配到项，请核对 activityId / 项目名称',
|
||||
newData.requestFormDetailList
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// 编辑模式下，回显已有数据（表单来自 descJson；项目选择在字典加载后由 applyEditTransferSelection 完成）
|
||||
// 编辑模式下，回显已有数据
|
||||
watch(
|
||||
() => props.editData,
|
||||
(newData) => {
|
||||
if (!newData || !newData.requestFormId) return
|
||||
if (!newData || !newData.requestFormId) return;
|
||||
|
||||
// 解析 descJson 回填表单
|
||||
if (newData.descJson) {
|
||||
try {
|
||||
const obj = JSON.parse(newData.descJson)
|
||||
const obj = JSON.parse(newData.descJson);
|
||||
Object.keys(form).forEach((key) => {
|
||||
if (obj[key] !== undefined) {
|
||||
form[key] = obj[key]
|
||||
form[key] = obj[key];
|
||||
}
|
||||
})
|
||||
applyTargetDepartmentEcho()
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('解析 descJson 失败:', e)
|
||||
console.error('解析 descJson 失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
applyEditTransferSelection()
|
||||
// 回填已选项目
|
||||
if (newData.requestFormDetailList && newData.requestFormDetailList.length > 0) {
|
||||
// 从全部数据中匹配已选项目
|
||||
const selectedIds = [];
|
||||
newData.requestFormDetailList.forEach((detail) => {
|
||||
const matched = applicationListAll.value.find(
|
||||
(item) => item.adviceName === detail.adviceName
|
||||
);
|
||||
if (matched) {
|
||||
selectedIds.push(matched.adviceDefinitionId);
|
||||
}
|
||||
});
|
||||
transferValue.value = selectedIds;
|
||||
}
|
||||
},
|
||||
{ immediate: true, deep: true }
|
||||
)
|
||||
|
||||
watch(
|
||||
() => orgOptions.value,
|
||||
() => {
|
||||
applyTargetDepartmentEcho()
|
||||
}
|
||||
)
|
||||
|
||||
// 编辑模式下，项目字典加载完成后重新回显已选项目
|
||||
watch(
|
||||
() => applicationListAll.value,
|
||||
() => {
|
||||
if (!props.editData?.requestFormId) return;
|
||||
if (!props.editData.requestFormDetailList?.length) return;
|
||||
if (!applicationListAll.value.length) return;
|
||||
|
||||
const selectedIds = [];
|
||||
props.editData.requestFormDetailList.forEach((detail) => {
|
||||
const matched = applicationListAll.value.find(
|
||||
(item) => item.adviceName === detail.adviceName
|
||||
);
|
||||
if (matched) {
|
||||
selectedIds.push(matched.adviceDefinitionId);
|
||||
}
|
||||
});
|
||||
isInitializing.value = true;
|
||||
transferValue.value = selectedIds;
|
||||
isInitializing.value = false;
|
||||
applyEditTransferSelection();
|
||||
}
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
const submit = () => {
|
||||
if (transferValue.value.length == 0) {
|
||||
return proxy.$message.error('请选择申请单');
|
||||
@@ -528,9 +429,9 @@ const submit = () => {
|
||||
};
|
||||
/** 查询科室 */
|
||||
const getLocationInfo = () => {
|
||||
return getDepartmentList().then((res) => {
|
||||
orgOptions.value = normalizeOrgTreeIds(res.data || []);
|
||||
applyTargetDepartmentEcho();
|
||||
getOrgList().then((res) => {
|
||||
orgOptions.value = res.data.records;
|
||||
console.log('科室========>', JSON.stringify(orgOptions.value));
|
||||
});
|
||||
};
|
||||
// 获取诊断目录
|
||||
|
||||
@@ -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>
|
||||
@@ -347,8 +347,8 @@ const rules = reactive({
|
||||
],
|
||||
});
|
||||
|
||||
// 禁用过去的日期（允许选择今天及以后）
|
||||
const disabledPastDate = (time) => {
|
||||
// 禁用过去的时间
|
||||
const disabledFutureDate = (time) => {
|
||||
return time.getTime() < Date.now() - 8.64e7;
|
||||
};
|
||||
|
||||
@@ -428,52 +428,11 @@ const loadEditData = () => {
|
||||
const projectWithDepartment = (selectProjectIds) => {
|
||||
if (!selectProjectIds || selectProjectIds.length === 0) {
|
||||
form.targetDepartment = '';
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取第一个选中项目的发往科室（orgId）
|
||||
// 优先使用配置的发往科室，如果没有则保留手动选择
|
||||
const selectedProject = applicationListAll.value?.find(
|
||||
item => selectProjectIds.includes(item.adviceDefinitionId)
|
||||
);
|
||||
|
||||
if (selectedProject && selectedProject.orgId) {
|
||||
// 项目配置了发往科室，自动填充
|
||||
const orgId = selectedProject.orgId;
|
||||
const orgName = selectedProject.orgName;
|
||||
|
||||
// 查找树中对应的节点，获取正确的 id 类型
|
||||
const findNode = (nodes, targetId) => {
|
||||
if (!nodes) return null;
|
||||
for (const node of nodes) {
|
||||
if (String(node.id) === String(targetId)) {
|
||||
return node;
|
||||
}
|
||||
if (node.children && node.children.length > 0) {
|
||||
const found = findNode(node.children, targetId);
|
||||
if (found) return found;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
|
||||
const treeNode = findNode(orgOptions.value, orgId);
|
||||
if (treeNode) {
|
||||
// 使用树节点的原始 id 值（确保类型匹配）
|
||||
form.targetDepartment = treeNode.id;
|
||||
} else {
|
||||
// 科室不在列表中（可能已删除），留空让用户手动选择
|
||||
form.targetDepartment = '';
|
||||
}
|
||||
}
|
||||
// 如果没有配置发往科室，保留手动选择（不修改 form.targetDepartment）
|
||||
};
|
||||
|
||||
watch(() => transferValue.value, (newValue) => {
|
||||
// 使用 nextTick 确保 DOM 更新完成后再设置值
|
||||
nextTick(() => {
|
||||
projectWithDepartment(newValue);
|
||||
});
|
||||
projectWithDepartment(newValue);
|
||||
});
|
||||
|
||||
const getPriorityCode = () => {
|
||||
@@ -512,7 +471,7 @@ const submit = () => {
|
||||
unitCode: item.unitCode || priceInfo.unitCode || '',
|
||||
unitPrice: item.price ?? priceInfo.price ?? 0,
|
||||
totalPrice: item.price ?? priceInfo.price ?? 0,
|
||||
positionId: form.targetDepartment || item.positionId, // 用户手动选择的发往科室优先于项目默认执行科室
|
||||
positionId: item.positionId,
|
||||
ybClassEnum: item.ybClassEnum,
|
||||
conditionId: item.conditionId,
|
||||
encounterDiagnosisId: item.encounterDiagnosisId,
|
||||
@@ -540,16 +499,17 @@ const submit = () => {
|
||||
categoryEnum: '22',
|
||||
}).then((res) => {
|
||||
if (res.code === 200) {
|
||||
ElMessage.success(res.msg || (props.isEditMode ? '修改成功' : '保存成功'));
|
||||
if (props.isEditMode) {
|
||||
proxy.$message.success(res.msg || '修改成功');
|
||||
} else {
|
||||
proxy.$message.success(res.msg);
|
||||
}
|
||||
applicationList.value = [];
|
||||
emits('submitOk');
|
||||
resetForm();
|
||||
emits('submitOk');
|
||||
} else {
|
||||
ElMessage.error(res.msg || '保存失败');
|
||||
proxy.$message.error(res.message);
|
||||
}
|
||||
}).catch((error) => {
|
||||
console.error('保存检查申请失败:', error);
|
||||
ElMessage.error('保存失败，请稍后重试');
|
||||
});
|
||||
};
|
||||
|
||||
@@ -665,6 +625,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;
|
||||
|
||||
@@ -128,7 +128,7 @@ 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) => {
|
||||
@@ -150,7 +150,6 @@ const getList = () => {
|
||||
if (surgeryMappedCache && surgeryMappedCache.length > 0) {
|
||||
applicationList.value = surgeryMappedCache;
|
||||
applicationListAll.value = surgeryRecordsCache;
|
||||
loading.value = false;
|
||||
return;
|
||||
}
|
||||
loadPage('');
|
||||
@@ -174,9 +173,7 @@ const loadPage = (key) => {
|
||||
dbTotal.value = res.data.total || 0;
|
||||
const records = res.data.records;
|
||||
applicationListAll.value = records;
|
||||
applicationList.value = records
|
||||
.filter(item => item.adviceDefinitionId != null)
|
||||
.map(mapToTransferItem);
|
||||
applicationList.value = records.map(mapToTransferItem);
|
||||
// 仅在无搜索时缓存
|
||||
if (!key) {
|
||||
surgeryRecordsCache = records;
|
||||
@@ -232,21 +229,64 @@ onMounted(() => {
|
||||
* type(1：watch监听类型 2:点击保存类型)
|
||||
* selectProjectIds(选中项目的id数组)
|
||||
* */
|
||||
const projectWithDepartment = (selectProjectIds) => {
|
||||
if (!selectProjectIds || selectProjectIds.length === 0) {
|
||||
form.targetDepartment = '';
|
||||
const projectWithDepartment = (selectProjectIds, type) => {
|
||||
//1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
|
||||
let isRelease = true;
|
||||
// 选中项目的数组
|
||||
const arr = [];
|
||||
// 根据选中的项目id查找对应的项目
|
||||
selectProjectIds.forEach((element) => {
|
||||
const searchData = applicationList.value.find((item) => {
|
||||
return element == item.adviceDefinitionId;
|
||||
});
|
||||
arr.push(searchData);
|
||||
});
|
||||
// 清空科室
|
||||
form.targetDepartment = '';
|
||||
if (arr.length > 0) {
|
||||
const obj = arr[0];
|
||||
// 判断科室是否相同
|
||||
const isCompare = arr.every((item) => {
|
||||
return item.orgId == obj.orgId;
|
||||
});
|
||||
if (!isCompare) {
|
||||
ElMessage({
|
||||
type: 'error',
|
||||
message: '执行科室不同',
|
||||
});
|
||||
isRelease = false;
|
||||
}
|
||||
// 选中项目中的执行科室id与全部科室数据做匹配
|
||||
const findItem = findTreeItem(orgOptions.value, obj.orgId);
|
||||
|
||||
if (!findItem) {
|
||||
isRelease = false;
|
||||
ElMessage({
|
||||
type: 'error',
|
||||
message: '未找到项目执行的科室',
|
||||
});
|
||||
}
|
||||
if (type == 1) {
|
||||
if (isRelease) {
|
||||
form.targetDepartment = findItem.id;
|
||||
}
|
||||
}
|
||||
}
|
||||
return isRelease;
|
||||
};
|
||||
// 监听选择项目变化
|
||||
watch(() => transferValue.value, (newValue) => {
|
||||
projectWithDepartment(newValue);
|
||||
});
|
||||
watch(
|
||||
() => transferValue.value,
|
||||
(newValue) => {
|
||||
projectWithDepartment(newValue, 1);
|
||||
}
|
||||
);
|
||||
const submit = () => {
|
||||
if (transferValue.value.length == 0) {
|
||||
return proxy.$message.error('请选择手术项目');
|
||||
return proxy.$message.error('请选择申请单');
|
||||
}
|
||||
if (!form.targetDepartment) {
|
||||
return proxy.$message.error('请选择发往科室');
|
||||
if (!projectWithDepartment(transferValue.value, 2)) {
|
||||
return;
|
||||
}
|
||||
let applicationListAllFilter = applicationListAll.value.filter((item) => {
|
||||
return transferValue.value.includes(item.adviceDefinitionId);
|
||||
@@ -259,7 +299,7 @@ const submit = () => {
|
||||
unitCode: item.unitCode,
|
||||
unitPrice: item.price,
|
||||
totalPrice: item.price,
|
||||
positionId: form.targetDepartment || item.positionId, // 用户手动选择的发往科室优先于项目默认执行科室
|
||||
positionId: item.positionId,
|
||||
definitionId: item.chargeItemDefinitionId,
|
||||
accountId: patientInfo.value.accountId,
|
||||
};
|
||||
|
||||
@@ -380,7 +380,7 @@ const form = ref({
|
||||
prescriptionList: prescriptionList.value,
|
||||
});
|
||||
const adviceQueryParams = ref({
|
||||
adviceType: 1,
|
||||
adviceType: '',
|
||||
categoryCode: '', // 初始为空，等待加载配置后动态设置
|
||||
searchKey: '',
|
||||
});
|
||||
@@ -429,8 +429,6 @@ const props = defineProps({
|
||||
});
|
||||
const isAdding = ref(false);
|
||||
const isSaving = ref(false);
|
||||
// 标记双击编辑的是否为已有数据的行（用于保存后是否自动添加下一行）
|
||||
const wasDoubleClickEdit = ref(false);
|
||||
const prescriptionRef = ref();
|
||||
const expandOrder = ref([]); //目前的展开行
|
||||
const stockList = ref([]);
|
||||
@@ -535,6 +533,7 @@ const statusOption = [
|
||||
let loadingInstance = undefined;
|
||||
onMounted(() => {
|
||||
document.addEventListener('keydown', escKeyListener);
|
||||
getList();
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
@@ -575,7 +574,6 @@ function handleTotalAmount() {
|
||||
}
|
||||
}, new Decimal(0));
|
||||
}
|
||||
getList();
|
||||
function getList() {
|
||||
getDiagnosisDefinitionList(queryParams.value).then((res) => {
|
||||
// prescriptionList.value = res.data.records;
|
||||
@@ -587,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();
|
||||
@@ -607,26 +610,13 @@ function getListInfo(addNewRow) {
|
||||
prescriptionList.value = res.data
|
||||
.map((item) => {
|
||||
const parsedContent = JSON.parse(item.contentJson);
|
||||
// 构造 unitCodeList，确保编辑时下拉框有正确的选项
|
||||
console.log('【DEBUG】unitCode:', parsedContent?.unitCode, typeof parsedContent?.unitCode, 'unitCodeList:', JSON.stringify(parsedContent?.unitCodeList));
|
||||
const unitCodeListData = parsedContent?.unitCodeList || [
|
||||
{ value: String(parsedContent?.unitCode ?? item.unitCode ?? ''), label: parsedContent?.unitCode_dictText ?? item.unitCode_dictText ?? '', type: 'unit' },
|
||||
{ value: String(parsedContent?.doseUnitCode ?? ''), label: parsedContent?.doseUnitCode_dictText ?? '', type: 'dose' },
|
||||
{ value: String(parsedContent?.minUnitCode ?? ''), label: parsedContent?.minUnitCode_dictText ?? '', type: 'minUnit' },
|
||||
];
|
||||
return {
|
||||
...parsedContent,
|
||||
...item,
|
||||
// 🔧 修复：contentJson 中的 totalPrice 优先于 charge_item 表的 totalPrice
|
||||
// charge_item.totalPrice 可能为 0 或 null（新建医嘱时），导致总金额显示为 "-"
|
||||
totalPrice: parsedContent?.totalPrice || item.totalPrice,
|
||||
isEdit: false,
|
||||
showPopover: false,
|
||||
doseQuantity: parsedContent?.doseQuantity,
|
||||
doseUnitCode_dictText: parsedContent?.doseUnitCode_dictText,
|
||||
// 确保 unitCode 为字符串类型，与 unitCodeList 的 option value 类型一致
|
||||
unitCode: String(parsedContent?.unitCode ?? item.unitCode ?? ''),
|
||||
unitCodeList: unitCodeListData,
|
||||
// 确保 therapyEnum 被正确设置，优先使用 contentJson 中的值
|
||||
therapyEnum: String(parsedContent?.therapyEnum ?? item.therapyEnum ?? '1'),
|
||||
// 🔧 修复：确保 orgId 为 String 类型，与 organization 树的 id 类型一致
|
||||
@@ -701,7 +691,7 @@ function loadConfiguredCategories() {
|
||||
nextTick(() => {
|
||||
// 创建新对象触发响应式更新
|
||||
adviceQueryParams.value = {
|
||||
adviceType: 1,
|
||||
adviceType: '',
|
||||
categoryCode: defaultCategoryCode,
|
||||
searchKey: '',
|
||||
};
|
||||
@@ -725,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))
|
||||
);
|
||||
});
|
||||
@@ -755,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;
|
||||
}
|
||||
return row.adviceType;
|
||||
// 诊疗/手术等非药品类型，检查其值是否在选项列表中
|
||||
if (adviceTypeList.value.some(item => item.value === row.adviceType)) {
|
||||
return row.adviceType;
|
||||
}
|
||||
// 不在选项中的值（如已废弃的 adviceType），返回 undefined 让 el-select 显示为空
|
||||
return undefined;
|
||||
}
|
||||
|
||||
// 新增医嘱
|
||||
@@ -806,7 +820,7 @@ function checkUnit(item, row) {
|
||||
}
|
||||
}
|
||||
|
||||
// 行双击打开编辑块：待保存、待签发医嘱均可编辑；已签发/已完成/停止不允许编辑
|
||||
// 行双击打开编辑块，仅待发送的可编辑
|
||||
function clickRowDb(row, column, event) {
|
||||
// 检查点击的是否是复选框
|
||||
if (event && event.target.closest('.el-checkbox')) {
|
||||
@@ -817,18 +831,14 @@ function clickRowDb(row, column, event) {
|
||||
return;
|
||||
}
|
||||
row.showPopover = false;
|
||||
// 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
|
||||
if (row.statusEnum == 1) {
|
||||
// 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
|
||||
row.therapyEnum = String(row.therapyEnum ?? '1');
|
||||
row.isEdit = true;
|
||||
const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
|
||||
rowIndex.value = index;
|
||||
if (index !== -1) {
|
||||
prescriptionList.value[index] = row;
|
||||
}
|
||||
prescriptionList.value[index] = row;
|
||||
expandOrder.value = [row.uniqueKey];
|
||||
} else {
|
||||
proxy.$modal.msgWarning('仅待保存或待签发医嘱允许编辑');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -900,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(() => {
|
||||
@@ -939,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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1200,19 +1213,27 @@ function handleSave() {
|
||||
});
|
||||
// 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
|
||||
loading.value = true;
|
||||
let list = saveList.map((item) => {
|
||||
const parsedContent = item.contentJson ? JSON.parse(item.contentJson) : {};
|
||||
return {
|
||||
...parsedContent,
|
||||
adviceType: item.adviceType,
|
||||
requestId: item.requestId,
|
||||
dbOpType: '1',
|
||||
groupId: item.groupId,
|
||||
uniqueKey: undefined,
|
||||
// 确保 therapyEnum 被正确传递
|
||||
therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
|
||||
};
|
||||
});
|
||||
let list = [];
|
||||
try {
|
||||
list = saveList.map((item) => {
|
||||
const parsedContent = item.contentJson ? JSON.parse(item.contentJson) || {} : {};
|
||||
return {
|
||||
...parsedContent,
|
||||
adviceType: item.adviceType,
|
||||
requestId: item.requestId,
|
||||
dbOpType: '1',
|
||||
groupId: item.groupId,
|
||||
uniqueKey: undefined,
|
||||
// 确保 therapyEnum 被正确传递
|
||||
therapyEnum: parsedContent?.therapyEnum || item.therapyEnum || '1',
|
||||
};
|
||||
});
|
||||
} catch (error) {
|
||||
loading.value = false;
|
||||
isSaving.value = false;
|
||||
proxy.$modal.msgError('医嘱内容解析失败，请检查待签发医嘱');
|
||||
return;
|
||||
}
|
||||
// 保存签发按钮
|
||||
isSaving.value = true;
|
||||
console.log('签发处方参数：', {
|
||||
@@ -1227,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;
|
||||
@@ -1330,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;
|
||||
}
|
||||
@@ -1395,15 +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 (isAdding.value && 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;
|
||||
}
|
||||
@@ -1444,32 +1479,40 @@ 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 || '保存失败，请重试');
|
||||
});
|
||||
}
|
||||
|
||||
function setValue(row) {
|
||||
// 构造单位列表
|
||||
// 构造单位列表，确保 value 始终为 String 类型，避免 el-select 值类型不匹配
|
||||
unitCodeList.value = [
|
||||
{ value: String(row.unitCode), label: row.unitCode_dictText, type: 'unit' },
|
||||
{ value: String(row.unitCode ?? ''), label: row.unitCode_dictText, type: 'unit' },
|
||||
{
|
||||
value: String(row.doseUnitCode),
|
||||
value: String(row.doseUnitCode ?? ''),
|
||||
label: row.doseUnitCode_dictText,
|
||||
type: 'dose',
|
||||
},
|
||||
{
|
||||
value: String(row.minUnitCode),
|
||||
value: String(row.minUnitCode ?? ''),
|
||||
label: row.minUnitCode_dictText,
|
||||
type: 'minUnit',
|
||||
},
|
||||
@@ -1534,9 +1577,9 @@ function setValue(row) {
|
||||
orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || row.orgName || patientInfo.value?.inHospitalOrgName || ''),
|
||||
// dose: undefined, Removed to preserve dose value from group package
|
||||
unitCodeList: unitCodeList.value,
|
||||
doseUnitCode: row.doseUnitCode,
|
||||
minUnitCode: String(row.minUnitCode),
|
||||
unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode) : String(row.unitCode),
|
||||
doseUnitCode: String(row.doseUnitCode ?? ''),
|
||||
minUnitCode: String(row.minUnitCode ?? ''),
|
||||
unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode ?? '') : String(row.unitCode ?? ''),
|
||||
categoryEnum: row.categoryCode,
|
||||
definitionId: row.chargeItemDefinitionId,
|
||||
executeNum: 1,
|
||||
@@ -1552,13 +1595,10 @@ function setValue(row) {
|
||||
? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
|
||||
: prevRow.minUnitPrice,
|
||||
positionName: selectedStock?.locationName,
|
||||
// 🔧 Bug #523 修复：初始化 totalPrice 为 0，避免总金额列显示为横杠
|
||||
totalPrice: row.quantity
|
||||
? (String(row.unitCode) == String(row.minUnitCode)
|
||||
? (row.quantity * (selectedStock
|
||||
? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
|
||||
: prevRow.minUnitPrice)).toFixed(6)
|
||||
: (row.quantity * (selectedStock?.price ?? 0)).toFixed(6))
|
||||
: undefined,
|
||||
? new Decimal(row.quantity).mul(selectedStock?.price ?? 0).toFixed(6)
|
||||
: '0',
|
||||
}
|
||||
: {
|
||||
quantity: 1,
|
||||
@@ -1590,17 +1630,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,
|
||||
@@ -1609,57 +1653,79 @@ 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,
|
||||
isEdit: false,
|
||||
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)
|
||||
? (item.orderDetailInfos?.orgId || mergedDetail.orgId)
|
||||
: patientInfo.value?.inHospitalOrgId
|
||||
) || '',
|
||||
orgName: findOrgName(
|
||||
(item.orderDetailInfos?.orgId || mergedDetail.orgId)
|
||||
? (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,
|
||||
diagnosisName: diagnosisName.value,
|
||||
therapyEnum: prescriptionList.value[rowIndex.value]?.therapyEnum || mergedDetail.therapyEnum || '1',
|
||||
// 🔧 修复：确保组套医嘱的 categoryEnum 被正确映射，防止后端 NPE
|
||||
categoryEnum: mergedDetail?.categoryEnum || mergedDetail?.categoryCode || item?.categoryCode,
|
||||
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 || '';
|
||||
// 确保价格字段有兜底值（setValue 可能因库存不足提前 return 导致未设置）
|
||||
newRow.unitPrice = baseRow.unitPrice ?? mergedDetail.unitPrice ?? 0;
|
||||
newRow.minUnitPrice = baseRow.minUnitPrice ?? mergedDetail.minUnitPrice ?? 0;
|
||||
newRow.unitTempPrice = newRow.unitPrice;
|
||||
newRow.methodCode_dictText = mergedDetail.methodCode_dictText || item.methodCode_dictText || '';
|
||||
newRow.rateCode_dictText = mergedDetail.rateCode_dictText || item.rateCode_dictText || '';
|
||||
newRow.doseUnitCode = mergedDetail.doseUnitCode || item.doseUnitCode || baseRow.doseUnitCode;
|
||||
newRow.doseUnitCode_dictText = mergedDetail.doseUnitCode_dictText || item.doseUnitCode_dictText || '';
|
||||
newRow.orgId = mergedDetail.orgId || mergedDetail.positionId || baseRow.orgId || '';
|
||||
newRow.positionName = mergedDetail.orgName || mergedDetail.positionName || baseRow.positionName || '';
|
||||
|
||||
// 计算价格和总量
|
||||
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);
|
||||
@@ -1687,8 +1753,6 @@ function handleSaveHistory(value) {
|
||||
encounterDiagnosisId: encounterDiagnosisId.value,
|
||||
// 确保 therapyEnum 被正确传递，默认为长期医嘱('1')
|
||||
therapyEnum: value.therapyEnum || '1',
|
||||
// 🔧 修复：历史医嘱的 categoryCode(String) 映射为后端 categoryEnum(Integer)，防止 NPE
|
||||
categoryEnum: value.categoryEnum || value.categoryCode,
|
||||
contentJson: JSON.stringify({
|
||||
...value,
|
||||
therapyEnum: value.therapyEnum || '1',
|
||||
|
||||
@@ -22,6 +22,9 @@
|
||||
<el-tab-pane label="检查申请" name="examine">
|
||||
<ExamineApplication ref="examineApplicationRef" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="汇总发药申请" name="summaryDrug">
|
||||
<SummaryDrugApplication ref="summaryDrugApplicationRef" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="手术申请" name="surgery">
|
||||
<SurgeryApplication ref="surgeryApplicationRef" />
|
||||
</el-tab-pane>
|
||||
@@ -44,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';
|
||||
@@ -79,6 +83,7 @@ const currentPatientInfo = ref({});
|
||||
const testApplicationRef = ref();
|
||||
const examineApplicationRef = ref();
|
||||
const surgeryApplicationRef = ref();
|
||||
const summaryDrugApplicationRef = ref();
|
||||
const bloodTtransfusionAapplicationRef = ref();
|
||||
|
||||
// 患者列表相关逻辑
|
||||
|
||||
@@ -348,14 +348,13 @@ const adviceTypeList = computed(() => {
|
||||
return val === 3 || val === 4;
|
||||
}).map(item => ({
|
||||
label: item.label,
|
||||
// drord_doctor_type 中耗材是 4，但 /advice-base-info 后端耗材类型是 2
|
||||
value: parseInt(item.value) === 4 ? 2 : parseInt(item.value)
|
||||
value: parseInt(item.value)
|
||||
}));
|
||||
return [...filtered, { label: '全部', value: '' }];
|
||||
}
|
||||
// 默认值
|
||||
return [
|
||||
{ label: '耗材', value: 2 },
|
||||
{ label: '耗材', value: 4 },
|
||||
{ label: '诊疗', value: 3 },
|
||||
{ label: '全部', value: '' },
|
||||
];
|
||||
@@ -374,8 +373,7 @@ const filterKeywords = ref({});
|
||||
const queryParams = ref({
|
||||
pageSize: 100,
|
||||
pageNum: 1,
|
||||
// 默认加载全部类型（药品1+耗材2+诊疗3）
|
||||
adviceTypes: [1, 2, 3],
|
||||
adviceTypes: '2,3',
|
||||
});
|
||||
/**
|
||||
* 医嘱提交数据模型
|
||||
@@ -484,9 +482,8 @@ watch(
|
||||
(visible) => {
|
||||
if (visible) {
|
||||
executeTime.value = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
|
||||
// 弹窗打开时按当前患者科室重新加载，避免复用上一次患者/登录科室的结果
|
||||
// 弹窗打开时重新加载科室和位置选项，确保数据最新
|
||||
loadDepartmentOptions();
|
||||
getAdviceBaseInfos();
|
||||
getDiseaseInitLoc(16);
|
||||
} else {
|
||||
resetData();
|
||||
@@ -558,28 +555,12 @@ function loadDepartmentOptions() {
|
||||
function getAdviceBaseInfos() {
|
||||
adviceLoading.value = true;
|
||||
queryParams.value.searchKey = searchText.value;
|
||||
// 字典值(3=诊疗,4=耗材)映射为后端adviceType(2=耗材,3=诊疗)
|
||||
if (adviceType.value === 4) {
|
||||
queryParams.value.adviceTypes = [2];
|
||||
} else if (adviceType.value === 3) {
|
||||
queryParams.value.adviceTypes = [3];
|
||||
} else {
|
||||
queryParams.value.adviceTypes = [1, 2, 3];
|
||||
}
|
||||
queryParams.value.adviceType = adviceType.value;
|
||||
queryParams.value.organizationId = orgId.value;
|
||||
queryParams.value.adviceTypes = normalizeAdviceTypesForQuery(adviceType.value);
|
||||
queryParams.value.organizationId = props.patientInfo.organizationId || orgId.value;
|
||||
queryParams.value.pricingFlag = 1; // 划价标记
|
||||
getAdviceBaseInfo(queryParams.value)
|
||||
.then((res) => {
|
||||
const list = res.data?.records || [];
|
||||
// 药品(1)和耗材(2)必须有库存才能展示，诊疗(3)无库存概念不过滤
|
||||
AdviceBaseInfoList.value = list.filter(item => {
|
||||
if (item.adviceType === 1 || item.adviceType === 2) {
|
||||
return item.inventoryList && item.inventoryList.length > 0;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
AdviceBaseInfoList.value = res.data?.records || [];
|
||||
})
|
||||
.finally(() => {
|
||||
adviceLoading.value = false;
|
||||
@@ -624,12 +605,6 @@ function getItemType_Text(type) {
|
||||
const map = { 2: '耗材', 3: '诊疗' };
|
||||
return map[type] || '其他';
|
||||
}
|
||||
function normalizeAdviceTypesForQuery(type) {
|
||||
if (type === '' || type === undefined || type === null) {
|
||||
return '2,3';
|
||||
}
|
||||
return Number(type) === 4 ? 2 : type;
|
||||
}
|
||||
function getUnitCodeOptions(row) {
|
||||
const unitCodes = [];
|
||||
// 大单位：优先用 code，code 缺失时用字典文本兜底
|
||||
|
||||
@@ -262,7 +262,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {nextTick, onMounted, ref} from 'vue';
|
||||
import {computed, nextTick, onMounted, ref, watch} from 'vue';
|
||||
import {ElMessage, ElMessageBox} from 'element-plus';
|
||||
// Element Plus 图标导入
|
||||
import {User} from '@element-plus/icons-vue';
|
||||
@@ -366,9 +366,9 @@ const rawPrescriptionList = ref([]); // 原始未分组数据
|
||||
const groupedPrescriptionList = ref([]); // 按encounterId分组后的数据
|
||||
const activeCollapseNames = ref([]); // Collapse激活状态
|
||||
const selectedRows = ref({}); // 选中的行数据
|
||||
const totalItemsCount = ref(0); // 总医嘱项数
|
||||
const totalAmount = ref(0); // 总金额（保留4位小数）
|
||||
const dialogVisible = ref(false);
|
||||
/** Tab 切换同步日期时跳过 date-picker change，避免与 v-model 循环触发 */
|
||||
const syncingDateFromTab = ref(false);
|
||||
const selectedFeeItems = ref([]);
|
||||
const currentPatientInfo = ref(null);
|
||||
const queryParams = ref({
|
||||
@@ -381,6 +381,24 @@ const userStore = useUserStore();
|
||||
const userId = ref(safeGet(userStore, 'id', ''));
|
||||
const orgId = ref(safeGet(userStore, 'orgId', ''));
|
||||
|
||||
// ========== 计算属性 ==========
|
||||
// 计算总统计信息（总项数、总金额）
|
||||
const calculateTotalStats = computed(() => {
|
||||
let itemsCount = 0;
|
||||
let amount = 0;
|
||||
|
||||
safeArray(groupedPrescriptionList.value).forEach((patientGroup) => {
|
||||
safeArray(patientGroup).forEach((item) => {
|
||||
itemsCount++;
|
||||
// 累加单价，保留4位小数精度
|
||||
amount = Math.round((amount + Number(safeGet(item, 'unitPrice', 0))) * 10000) / 10000;
|
||||
});
|
||||
});
|
||||
|
||||
totalItemsCount.value = itemsCount;
|
||||
totalAmount.value = amount;
|
||||
});
|
||||
|
||||
// ========== 方法 ==========
|
||||
/**
|
||||
* 计算单个患者的总金额（保留4位小数）
|
||||
@@ -429,19 +447,16 @@ const handleTableSelectionChange = (index, val) => {
|
||||
};
|
||||
|
||||
/**
|
||||
* 按 Tab 同步日期范围（避免 date-picker @change 与 Tab v-model 互相覆盖）
|
||||
* @param {string} rangeType - today | yesterday | custom
|
||||
* 日期Tab切换
|
||||
* @param {Object} tab - 标签页
|
||||
*/
|
||||
const applyDateRangeByTab = (rangeType) => {
|
||||
const handleDateTabClick = (tab) => {
|
||||
const today = new Date();
|
||||
const yesterday = new Date(today);
|
||||
yesterday.setDate(today.getDate() - 1);
|
||||
const format = (date) => formatDateStr(date, 'YYYY-MM-DD');
|
||||
|
||||
syncingDateFromTab.value = true;
|
||||
dateRange.value = rangeType;
|
||||
|
||||
switch (rangeType) {
|
||||
switch (safeGet(tab, 'paneName')) {
|
||||
case 'today':
|
||||
dateRangeValue.value = [format(today), format(today)];
|
||||
break;
|
||||
@@ -449,54 +464,27 @@ const applyDateRangeByTab = (rangeType) => {
|
||||
dateRangeValue.value = [format(yesterday), format(yesterday)];
|
||||
break;
|
||||
case 'custom':
|
||||
if (safeArray(dateRangeValue.value).length < 2) {
|
||||
if (!dateRangeValue.value.length) {
|
||||
dateRangeValue.value = [format(today), format(today)];
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
nextTick(() => {
|
||||
syncingDateFromTab.value = false;
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 日期Tab切换
|
||||
* @param {Object} tab - 标签页
|
||||
*/
|
||||
const handleDateTabClick = (tab) => {
|
||||
const rangeType = tab?.paneName ?? tab?.props?.name;
|
||||
if (!rangeType) return;
|
||||
applyDateRangeByTab(rangeType);
|
||||
handleQuery();
|
||||
};
|
||||
|
||||
/**
|
||||
* 日期选择器变化（仅用户手动改日期时切到「自定义」）
|
||||
* 日期选择器变化
|
||||
* @param {Array} val - 选中日期
|
||||
*/
|
||||
const handleDatePickerChange = (val) => {
|
||||
if (syncingDateFromTab.value) return;
|
||||
|
||||
const dateVal = safeArray(val);
|
||||
if (dateVal.length !== 2) return;
|
||||
|
||||
const start = new Date(dateVal[0]);
|
||||
const end = new Date(dateVal[1]);
|
||||
if (start > end) {
|
||||
ElMessage.warning('开始日期不能晚于结束日期');
|
||||
syncingDateFromTab.value = true;
|
||||
dateRangeValue.value = [dateVal[1], dateVal[0]];
|
||||
nextTick(() => {
|
||||
syncingDateFromTab.value = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (dateRange.value !== 'custom') {
|
||||
if (dateVal.length === 2) {
|
||||
dateRange.value = 'custom';
|
||||
const start = new Date(dateVal[0]);
|
||||
const end = new Date(dateVal[1]);
|
||||
if (start > end) {
|
||||
ElMessage.warning('开始日期不能晚于结束日期');
|
||||
dateRangeValue.value = [dateVal[1], dateVal[0]];
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -726,7 +714,24 @@ const handleSingleDelete = (row) => {
|
||||
};
|
||||
// ========== 初始化 ==========
|
||||
onMounted(() => {
|
||||
applyDateRangeByTab('today');
|
||||
// 设置默认日期
|
||||
const today = new Date();
|
||||
const defaultDate = formatDateStr(today, 'YYYY-MM-DD');
|
||||
dateRangeValue.value = [defaultDate, defaultDate];
|
||||
|
||||
// 监听日期变化自动查询
|
||||
watch(
|
||||
[dateRange, dateRangeValue],
|
||||
([newRange, newVal], [oldRange, oldVal]) => {
|
||||
if (oldRange !== undefined && safeArray(newVal).length === 2) {
|
||||
handleQuery();
|
||||
}
|
||||
},
|
||||
{ deep: true }
|
||||
);
|
||||
|
||||
// 初始化统计信息
|
||||
calculateTotalStats.value;
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -29,6 +29,12 @@ export const inpatientNurseNavs = [
|
||||
icon: 'EditPen',
|
||||
accent: '#ff7a45',
|
||||
},
|
||||
{
|
||||
label: '汇总发药申请',
|
||||
path: '/inHospital/statistics/drugDistribution',
|
||||
icon: 'Collection',
|
||||
accent: '#597ef7',
|
||||
},
|
||||
{
|
||||
label: '住院记账',
|
||||
path: '/inHospital/statistics/InpatientBilling',
|
||||
|
||||
@@ -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,29 +173,15 @@ function handleGetPrescription() {
|
||||
}
|
||||
}
|
||||
|
||||
async function handelSwicthChange(value) {
|
||||
if (isDetails.value == '1') {
|
||||
if (!prescriptionRefs.value) {
|
||||
chooseAll.value = false;
|
||||
return;
|
||||
}
|
||||
await nextTick();
|
||||
if (value) {
|
||||
prescriptionRefs.value.selectAllRows();
|
||||
} else {
|
||||
prescriptionRefs.value.clearSelection();
|
||||
}
|
||||
function handelSwicthChange(value) {
|
||||
if (!prescriptionRefs.value) {
|
||||
chooseAll.value = false;
|
||||
return;
|
||||
}
|
||||
if (value) {
|
||||
prescriptionRefs.value.selectAllRows();
|
||||
} else {
|
||||
if (!summaryMedicineRefs.value) {
|
||||
chooseAll.value = false;
|
||||
return;
|
||||
}
|
||||
await nextTick();
|
||||
if (value) {
|
||||
summaryMedicineRefs.value.selectAllRows();
|
||||
} else {
|
||||
summaryMedicineRefs.value.clearSelection();
|
||||
}
|
||||
prescriptionRefs.value.clearSelection();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -142,13 +142,6 @@
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="医嘱状态" prop="requestStatus_enumText" width="100">
|
||||
<template #default="scope">
|
||||
<el-tag :type="getStatusType(scope.row.requestStatus)" size="small">
|
||||
{{ scope.row.requestStatus_enumText }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="执行科室" prop="positionName" width="230" />
|
||||
<el-table-column label="签发时间" prop="requestTime" width="230" />
|
||||
</el-table>
|
||||
@@ -159,7 +152,6 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import {ref, computed, getCurrentInstance} from 'vue';
|
||||
import {adviceVerify, cancel, getPrescriptionList} from './api';
|
||||
import {patientInfoList} from '../../components/store/patient.js';
|
||||
import {formatDateStr} from '@/utils/index';
|
||||
@@ -171,24 +163,6 @@ const type = ref(null);
|
||||
const { proxy } = getCurrentInstance();
|
||||
const loading = ref(false);
|
||||
const chooseAll = ref(false);
|
||||
const selectionTrigger = ref(0);
|
||||
|
||||
const getStatusType = (status) => {
|
||||
const map = {
|
||||
1: 'info', // 待发送
|
||||
2: 'primary', // 已发送
|
||||
3: 'success', // 已完成
|
||||
4: 'warning', // 暂停
|
||||
5: 'danger', // 取消/待退
|
||||
6: 'danger', // 停嘱
|
||||
7: 'info' // 不执行
|
||||
}
|
||||
return map[status] || 'info'
|
||||
}
|
||||
const hasDispensedSelected = computed(() => {
|
||||
selectionTrigger.value;
|
||||
return getSelectRows().some(item => item.dispenseStatus === 4);
|
||||
});
|
||||
const props = defineProps({
|
||||
requestStatus: {
|
||||
type: Number,
|
||||
@@ -202,16 +176,8 @@ function handleRadioChange() {
|
||||
|
||||
function handleGetPrescription() {
|
||||
if (patientInfoList.value.length > 0) {
|
||||
// 过滤掉 encounterId 无效的患者节点，防止后端 SQL 解析异常
|
||||
const validEncounterIds = patientInfoList.value
|
||||
.map((i) => i.encounterId)
|
||||
.filter((id) => id !== undefined && id !== null && id !== '');
|
||||
if (validEncounterIds.length === 0) {
|
||||
proxy.$message.warning('请选择有效的患者');
|
||||
return;
|
||||
}
|
||||
loading.value = true;
|
||||
let encounterIds = validEncounterIds.join(',');
|
||||
let encounterIds = patientInfoList.value.map((i) => i.encounterId).join(',');
|
||||
getPrescriptionList({
|
||||
encounterIds: encounterIds,
|
||||
requestStatus: props.requestStatus,
|
||||
@@ -296,9 +262,7 @@ function getGroupMarkers() {
|
||||
}
|
||||
|
||||
// 选择框改变时的处理
|
||||
function handleSelectionChange(selection, row) {
|
||||
selectionTrigger.value++;
|
||||
}
|
||||
function handleSelectionChange(selection, row) {}
|
||||
|
||||
/**
|
||||
* 核对通过
|
||||
@@ -327,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) => {
|
||||
@@ -346,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,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@@ -777,9 +777,6 @@ const InputOptions = ref([
|
||||
// 日期范围 - 体征信息搜索时间
|
||||
const receptionTime = ref(null);
|
||||
|
||||
// 按钮禁用状态（保存按钮依赖）
|
||||
const buttonDisabled = ref(false);
|
||||
|
||||
// 表单数据 - 体征录入
|
||||
const formData = ref({
|
||||
recordingDate: '',
|
||||
@@ -850,10 +847,26 @@ function getPatientList() {
|
||||
patientId: props.patientId
|
||||
}
|
||||
}).then((res) => {
|
||||
if (res.code === 200 && res.data) {
|
||||
patientList.value = Array.isArray(res.data) ? res.data : (res.data.data || []);
|
||||
|
||||
// 判断返回的数据结构
|
||||
let data = res.data;
|
||||
if (res.data && res.data.data && typeof res.data.data === 'object') {
|
||||
// 如果是嵌套结构 {data: {data: Array(3)}}
|
||||
data = res.data.data;
|
||||
} else if (res.data && typeof res.data === 'object' && res.data.data !== undefined) {
|
||||
// 如果是 {code: 200, msg: '操作成功', data: Array(3)}
|
||||
data = res.data.data;
|
||||
}
|
||||
|
||||
console.log('=== data 长度 ===', data?.length);
|
||||
|
||||
if (res.code === 200 && data) {
|
||||
console.log('=== 准备赋值 patientList.value ===');
|
||||
patientList.value = data;
|
||||
console.log('=== patientList.value 赋值后 ===', patientList.value);
|
||||
console.log('=== patientList.value 长度 ===', patientList.value?.length);
|
||||
} else {
|
||||
patientList.value = [];
|
||||
console.error('=== 查询失败或无数据 ===');
|
||||
}
|
||||
}).catch(err => {
|
||||
console.error('=== 查询报错 ===', err);
|
||||
@@ -872,22 +885,8 @@ function getPatientDetial() {
|
||||
queryParams.value.patientId = props.patientId;
|
||||
// 默认查询今天的数据
|
||||
const today = moment().format('YYYY-MM-DD');
|
||||
const now = moment();
|
||||
receptionTime.value = [today, today];
|
||||
formData.value.recordingDate = today;
|
||||
// 自动填充最近的整点时间点（2/6/10/14/18/22点）
|
||||
const hour = now.hour();
|
||||
const timePoints = [2, 6, 10, 14, 18, 22];
|
||||
let nearestHour = timePoints[0];
|
||||
let minDiff = Math.abs(hour - nearestHour);
|
||||
for (const tp of timePoints) {
|
||||
const diff = Math.abs(hour - tp);
|
||||
if (diff < minDiff) {
|
||||
minDiff = diff;
|
||||
nearestHour = tp;
|
||||
}
|
||||
}
|
||||
formData.value.timePoint = String(nearestHour).padStart(2, '0') + '00';
|
||||
// 自动加载数据
|
||||
getPatientList();
|
||||
listPatient(queryParams.value).then((res) => {
|
||||
@@ -968,29 +967,6 @@ function confirmCharge() {
|
||||
encounterId: props.patientInfo.encounterId,
|
||||
};
|
||||
|
||||
// 自动获取当前日期和时间
|
||||
const now = moment();
|
||||
if (!params.recordingDate) {
|
||||
params.recordingDate = now.format('YYYY-MM-DD');
|
||||
formData.value.recordingDate = params.recordingDate;
|
||||
}
|
||||
if (!params.timePoint) {
|
||||
// 取最近的整点时间点（2/6/10/14/18/22点）
|
||||
const hour = now.hour();
|
||||
const timePoints = [2, 6, 10, 14, 18, 22];
|
||||
let nearestHour = timePoints[0];
|
||||
let minDiff = Math.abs(hour - nearestHour);
|
||||
for (const tp of timePoints) {
|
||||
const diff = Math.abs(hour - tp);
|
||||
if (diff < minDiff) {
|
||||
minDiff = diff;
|
||||
nearestHour = tp;
|
||||
}
|
||||
}
|
||||
params.timePoint = String(nearestHour).padStart(2, '0') + '00';
|
||||
formData.value.timePoint = params.timePoint;
|
||||
}
|
||||
|
||||
// 收集所有录入的体征数据
|
||||
const vitalSignsCode = [];
|
||||
const vitalSignsValues = [];
|
||||
@@ -1076,18 +1052,13 @@ function confirmCharge() {
|
||||
vitalSignsValues.push(params.stoolVolume);
|
||||
}
|
||||
|
||||
// 校验：没有录入任何体征数据时提示用户
|
||||
if (vitalSignsCode.length === 0) {
|
||||
proxy.$modal.msgWarning('请录入患者体征信息');
|
||||
return;
|
||||
}
|
||||
|
||||
params.vitalSignsCode = vitalSignsCode;
|
||||
params.vitalSignsValues = vitalSignsValues;
|
||||
params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');
|
||||
|
||||
addVitalSigns(params).then(res => {
|
||||
if (res.code === 200) {
|
||||
proxy.$modal.msgSuccess('保存成功');
|
||||
proxy.msgSuccess('保存成功');
|
||||
// 保存成功后刷新列表
|
||||
getPatientList();
|
||||
// 清空表单
|
||||
@@ -1117,9 +1088,6 @@ function confirmCharge() {
|
||||
stoolVolume: '',
|
||||
};
|
||||
}
|
||||
}).catch(err => {
|
||||
console.error('保存体征数据失败:', err);
|
||||
proxy.$modal.msgError('保存失败，请重试');
|
||||
});
|
||||
}
|
||||
/** 重置操作表单 */
|
||||
|
||||
@@ -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(
|
||||
'所选批号在本仓库无对应库存或批号不一致，已按仓库实物回显批号与可领数量，请核对。'
|
||||
);
|
||||
}
|
||||
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' });
|
||||
});
|
||||
}
|
||||
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
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user