From 0d31820878b9d94a051b63569effe651d7ac6a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com>
Date: Sat, 16 May 2026 19:24:09 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#476:=20=E4=BD=8F=E9=99=A2=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E5=B7=A5=E4=BD=9C-=E6=A3=80=E6=9F=A5=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8D=95=E7=95=8C=E9=9D=A2=E7=BC=BA=E5=A4=B1=E6=A0=B8?=
 =?UTF-8?q?=E5=BF=83=E4=B8=B4=E5=BA=8A=E5=AD=97=E6=AE=B5=EF=BC=88=E7=B4=A7?=
 =?UTF-8?q?=E6=80=A5=E7=A8=8B=E5=BA=A6=E3=80=81=E8=BF=87=E6=95=8F=E5=8F=B2?=
 =?UTF-8?q?=E3=80=81=E6=A3=80=E6=9F=A5=E7=9B=AE=E7=9A=84=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

详情弹窗和打印功能缺少紧急程度、过敏史、检查目的、期望检查时间、病史摘要等字段显示。
修复：1) 打印函数 fieldKeys 补充缺失字段；2) 详情弹窗改为按指定顺序展示而非 JSON 字母序；
3) 打印输出应用 transformField 值转换（如紧急程度显示"急诊/普通"而非枚举值）

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../applicationShow/examineApplication.vue    | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 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 b0b74b1d0..bb498a019 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
@@ -179,11 +179,14 @@
 
         <div v-if="descJsonData && hasMatchedFields" class="applicationShow-container-content">
           <el-descriptions title="申请单描述" :column="2">
-            <template v-for="(value, key) in descJsonData" :key="key">
-              <el-descriptions-item v-if="isFieldMatched(key)" :label="getFieldLabel(key)">
-                {{ transformField(key, value) || '-' }}
-              </el-descriptions-item>
-            </template>
+            <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>
           </el-descriptions>
         </div>
 
@@ -511,6 +514,13 @@ 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 {
@@ -679,15 +689,16 @@ const handlePrint = async (row) => {
     }
 
     // 构建 descJson 字段行（与详情弹窗展示的字段一致）
-    const fieldKeys = ['targetDepartment', 'symptom', 'sign', 'clinicalDiagnosis', 'otherDiagnosis', 'relatedResult', 'attention'];
+    const fieldKeys = orderedDescFieldKeys;
     let descFieldsHtml = '';
     fieldKeys.forEach((key) => {
       const label = labelMap[key] || key;
-      if (descData[key] != null && descData[key] !== '') {
+      const value = transformField(key, descData[key]);
+      if (descData[key] != null && descData[key] !== '' && value != null && value !== '') {
         descFieldsHtml += `
           <div class="info-row">
             <span class="label">${label}：</span>
-            <span class="value">${descData[key]}</span>
+            <span class="value">${value}</span>
           </div>`;
       }
     });