From f084043a4b7c2001fe66f07ea07739eeeae1578a Mon Sep 17 00:00:00 2001
From: Yuan <1450637472@qq.com>
Date: Wed, 10 Dec 2025 19:07:51 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=EF=BC=9A=E5=AF=B9=E8=B4=A6=E5=AF=B9?=
 =?UTF-8?q?=E5=B9=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/BankbillHistoryMapper.xml          |   4 +-
 .../mapper/BankbillsHistoryMapper.xml         |   1 +
 .../TenpaySummaryMapper.xml                   |   6 +-
 .../mapper/TransactionDetailMapper.xml        |   7 +-
 .../financialReconciliation/thirdDetail.html  |   2 +-
 .../templates/paymentStatistics/summary.html  | 301 ++++++++++--------
 6 files changed, 176 insertions(+), 145 deletions(-)

diff --git a/src/main/resources/mapper/BankbillHistoryMapper.xml b/src/main/resources/mapper/BankbillHistoryMapper.xml
index 1b2ae8a..cc3d91d 100644
--- a/src/main/resources/mapper/BankbillHistoryMapper.xml
+++ b/src/main/resources/mapper/BankbillHistoryMapper.xml
@@ -73,7 +73,7 @@
                 and C_ZFFS = #{c_zffs}
             </if>
             <if test="likeFiled!=null and likeFiled!=''">
