diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml index f61bb8f2..3edeaebd 100755 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml @@ -96,14 +96,22 @@ INNER JOIN med_medication_request AS T5 ON T4.med_req_id = T5.id AND T5.delete_flag = '0' - WHERE - T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared}) + WHERE EXISTS ( + SELECT 1 FROM wor_supply_request wsr + WHERE wsr.type_enum = 3 + AND wsr.delete_flag = '0' + AND wsr.bus_no = T4.summary_no + AND T4.summary_no IS NOT NULL + AND T4.summary_no != '' + ) + AND + T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},8) - T4.status_enum IN (#{inProgress},#{preparation},#{prepared}) + T4.status_enum IN (#{inProgress},#{preparation},#{prepared},8) - T4.status_enum = #{completed} + T4.status_enum IN (#{completed},8) ) AS ii ${ew.customSqlSegment}