From fd9309f12557f781edd3ea7e740c1491bb4778a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com> Date: Thu, 14 May 2026 15:19:00 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#494:=20=E4=BD=8F=E9=99=A2=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=9A=E7=94=B3=E8=AF=B7=E5=8D=95=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=B8=BA=E9=80=9A=E7=94=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E6=9C=AA=E5=B1=95=E7=A4=BA=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../RequestFormManageAppMapper.xml | 8 ++++++- .../applicationShow/examineApplication.vue | 23 ++++++++++++++++++- .../applicationForm/medicalExaminations.vue | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml index 4ebf576f8..fafd10ae4 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml @@ -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, diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue index 63da4662e..f8979e466 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue @@ -86,7 +86,11 @@ - + + + @@ -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 - 状态码 diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue index 6198c9c00..9c99f8d3b 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue @@ -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,