住院日结增加聚合支付

src/main/java/cn/hnthyy/thmz/mapper/his/zy/ZyDailySettlementMapper.java

@@ -59,6 +59,8 @@ public interface ZyDailySettlementMapper {
             " depositYlkNum = sum(case when (window_no='1' and status  ='1' and depo_type='3' )  then 1 else 0 end)," +
             " depositQtAmount = sum(case when (window_no='1' and status  ='1' and depo_type='0' )  then depo_amount else 0 end)," +
             " depositQtNum = sum(case when (window_no='1' and status  ='1' and depo_type='0' )  then 1 else 0 end)," +
+            " depositJhzfAmount= sum(case when (window_no='1' and depo_type='O' )  then depo_amount else 0 end), " +
+            " depositJhzfNum = sum(case when (window_no='1' and status  ='1' and depo_type='O' )  then 1 else 0 end)," +
             " depositByjzAmount= sum(case when (window_no='1' and depo_type='Y' )  then depo_amount else 0 end), " +
             " returnCashAmount = sum(case when (window_no='1' and status  ='2' and depo_type='A' )then depo_amount else 0 end)," +
             " returnCashNum = sum(case when (window_no='1' and status  ='2' and depo_type='A' ) then 1 else 0 end)," +
@@ -72,18 +74,22 @@ public interface ZyDailySettlementMapper {
             " returnYlkNum = sum(case when (window_no='1' and status  ='2' and depo_type='3' )  then 1 else 0 end)," +
             " returnQtAmount = sum(case when (window_no='1' and status  ='2' and depo_type='0' )  then depo_amount else 0 end)," +
             " returnQtNum = sum(case when (window_no='1' and status  ='2' and depo_type='0' )  then 1 else 0 end)," +
+            " returnJhzfAmount = sum(case when (window_no='1' and status  ='2' and depo_type='O' )  then depo_amount else 0 end)," +
+            " returnJhzfNum = sum(case when (window_no='1' and status  ='2' and depo_type='O' )  then 1 else 0 end)," +
             " jsbkCashAmount=sum(case when (window_no='2' and status in ('1','3','4','5') and depo_type='A') then depo_amount else 0 end)," +
             " jsbkWxAmount=sum(case when (window_no='2' and status in ('1','3','4','5') and depo_type='E') then depo_amount else 0 end)," +
             " jsbkZfbAmount=sum(case when (window_no='2' and status in ('1','3','4','5') and depo_type='F') then depo_amount else 0 end)," +
             " jsbkYbAmount=sum(case when (window_no='2' and status in ('1','3','4','5') and  depo_type in ('6','7'))  then depo_amount else 0 end)," +
             " jsbkYlkAmount=sum(case when (window_no='2' and status in ('1','3','4','5') and depo_type='3')  then depo_amount else 0 end)," +
             " jsbkQtAmount=sum(case when (window_no='2' and status in ('1','3','4','5') and  depo_type in ('0','J')) then depo_amount else 0 end), " +
+            " jsbkJhzfAmount=sum(case when (window_no='2' and status in ('1','3','4','5') and depo_type='O') then depo_amount else 0 end)," +
             " jstkCashAmount=sum(case when ( window_no='2' and status ='2' and depo_type='A') then depo_amount else 0 end)," +
             " jstkWxAmount=sum(case when ( window_no='2' and status ='2' and depo_type='E') then depo_amount else 0 end)," +
             " jstkZfbAmount=sum(case when ( window_no='2' and status ='2' and depo_type='F') then depo_amount else 0 end)," +
             " jstkYbAmount=sum(case when ( window_no='2' and status ='2' and depo_type in ('6','7')) then depo_amount else 0 end)," +
             " jstkYlkAmount=sum(case when ( window_no='2' and status ='2' and depo_type='3') then depo_amount else 0 end)," +
             " jstkQtAmount=sum(case when ( window_no='2' and status ='2' and depo_type in ('0','J')) then depo_amount else 0 end)," +
+            " jstkJhzfAmount=sum(case when ( window_no='2' and status ='2' and depo_type='O') then depo_amount else 0 end)," +
             " jsjzMzyfAmount=sum(case when ( window_no='2' and status ='4' and upper(depo_type)='D') then depo_amount else 0 end)," +
             " jsCfbzAmount=sum(case when ( window_no='2' and status ='4' and upper(depo_type)='C') then depo_amount else 0 end)," +
             " totalByybdf=sum(case when ( window_no='2' and status ='2' and upper(depo_type)='J') then depo_amount else 0 end) " +

src/main/java/cn/hnthyy/thmz/service/impl/his/zy/ZyDailySettlementServiceImpl.java

@@ -129,6 +129,12 @@ public class ZyDailySettlementServiceImpl implements ZyDailySettlementService {
             Collections.sort(chargeZyDepositFileList, (o1, o2) -> {
                 String receipt_no1 =(String)o1.get("receipt_no");
                 String receipt_no2= (String)o2.get("receipt_no");
+                if(receipt_no1==null){
+                    receipt_no1="";
+                }
+                if(receipt_no2==null){
+                    receipt_no2="";
+                }
                 return receipt_no1.compareTo(receipt_no2);
             });
             zyDailySettlementVo.setReceiptNoBegin((String) chargeZyDepositFileList.get(0).get("receipt_no"));

src/main/java/cn/hnthyy/thmz/service/impl/his/zy/ZyDepositFileServiceImpl.java

@@ -66,7 +66,7 @@ public class ZyDepositFileServiceImpl implements ZyDepositFileService {
         depoTimes++;
         zyDepositFile.setDepoTimes(Double.valueOf(depoTimes));
         zyDepositFile.setDepoDate(new Date());
-        zyDepositFile.setWindowNo("1");
+        zyDepositFile.setWindowNo(ZyDepositFile.IN_HOSPITAL);
         zyDepositFile.setDeleted(YesNoEnum.NO.code.toString());
         //此时账页信息为空，是收费
         if (zyDepositFile.getLedgerSn() == null) {

src/main/java/cn/hnthyy/thmz/vo/ZyDailySettlementVo.java

@@ -50,6 +50,10 @@ public class ZyDailySettlementVo {
     private BigDecimal depositQtAmount;
     //其他缴纳的预收金次数
     private Integer depositQtNum;
+    //聚合支付缴纳的预收金金额
+    private BigDecimal depositJhzfAmount;
+    //聚合支付缴纳的预收金次数
+    private Integer depositJhzfNum;
     //合计缴纳的预收金金额
     private BigDecimal depositTotalAmount;
     //合计缴纳的预收金次数
@@ -80,6 +84,10 @@ public class ZyDailySettlementVo {
     private BigDecimal returnQtAmount;
     //其他退费的预收金次数
     private Integer returnQtNum;
+    //聚合支付退费的预收金金额
+    private BigDecimal returnJhzfAmount;
+    //聚合支付退费的预收金次数
+    private Integer returnJhzfNum;
     //合计退费的预收金金额
     private BigDecimal returnTotalAmount;
     //合计退费的预收金次数
@@ -96,6 +104,8 @@ public class ZyDailySettlementVo {
     private BigDecimal jsbkYlkAmount;
     //其他结算补款金额
     private BigDecimal jsbkQtAmount;
+    //聚合支付结算补款金额
+    private BigDecimal jsbkJhzfAmount;
     //合计结算补款金额
     private BigDecimal jsbkTotalAmount;
     //现金结算退款金额
@@ -110,6 +120,8 @@ public class ZyDailySettlementVo {
     private BigDecimal jstkYlkAmount;
     //其他结算退款金额
     private BigDecimal jstkQtAmount;
+    //聚合支付结算退款金额
+    private BigDecimal jstkJhzfAmount;
     //合计结算退款金额
     private BigDecimal jstkTotalAmount;
     //民政优抚金额
@@ -135,6 +147,8 @@ public class ZyDailySettlementVo {
     private BigDecimal yjjsjhjYlkAmount;
     //预交金上缴合计 其他 部分金额
     private BigDecimal yjjsjhjQtAmount;
+    //预交金上缴合计 聚合支付 部分金额
+    private BigDecimal yjjsjhjJhzfAmount;
     //预交金上缴合计 合计 部分金额
     private BigDecimal yjjsjhjHjAmount;
     //预交金上缴合计大写
@@ -152,6 +166,8 @@ public class ZyDailySettlementVo {
     private BigDecimal jsbtYlkAmount;
     //结算补退合计 其他 部分金额
     private BigDecimal jsbtQtAmount;
+    //结算补退合计 聚合支付 部分金额
+    private BigDecimal jsbtJhzfAmount;
     //结算补退合计 合计 部分金额
     private BigDecimal jsbtHjAmount;
     //结算补退合计大写
@@ -168,6 +184,8 @@ public class ZyDailySettlementVo {
     private BigDecimal sjhjYbkAmount;
     //上缴合计 银联卡 部分金额
     private BigDecimal sjhjYlkAmount;
+    //上缴合计 聚合支付 部分金额
+    private BigDecimal sjhjJhzfAmount;
     //转账部分金额
     private BigDecimal zzAmount;
     //发票现金部分金额
@@ -236,7 +254,10 @@ public class ZyDailySettlementVo {
         if (depositQtAmount == null) {
             depositQtAmount = BigDecimal.ZERO;
         }
-        depositTotalAmount = depositCashAmount.add(depositWxAmount).add(depositZfbAmount).add(depositYbAmount).add(depositYlkAmount).add(depositQtAmount);
+        if (depositJhzfAmount == null) {
+            depositJhzfAmount = BigDecimal.ZERO;
+        }
+        depositTotalAmount = depositCashAmount.add(depositWxAmount).add(depositZfbAmount).add(depositYbAmount).add(depositYlkAmount).add(depositQtAmount).add(depositJhzfAmount);
         if (depositCashNum == null) {
             depositCashNum = 0;
         }
@@ -255,7 +276,10 @@ public class ZyDailySettlementVo {
         if (depositQtNum == null) {
             depositQtNum = 0;
         }
-        depositTotalNum = depositCashNum + depositWxNum + depositZfbNum + depositYbNum + depositYlkNum + depositQtNum;
+        if (depositJhzfNum == null) {
+            depositJhzfNum = 0;
+        }
+        depositTotalNum = depositCashNum + depositWxNum + depositZfbNum + depositYbNum + depositYlkNum + depositQtNum+depositJhzfNum;
 
         //退预交金
         if (returnCashAmount == null) {
@@ -288,7 +312,12 @@ public class ZyDailySettlementVo {
         } else if (returnQtAmount.compareTo(BigDecimal.ZERO) == -1) {
             returnQtAmount = BigDecimal.ZERO.subtract(returnQtAmount);
         }
-        returnTotalAmount = returnCashAmount.add(returnWxAmount).add(returnZfbAmount).add(returnYbAmount).add(returnYlkAmount).add(returnQtAmount);
+        if (returnJhzfAmount == null) {
+            returnJhzfAmount = BigDecimal.ZERO;
+        } else if (returnJhzfAmount.compareTo(BigDecimal.ZERO) == -1) {
+            returnJhzfAmount = BigDecimal.ZERO.subtract(returnJhzfAmount);
+        }
+        returnTotalAmount = returnCashAmount.add(returnWxAmount).add(returnZfbAmount).add(returnYbAmount).add(returnYlkAmount).add(returnQtAmount).add(returnJhzfAmount);
         if (returnCashNum == null) {
             returnCashNum = 0;
         }
@@ -307,7 +336,10 @@ public class ZyDailySettlementVo {
         if (returnQtNum == null) {
             returnQtNum = 0;
         }
-        returnTotalNum = returnCashNum + returnWxNum + returnZfbNum + returnYbNum + returnYlkNum + returnQtNum;
+        if (returnJhzfNum == null) {
+            returnJhzfNum = 0;
+        }
+        returnTotalNum = returnCashNum + returnWxNum + returnZfbNum + returnYbNum + returnYlkNum + returnQtNum+returnJhzfNum;
 
         //结算补款
         if (jsbkCashAmount == null) {
@@ -328,7 +360,10 @@ public class ZyDailySettlementVo {
         if (jsbkQtAmount == null) {
             jsbkQtAmount = BigDecimal.ZERO;
         }
-        jsbkTotalAmount = jsbkCashAmount.add(jsbkWxAmount).add(jsbkZfbAmount).add(jsbkYbAmount).add(jsbkYlkAmount).add(jsbkQtAmount);
+        if (jsbkJhzfAmount == null) {
+            jsbkJhzfAmount = BigDecimal.ZERO;
+        }
+        jsbkTotalAmount = jsbkCashAmount.add(jsbkWxAmount).add(jsbkZfbAmount).add(jsbkYbAmount).add(jsbkYlkAmount).add(jsbkQtAmount).add(jsbkJhzfAmount);
         //结算退款
         if (jstkCashAmount == null) {
             jstkCashAmount = BigDecimal.ZERO;
@@ -348,7 +383,10 @@ public class ZyDailySettlementVo {
         if (jstkQtAmount == null) {
             jstkQtAmount = BigDecimal.ZERO;
         }
-        jstkTotalAmount = jstkCashAmount.add(jstkWxAmount).add(jstkZfbAmount).add(jstkYbAmount).add(jstkYlkAmount).add(jstkQtAmount);
+        if (jstkJhzfAmount == null) {
+            jstkJhzfAmount = BigDecimal.ZERO;
+        }
+        jstkTotalAmount = jstkCashAmount.add(jstkWxAmount).add(jstkZfbAmount).add(jstkYbAmount).add(jstkYlkAmount).add(jstkQtAmount).add(jstkJhzfAmount);
         //医保支付金额
         if (jzAmount == null) {
             jzAmount = BigDecimal.ZERO;
@@ -367,6 +405,7 @@ public class ZyDailySettlementVo {
         yjjsjhjYbkAmount = depositYbAmount.subtract(returnYbAmount);
         yjjsjhjYlkAmount = depositYlkAmount.subtract(returnYlkAmount);
         yjjsjhjQtAmount = depositQtAmount.subtract(returnQtAmount);
+        yjjsjhjJhzfAmount = depositJhzfAmount.subtract(returnJhzfAmount);
         yjjsjhjHjAmount = depositTotalAmount.subtract(returnTotalAmount);
         yjjsjhjHjAmountStr = NumberToCN.number2CNMontrayUnit(yjjsjhjHjAmount);
 
@@ -376,6 +415,7 @@ public class ZyDailySettlementVo {
         jsbtYbkAmount = jsbkYbAmount.subtract(jstkYbAmount);
         jsbtYlkAmount = jsbkYlkAmount.subtract(jstkYlkAmount);
         jsbtQtAmount = jsbkQtAmount.subtract(jstkQtAmount);
+        jsbtJhzfAmount = jsbkJhzfAmount.subtract(jstkJhzfAmount);
         jsbtHjAmount = jsbkTotalAmount.subtract(jstkTotalAmount);
         jsbtHjAmountStr = NumberToCN.number2CNMontrayUnit(jsbtHjAmount);
 
@@ -385,6 +425,7 @@ public class ZyDailySettlementVo {
         sjhjZfbAmount = yjjsjhjZfbAmount.add(jsbtZfbAmount);
         sjhjYbkAmount = yjjsjhjYbkAmount.add(jsbtYbkAmount);
         sjhjYlkAmount = yjjsjhjYlkAmount.add(jsbtYlkAmount);
+        sjhjJhzfAmount = yjjsjhjJhzfAmount.add(jsbtJhzfAmount);
         //转账=deposit_qt  + return_qt + js_bk_qt  -  js_tk_qt
         zzAmount = depositQtAmount.add(returnQtAmount).add(jsbkQtAmount).subtract(jstkQtAmount);
         //total_charge- (js_cfbz+js_jz_yb+js_jz_mzyf)-(js_bk_ylk  -  js_tk_ylk )-( js_bk_cheque  -  js_tk_cheque )

src/main/resources/static/js/zy/zy_daily.js

@@ -105,6 +105,10 @@ function getRjbb() {
                 $("#depositQtAmount").html(data.depositQtAmount.toFixed(2));
                 $("#jsbkQtAmount").html(data.jsbkQtAmount.toFixed(2));
 
+                $("#depositJhzfNum").html(data.depositJhzfNum);
+                $("#depositJhzfAmount").html(data.depositJhzfAmount.toFixed(2));
+                $("#jsbkJhzfAmount").html(data.jsbkJhzfAmount.toFixed(2));
+
                 $("#depositTotalNum").html(data.depositTotalNum);
                 $("#depositTotalAmount").html(data.depositTotalAmount.toFixed(2));
                 $("#jsbkTotalAmount").html(data.jsbkTotalAmount.toFixed(2));
@@ -133,6 +137,10 @@ function getRjbb() {
                 $("#returnQtAmount").html(data.returnQtAmount.toFixed(2));
                 $("#jstkQtAmount").html(data.jstkQtAmount.toFixed(2));
 
+                $("#returnJhzfNum").html(data.returnJhzfNum);
+                $("#returnJhzfAmount").html(data.returnJhzfAmount.toFixed(2));
+                $("#jstkJhzfAmount").html(data.jstkJhzfAmount.toFixed(2));
+
                 $("#returnTotalNum").html(data.returnTotalNum);
                 $("#returnTotalAmount").html(data.returnTotalAmount.toFixed(2));
                 $("#jstkTotalAmount").html(data.jstkTotalAmount.toFixed(2));
@@ -155,6 +163,9 @@ function getRjbb() {
                 $("#yjjsjhjQtAmount").html(data.yjjsjhjQtAmount.toFixed(2));
                 $("#jsbtQtAmount").html(data.jsbtQtAmount.toFixed(2));
 
+                $("#yjjsjhjJhzfAmount").html(data.yjjsjhjJhzfAmount.toFixed(2));
+                $("#jsbtJhzfAmount").html(data.jsbtJhzfAmount.toFixed(2));
+
                 $("#yjjsjhjHjAmount").html(data.yjjsjhjHjAmount.toFixed(2));
                 $("#jsbtHjAmount").html(data.jsbtHjAmount.toFixed(2));
 
@@ -167,6 +178,8 @@ function getRjbb() {
 
                 $("#sjhjYbkAmount").html(data.sjhjYbkAmount.toFixed(2));
                 $("#sjhjYlkAmount").html(data.sjhjYlkAmount.toFixed(2));
+                $("#sjhjJhzfAmount").html(data.sjhjJhzfAmount.toFixed(2));
+
                 $("#zzAmount").html(data.zzAmount.toFixed(2));
 
                 $("#jzAmount").html(data.jzAmount.toFixed(2));

src/main/resources/templates/zy/zy_daily.html

@@ -68,14 +68,14 @@
                     <table class="table table-striped table-bordered">
                         <tbody>
                         <tr>
-                            <td rowspan="23" class="text-center" style="vertical-align: middle !important;">预<br>交<br>金
+                            <td rowspan="26" class="text-center" style="vertical-align: middle !important;">预<br>交<br>金
                             </td>
-                            <td rowspan="8" class="text-center" style="vertical-align: middle !important;">收</td>
+                            <td rowspan="9" class="text-center" style="vertical-align: middle !important;">收</td>
                             <td>类型</td>
                             <td>张数</td>
                             <td colspan="2">金额</td>
-                            <td rowspan="23" class="text-center" style="vertical-align: middle !important;">结<br>算</td>
-                            <td rowspan="8" class="text-center" style="vertical-align: middle !important;">补<br>款</td>
+                            <td rowspan="26" class="text-center" style="vertical-align: middle !important;">结<br>算</td>
+                            <td rowspan="9" class="text-center" style="vertical-align: middle !important;">补<br>款</td>
                             <td>类型</td>
                             <td colspan="3">金额</td>
                         </tr>
@@ -114,6 +114,13 @@
                             <td>银联卡</td>
                             <td colspan="3" id="jsbkYlkAmount">0.00</td>
                         </tr>
+                        <tr>
+                            <td>聚合支付</td>
+                            <td id="depositJhzfNum">0.00</td>
+                            <td colspan="2" id="depositJhzfAmount">0.00</td>
+                            <td>聚合支付</td>
+                            <td colspan="3" id="jsbkJhzfAmount">0.00</td>
+                        </tr>
                         <tr>
                             <td>其他</td>
                             <td id="depositQtNum">0.00</td>
@@ -129,11 +136,11 @@
                             <td colspan="3" id="jsbkTotalAmount">0.00</td>
                         </tr>
                         <tr>
-                            <td rowspan="7" class="text-center" style="vertical-align: middle !important;">退</td>
+                            <td rowspan="8" class="text-center" style="vertical-align: middle !important;">退</td>
                             <td>现金</td>
                             <td id="returnCashNum">0.00</td>
                             <td colspan="2" id="returnCashAmount">0.00</td>
-                            <td rowspan="7" class="text-center" style="vertical-align: middle !important;">退<br>款</td>
+                            <td rowspan="8" class="text-center" style="vertical-align: middle !important;">退<br>款</td>
                             <td>现金</td>
                             <td colspan="3" id="jstkCashAmount">0.00</td>
                         </tr>
@@ -165,6 +172,13 @@
                             <td>银联卡</td>
                             <td colspan="3" id="jstkYlkAmount">0.00</td>
                         </tr>
+                        <tr>
+                            <td>聚合支付</td>
+                            <td id="returnJhzfNum">0.00</td>
+                            <td colspan="2" id="returnJhzfAmount">0.00</td>
+                            <td>聚合支付</td>
+                            <td colspan="3" id="jstkJhzfAmount">0.00</td>
+                        </tr>
                         <tr>
                             <td>其他</td>
                             <td id="returnQtNum">0.00</td>
@@ -182,12 +196,12 @@
 
 
                         <tr>
-                            <td rowspan="8" class="text-center" style="vertical-align: middle !important;">
+                            <td rowspan="9" class="text-center" style="vertical-align: middle !important;">
                                 收<br>退<br>合<br>计
                             </td>
                             <td>现金</td>
                             <td colspan="3" id="yjjsjhjCashAmount">0.00</td>
-                            <td rowspan="8" class="text-center" style="vertical-align: middle !important;">
+                            <td rowspan="9" class="text-center" style="vertical-align: middle !important;">
                                 补<br>退<br>合<br>计
                             </td>
                             <td>现金</td>
@@ -217,6 +231,12 @@
                             <td>银联卡</td>
                             <td colspan="3" id="jsbtYlkAmount">0.00</td>
                         </tr>
+                        <tr>
+                            <td>聚合支付</td>
+                            <td colspan="3" id="yjjsjhjJhzfAmount">0.00</td>
+                            <td>聚合支付</td>
+                            <td colspan="3" id="jsbtJhzfAmount">0.00</td>
+                        </tr>
                         <tr>
                             <td>其他</td>
                             <td colspan="3" id="yjjsjhjQtAmount">0.00</td>
@@ -236,7 +256,7 @@
                             <td colspan="3" id="jsbtHjAmountStr">0.00</td>
                         </tr>
                         <tr>
-                            <td rowspan="3" colspan="2" class="text-center" style="vertical-align: middle !important;">
+                            <td rowspan="4" colspan="2" class="text-center" style="vertical-align: middle !important;">
                                 上缴合计
                             </td>
                             <td>现金</td>
@@ -262,6 +282,14 @@
                             <td>发票现金</td>
                             <td colspan="2" id="fpxjAmount">0.00</td>
                         </tr>
+                        <tr>
+                            <td>聚合支付</td>
+                            <td colspan="2" id="sjhjJhzfAmount">0.00</td>
+                            <td></td>
+                            <td colspan="3" ></td>
+                            <td></td>
+                            <td colspan="2" ></td>
+                        </tr>
                         <tr>
                             <td colspan="2">结算总金额</td>
                             <td colspan="3" id="totalCharge">0.00</td>