From 446b7cb1c02359f5fb888019378ee770c5110d9d Mon Sep 17 00:00:00 2001
From: Yuan <1450637472@qq.com>
Date: Tue, 18 Nov 2025 17:01:03 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=EF=BC=9A=E5=AF=B9=E8=B4=A6=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=A2=84=E4=BA=A4=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduler/jobMethod/ReconciliationMethod.java    | 11 +++++++++++
 src/main/resources/mapper/HisbillsHistoryMapper.xml  |  9 +++++++++
 .../resources/mapper/TransactionDetailMapper.xml     | 12 ++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java
index c9dc0f6..3950cbb 100644
--- a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java
+++ b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java
@@ -91,6 +91,17 @@ public class ReconciliationMethod {
             }
             searchMap.put("medical_insurance_code", medical_insurance_code);
 
+            // 查询预交金支付方式（payType=7）的dicvalue，常规对账需要排除
+            String prepayment_code = "";
+            HashMap<String, String> prepaymentSearchMap = new HashMap<>();
+            prepaymentSearchMap.put("parentCode", "PAY_TYPE");
+            prepaymentSearchMap.put("dicname", "预交金");
+            List<HashMap<Object, Object>> prepaymentPayTypeList = dicinfoService.selectDicinfoListByCondition(prepaymentSearchMap);
+            if (prepaymentPayTypeList != null && prepaymentPayTypeList.size() > 0) {
+                prepayment_code = StringDUtil.changeNullToEmpty(prepaymentPayTypeList.get(0).get("DICVALUE"));
+            }
+            searchMap.put("prepayment_code", prepayment_code);
+
             //查询his和三方记录
             List<HashMap<Object, Object>> hisbillsList = hisbillsHistoryService.findHisBillsByDate(searchMap);
 
diff --git a/src/main/resources/mapper/HisbillsHistoryMapper.xml b/src/main/resources/mapper/HisbillsHistoryMapper.xml
index 93128a4..91d65b9 100644
--- a/src/main/resources/mapper/HisbillsHistoryMapper.xml
+++ b/src/main/resources/mapper/HisbillsHistoryMapper.xml
@@ -30,6 +30,9 @@
         <if test="medical_insurance_code != null and medical_insurance_code != ''">
             and PayType != #{medical_insurance_code}
         </if>
+        <if test="prepayment_code != null and prepayment_code != ''">
+            and PayType != #{prepayment_code}
+        </if>
     </select>
 
     <select id="findHisDetailByParam" parameterType="HashMap" resultType="HashMap">
@@ -53,6 +56,12 @@
         <if test="military_code != null and military_code != ''">
             and PayType != #{military_code}
         </if>
+        <if test="medical_insurance_code != null and medical_insurance_code != ''">
+            and PayType != #{medical_insurance_code}
+        </if>
+        <if test="prepayment_code != null and prepayment_code != ''">
+            and PayType != #{prepayment_code}
+        </if>
         <if test="tranID!=null and tranID!=''">
             and HisTransId=#{tranID}
         </if>
diff --git a/src/main/resources/mapper/TransactionDetailMapper.xml b/src/main/resources/mapper/TransactionDetailMapper.xml
index 97cee16..aba63aa 100644
--- a/src/main/resources/mapper/TransactionDetailMapper.xml
+++ b/src/main/resources/mapper/TransactionDetailMapper.xml
@@ -80,6 +80,9 @@
                  inner join bankbill_history b on a.PlatformTransId = b.C_YSDDH
         where b.C_JYRQ &gt;= #{startTime}
           and b.C_JYRQ &lt;= #{endTime}
+        <if test="prepayment_code != null and prepayment_code != ''">
+          and a.PayType != #{prepayment_code}
+        </if>
         <if test="excludeMilitaryOperators != null and excludeMilitaryOperators.size() > 0">
           and a.HisOperCode not in
           <foreach collection="excludeMilitaryOperators" item="operator" open="(" separator="," close=")">
@@ -120,6 +123,9 @@
         <if test="medical_insurance_code != null and medical_insurance_code != ''">
             and payType!=#{medical_insurance_code}
         </if>
+        <if test="prepayment_code != null and prepayment_code != ''">
+            and payType!=#{prepayment_code}
+        </if>
         ) a
                  inner join
                  (select * from bankbill_history where C_JYRQ = #{trade_date}) b
@@ -157,6 +163,9 @@
         <if test="medical_insurance_code != null and medical_insurance_code != ''">
             and payType!=#{medical_insurance_code}
         </if>
+        <if test="prepayment_code != null and prepayment_code != ''">
+            and payType!=#{prepayment_code}
+        </if>
         ) a
                  left join
                  (select * from bankbill_history where C_JYRQ = #{trade_date}) b
@@ -195,6 +204,9 @@
         <if test="medical_insurance_code != null and medical_insurance_code != ''">
             and payType!=#{medical_insurance_code}
         </if>
+        <if test="prepayment_code != null and prepayment_code != ''">
+            and payType!=#{prepayment_code}
+        </if>
         ) a
                  right join
                  (select * from bankbill_history where C_JYRQ = #{trade_date}) b