diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index c5960d13e..e690143fa 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -207,6 +207,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.send_company like concat('%', #{params.sendCompany}, '%')
             </if>
 
+            <if test="blMerge != null  and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
+
+
+
 
             <if test="params.mergeStatus != null and params.mergeStatus == 1">
                 and b.bl_merge='0'
@@ -350,7 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.send_company like concat('%', #{params.sendCompany}, '%')
             </if>
 
-
+            <if test="blMerge != null  and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
 
             <if test="params.mergeStatus != null and params.mergeStatus == 1">
                 and b.bl_merge='0'
@@ -486,6 +490,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.dispatch_underling_site_code =  #{params.dispatchUnderlingSiteCode}
             </if>
 
+            <if test="blMerge != null  and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
+
             <if test="params.mergeStatus != null and params.mergeStatus == 1">
                 and b.bl_merge='0'
                 and b.bl_confirm_center='1'
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index a24f663df..6d8521ce1 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -636,8 +636,6 @@
         where id = #{id}
     </update>
 
-    <!-- and rel_id = #{promId}   -->
-
     <delete id="deleteTransferScanRecord" parameterType="String">
         update emis_tms_scan_record set del_flag='1' where  scan_type='80' and main_bill_code=#{billCode}
     </delete>