diff --git a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs index 0fc0b5404..26115c1b1 100644 --- a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs +++ b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs @@ -51,30 +51,30 @@ namespace IRaCIS.Core.API.Controllers.Special [TrialGlobalLimit( "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )] public async Task> AddOrUpdateTrial(TrialCommand param) { - var userId = Guid.Parse(User.FindFirst("id").Value); + //var userId = Guid.Parse(User.FindFirst("id").Value); var result = await _trialService.AddOrUpdateTrial(param); - if (_trialService.TrialExpeditedChange) - { - var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(param.Id.Value); - var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty); + //if (_trialService.TrialExpeditedChange) + //{ + // var needCalReviewerIds = await _trialService.GetTrialEnrollmentReviewerIds(param.Id.Value); + // var calcList = await _calculateService.GetNeedCalculateReviewerList(Guid.Empty, string.Empty); - calcList.ForEach(t => - { - if (needCalReviewerIds.Contains(t.DoctorId)) - { - _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO() - { - NeedCalculateReviewers = new List() - { - t.DoctorId - }, - CalculateMonth = DateTime.Parse(t.YearMonth) - }, User.FindFirst("id").Value); + // calcList.ForEach(t => + // { + // if (needCalReviewerIds.Contains(t.DoctorId)) + // { + // _calculateService.CalculateMonthlyPayment(new CalculateDoctorAndMonthDTO() + // { + // NeedCalculateReviewers = new List() + // { + // t.DoctorId + // }, + // CalculateMonth = DateTime.Parse(t.YearMonth) + // }, User.FindFirst("id").Value); - } - }); - } + // } + // }); + //} return result; } diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index 84d779701..bc5008929 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -1136,7 +1136,7 @@ namespace IRaCIS.Core.Application.Service UserTypeShortName = t.UserTypeRole.UserTypeShortName, }).FirstOrDefaultAsync(); - await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName + (userTokenInfo.UserTypeShortName)}", OptType = UserOptType.LoginSelectRole }, true); + await _userLogRepository.AddAsync(new UserLog() { IP = _userInfo.IP, ActionIdentityUserId = userTokenInfo.IdentityUserId, ActionUserName = $"{userTokenInfo.UserName } ({userTokenInfo.UserTypeShortName})", OptType = UserOptType.LoginSelectRole }, true); if (userTokenInfo != null) {