|
@@ -732,6 +732,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
//包含退费的付款方式
|
|
|
List<MzDepositFile> fullNewMzDepositFiles = new ArrayList<>();
|
|
|
int times = 0;
|
|
|
+ int oriTimes = mzDepositFileVo.getTimes();
|
|
|
if (allRefund) {
|
|
|
getDeposFiles(opId, mzDepositFileVo, now, 0, 0, null, null, fullNewMzDepositFiles, allRefund, null);
|
|
|
//新增收费方式记录
|
|
@@ -756,7 +757,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
List<MzYjReq> mzYjReqs = mzYjReqService.queryNotRefundYjReq(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes(), orderCodes);
|
|
|
if (mzYjReqs != null && mzYjReqs.size() > 0) {
|
|
|
for (MzYjReq yj : mzYjReqs) {
|
|
|
- yj.setReqNo(mzYshConfigService.getReqNo());
|
|
|
+ int newReqNo= mzYshConfigService.getReqNo();
|
|
|
+ mzChargeDetailMapper.updateReqNo(yj.getPatientId(),times,yj.getReqNo(),newReqNo);
|
|
|
+ yj.setReqNo(newReqNo);
|
|
|
yj.setTimes(times);
|
|
|
yj.setPayMark(PayMarkEnum.NO_CHARGE.code);
|
|
|
yj.setSerialNo(null);
|
|
@@ -795,7 +798,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
|
|
|
updateMzPatientMi.setLvDate(now);
|
|
|
mzPatientMiMapper.updateMzPatientMi(updateMzPatientMi);
|
|
|
}
|
|
|
- MzYjReq updateMzYjReq = new MzYjReq(mzDepositFileVo.getPatientId(), mzDepositFileVo.getTimes());
|
|
|
+ MzYjReq updateMzYjReq = new MzYjReq(mzDepositFileVo.getPatientId(), oriTimes);
|
|
|
updateMzYjReq.setPayMark(PayMarkEnum.RETURN_PREMIUM.code);
|
|
|
mzYjReqService.modifyMzYjReq(updateMzYjReq);
|
|
|
return times;
|