Compare commits
1 Commits
bug475-fix
...
87924a5f25
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87924a5f25 |
@@ -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})
|
||||||
|
|||||||
Reference in New Issue
Block a user