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

fix(#668): guanyu (文件合入)

Browse Source
This commit is contained in:
关羽
2026-06-13 20:50:03 +08:00
committed by 华佗
parent 3b3cb1a39e
commit 7da7ec80aa
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml
View File

@@ -97,10 +97,10 @@
ON T4.med_req_id = T5.id ON T4.med_req_id = T5.id
AND T5.delete_flag = '0' AND T5.delete_flag = '0'
WHERE <if test="statusEnum == null"> WHERE <if test="statusEnum == null">
T4.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) T4.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="statusEnum == 3"> <if test="statusEnum == 3">
T4.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized}) T4.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="statusEnum == 4"> <if test="statusEnum == 4">
T4.status_enum = #{completed} T4.status_enum = #{completed}
@@ -108,9 +108,6 @@
<if test="statusEnum == 18"> <if test="statusEnum == 18">
T4.status_enum = #{submitted} T4.status_enum = #{submitted}
</if> </if>
<if test="statusEnum == 1">
T4.status_enum = #{draft}
</if>
) AS ii ) AS ii
${ew.customSqlSegment} ${ew.customSqlSegment}
GROUP BY ii.encounter_id, GROUP BY ii.encounter_id,
@@ -271,10 +268,10 @@
-- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查 -- 因发药配药合并，前台只能看到待发药，已发药状态，但是后台配药发药状态都查
AND AND
<if test="dispenseStatus == null"> <if test="dispenseStatus == null">
T1.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) T1.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="dispenseStatus == 3"> <if test="dispenseStatus == 3">
T1.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized}) T1.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized})
</if> </if>
<if test="dispenseStatus == 4"> <if test="dispenseStatus == 4">
T1.status_enum = #{completed} T1.status_enum = #{completed}
@@ -282,9 +279,6 @@
<if test="dispenseStatus == 18"> <if test="dispenseStatus == 18">
T1.status_enum = #{submitted} T1.status_enum = #{submitted}
</if> </if>
<if test="dispenseStatus == 1">
T1.status_enum = #{draft}
</if>
AND T14.inventory_status_enum = #{active} AND T14.inventory_status_enum = #{active}
ORDER BY prescription_no DESC ORDER BY prescription_no DESC
) AS ii ) AS ii