diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d1dbf5ecd..842a05c9c 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -661,14 +661,17 @@
             </if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and FIND_IN_SET(a.`problem_type`,#{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 <![CDATA[ !FIND_IN_SET(a.`problem_type`,#{params.problemQueryIds}) or a.`problem_type` is null ]]>
+                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.beginOrderDate != null and params.beginOrderDate != ''">
                 and a.order_date <![CDATA[ >= ]]>  #{params.beginOrderDate}
             </if>
@@ -1434,15 +1437,18 @@
             </if>
 
             <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
-                and FIND_IN_SET( a.`problem_type`,#{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 ( <![CDATA[ !FIND_IN_SET(a.`problem_type`,#{params.problemQueryIds}) or a.`problem_type` is null ]]> )
+                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="blSign != null  and blSign == 1">
                 and a.bl_sign='1'
             </if>