diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
index 20341675a..9a80799fa 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettlePayRecordController.java
@@ -126,10 +126,6 @@ public class EmisSettlePayRecordController extends BaseController
         return getDataTable(list);
     }
 
-
-
-
-
      /**
      * 检查是否重复
      * 
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index f2476544a..5d772f2ed 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -230,8 +230,8 @@
                 a.settle_bill_no,
                 sum( b.pay_money) AS totalPayMoney,
                 sum( if(b.trade_date <![CDATA[ <= ]]>  a.payment_due_date,b.pay_money,0)  ) AS recdMoneyIn,
-                sum( if(a.settle_type='2' and a.credit_period <![CDATA[ > ]]> 30 and b.trade_date <![CDATA[ > ]]> a.payment_due_date and b.trade_date <![CDATA[ < ]]>  DATE_SUB( a.payment_due_date, INTERVAL (a.credit_period-60) DAY ),b.pay_money,0)  ) AS recdPayMoney60D,
-                sum( if( (a.settle_type='2' and a.credit_period <![CDATA[ > ]]> 30 and b.trade_date <![CDATA[ >= ]]> DATE_SUB( a.payment_due_date, INTERVAL (a.credit_period-60) DAY ) ) or ( ( (a.settle_type='2' and a.credit_period <![CDATA[ < ]]> 30) or a.settle_type='1' ) and b.trade_date <![CDATA[ > ]]>  a.payment_due_date ),b.pay_money,0)  ) AS recdPayMoneyGreat60D
+                sum( if(a.settle_type='2' and a.credit_period <![CDATA[ >= ]]> 30 and b.trade_date <![CDATA[ > ]]> a.payment_due_date and b.trade_date <![CDATA[ < ]]>  DATE_SUB( a.payment_due_date, INTERVAL (a.credit_period-60) DAY ),b.pay_money,0)  ) AS recdPayMoney60D,
+                sum( if( (a.settle_type='2' and a.credit_period <![CDATA[ >= ]]> 30 and b.trade_date <![CDATA[ >= ]]> DATE_SUB( a.payment_due_date, INTERVAL (a.credit_period-60) DAY ) ) or ( ( (a.settle_type='2' and a.credit_period <![CDATA[ < ]]> 30) or a.settle_type='1' ) and b.trade_date <![CDATA[ > ]]>  a.payment_due_date ),b.pay_money,0)  ) AS recdPayMoneyGreat60D
             FROM
                 emis_settle_bill a,
                 emis_settle_pay_record b,
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index f55ab9948..4552c886b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -319,10 +319,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and b.trade_date <![CDATA[ <= ]]>  esb.payment_due_date
                 </if>
                 <if test="params.queryDataType != null and params.queryDataType == 2">
-                    and ( esb.settle_type='2' and esb.credit_period <![CDATA[ > ]]> 30 and b.trade_date <![CDATA[ > ]]> esb.payment_due_date and b.trade_date <![CDATA[ < ]]>  DATE_SUB( esb.payment_due_date, INTERVAL (esb.credit_period-60) DAY ) )
+                    and ( esb.settle_type='2' and esb.credit_period <![CDATA[ >= ]]> 30 and b.trade_date <![CDATA[ > ]]> esb.payment_due_date and b.trade_date <![CDATA[ < ]]>  DATE_SUB( esb.payment_due_date, INTERVAL (esb.credit_period-60) DAY ) )
                 </if>
                 <if test="params.queryDataType != null and params.queryDataType == 3">
-                    and ( ( esb.settle_type='2' and esb.credit_period <![CDATA[ > ]]> 30 and b.trade_date <![CDATA[ >= ]]> DATE_SUB( esb.payment_due_date, INTERVAL (esb.credit_period-60) DAY ) ) or ( ( (esb.settle_type='2' and esb.credit_period <![CDATA[ < ]]> 30) or esb.settle_type='1' ) and b.trade_date <![CDATA[ > ]]>  esb.payment_due_date ) )
+                    and ( ( esb.settle_type='2' and esb.credit_period <![CDATA[ >= ]]> 30 and b.trade_date <![CDATA[ >= ]]> DATE_SUB( esb.payment_due_date, INTERVAL (esb.credit_period-60) DAY ) ) or ( ( (esb.settle_type='2' and esb.credit_period <![CDATA[ < ]]> 30) or esb.settle_type='1' ) and b.trade_date <![CDATA[ > ]]>  esb.payment_due_date ) )
                 </if>
                 and FIND_IN_SET(espbr.settle_bill_no,#{settleBillNo})
             )