Fix Bug #494: 住院医生工作站-检查申请:申请单名称显示为通用名称,未展示具体检查项目名称

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
赵云
2026-05-14 15:19:00 +08:00
committed by 关羽
parent c2941f5948
commit 85d2b9990b
3 changed files with 30 additions and 2 deletions

View File

@@ -8,7 +8,13 @@
SELECT drf.id AS request_form_id,
drf.encounter_id,
drf.prescription_no,
drf.NAME,
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,

View File

@@ -86,7 +86,11 @@
</template>
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="patientName" label="患者姓名" width="120" />
<el-table-column prop="name" label="申请单名称" 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" />
@@ -429,6 +433,23 @@ const parseStatus = (status) => {
return statusMap[String(status)] || '-';
};
/**
* 根据申请单详情构建申请单名称
* 单一项目:显示项目名称
* 多个项目:显示首个项目名称+"等X项"
*/
const buildApplicationName = (row) => {
const details = row.requestFormDetailList;
if (!details || details.length === 0) {
return row.name || '-';
}
if (details.length === 1) {
return details[0].adviceName || row.name || '-';
}
const first = details[0];
return `${first.adviceName || ''}${details.length}`;
};
/**
* 获取状态标签类型 - 参考临床医嘱样式
* @param {string|number} status - 状态码

View File

@@ -545,6 +545,7 @@ const submit = () => {
applicationListAllFilter = applicationListAllFilter.map((item) => {
return {
adviceDefinitionId: item.adviceDefinitionId,
adviceName: item.adviceName,
quantity: 1,
unitCode: item.priceList[0].unitCode,
unitPrice: item.priceList[0].price,