update:财付通金额统计sql不区分操作员大小写

src/main/java/com/saye/hospitalgd/scheduler/jobMethod/BankGetDataMethodByJHLZF.java

@@ -716,13 +716,18 @@ public class BankGetDataMethodByJHLZF {
                                     bankbillHistory.setCZddh("");                                 // 子订单号（空）
                                     bankbillHistory.setBillTableName("建行龙支付对账单");          // 对账表名
                                     
-                                    // 根据终端号判断是否为住院订单
+                                    String shddh = bankbillHistory.getCShddh();
-                                    // 终端号为10091548或10091549的为住院订单，不参与对账
+                                    if ("10091548".equals(zdh)
-                                    if ("10091548".equals(zdh) || "10091549".equals(zdh) || "10091546".equals(zdh) || "10091547".equals(zdh) || "10091544".equals(zdh) || "10091545".equals(zdh)) {
+                                            || "10091549".equals(zdh)
-                                        bankbillHistory.setIsInpatient("1");  // 标记为住院订单
+                                            || "10091546".equals(zdh)
-                                        log.info("标记为住院订单: 终端号=" + zdh + ", 订单号=" + bankbillHistory.getCShddh());
+                                            || "10091547".equals(zdh)
+                                            || "10091544".equals(zdh)
+                                            || "10091545".equals(zdh)
+                                            || (shddh != null && shddh.endsWith("ZZJZY"))) {
+                                        bankbillHistory.setIsInpatient("1");
+                                        log.info("标记为住院订单: 终端号=" + zdh + ", 订单号=" + shddh);
                                     } else {
-                                        bankbillHistory.setIsInpatient("0");  // 标记为非住院订单
+                                        bankbillHistory.setIsInpatient("0");
                                     }
 
                                 bankbillHistoryList.add(bankbillHistory);

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>

src/main/resources/mapper/FinancialReconciliation/TenpaySummaryMapper.xml

@@ -69,7 +69,7 @@
             <if test="endTime != null and endTime != ''">
                 AND trade_date &lt;= #{endTime}
             </if>
-            AND LOWER(HisOperCode) in  ('wx' , 'yb')
+            AND HisOperCode in  ('wx' , 'yb')
             AND TradingStatus = '1'
             AND PayType in ('2','1')
         </where>
@@ -93,7 +93,7 @@
             <if test="endTime != null and endTime != ''">
                 AND trade_date &lt;= #{endTime}
             </if>
-            AND LOWER(HisOperCode) in  ('wx' , 'yb')
+            AND HisOperCode in  ('wx' , 'yb')
             AND TradingStatus = '2'
             AND PayType in ('2','1')
         </where>
@@ -109,7 +109,7 @@
             <if test="endTime != null and endTime != ''">
                 AND trade_date &lt;= #{endTime}
             </if>
-            AND LOWER(HisOperCode) in  ('wx' , 'yb')
+            AND HisOperCode in  ('wx' , 'yb')
             AND TradingStatus IN ('1','2')
             AND PayType in ('2','1')
         </where>

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 (
+                 ) b
-                       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的记录
                  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>