From 0a344423e5286250c587aa8b8ff9ffd4117799ac Mon Sep 17 00:00:00 2001
From: Yuan <1450637472@qq.com>
Date: Wed, 19 Nov 2025 11:37:49 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=EF=BC=9A=E8=BF=87=E6=BB=A4=E5=86=9B?=
 =?UTF-8?q?=E4=BF=9D=E6=94=AF=E4=BB=98=E5=AF=B9=E8=B4=A6?=
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  |  6 ++++++
 .../resources/mapper/TransactionDetailMapper.xml     | 12 ++++++++++++
 3 files changed, 29 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 282429e..2ab3643 100644
--- a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java
+++ b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java
@@ -101,6 +101,17 @@ public class ReconciliationMethod {
                 prepayment_code = StringDUtil.changeNullToEmpty(prepaymentPayTypeList.get(0).get("DICVALUE"));
             }
             searchMap.put("prepayment_code", prepayment_code);
+            
+            // 查询军保支付方式的dicvalue，常规对账需要排除
+            String military_payment_code = "";
+            HashMap<String, String> militaryPaymentSearchMap = new HashMap<>();
+            militaryPaymentSearchMap.put("parentCode", "PAY_TYPE");
+            militaryPaymentSearchMap.put("dicname", "军保支付");
+            List<HashMap<Object, Object>> militaryPaymentPayTypeList = dicinfoService.selectDicinfoListByCondition(militaryPaymentSearchMap);
+            if (militaryPaymentPayTypeList != null && militaryPaymentPayTypeList.size() > 0) {
+                military_payment_code = StringDUtil.changeNullToEmpty(militaryPaymentPayTypeList.get(0).get("DICVALUE"));
+            }
+            searchMap.put("military_payment_code", military_payment_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 91d65b9..2b105c2 100644
--- a/src/main/resources/mapper/HisbillsHistoryMapper.xml
+++ b/src/main/resources/mapper/HisbillsHistoryMapper.xml
@@ -33,6 +33,9 @@
         <if test="prepayment_code != null and prepayment_code != ''">
             and PayType != #{prepayment_code}
         </if>
+        <if test="military_payment_code != null and military_payment_code != ''">
+            and PayType != #{military_payment_code}
+        </if>
     </select>
 
     <select id="findHisDetailByParam" parameterType="HashMap" resultType="HashMap">
@@ -62,6 +65,9 @@
         <if test="prepayment_code != null and prepayment_code != ''">
             and PayType != #{prepayment_code}
         </if>
+        <if test="military_payment_code != null and military_payment_code != ''">
+            and PayType != #{military_payment_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 aba63aa..1275a85 100644
--- a/src/main/resources/mapper/TransactionDetailMapper.xml
+++ b/src/main/resources/mapper/TransactionDetailMapper.xml
@@ -83,6 +83,9 @@
         <if test="prepayment_code != null and prepayment_code != ''">
           and a.PayType != #{prepayment_code}
         </if>
+        <if test="military_payment_code != null and military_payment_code != ''">
+          and a.PayType != #{military_payment_code}
+        </if>
         <if test="excludeMilitaryOperators != null and excludeMilitaryOperators.size() > 0">
           and a.HisOperCode not in
           <foreach collection="excludeMilitaryOperators" item="operator" open="(" separator="," close=")">
@@ -126,6 +129,9 @@
         <if test="prepayment_code != null and prepayment_code != ''">
             and payType!=#{prepayment_code}
         </if>
+        <if test="military_payment_code != null and military_payment_code != ''">
+            and payType!=#{military_payment_code}
+        </if>
         ) a
                  inner join
                  (select * from bankbill_history where C_JYRQ = #{trade_date}) b
@@ -166,6 +172,9 @@
         <if test="prepayment_code != null and prepayment_code != ''">
             and payType!=#{prepayment_code}
         </if>
+        <if test="military_payment_code != null and military_payment_code != ''">
+            and payType!=#{military_payment_code}
+        </if>
         ) a
                  left join
                  (select * from bankbill_history where C_JYRQ = #{trade_date}) b
@@ -207,6 +216,9 @@
         <if test="prepayment_code != null and prepayment_code != ''">
             and payType!=#{prepayment_code}
         </if>
+        <if test="military_payment_code != null and military_payment_code != ''">
+            and payType!=#{military_payment_code}
+        </if>
         ) a
                  right join
                  (select * from bankbill_history where C_JYRQ = #{trade_date}) b