-                and C_YSDDH like concat('%',concat(#{likeFiled},'%'))
+                and C_SHDDH like concat('%',concat(#{likeFiled},'%'))
             </if>
             and C_SHDDH in (
               select C_SHDDH
@@ -280,7 +280,7 @@
                 and C_ZFFS = #{c_zffs}
             </if>
             <if test="likeFiled!=null and likeFiled!=''">
-                and C_YSDDH like concat('%',concat(#{likeFiled},'%'))
+                and C_SHDDH like concat('%',concat(#{likeFiled},'%'))
             </if>
         </where>
     </select>
diff --git a/src/main/resources/mapper/BankbillsHistoryMapper.xml b/src/main/resources/mapper/BankbillsHistoryMapper.xml
index 40e1999..717ec4d 100644
--- a/src/main/resources/mapper/BankbillsHistoryMapper.xml
+++ b/src/main/resources/mapper/BankbillsHistoryMapper.xml
@@ -41,6 +41,7 @@
         from bankbill_history
         where C_JYRQ = #{trade_date}
         and (is_inpatient is null or is_inpatient = '0')  <!-- 排除住院订单(终端号10091548和10091549) -->
+        and (bill_table_name is null or bill_table_name != '微信医保账单')  <!-- 排除微信医保账单 -->
     </select>
     <insert id="saveOriginalData" parameterType="java.util.List">
         insert into bankbills_original (
diff --git a/src/main/resources/mapper/FinancialReconciliation/TenpaySummaryMapper.xml b/src/main/resources/mapper/FinancialReconciliation/TenpaySummaryMapper.xml
index 11ef0df..4e129a5 100644
--- a/src/main/resources/mapper/FinancialReconciliation/TenpaySummaryMapper.xml
+++ b/src/main/resources/mapper/FinancialReconciliation/TenpaySummaryMapper.xml
@@ -14,7 +14,7 @@
             <if test="endTime != null and endTime != ''">
                 AND C_JYRQ &lt;= #{endTime}
             </if>
-            AND bill_table_name = '微信支付账单'
+            AND bill_table_name in ('微信支付账单','微信医保账单')
             AND C_JYLX = '1'
         </where>
         UNION ALL
@@ -37,7 +37,7 @@
             <if test="endTime != null and endTime != ''">
                 AND C_JYRQ &lt;= #{endTime}
             </if>
-            AND bill_table_name = '微信支付账单'
+            AND bill_table_name in ('微信支付账单','微信医保账单')
             AND C_JYLX = '2'
         </where>
         UNION ALL
@@ -52,7 +52,7 @@
             <if test="endTime != null and endTime != ''">
                 AND C_JYRQ &lt;= #{endTime}
             </if>
-            AND bill_table_name = '微信支付账单'
+            AND bill_table_name in ('微信支付账单','微信医保账单')
             AND C_JYLX IN ('1','2')
         </where>
     </select>
diff --git a/src/main/resources/mapper/TransactionDetailMapper.xml b/src/main/resources/mapper/TransactionDetailMapper.xml
index b1532c6..9e91207 100644
--- a/src/main/resources/mapper/TransactionDetailMapper.xml
+++ b/src/main/resources/mapper/TransactionDetailMapper.xml
@@ -82,6 +82,7 @@
           and b.C_JYRQ &lt;= #{endTime}
           and a.PayMethod != '2' -- 排除不参与对账的记录
           and (b.is_inpatient is null or b.is_inpatient = '0') -- 排除住院订单
+          and (b.bill_table_name is null or b.bill_table_name != '微信医保账单') -- 排除微信医保账单
         <if test="prepayment_code != null and prepayment_code != ''">
           and a.PayType != #{prepayment_code}
         </if>
@@ -139,7 +140,7 @@
         </if>
         ) a
                  inner join
-                 (select * from bankbill_history where C_JYRQ = #{trade_date} and (is_inpatient is null or is_inpatient = '0')) b -- 排除住院订单
+                 (select * from bankbill_history where C_JYRQ = #{trade_date} and (is_inpatient is null or is_inpatient = '0') and (bill_table_name is null or bill_table_name != '微信医保账单')) 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)
     </insert>
 
@@ -185,7 +186,7 @@
         </if>
         ) a
                  left join
-                 (select * from bankbill_history where C_JYRQ = #{trade_date} and (is_inpatient is null or is_inpatient = '0')) b -- 排除住院订单
+                 (select * from bankbill_history where C_JYRQ = #{trade_date} and (is_inpatient is null or is_inpatient = '0') and (bill_table_name is null or bill_table_name != '微信医保账单')) 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 b.C_SHDDH is null
     </insert>
@@ -236,11 +237,13 @@
                    select * from bankbill_history
                    where C_JYRQ = #{trade_date}
                      and (is_inpatient is null or is_inpatient = '0')
+                     and (bill_table_name is null or bill_table_name != '微信医保账单')
                      and C_SHDDH in (
                        select C_SHDDH
                        from bankbill_history
                        where C_JYRQ = #{trade_date}
                          and (is_inpatient is null or is_inpatient = '0')
+                         and (bill_table_name is null or bill_table_name != '微信医保账单')
                        group by C_SHDDH
                        having ROUND(SUM(CAST(C_JYJE AS DECIMAL(18,2))), 2) != 0
                      )
diff --git a/src/main/resources/templates/financialReconciliation/thirdDetail.html b/src/main/resources/templates/financialReconciliation/thirdDetail.html
index a7dca5d..7b1d34d 100644
--- a/src/main/resources/templates/financialReconciliation/thirdDetail.html
+++ b/src/main/resources/templates/financialReconciliation/thirdDetail.html
@@ -83,7 +83,7 @@
                 <div class="layui-inline">
                     <div class="layui-input-inline">
                         <input type="text" class="layui-input" style="width: 240px;" id="likeFiled"
-                               placeholder="请输入平台交易号">
+                               placeholder="请输入平台订单号">
                     </div>
                 </div>
             </form>
diff --git a/src/main/resources/templates/paymentStatistics/summary.html b/src/main/resources/templates/paymentStatistics/summary.html
index 62dec64..898762a 100644
--- a/src/main/resources/templates/paymentStatistics/summary.html
+++ b/src/main/resources/templates/paymentStatistics/summary.html
@@ -26,46 +26,41 @@
         }
 
         .content {
-            width: 210rem;
-            height: 297rem;
+            /* 放大整体画布，避免大额数字挤压 */
+            width: 240rem;
+            height: 320rem;
             margin: 0 auto;
             display: flex;
             justify-content: center;
-            align-items: center;
+            align-items: flex-start;
         }
 
-        .table {
-            width: 90%;
-            height: 90%;
-            border-top: black solid 1px;
-            border-left: black solid 1px;
-            display: grid;
-            grid-template-columns: 15% 15% 7.5% 20% 7.5% 20% 15%;
-            grid-template-rows: 8% repeat(11, 4%) 48%;
-            grid-template-areas:'a a a a a a a'
-                          '. b b b c c .'
-                          '. . . . . . .'
-                          'd . . . e f g'
-                          'd . . . e f g'
-                          'd . . . e f g'
-                          'd . . . e f g'
-                          '. h . . . . .'
-                          '. h . . . . .'
-                          '. h . . . . .'
-                          '. h . . . . .'
-                            '. . . . . . .'
-                          '. i i i i i i'
-
+        .hz-table {
+            width: 95%;
+            border-collapse: collapse;
+            table-layout: fixed;
+            margin-top: 2rem;
         }
 
-        .table div {
-            border-right: 1px solid black;
-            border-bottom: black solid 1px;
-            height: 100%;
-            width: 100%;
-            display: flex;
-            align-items: center;
-            justify-content: center;
+        .hz-table th,
+        .hz-table td {
+            border: 1px solid #000;
+            text-align: center;
+            padding: 0.8rem 0.5rem;
+            word-break: break-word;
+        }
+
+        .hz-table .title-row th {
+            font-size: 6rem;
+            border: none;
+            padding-top: 1rem;
+            padding-bottom: 1rem;
+        }
+
+        .hz-table .sub-title-row th {
+            font-size: 4rem;
+            border: none;
+            padding-bottom: 1rem;
         }
     </style>
 </head>
@@ -95,75 +90,113 @@
     </div>
     <div class="printDiv">
         <div class="content" id="tableContent">
-            <div class="table" style="font-size: 5rem;">
-                <div style="grid-area: a;flex-direction:column;">
-                    <span style="align-items:center;display: flex;height: 60%;font-size: 6rem;"
-                          th:text="${table_name}"></span>
-                    <span class="rqsj"
-                          style="align-items:center;font-size: 4rem;display: flex;height: 40%;align-self: end;">统计时间：</span>
-                </div>
-                <div></div>
-                <div style="grid-area: b;">银联商务</div>
-                <div style="grid-area: c;">医院信息系统</div>
-                <div>差额</div>
-                <div style="grid-area: d;">扫码支付</div>
-                <div></div>
-                <div>支付方式</div>
-                <div>笔数</div>
-                <div style="grid-area: e;" id="his_num_2"></div>
-                <div style="grid-area: f;" id="his_money_2"></div>
-                <div style="grid-area: g;" id="diff_1"></div>
-                <div>金额</div>
-                <div>笔数</div>
-                <div>金额</div>
-                <div></div>
-                <div>微信支付</div>
-                <div id="third_num_1_1"></div>
-                <div id="third_money_1_1"></div>
-                <div>刷卡支付</div>
-                <div id="third_num_1_2"></div>
-                <div id="third_money_1_2"></div>
-                <div style="grid-area: h;background:linear-gradient(123deg, transparent 49.5%, black 49.5%, black 50.5%, transparent 50.5%);"></div>
-                <div>支付宝支付</div>
-                <div id="third_num_1_3"></div>
-                <div id="third_money_1_3"></div>
-                <div>其他支付</div>
-                <div id="third_num_1_4"></div>
-                <div id="third_money_1_4"></div>
-                <div>支付宝支付</div>
-                <div id="third_num_2"></div>
-                <div id="third_money_2"></div>
-                <div id="his_num_1"></div>
-                <div id="his_money_1"></div>
-                <div id="diff_2"></div>
-                <div>微信支付</div>
-                <div id="third_num_3"></div>
-                <div id="third_money_3"></div>
-                <div id="his_num_3"></div>
-                <div id="his_money_3"></div>
-                <div id="diff_3"></div>
-                <div>银行卡支付</div>
-                <div id="third_num_4"></div>
-                <div id="third_money_4"></div>
-                <div id="his_num_4"></div>
-                <div id="his_money_4"></div>
-                <div id="diff_4"></div>
-                <div>其他</div>
-                <div id="third_num_5"></div>
-                <div id="third_money_5"></div>
-                <div id="his_num_5"></div>
-                <div id="his_money_5"></div>
-                <div id="diff_5"></div>
-                <div>合计</div>
-                <div></div>
-                <div id="allThirdNum"></div>
-                <div id="allThirdMoney"></div>
-                <div id="allHisNum"></div>
-                <div id="allHisMoney"></div>
-                <div id="allDiff"></div>
-                <div>单边账原因</div>
-                <div style="grid-area: i;"></div>
-            </div>
+            <table class="hz-table" style="font-size: 5rem;">
+                <thead>
+                <tr class="title-row">
+                    <th colspan="7" th:text="${table_name}">武警宁夏总队医院对账汇总表</th>
+                </tr>
+                <tr class="sub-title-row">
+                    <th colspan="7" class="rqsj">统计时间：</th>
+                </tr>
+                <tr>
+                    <th rowspan="2" style="width:14%;">支付方式</th>
+                    <th rowspan="2" style="width:14%;">支付方式</th>
+                    <th colspan="2" style="width:30%;">银联商务</th>
+                    <th colspan="2" style="width:30%;">医院信息系统<br/>现金金额：<span id="his_cash_money">0.00</span></th>
+                    <th rowspan="2" style="width:12%;">差额</th>
+                </tr>
+                <tr>
+                    <th>笔数</th>
+                    <th>金额</th>
+                    <th>笔数</th>
+                    <th>金额</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td rowspan="4">扫码支付</td>
+                    <td>微信支付</td>
+                    <td id="third_num_1_1"></td>
+                    <td id="third_money_1_1"></td>
+                    <td rowspan="4" id="his_num_2"></td>
+                    <td rowspan="4" id="his_money_2"></td>
+                    <td rowspan="4" id="diff_1"></td>
+                </tr>
+                <tr>
+                    <td>刷卡支付</td>
+                    <td id="third_num_1_2"></td>
+                    <td id="third_money_1_2"></td>
+                </tr>
+                <tr>
+                    <td>支付宝支付</td>
+                    <td id="third_num_1_3"></td>
+                    <td id="third_money_1_3"></td>
+                </tr>
+                <tr>
+                    <td>其他支付</td>
+                    <td id="third_num_1_4"></td>
+                    <td id="third_money_1_4"></td>
+                </tr>
+
+                <tr>
+                    <td colspan="2">支付宝支付</td>
+                    <td id="third_num_2"></td>
+                    <td id="third_money_2"></td>
+                    <td id="his_num_1"></td>
+                    <td id="his_money_1"></td>
+                    <td id="diff_2"></td>
+                </tr>
+
+                <tr>
+                    <td colspan="2">微信支付</td>
+                    <td id="third_num_3"></td>
+                    <td id="third_money_3"></td>
+                    <td id="his_num_3"></td>
+                    <td id="his_money_3"></td>
+                    <td id="diff_3"></td>
+                </tr>
+
+                <tr>
+                    <td colspan="2">银行卡支付</td>
+                    <td id="third_num_4"></td>
+                    <td id="third_money_4"></td>
+                    <td id="his_num_4"></td>
+                    <td id="his_money_4"></td>
+                    <td id="diff_4"></td>
+                </tr>
+
+                <tr>
+                    <td colspan="2">其他</td>
+                    <td id="third_num_5"></td>
+                    <td id="third_money_5"></td>
+                    <td id="his_num_5"></td>
+                    <td id="his_money_5"></td>
+                    <td id="diff_5"></td>
+                </tr>
+
+                <tr>
+                    <td colspan="2">现金支付</td>
+                    <td id="third_num_cash"></td>
+                    <td id="third_money_cash"></td>
+                    <td id="his_cash_num_row"></td>
+                    <td id="his_cash_money_row"></td>
+                    <td id="diff_cash"></td>
+                </tr>
+
+                <tr>
+                    <td colspan="2">合计</td>
+                    <td id="allThirdNum"></td>
+                    <td id="allThirdMoney"></td>
+                    <td id="allHisNum"></td>
+                    <td id="allHisMoney"></td>
+                    <td id="allDiff"></td>
+                </tr>
+
+                <tr>
+                    <td colspan="7" style="text-align:left;">单边账原因：</td>
+                </tr>
+                </tbody>
+            </table>
         </div>
     </div>
 </div>
@@ -235,45 +268,28 @@
                     "print-color-adjust:exact;" +
                     "        }\n" +
                     "        .content{\n" +
-                    "            width: 649px;\n" +
-                    "            height: 978px;\n" +
+                    "            width: 740px;\n" +
+                    "            height: 1040px;\n" +
                     "            margin:auto;\n" +
                     "            display: flex;\n" +
                     "            justify-content: center;\n" +
-                    "            align-items:center;\n" +
+                    "            align-items:flex-start;\n" +
                     "            text-align:center;\n" +
                     "        }\n" +
-                    "        .table{\n" +
-                    "            width: 90%;\n" +
-                    "            height: 90%;\n" +
-                    "            border-top: black solid 1px;\n" +
-                    "            border-left: black solid 1px;\n" +
-                    "            display: grid;\n" +
-                    "            grid-template-columns: 15% 15% 7.5% 20% 7.5% 20% 15%;\n" +
-                    "            grid-template-rows: 8% repeat(11,4%) 48%;\n" +
-                    "            grid-template-areas:'a a a a a a a'\n" +
-                    "                          '. b b b c c .'\n" +
-                    "                          '. . . . . . .'\n" +
-                    "                          'd . . . e f g'\n" +
-                    "                          'd . . . e f g'\n" +
-                    "                          'd . . . e f g'\n" +
-                    "                          'd . . . e f g'\n" +
-                    "                          '. h . . . . .'\n" +
-                    "                          '. h . . . . .'\n" +
-                    "                          '. h . . . . .'\n" +
-                    "                          '. h . . . . .'\n" +
-                    "                          '. . . . . . .'\n" +
-                    "                          '. i i i i i i'\n" +
-                    "\n" +
+                    "        .hz-table{\n" +
+                    "            width: 95%;\n" +
+                    "            border-collapse: collapse;\n" +
+                    "            table-layout: fixed;\n" +
+                    "            margin-top: 12px;\n" +
                     "        }\n" +
-                    "        .table div{\n" +
-                    "            border-right: 1px solid black;\n" +
-                    "            border-bottom: black solid 1px;\n" +
-                    "            height: 100%;\n" +
-                    "            width: 100%;\n" +
-                    "            display: flex;\n" +
-                    "            align-items:center;\n" +
-                    "            justify-content:center;\n" +
+                    "        .hz-table th, .hz-table td{\n" +
+                    "            border:1px solid #000;\n" +
+                    "            text-align:center;\n" +
+                    "            padding:8px 4px;\n" +
+                    "            word-break: break-word;\n" +
+                    "        }\n" +
+                    "        .title-row th{font-size:36px;border:none;padding-top:10px;padding-bottom:10px;}\n" +
+                    "        .sub-title-row th{font-size:24px;border:none;padding-bottom:10px;}\n" +
                     "        }</style>";
 
 
@@ -341,10 +357,17 @@
                 //his需要统计 1银行卡支付 2扫码支付 3掌医支付 4现金支付 5其他
                 //三方需要统计 1_1微信支付 1_2支付宝支付 1_3云闪付支付 1_4其他支付 2银行卡支付 3掌医支付 4现金支付 5其他
 
+                let hisCashMoney = Number(hisMoneyData["5"] || 0);
+                let hisCashNum = Number(hisNumData["5"] || 0);
                 for (let key in hisMoneyData) {
-                    allHisMoney = allHisMoney + Number(hisMoneyData[key]);
+                    if (key !== "5") {
+                        allHisMoney = allHisMoney + Number(hisMoneyData[key]);
+                    }
                     $("#his_money_" + key).html(formatAmount(hisMoneyData[key]));
                 }
+                $("#his_cash_money").html(formatAmount(hisCashMoney.toFixed(2)));
+                $("#his_cash_num_row").html(hisCashNum);
+                $("#his_cash_money_row").html(formatAmount(hisCashMoney.toFixed(2)));
 
                 for (let key in thirdMoneyData) {
                     allThirdMoney = allThirdMoney + Number(thirdMoneyData[key]);
@@ -352,7 +375,9 @@
                 }
 
                 for (let key in hisNumData) {
-                    allHisNum = allHisNum + Number(hisNumData[key]);
+                    if (key !== "5") {
+                        allHisNum = allHisNum + Number(hisNumData[key]);
+                    }
                     $("#his_num_" + key).html(hisNumData[key]);
                 }
 
@@ -360,6 +385,8 @@
                     allThirdNum = allThirdNum + Number(thirdNumData[key]);
                     $("#third_num_" + key).html(thirdNumData[key]);
                 }
+                $("#third_num_cash").html('0');
+                $("#third_money_cash").html(formatAmount('0.00'));
 
                 $("#diff_1").html("");
                 $("#diff_2").html("");