diff --git a/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs b/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs index 2532ca8..2e822c8 100644 --- a/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs +++ b/src/Shentun.Peis.Application/ChargeRequests/ChargeRequestAppService.cs @@ -53,7 +53,7 @@ namespace Shentun.Peis.ChargeRequests _asbitemRepository = asbitemRepository; } /// - /// + /// 创建申请单 /// /// /// @@ -85,10 +85,10 @@ namespace Shentun.Peis.ChargeRequests foreach (var item in list) { item.registerCheckAsbitem.ChargeRequestId = chargeRequest.Id; - await _registerCheckAsbitemRepository.UpdateAsync(item.registerCheckAsbitem,true); + await _registerCheckAsbitemRepository.UpdateAsync(item.registerCheckAsbitem); } //插入申请单信息 - chargeRequest = await _chargeRequestRepository.InsertAsync(chargeRequest,true); + chargeRequest = await _chargeRequestRepository.InsertAsync(chargeRequest); foreach (var item in list) { var chargeRequestAsbitemSource = new ChargeRequestAsbitem() @@ -101,9 +101,9 @@ namespace Shentun.Peis.ChargeRequests IsCharge = 'N' }; var chargeRequestAsbitem = await _chargeRequestAsbitemManager.CreateAsync(chargeRequestAsbitemSource); - await _chargeRequestAsbitemRepository.InsertAsync(chargeRequestAsbitem,true); + await _chargeRequestAsbitemRepository.InsertAsync(chargeRequestAsbitem); } - //await _unitOfWorkManager.Current.SaveChangesAsync(); + await _unitOfWorkManager.Current.SaveChangesAsync(); await _unitOfWorkManager.Current.CompleteAsync(); //await UnitOfWorkManager.Current.SaveChangesAsync(); //await UnitOfWorkManager.Current.CompleteAsync(); @@ -114,6 +114,12 @@ namespace Shentun.Peis.ChargeRequests result.ChargeRequestNo = chargeRequest.ChargeRequestNo; return result; } + /// + /// 作废申请单 + /// + /// + /// + /// [HttpPost("api/app/ChargeRequest/CancelChargeRequest")] public async Task CancelChargeRequestAsync(ChargeRequestIdInputDto input) { @@ -128,7 +134,12 @@ namespace Shentun.Peis.ChargeRequests return result; } - + /// + /// 退费申请单 + /// + /// + /// + /// [HttpPost("api/app/ChargeRequest/RefundChargeRequest")] public async Task ReundChargeRequestAsync(ChargeRequestIdInputDto input) { @@ -137,7 +148,7 @@ namespace Shentun.Peis.ChargeRequests throw new UserFriendlyException("input参数不能为空"); } - await _chargeRequestManager.SendThirChargeRequestAsync(input.ChargeRequestId, "CancelRequest"); + await _chargeRequestManager.SendThirChargeRequestAsync(input.ChargeRequestId, "RefundRequest"); ChargeRequestDto result = new ChargeRequestDto(); diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index 0af620a..39b9f82 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -164,7 +164,7 @@ namespace Shentun.Peis.PrintReports //生成LIS条码 var lisRequests = await _lisRequestManager.SetLisRequestAsync(input.PatientRegisterId); await _unitOfWorkManager.Current.SaveChangesAsync(); - + await _unitOfWorkManager.Current.CompleteAsync(); //检索条码数据