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 311ff2cb3..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 (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) + T4.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T4.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized}) + T4.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized}) T4.status_enum = #{completed} @@ -108,9 +108,6 @@ T4.status_enum = #{submitted} - - T4.status_enum = #{draft} - ) AS ii ${ew.customSqlSegment} GROUP BY ii.encounter_id, @@ -271,10 +268,10 @@ -- 因发药配药合并,前台只能看到待发药,已发药状态,但是后台配药发药状态都查 AND - T1.status_enum IN (#{draft},#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) + T1.status_enum IN (1,#{inProgress},#{completed},#{preparation},#{prepared},#{summarized}) - T1.status_enum IN (#{draft},#{inProgress},#{preparation},#{prepared},#{summarized}) + T1.status_enum IN (1,#{inProgress},#{preparation},#{prepared},#{summarized}) T1.status_enum = #{completed} @@ -282,9 +279,6 @@ T1.status_enum = #{submitted} - - T1.status_enum = #{draft} - AND T14.inventory_status_enum = #{active} ORDER BY prescription_no DESC ) AS ii