作废重打优化

src/main/java/cn/hnthyy/thmz/entity/his/MzReceiptSerial.java

@@ -99,7 +99,7 @@ public class MzReceiptSerial implements Serializable {
     //发票日结日期  收费的人的日结时间
     private Date chargeDcountDate;
     //发票日结状态 1：已结帐；0：未结 收费的人的日结状态
-    private Integer chargeDdcountNo;
+    private Integer chargeDcountNo;
     private Integer totalCount;
     public MzReceiptSerial() {
     }

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

@@ -481,13 +481,11 @@ public interface MzChargeDetailMapper {
      * 修改发票流水号与缴费次数  发票作废重打时调用
      * @param receiptNo
      * @param serialNo
-     * @param opId
-     * @param chargeDate
      * @param oriSerialNo
      * @return
      */
-    @Update("update mz_charge_detail set receipt_no =#{receiptNo},serial_no=#{serialNo},real_no=#{serialNo},cashier_id=#{opId},charge_date=#{chargeDate} where serial_no = #{oriSerialNo}")
-    int updateBySerialNo(@Param("receiptNo") Integer receiptNo,@Param("serialNo") Integer serialNo,@Param("opId") String opId,@Param("chargeDate") Date chargeDate,@Param("oriSerialNo") Integer oriSerialNo);
+    @Update("update mz_charge_detail set receipt_no =#{receiptNo},serial_no=#{serialNo},real_no=#{serialNo} where serial_no = #{oriSerialNo}")
+    int updateBySerialNo(@Param("receiptNo") Integer receiptNo,@Param("serialNo") Integer serialNo,@Param("oriSerialNo") Integer oriSerialNo);
 
     /**
      * 查询病人缴费记录

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

@@ -67,7 +67,7 @@ public interface MzReceiptSerialMapper {
             "#{charge14,jdbcType=DOUBLE},#{charge15,jdbcType=DOUBLE},#{charge16,jdbcType=DOUBLE},#{charge17,jdbcType=DOUBLE},#{charge18,jdbcType=DOUBLE},#{charge19,jdbcType=DOUBLE}," +
             "#{charge20,jdbcType=DOUBLE},#{payMark,jdbcType=CHAR},#{totalCharge,jdbcType=DOUBLE},#{chargeDate,jdbcType=TIMESTAMP},#{receiptBill,jdbcType=CHAR},#{receiptSn,jdbcType=INTEGER}," +
             "#{dcountDate,jdbcType=TIMESTAMP},#{windowsNo,jdbcType=CHAR},#{dcountNo,jdbcType=INTEGER},#{serialYb,jdbcType=INTEGER},#{fpFlag,jdbcType=CHAR},#{responceType,jdbcType=CHAR}," +
-            "#{chequeType,jdbcType=CHAR},#{chequeNo,jdbcType=VARCHAR},#{tfFlag,jdbcType=CHAR},#{deptNo,jdbcType=VARCHAR},#{chargeDcountDate,jdbcType=TIMESTAMP},#{chargeDdcountNo,jdbcType=INTEGER},#{payId,jdbcType=CHAR})")
+            "#{chequeType,jdbcType=CHAR},#{chequeNo,jdbcType=VARCHAR},#{tfFlag,jdbcType=CHAR},#{deptNo,jdbcType=VARCHAR},#{chargeDcountDate,jdbcType=TIMESTAMP},#{chargeDcountNo,jdbcType=INTEGER},#{payId,jdbcType=CHAR})")
     int insertMzReceiptSerial(MzReceiptSerial mzReceiptSerial);
 
 
@@ -91,7 +91,7 @@ public interface MzReceiptSerialMapper {
                     "#{item.payMark,jdbcType=CHAR},#{item.totalCharge,jdbcType=DOUBLE},#{item.chargeDate,jdbcType=TIMESTAMP},#{item.receiptBill,jdbcType=CHAR},#{item.receiptSn,jdbcType=INTEGER}," +
                     "#{item.dcountDate,jdbcType=TIMESTAMP},#{item.windowsNo,jdbcType=CHAR},#{item.dcountNo,jdbcType=INTEGER},#{item.serialYb,jdbcType=INTEGER},#{item.fpFlag,jdbcType=CHAR}," +
                     "#{item.responceType,jdbcType=CHAR},#{item.chequeType,jdbcType=CHAR},#{item.chequeNo,jdbcType=VARCHAR},#{item.tfFlag,jdbcType=CHAR},#{item.deptNo,jdbcType=VARCHAR}," +
-                    "#{item.chargeDcountDate,jdbcType=TIMESTAMP},#{item.chargeDdcountNo,jdbcType=INTEGER},#{item.payId,jdbcType=CHAR}) ",
+                    "#{item.chargeDcountDate,jdbcType=TIMESTAMP},#{item.chargeDcountNo,jdbcType=INTEGER},#{item.payId,jdbcType=CHAR}) ",
             "</foreach>",
             "</script>"
     })

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

@@ -688,7 +688,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             mz.setCharge20(BigDecimal.ZERO.subtract(mz.getCharge20()));
             mz.setChequeType(Constants.CASH);
             mz.setChargeDcountDate(null);
-            mz.setChargeDdcountNo(YesNoEnum.NO.code);
+            mz.setChargeDcountNo(YesNoEnum.NO.code);
         }
     }
 
@@ -1182,7 +1182,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         }
         mzReceiptSerial.setWindowsNo(windows.getWindowsNo().toString());
         mzReceiptSerial.setDcountNo(YesNoEnum.NO.code);
-        mzReceiptSerial.setChargeDdcountNo(YesNoEnum.NO.code);
+        mzReceiptSerial.setChargeDcountNo(YesNoEnum.NO.code);
         mzReceiptSerial.setResponceType(responseType);
         mzReceiptSerial.setTfFlag(YesNoEnum.NO.code);
         mzReceiptSerial.setDeptNo(windows.getDeptNo());
@@ -1228,7 +1228,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         newMzReceiptSerial.setReceiptNo(newMzReceiptSerial.getReceiptNo() + 1);
                         newMzReceiptSerial.setDcountNo(YesNoEnum.NO.code);
                         newMzReceiptSerial.setDcountDate(null);
-                        newMzReceiptSerial.setChargeDdcountNo(YesNoEnum.NO.code);
+                        newMzReceiptSerial.setChargeDcountNo(YesNoEnum.NO.code);
                         newMzReceiptSerial.setChargeDcountDate(null);
                         newMzReceiptSerial.setChargeDate(now);
                         newMzReceiptSerial.setSerialNo(serialNo);
@@ -1267,7 +1267,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     j.setTfFlag(YesNoEnum.YES.code);
                     j.setDcountNo(YesNoEnum.NO.code);
                     j.setDcountDate(null);
-                    j.setChargeDdcountNo(YesNoEnum.NO.code);
+                    j.setChargeDcountNo(YesNoEnum.NO.code);
                     j.setChargeDcountDate(null);
                     newList.add(j);
                 }

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

@@ -180,7 +180,7 @@ public class MzReceiptSerialServiceImpl implements MzReceiptSerialService {
         mzReceiptSerialMapper.insertMzReceiptSerial(mzReceiptSerial);
         //更新收费明细表发票流水号
         Date now = new Date();
-        mzChargeDetailMapper.updateBySerialNo(mzReceiptSerial.getReceiptNo(), mzReceiptSerial.getSerialNo(), user.getUserIdCode(), now, oriSerialNo);
+        mzChargeDetailMapper.updateBySerialNo(mzReceiptSerial.getReceiptNo(), mzReceiptSerial.getSerialNo(), oriSerialNo);
         MzDepositFile mzDepositFile=mzDepositFileMapper.selectMzDepositFileBySerialNo(oriSerialNo);
         //原收费方式记录设置为作废
         mzDepositFileMapper.updatePayMark(PayMarkEnum.CANCELLATION.code,oriSerialNo);