发票作废显示功能优化

src/main/java/cn/hnthyy/thmz/mapper/his/mz/ChargeFeeVoMapper.java

@@ -486,7 +486,7 @@ public interface ChargeFeeVoMapper {
             " and case pay_mark when '2' then obsolete_dcount_date else dcount_date end =#{dcountDate,jdbcType=TIMESTAMP} ",
             "</when>",
             "<when test='dcountDate == null'>",
-            " and case pay_mark when '2' then obsolete_dcount_date else dcount_no end  =0 ",
+            " and case pay_mark when '2' then obsolete_dcount_no else dcount_no end  =0 ",
             "</when>",
             "</script>"})
     Integer countReceipt(@Param("userIdCode") String userIdCode, @Param("payMark") String payMark, @Param("dcountDate") Date dcountDate);

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

@@ -59,14 +59,16 @@ public interface MzReceiptSerialMapper {
      */
     @Insert("INSERT INTO  mz_receipt_serial(patient_id,times,receipt_no,serial_no,operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9," +
             "charge10,charge11,charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,pay_mark,total_charge,charge_date,receipt_bill,receipt_sn," +
-            "dcount_date,windows_no,dcount_no,serial_yb,fp_flag,responce_type,cheque_type,cheque_no,tf_flag,dept_no,charge_dcount_date,charge_dcount_no,pay_id) VALUES " +
+            "dcount_date,windows_no,dcount_no,serial_yb,fp_flag,responce_type,cheque_type,cheque_no,tf_flag,dept_no,charge_dcount_date,charge_dcount_no,pay_id," +
+            "obsolete_id,obsolete_date,obsolete_dcount_date,obsolete_dcount_no) VALUES " +
             "(#{patientId,jdbcType=CHAR},#{times,jdbcType=INTEGER},#{receiptNo,jdbcType=SMALLINT},#{serialNo,jdbcType=INTEGER},#{operatorId,jdbcType=CHAR},#{charge1,jdbcType=DOUBLE}," +
             "#{charge2,jdbcType=DOUBLE},#{charge3,jdbcType=DOUBLE},#{charge4,jdbcType=DOUBLE},#{charge5,jdbcType=DOUBLE},#{charge6,jdbcType=DOUBLE},#{charge7,jdbcType=DOUBLE}," +
             "#{charge8,jdbcType=DOUBLE},#{charge9,jdbcType=DOUBLE},#{charge10,jdbcType=DOUBLE},#{charge11,jdbcType=DOUBLE},#{charge12,jdbcType=DOUBLE},#{charge13,jdbcType=DOUBLE}," +
             "#{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},#{chargeDcountNo,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},#{obsoleteId,jdbcType=VARCHAR},#{obsoleteDate,jdbcType=TIMESTAMP},#{obsoleteDcountDate,jdbcType=TIMESTAMP},#{obsoleteDcountNo,jdbcType=VARCHAR})")
     int insertMzReceiptSerial(MzReceiptSerial mzReceiptSerial);
 
 
@@ -80,7 +82,8 @@ public interface MzReceiptSerialMapper {
             "<script>",
             "INSERT INTO  mz_receipt_serial(patient_id,times,receipt_no,serial_no,operator_id,charge1,charge2,charge3,charge4,charge5,charge6,charge7,charge8,charge9,charge10,charge11," +
                     "charge12,charge13,charge14,charge15,charge16,charge17,charge18,charge19,charge20,pay_mark,total_charge,charge_date,receipt_bill,receipt_sn,dcount_date,windows_no," +
-                    "dcount_no,serial_yb,fp_flag,responce_type,cheque_type,cheque_no,tf_flag,dept_no,charge_dcount_date,charge_dcount_no,pay_id) VALUES ",
+                    "dcount_no,serial_yb,fp_flag,responce_type,cheque_type,cheque_no,tf_flag,dept_no,charge_dcount_date,charge_dcount_no,pay_id," +
+                    "obsolete_id,obsolete_date,obsolete_dcount_date,obsolete_dcount_no) VALUES ",
             "<foreach collection='mzReceiptSerials' item='item' index='index' separator=','>",
             " (#{item.patientId,jdbcType=CHAR},#{item.times,jdbcType=INTEGER},#{item.receiptNo,jdbcType=SMALLINT},#{item.serialNo,jdbcType=INTEGER},#{item.operatorId,jdbcType=CHAR}," +
                     "#{item.charge1,jdbcType=DOUBLE},#{item.charge2,jdbcType=DOUBLE},#{item.charge3,jdbcType=DOUBLE},#{item.charge4,jdbcType=DOUBLE},#{item.charge5,jdbcType=DOUBLE}," +
@@ -90,7 +93,8 @@ 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.chargeDcountNo,jdbcType=INTEGER},#{item.payId,jdbcType=CHAR}) ",
+                    "#{item.chargeDcountDate,jdbcType=TIMESTAMP},#{item.chargeDcountNo,jdbcType=INTEGER},#{item.payId,jdbcType=CHAR},#{item.obsoleteId,jdbcType=VARCHAR}," +
+                    "#{item.obsoleteDate,jdbcType=TIMESTAMP},#{item.obsoleteDcountDate,jdbcType=TIMESTAMP},#{item.obsoleteDcountNo,jdbcType=VARCHAR}) ",
             "</foreach>",
             "</script>"
     })

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

@@ -1312,6 +1312,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             mz.setDcountDate(null);
             mz.setChargeDcountDate(null);
             mz.setChargeDcountNo(YesNoEnum.NO.code);
+            mz.setObsoleteDcountDate(null);
+            mz.setObsoleteDcountNo(YesNoEnum.NO.code);
             mz.setFpFlag(null);
             newReceiptSerials.add(mz);
         }
@@ -1915,6 +1917,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzReceiptSerial.setWindowsNo(windows.getWindowsNo().toString());
         mzReceiptSerial.setDcountNo(YesNoEnum.NO.code);
         mzReceiptSerial.setChargeDcountNo(YesNoEnum.NO.code);
+        mzReceiptSerial.setObsoleteDcountNo(YesNoEnum.NO.code);
         mzReceiptSerial.setResponceType(responseType);
         mzReceiptSerial.setTfFlag(YesNoEnum.NO.code);
         mzReceiptSerial.setDeptNo(windows.getDeptNo());
@@ -1962,6 +1965,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         newMzReceiptSerial.setDcountDate(null);
                         newMzReceiptSerial.setChargeDcountNo(YesNoEnum.NO.code);
                         newMzReceiptSerial.setChargeDcountDate(null);
+                        newMzReceiptSerial.setObsoleteDcountDate(null);
+                        newMzReceiptSerial.setObsoleteDcountNo(YesNoEnum.NO.code);
                         newMzReceiptSerial.setChargeDate(now);
                         newMzReceiptSerial.setSerialNo(serialNo);
                         newMzReceiptSerial.setOperatorId(opId);
@@ -2004,6 +2009,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     j.setDcountDate(null);
                     j.setChargeDcountNo(YesNoEnum.NO.code);
                     j.setChargeDcountDate(null);
+                    j.setObsoleteDcountDate(null);
+                    j.setObsoleteDcountNo(YesNoEnum.NO.code);
                     j.setOperatorId(opId);
                     j.setPayId(opId);
                     newList.add(j);