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

Fix Bug #503: 【住院发退药】发药明细与发药汇总单数据触发时机不一致，存在业务脱节风险

Browse Source 
在 selectEncounterInfoListPage 和 selectMedicineDispenseOrderPage 两个查询中增加
summary_no IS NOT NULL 过滤条件，使发药明细单仅在护士执行"汇总发药申请"后才显示记录，
与发药汇总单保持一致的触发时机。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
关羽
2026-05-10 11:06:33 +08:00
parent 2b64719d46
commit 7b17a66214
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
View File

@@ -105,6 +105,8 @@
<if test="statusEnum == 4"> <if test="statusEnum == 4">
T4.status_enum = #{completed} T4.status_enum = #{completed}
</if> </if>
AND T4.summary_no IS NOT NULL
AND T4.summary_no != ''
) AS ii ) AS ii
${ew.customSqlSegment} ${ew.customSqlSegment}
GROUP BY ii.encounter_id, GROUP BY ii.encounter_id,
@@ -263,6 +265,8 @@
AND T15.delete_flag = '0' AND T15.delete_flag = '0'
WHERE T1.delete_flag = '0' WHERE T1.delete_flag = '0'
-- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查 -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
AND T1.summary_no IS NOT NULL
AND T1.summary_no != ''
AND AND
<if test="dispenseStatus == null"> <if test="dispenseStatus == null">
T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared}) T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})