From 3ddd74d6799d968dc8ff5ebce1428e4eb2c25aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com>
Date: Sun, 10 May 2026 17:06:07 +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?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0"=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E9=80=9A=E7=94=A8=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=85=B7=E4=BD=93=E6=A3=80=E6=9F=A5=E9=A1=B9?=
 =?UTF-8?q?=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 <noreply@anthropic.com>
---
 .../applicationShow/examineApplication.vue    | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

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 680f7522..a915ce28 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 @@
           </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>{{ getItemName(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" />
@@ -159,7 +163,7 @@
               currentDetail.patientName || '-'
             }}</el-descriptions-item>
             <el-descriptions-item label="申请单名称">{{
-              currentDetail.name || '-'
+              getItemName(currentDetail)
             }}</el-descriptions-item>
             <el-descriptions-item label="申请单状态">{{
               parseStatus(currentDetail.status)
@@ -399,6 +403,28 @@ const parseStatus = (status) => {
   return statusMap[String(status)] || '-';
 };
 
+/**
+ * 获取申请单展示名称：优先使用具体医嘱名称列表
+ */
+const getItemName = (row) => {
+  const items = row?.requestFormDetailList;
+  if (items && items.length > 0) {
+    return items.map(item => item.adviceName).filter(Boolean).join('、') || row.name || '-';
+  }
+  return row.name || '-';
+};
+
+/**
+ * 构建打印用项目名称字符串（同步函数，用于模板字符串）
+ */
+const buildItemNames = (row) => {
+  const items = row?.requestFormDetailList;
+  if (items && items.length > 0) {
+    return items.map(item => item.adviceName).filter(Boolean).join('、') || row.name || '';
+  }
+  return row.name || '';
+};
+
 const labelMap = {
   categoryType: '项目类别',
   targetDepartment: '发往科室',
@@ -651,7 +677,7 @@ const buildPrintContent = (row) => {
   return `
     <h2>检查申请单</h2>
     <div class="info-row"><span class="label">患者姓名:</span>${row.patientName || '-'}</div>
-    <div class="info-row"><span class="label">申请单名称:</span>${row.name || '-'}</div>
+    <div class="info-row"><span class="label">申请单名称:</span>${buildItemNames(row) || '-'}</div>
     <div class="info-row"><span class="label">创建时间:</span>${row.createTime || '-'}</div>
     <div class="info-row"><span class="label">处方号:</span>${row.prescriptionNo || '-'}</div>
     <div class="info-row"><span class="label">申请者:</span>${row.requesterId_dictText || '-'}</div>