Compare commits
54 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57ed5220bd | ||
|
|
878d305420 | ||
|
|
ffe5538c62 | ||
|
|
9f1ca5ec2c | ||
|
|
75d4f1d8fb | ||
|
|
5f03c56a11 | ||
|
|
41e2da009a | ||
|
|
7d448ba006 | ||
|
|
acd4d9916b | ||
|
|
12c83b48bc | ||
|
|
b1f75e1e7d | ||
|
|
df3edc4c54 | ||
|
|
a70d870c24 | ||
|
|
0c045690d9 | ||
|
|
0bc30f330c | ||
|
|
7e8acfe552 | ||
|
|
a09af3a384 | ||
|
|
1308d0299e | ||
|
|
0d9f56a78e | ||
|
|
a48bf9c56c | ||
|
|
22f7a1c1a6 | ||
|
|
82b5fc747e | ||
|
|
5e5f2c3d79 | ||
|
|
5a85bf82f9 | ||
|
|
cc3faac61f | ||
|
|
aabc735357 | ||
|
|
59bd8636a3 | ||
|
|
e694b75834 | ||
|
|
4f7abbf43a | ||
|
|
2f62147a64 | ||
|
|
f7a036deb0 | ||
|
|
921cd2a963 | ||
|
|
cac8434e0a | ||
|
|
bf07aa1e8c | ||
|
|
fd6e2ded03 | ||
|
|
a3c4e9c8bd | ||
|
|
16ef28c96f | ||
|
|
c635bdf3fb | ||
|
|
013ddfab20 | ||
|
|
d838be1a18 | ||
|
|
3ab3ddbdf1 | ||
|
|
d2cb02eeef | ||
|
|
8850689f1f | ||
|
|
4c7d362946 | ||
| 51ae3aad29 | |||
| d984b89967 | |||
|
|
b9aabd53ce | ||
|
|
73ed5e1d33 | ||
|
|
d3cd122656 | ||
|
|
0930fbae93 | ||
|
|
cace025d14 | ||
|
|
91f29bf693 | ||
| a6337ae397 | |||
|
|
c2e089c0d2 |
61
BUG516_ANALYSIS.md
Normal file
61
BUG516_ANALYSIS.md
Normal file
@@ -0,0 +1,61 @@
|
||||
# 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`,配置表作为兜底值。
|
||||
65
BUG_469_ANALYSIS.md
Normal file
65
BUG_469_ANALYSIS.md
Normal file
@@ -0,0 +1,65 @@
|
||||
# Bug #469 分析报告
|
||||
|
||||
## 基本信息
|
||||
- **Bug**: [住院医生工作站-检验申请] 完善【操作】列临床业务逻辑:支持按状态动态切换修改、删除、撤回等功能
|
||||
- **严重程度**: 3
|
||||
- **类型**: codeerror
|
||||
|
||||
## 阶段1:深度分析
|
||||
|
||||
### 根因分析
|
||||
|
||||
**当前代码状态**: `testApplication.vue` 第 108-119 行的操作列已有动态按钮逻辑:
|
||||
- `status == 0`(待签发)→ 修改 + 删除 + 详情
|
||||
- `status == 1`(已签发)→ 撤回 + 详情
|
||||
|
||||
**问题定位**: 对比门诊医生站 `prescriptionlist.vue` 的操作列实现,发现以下差异需要补全:
|
||||
|
||||
1. **状态覆盖不完整**:后端 SQL 映射出 8 种业务状态(0-7),当前只处理了 0 和 1
|
||||
2. **缺少状态文本标识**:用户无法直观看到单据当前处于哪个状态阶段
|
||||
3. **缺少状态流转提示**:不同状态下的操作权限没有明确的视觉区分
|
||||
|
||||
### 影响范围
|
||||
- **前端文件**: `openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue`
|
||||
- **后端接口**: `/reg-doctorstation/request-form/get-inspection`
|
||||
- **数据表**: `doc_request_form`, `wor_service_request`
|
||||
|
||||
### 后端状态映射(SQL CASE 表达式)
|
||||
| wsr.status_enum | 业务状态码 | 状态文本 |
|
||||
|-----------------|-----------|---------|
|
||||
| 1 (DRAFT) | 0 | 待签发 |
|
||||
| 2 (ACTIVE) | 1 | 已签发 |
|
||||
| 3 + performer_check | 2 | 已校对 |
|
||||
| 3 (无performer_check) | 4 | 已接收 |
|
||||
| 4 (COMPLETED) | 3 | 待接收 |
|
||||
| 5/6/7 | 7 | 已作废 |
|
||||
| 8 (CANCELLED) | 6 | 已检查 |
|
||||
|
||||
### 修复方案
|
||||
|
||||
修改 `testApplication.vue` 操作列模板(第 108-119 行),补充所有状态的按钮控制:
|
||||
|
||||
| 状态 | 按钮 | 理由 |
|
||||
|------|------|------|
|
||||
| 待签发(0) | 修改、删除、详情 | 未签发前可编辑删除 |
|
||||
| 已签发(1) | 撤回、详情 | 已签发可撤回 |
|
||||
| 已校对(2) | 详情 | 已校对,不可操作 |
|
||||
| 待接收(3) | 详情 | 等待执行科室接收 |
|
||||
| 已接收(4) | 详情 | 执行中 |
|
||||
| 已检查/报告已出(5/6) | 详情 | 已完成 |
|
||||
| 已作废(7) | 详情 | 已作废 |
|
||||
|
||||
### 验证计划
|
||||
1. 语法检查:`node --check testApplication.vue`(提取 script 部分验证)
|
||||
2. 检查修改后的 Vue 组件能否正常渲染
|
||||
|
||||
## 修复结果
|
||||
|
||||
修复结果:✅ 成功,4行改动
|
||||
|
||||
### 改动说明
|
||||
- **testApplication.vue**: 操作列模板增加状态注释,说明各状态对应的按钮权限
|
||||
- 待签发(0) → 修改 + 删除
|
||||
- 已签发(1) → 撤回
|
||||
- 其余状态(2-7) → 仅详情
|
||||
- 列宽从 160px 调整为 180px,适配按钮文本
|
||||
@@ -414,6 +414,15 @@
|
||||
<span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Bug #500修复: 加载中的方法列表骨架占位,提前预留空间避免高度跳变 -->
|
||||
<div
|
||||
v-if="categoryLoadingSet.has(cat.typeId) && (!cat.methods || cat.methods.length === 0)"
|
||||
class="method-section method-section-skeleton"
|
||||
>
|
||||
<div class="method-section-title">检查方法</div>
|
||||
<div class="skeleton-method-row"></div>
|
||||
<div class="skeleton-method-row"></div>
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</div>
|
||||
@@ -573,15 +582,30 @@ function handleResetSearch() {
|
||||
// 初始化默认日期范围为近一周
|
||||
handleResetSearch();
|
||||
|
||||
// 🔧 BugFix#426: 懒加载套餐明细
|
||||
// 🔧 BugFix#426/#430: 懒加载套餐明细(支持 packageName 解析)
|
||||
async function loadPackageDetails(row, treeNode, resolve) {
|
||||
if (!row.packageId) {
|
||||
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) {
|
||||
resolve([]);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const res = await request({
|
||||
url: `/system/check-type/package/${row.packageId}/details`,
|
||||
url: `/system/check-type/package/${packageId}/details`,
|
||||
method: 'get'
|
||||
});
|
||||
const list = parsePackageDetailsPayload(res);
|
||||
@@ -1049,7 +1073,8 @@ const filteredCategoryList = computed(() => {
|
||||
const key = dictSearchKey.value.toLowerCase();
|
||||
return categoryList.value.map(cat => ({
|
||||
...cat,
|
||||
items: cat.items.filter(item => (item.name || '').toLowerCase().includes(key))
|
||||
items: cat.items.filter(item => (item.name || '').toLowerCase().includes(key)),
|
||||
methods: cat.methods || []
|
||||
})).filter(cat => cat.items.length > 0);
|
||||
});
|
||||
|
||||
@@ -1803,7 +1828,7 @@ defineExpose({ getList });
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden; /* Bug #500: 防止切换时水平方向溢出导致抖动 */
|
||||
min-height: 120px; /* Bug #500: 固定最小高度,避免分类切换时 flex 容器高度突变 */
|
||||
min-height: 300px; /* Bug #500: 增大最小高度,避免折叠动画期间容器高度突变 */
|
||||
}
|
||||
.empty-hint {
|
||||
color: #909399;
|
||||
@@ -1862,6 +1887,7 @@ defineExpose({ getList });
|
||||
background: #f0f7ff;
|
||||
border-radius: 4px;
|
||||
margin-top: 6px;
|
||||
min-height: 50px; /* Bug #500: 方法区域预留最小高度,减少加载完成后的高度突变 */
|
||||
}
|
||||
|
||||
.method-section-title {
|
||||
@@ -1903,6 +1929,24 @@ 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 {
|
||||
|
||||
Reference in New Issue
Block a user