From 1a51508e78b07dd1a5d58c6d3614c7c4c69e0e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Fri, 12 Jun 2026 17:29:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(#761):=20=E4=BF=AE=E5=A4=8D=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E9=A2=86=E8=8D=AF=E5=88=97=E8=A1=A8=E9=A2=86=E8=8D=AF?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=20?=
 =?UTF-8?q?=E2=80=94=20=E6=94=B9=E7=94=A8=20cli=5Fprocedure.occurrence=5Ft?=
 =?UTF-8?q?ime=20=E4=BD=9C=E4=B8=BA=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MedicineSummaryAppMapper.xml                      | 11 +++++++----
 .../drugDistribution/components/prescriptionList.vue  |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
index e90c8784a..7e0749e01 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
@@ -36,7 +36,7 @@
         <collection property="medicineSummaryParamList" ofType="com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryParam">
             <result property="procedureId" column="procedure_id"/>
             <result property="dispenseId" column="dispense_id"/>
-            <result property="dispenseTime" column="planned_dispense_time"/>
+            <result property="dispenseTime" column="execution_time"/>
             <result property="dispenseStatus" column="dispense_status"/>
         </collection>
     </resultMap>
@@ -75,7 +75,7 @@
                ii.admitting_doctor_name,
                ii.balance_amount,
                ii.dispense_id,
-               ii.planned_dispense_time,
+               ii.execution_time,
                ii.procedure_id,
                ii.dispense_status
         FROM (( SELECT T1.encounter_id,
@@ -113,7 +113,7 @@
                        pra."name" AS admitting_doctor_name,
                        personal_account.balance_amount,
                        mmd.id AS dispense_id,
-                       mmd.planned_dispense_time,
+                       cp.occurrence_time AS execution_time,
                        mmd.procedure_id,
                        mmd.status_enum AS dispense_status
                 FROM med_medication_request AS T1
@@ -121,6 +121,9 @@
                          ON T1.id = mmd.med_req_id
                              AND mmd.delete_flag = '0'
                              AND mmd.status_enum != #{summarized}
+                         LEFT JOIN cli_procedure cp
+                                  ON cp.id = mmd.procedure_id
+                                      AND cp.delete_flag = '0'
                          LEFT JOIN med_medication_definition AS T2
                                    ON T2.id = T1.medication_id
                                        AND T2.delete_flag = '0'
@@ -200,7 +203,7 @@
                     AND T1.status_enum = #{completed}
                     AND T1.refund_medicine_id IS NULL
                     AND mmd.procedure_id IS NOT NULL
-                ORDER BY mmd.planned_dispense_time )) AS ii
+                ORDER BY cp.occurrence_time )) AS ii
             ${ew.customSqlSegment}
     </select>
     <select id="selectMedicineSummaryFormPage"
diff --git a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
index 1ac1149d6..a804f9fd9 100755
--- a/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
+++ b/healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
@@ -161,7 +161,7 @@
               </template>
             </vxe-column>
             <vxe-column
-              title="领药时间"
+              title="执行时间"
               field="times"
             >
               <template #default="scope">