Parcourir la source

修复打印发票bug

hurugang il y a 5 ans
Parent
commit
8fd2a066da

+ 10 - 0
src/main/java/cn/hnthyy/thmz/mapper/his/MzDepositFileMapper.java

@@ -98,4 +98,14 @@ public interface MzDepositFileMapper {
     @Update("update mz_deposit_file set pay_mark=#{payMark} where serial_no=#{oriSerialNo}")
     int updatePayMark(@Param("payMark") String payMark, @Param("oriSerialNo") Integer oriSerialNo);
 
+
+    /**
+     * 更新收费表的收款方式,手机缴费打发票时修改
+     *
+     * @param chequeType
+     * @param receiptSn
+     * @return
+     */
+    @Update("update mz_deposit_file set cheque_type=#{chequeType} where receipt_sn=#{receiptSn}")
+    int updateChequeType(@Param("chequeType") String chequeType,@Param("receiptSn") Integer receiptSn);
 }

+ 2 - 0
src/main/java/cn/hnthyy/thmz/service/impl/his/MzChargeDetailServiceImpl.java

@@ -680,6 +680,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             mz.setCharge18(BigDecimal.ZERO.subtract(mz.getCharge18()));
             mz.setCharge19(BigDecimal.ZERO.subtract(mz.getCharge19()));
             mz.setCharge20(BigDecimal.ZERO.subtract(mz.getCharge20()));
+            mz.setChequeType(Constants.CASH);
         }
     }
 
@@ -747,6 +748,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     temp.setChargeDate(now);
                     temp.setPayMark(PayMarkEnum.RETURN_PREMIUM.code);
                     temp.setOpId(opId);
+                    temp.setChequeType(Constants.CASH);
                     newMzDepositFiles.add(temp);
                 }
             }

+ 1 - 0
src/main/java/cn/hnthyy/thmz/service/impl/his/MzReceiptSerialServiceImpl.java

@@ -120,6 +120,7 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
             }else if(Constants.ZFB.equals(mzDepositFile.getChequeType())){
                 updateMzReceiptSerial.setNewChequeType(Constants.ZZZFB);
             }
+            mzDepositFileMapper.updateChequeType(updateMzReceiptSerial.getNewChequeType(),mzDepositFile.getReceiptSn());
         }
         mzReceiptSerialMapper.updateMzReceiptSerialByReceiptNo(updateMzReceiptSerial);
         if (receipt.getReceiptCurrent() == receipt.getReceiptEnd()) {

+ 1 - 1
src/main/resources/static/js/custom-from-min.js

@@ -1060,7 +1060,7 @@ function init_daterangepicker() {
         minDate: '2012-01-01',
         maxDate: nowString(),
         dateLimit: {
-            days: 60
+            days: 1200
         },
         showDropdowns: true,
         showWeekNumbers: true,

+ 1 - 1
src/main/resources/static/js/custom.js

@@ -1889,7 +1889,7 @@ function init_daterangepicker() {
         minDate: '2012-01-01',
         maxDate: nowString(),
         dateLimit: {
-            days: 60
+            days: 1200
         },
         showDropdowns: true,
         showWeekNumbers: true,