diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 3c76179b6..efaf4fba6 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -117,8 +117,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.dispatch_underling_site_code =  #{params.dispatchUnderlingSiteCode}
             </if>
 
-            <if test="params.problemType != null and params.problemType != ''">
-                and a.problem_type =  #{params.problemType}
+
+            <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
+                and a.bill_code in (
+                select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                )
+            </if>
+
+            <if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
+                and a.bill_code not in (
+                select bill_code from emis_waybill_problem_info ewpi where FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                )
             </if>
 
             <if test="params.receiveCompany != null and params.receiveCompany != ''">