From d3310ade51449c940483db52b244f5ed33bff0a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com>
Date: Thu, 14 May 2026 22:10:19 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#467:=20[=E4=BD=8F=E9=99=A2?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=B7=A5=E4=BD=9C=E7=AB=99-=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E7=94=B3=E8=AF=B7]=20=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=B8=8D=E8=A7=84=E8=8C=83=EF=BC=9A?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=9C=AF=E8=AF=AD=E9=94=99=E8=AF=AF=E4=B8=94?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=90=8D=E7=A7=B0=E6=9C=AA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?=
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>
---
 .../mapper/regdoctorstation/RequestFormManageAppMapper.xml | 7 ++++++-
 .../home/components/applicationShow/testApplication.vue    | 2 +-
 2 files changed, 7 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 8a9479fdb..71c63a34a 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
@@ -78,7 +78,11 @@
     <select id="getRequestFormDetail" resultType="com.openhis.web.regdoctorstation.dto.RequestFormDetailQueryDto">
         SELECT wsr.quantity,
                wsr.unit_code,
-               COALESCE(wad.NAME, wsr.content_json::jsonb->>'surgeryName') AS advice_name,
+               COALESCE(
+                   wad.NAME,
+                   wsr.content_json::jsonb->>'surgeryName',
+                   '检验项目'
+               ) AS advice_name,
                aci.total_price
         FROM wor_service_request AS wsr
                  LEFT JOIN wor_activity_definition AS wad ON wad.ID = wsr.activity_id
@@ -88,6 +92,7 @@
             AND aci.delete_flag = '0'
         WHERE wsr.delete_flag = '0'
           AND wsr.prescription_no = #{prescriptionNo}
+        ORDER BY wsr.id
     </select>
 
     <select id="getActivityOrganizationConfig"
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
index 3881938f1..9fc9af90f 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/testApplication.vue
@@ -136,7 +136,7 @@
               currentDetail.patientName || '-'
             }}</el-descriptions-item>
             <el-descriptions-item label="申请单名称">{{
-              currentDetail.name || '-'
+              buildApplicationName(currentDetail)
             }}</el-descriptions-item>
             <el-descriptions-item label="创建时间">{{
               currentDetail.createTime || '-'