From bad857217df7b10785169b52a68c6bdf249aceb0 Mon Sep 17 00:00:00 2001
From: Elliott <2423414394@qq.com>
Date: Thu, 8 Jan 2026 14:48:54 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E9=93=B6=E8=A1=8C=E4=B8=80=E6=AD=A3?=
 =?UTF-8?q?=E4=B8=80=E8=B4=9F=E4=BA=A4=E6=98=93=E4=B8=8D=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/BankbillHistoryMapper.xml  | 17 -----------------
 .../mapper/TransactionDetailMapper.xml          | 12 ++----------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/main/resources/mapper/BankbillHistoryMapper.xml b/src/main/resources/mapper/BankbillHistoryMapper.xml
index cc3d91d..6e9f271 100644
--- a/src/main/resources/mapper/BankbillHistoryMapper.xml
+++ b/src/main/resources/mapper/BankbillHistoryMapper.xml
@@ -75,23 +75,6 @@
             <if test="likeFiled!=null and likeFiled!=''">
                 and C_SHDDH like concat('%',concat(#{likeFiled},'%'))
             </if>
-            and C_SHDDH in (
-              select C_SHDDH
-              from bankbill_history
-              <where>
-                <if test="startTime!=null and startTime!=''">
-                    and C_JYRQ &gt;= #{startTime}
-                </if>
-                <if test="endTime!=null and endTime!=''">
-                    and C_JYRQ &lt;= #{endTime}
-                </if>
-                <if test="c_zffs!=null and c_zffs!=''">
-                    and C_ZFFS = #{c_zffs}
-                </if>
-              </where>
-              group by C_SHDDH
-              having ROUND(SUM(CAST(C_JYJE AS DECIMAL(18,2))), 2) != 0
-            )
         </where>
         order by C_JYRQ,C_JYSJ
     </select>
diff --git a/src/main/resources/mapper/TransactionDetailMapper.xml b/src/main/resources/mapper/TransactionDetailMapper.xml
index b1532c6..ab4a65e 100644
--- a/src/main/resources/mapper/TransactionDetailMapper.xml
+++ b/src/main/resources/mapper/TransactionDetailMapper.xml
@@ -217,7 +217,7 @@
         from (select * from hisbill_history where trade_date = #{trade_date}  and payType!=#{cash_code}
         and PayMethod != '2' -- 排除不参与对账的记录
         and PayType != '9' -- 排除账户支付，不参与常规对账
-        and PayType != '10' -- 排除统筹支付，不参与常规对账
+        and PayType != '10'
         <if test="military_code != null and military_code != ''">
             and payType!=#{military_code}
         </if>
@@ -236,15 +236,7 @@
                    select * from bankbill_history
                    where C_JYRQ = #{trade_date}
                      and (is_inpatient is null or is_inpatient = '0')
-                     and C_SHDDH in (
-                       select C_SHDDH
-                       from bankbill_history
-                       where C_JYRQ = #{trade_date}
-                         and (is_inpatient is null or is_inpatient = '0')
-                       group by C_SHDDH
-                       having ROUND(SUM(CAST(C_JYJE AS DECIMAL(18,2))), 2) != 0
-                     )
-                 ) b -- 排除住院订单，且排除同订单号正负抵消为0的记录
+                 ) b
                  on a.PlatformTransId = b.C_SHDDH and a.TradingStatus = b.C_JYLX and ROUND(CAST(a.Amount AS DECIMAL(18,2)), 2) = ROUND(CAST(b.C_JYJE AS DECIMAL(18,2)), 2)
         where a.PlatformTransId is null
     </insert>