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 @@
-
+
@@ -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}