fix(#668): 请修复 Bug #668

由 AI Agent (guanyu) 自动修复,请查看 diff 确认变更内容。
This commit is contained in:
2026-06-11 10:16:16 +08:00
parent 71013aa6d8
commit f05cc8da66

View File

@@ -97,10 +97,10 @@
ON T4.med_req_id = T5.id
AND T5.delete_flag = '0'
WHERE <if test="statusEnum == null">
T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
T4.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if>
<if test="statusEnum == 3">
T4.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized})
T4.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
</if>
<if test="statusEnum == 4">
T4.status_enum = #{completed}
@@ -268,10 +268,10 @@
-- 因发药配药合并,前台只能看到待发药,已发药状态,但是后台配药发药状态都查
AND
<if test="dispenseStatus == null">
T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
T1.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if>
<if test="dispenseStatus == 3">
T1.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized})
T1.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
</if>
<if test="dispenseStatus == 4">
T1.status_enum = #{completed}