出纳处理

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

@@ -153,7 +153,8 @@ public interface ZyLedgerFileMapper {
      * @param ledgerSn
      * @return
      */
-    @Select("select account_date , cash_date , settle , last_balance , deposit , total_charge,ybjzje=total_charge - ( deposit - settle ),zfje=( deposit - settle ) from zy_ledger_file where inpatient_no =#{inpatientNo} AND admiss_times =#{admissTimes} AND ledger_sn =#{ledgerSn} ")
+    @Select("select account_date , cash_date , settle , last_balance , deposit , total_charge,ybjzje=fund_pay_sumamt,acct_pay, " +
+            "zfje=last_balance from zy_ledger_file where inpatient_no =#{inpatientNo} AND admiss_times =#{admissTimes} AND ledger_sn =#{ledgerSn} ")
     Map<String,Object> selectTellerInfo(@Param("inpatientNo") String inpatientNo, @Param("admissTimes") Integer admissTimes, @Param("ledgerSn") Integer ledgerSn);
 
     /**

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

@@ -985,6 +985,7 @@ function teller(inpatientNo, admissTimes) {
                     $("#amountMoneyRefund").text(res.data.total_charge == null ? 0.00 : res.data.total_charge.toFixed(2));
                     $("#depositRefund").text(res.data.deposit == null ? 0.00 : res.data.deposit.toFixed(2));
                     $("#ybjzjeRefund").text(res.data.ybjzje == null ? 0.00 : res.data.ybjzje.toFixed(2));
+                    $("#acctPayRefund").text(res.data.acct_pay == null ? 0.00 : res.data.acct_pay.toFixed(2));
                     $("#settleRefund").text(res.data.settle == null ? 0.00 : res.data.settle.toFixed(2));
                     var refundList = res.refundList;
                     if (refundList != null && refundList.length > 0) {
@@ -1014,6 +1015,7 @@ function teller(inpatientNo, admissTimes) {
                     $("#amountMoneyConfirm").text(res.data.total_charge == null ? 0.00 : res.data.total_charge.toFixed(2));
                     $("#depositConfirm").text(res.data.deposit == null ? 0.00 : res.data.deposit.toFixed(2));
                     $("#ybjzjeConfirm").text(res.data.ybjzje == null ? 0.00 : res.data.ybjzje.toFixed(2));
+                    $("#acctPayConfirm").text(res.data.acct_pay == null ? 0.00 : res.data.acct_pay.toFixed(2));
                     $("#settleConfirm").text(res.data.settle == null ? 0.00 : Math.abs(res.data.settle.toFixed(2)));
                     $("#cash").val(res.data.settle == null ? 0.00 : Math.abs(res.data.settle.toFixed(2)));
                 }
@@ -1345,6 +1347,7 @@ function saveTeller(settleType, refundType) {
                 return;
             }
             if (res.code == 0 || res.code == -2) {
+                console.log('打印发票')
                 prn1PrintHand(inpatientNo, admissTimes, null);
                 successMesage(res);
                 $("#confirmFeeModal").modal("hide");

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

@@ -306,10 +306,17 @@
                         </div>
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <div class="col-md-6 col-sm-6 col-xs-12">
-                                <div class="total"> 医保记账：
+                                <div class="total"> 医保报销：
                                     <span class="amountMoney" id="ybjzjeConfirm">0.00</span><span>元</span>
                                 </div>
                             </div>
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                <div class="total"><span id="acctName">个账支付：</span>
+                                    <span class="amountMoney" id="acctPayConfirm">0.00</span><span>元</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-12 col-sm-12 col-xs-12">
                             <div class="col-md-6 col-sm-6 col-xs-12">
                                 <div class="total"><span id="settleName">补交金额：</span>
                                     <span class="amountMoney" id="settleConfirm">0.00</span><span>元</span>
@@ -406,10 +413,17 @@
                         </div>
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <div class="col-md-6 col-sm-6 col-xs-12">
-                                <div class="total"> 医保记账：
+                                <div class="total"> 医保报销：
                                     <span class="amountMoney" id="ybjzjeRefund">0.00</span><span>元</span>
                                 </div>
                             </div>
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                <div class="total"> 个账支付：
+                                    <span class="amountMoney" id="acctPayRefund">0.00</span><span>元</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-12 col-sm-12 col-xs-12">
                             <div class="col-md-6 col-sm-6 col-xs-12">
                                 <div class="total">退款金额：
                                     <span class="amountMoney" id="settleRefund">0.00</span><span>元</span>