wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#761): 修复汇总领药列表领药时间显示异常 — 改用 cli_procedure.occurrence_time 作为执行时间数据源

Browse Source
This commit is contained in:
华佗
2026-06-12 17:29:19 +08:00
parent a22418c26c
commit 35fd33ba59
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml
View File

@@ -36,7 +36,7 @@
<collection property="medicineSummaryParamList" ofType="com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryParam"> <collection property="medicineSummaryParamList" ofType="com.healthlink.his.web.inhospitalnursestation.dto.MedicineSummaryParam">
<result property="procedureId" column="procedure_id"/> <result property="procedureId" column="procedure_id"/>
<result property="dispenseId" column="dispense_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"/> <result property="dispenseStatus" column="dispense_status"/>
</collection> </collection>
</resultMap> </resultMap>
@@ -75,7 +75,7 @@
ii.admitting_doctor_name, ii.admitting_doctor_name,
ii.balance_amount, ii.balance_amount,
ii.dispense_id, ii.dispense_id,
ii.planned_dispense_time, ii.execution_time,
ii.procedure_id, ii.procedure_id,
ii.dispense_status ii.dispense_status
FROM (( SELECT T1.encounter_id, FROM (( SELECT T1.encounter_id,
@@ -113,7 +113,7 @@
pra."name" AS admitting_doctor_name, pra."name" AS admitting_doctor_name,
personal_account.balance_amount, personal_account.balance_amount,
mmd.id AS dispense_id, mmd.id AS dispense_id,
mmd.planned_dispense_time, cp.occurrence_time AS execution_time,
mmd.procedure_id, mmd.procedure_id,
mmd.status_enum AS dispense_status mmd.status_enum AS dispense_status
FROM med_medication_request AS T1 FROM med_medication_request AS T1
@@ -121,6 +121,9 @@
ON T1.id = mmd.med_req_id ON T1.id = mmd.med_req_id
AND mmd.delete_flag = '0' AND mmd.delete_flag = '0'
AND mmd.status_enum != #{summarized} 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 LEFT JOIN med_medication_definition AS T2
ON T2.id = T1.medication_id ON T2.id = T1.medication_id
AND T2.delete_flag = '0' AND T2.delete_flag = '0'
@@ -200,7 +203,7 @@
AND T1.status_enum = #{completed} AND T1.status_enum = #{completed}
AND T1.refund_medicine_id IS NULL AND T1.refund_medicine_id IS NULL
AND mmd.procedure_id IS NOT 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} ${ew.customSqlSegment}
</select> </select>
<select id="selectMedicineSummaryFormPage" <select id="selectMedicineSummaryFormPage"

2
healthlink-his-ui/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
View File

@@ -161,7 +161,7 @@
</template> </template>
</vxe-column> </vxe-column>
<vxe-column <vxe-column
title="领药时间" title="执行时间"
field="times" field="times"
> >
<template #default="scope"> <template #default="scope">