Merge branch 'dev-1.0.6' into dev-1.0.5

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

@@ -113,8 +113,8 @@ public interface MzDepositFileMapper {
      * @param oriSerialNo
      * @return
      */
-    @Update("update mz_deposit_file set pay_mark=#{payMark} where serial_no=#{oriSerialNo}")
-    int updatePayMark(@Param("payMark") String payMark, @Param("oriSerialNo") Integer oriSerialNo);
+    @Update("update mz_deposit_file set pay_mark=#{payMark} where serial_no=#{oriSerialNo} and cheque_type=#{chequeType}")
+    int updatePayMark(@Param("payMark") String payMark, @Param("oriSerialNo") Integer oriSerialNo,@Param("chequeType") String chequeType);
 
 
     /**

src/main/java/cn/hnthyy/thmz/service/impl/his/MzReceiptSerialServiceImpl.java

@@ -201,8 +201,11 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         mzChargeDetailMapper.updateBySerialNo(receiptNo, mzReceiptSerial.getSerialNo(), oriSerialNo);
         List<MzDepositFile> mzDepositFiles = mzDepositFileMapper.selectMzDepositFileBySerialNo(oriSerialNo);
         //原收费方式记录设置为作废
-        mzDepositFileMapper.updatePayMark(PayMarkEnum.CANCELLATION.code, oriSerialNo);
+        mzDepositFileMapper.updatePayMark(PayMarkEnum.CANCELLATION.code, oriSerialNo,mzReceiptSerial.getChequeType());
         for (MzDepositFile mzDepositFile : mzDepositFiles) {
+            if(Constants.BYJZ.equals(mzDepositFile.getChequeType())){
+                continue;
+            }
             //新增新的收费方式记录
             mzDepositFile.setReceiptNo(mzReceiptSerial.getReceiptNo());
             mzDepositFile.setReceiptSn(mzReceiptSerial.getSerialNo());