特门发票优化

src/main/java/cn/hnthyy/thmz/controller/MzReceiptSerialController.java

@@ -147,11 +147,11 @@ public class MzReceiptSerialController {
             MzDepositFile mz = new MzDepositFile(patientId, times);
             mz.setReceiptNo(receiptNo);
             List<MzDepositFile> mzDepositFiles = mzDepositFileService.queryMzDepositFile(mz);
-            //非本院记账金额
+            //非本院记账 和非医保记账金额
             BigDecimal totalPay = BigDecimal.ZERO;
             if (mzDepositFiles != null && mzDepositFiles.size() > 0) {
                 for (MzDepositFile mzDepositFile : mzDepositFiles) {
-                    if (!Constants.BYJZ.equals(mzDepositFile.getChequeType())) {
+                    if (!Constants.BYJZ.equals(mzDepositFile.getChequeType()) && !Constants.YBJZ.equals(mzDepositFile.getChequeType())) {
                         totalPay = totalPay.add(mzDepositFile.getAmount());
                     }
                 }

src/main/java/cn/hnthyy/thmz/mapper/his/MzReceiptSerialMapper.java

@@ -131,7 +131,7 @@ public interface MzReceiptSerialMapper {
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,rtrim(pay_mark) pay_mark,total_charge,charge_date,rtrim(receipt_bill) receipt_bill,",
             "receipt_sn,dcount_date,rtrim(windows_no) windows_no,dcount_no,serial_yb,rtrim(fp_flag) fp_flag,rtrim(responce_type) responce_type,rtrim(cheque_type) cheque_type,cheque_no," +
                     "rtrim(tf_flag) tf_flag,dept_no,rtrim(pay_id) pay_id,charge_dcount_date,charge_dcount_no",
-            "from mz_receipt_serial where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER} and receipt_no = #{receiptNo,jdbcType=INTEGER} and (cheque_type  <![CDATA[<>]]> 'Y' or cheque_type is null or operator_id =99999) order by receipt_no desc",
+            "from mz_receipt_serial where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER} and receipt_no = #{receiptNo,jdbcType=INTEGER} and ((cheque_type  <![CDATA[<>]]> 'Y' and cheque_type  <![CDATA[<>]]> '2' ) or cheque_type is null or operator_id =99999) order by receipt_no desc",
             "</script>"})
     MzReceiptSerial selectAllSerialForThisTime(@Param(value = "patientId") String patientId, @Param("times") Integer times,@Param("receiptNo") Integer receiptNo);
 

src/main/resources/static/js/toll_administration.js

@@ -786,6 +786,8 @@ function confirmFeeModal(times, totalCharge, receiptNo) {
         $('#payType_0').selectpicker('refresh');
         $("#payType_0").parent().parent().next().children(':first').val(fundPay);
         $("#payType_0").parent().parent().next().next().children(':first').remove();
+        $("#payType_0").attr("disabled",true);
+        $("#payType_0").parent().parent().next().children(':first').attr("readonly","readonly");
     }
     var realMoney = Minus(data, fundPay);
     $("#realMoney").val(data);