|
|
@@ -106,7 +106,7 @@ public interface ChargeFeeVoMapper {
|
|
|
" m.cheque_type, " +
|
|
|
" m.op_id from mz_deposit_file m left join mz_receipt_serial r on m.serial_no =r.serial_no where " +
|
|
|
" case '1' when #{caseType} then r.charge_date else m.dcount_date end =#{dcountDate,jdbcType=TIMESTAMP} " +
|
|
|
- " and m.pay_mark <> 2 and m.cheque_type <>'Z' " +
|
|
|
+ " and r.pay_mark <> 2 and m.cheque_type <>'Z' " +
|
|
|
" group by r.receipt_sn,r.receipt_bill,m.cheque_type,r.pay_mark,m.op_id " +
|
|
|
" order by abs(r.receipt_sn),r.receipt_bill")
|
|
|
List<ChargeFeeVo> selectChargeFeeVoReprint(@Param("userIdCode") String userIdCode, @Param("caseType") String caseType, @Param("dcountDate") Date dcountDate);
|
|
|
@@ -515,11 +515,11 @@ public interface ChargeFeeVoMapper {
|
|
|
" and (b.patient_id=a.patient_id) " +
|
|
|
"group by a.name,b.receipt_bill,b.receipt_sn " +
|
|
|
"union " +
|
|
|
- "select '作废'," +
|
|
|
- " receipt_bill=rtrim(receipt_bill)," +
|
|
|
+ "select a.name," +
|
|
|
+ " receipt_bill=rtrim(b.receipt_bill)," +
|
|
|
" flag=''," +
|
|
|
- " total_charge " +
|
|
|
- "from mz_receipt_serial " +
|
|
|
+ " total_charge= b.total_charge " +
|
|
|
+ "from mz_receipt_serial b left join mz_patient_mi a on b.patient_id = a.patient_id " +
|
|
|
"where operator_id=#{userIdCode} and pay_mark='2' ",
|
|
|
"<when test='dcountDate!=null'>",
|
|
|
" and dcount_date=#{dcountDate,jdbcType=TIMESTAMP} ",
|
hurugang