diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index 9740dd326..c5960d13e 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -208,7 +208,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and b.bl_merge='0' and b.bl_confirm_center='1' @@ -473,10 +472,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.confirm_site_note = #{confirmSiteNote} and b.confirm_site_code = #{confirmSiteCode} + + and ( a.problem_type is null or (a.problem_type is not null and (a.problem_type != 173 and a.problem_type != 170 and a.problem_type != 151) ) ) + + and a.send_site_code = #{params.sendSiteCode} + + and a.dispatch_underling_site_code = #{params.dispatchUnderlingSiteCode}