diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml index e33b15a00..e9167ce55 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml @@ -97,10 +97,10 @@ ON T4.med_req_id = T5.id AND T5.delete_flag = '0' WHERE - T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) + T4.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T4.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized}) + T4.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized}) T4.status_enum = #{completed} @@ -268,10 +268,10 @@ -- 因发药配药合并,前台只能看到待发药,已发药状态,但是后台配药发药状态都查 AND - T1.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) + T1.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T1.status_enum IN (#{inProgress},#{preparation},#{prepared},#{summarized}) + T1.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized}) T1.status_enum = #{completed}