diff --git a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs b/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs index 927d412..6d64fa5 100644 --- a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs +++ b/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentDetailViewModel.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using IRaCIS.Core.Application.Contracts.RequestAndResponse; @@ -186,6 +186,11 @@ namespace IRaCIS.Application.ViewModels.Pay public decimal AdjudicationIn24H { get; set; } public decimal AdjudicationIn48H { get; set; } public decimal Global { get; set; } + + public decimal RefresherTraining { get; set; } + public decimal AdditionalCharge1 { get; set; } + public decimal AdditionalCharge2 { get; set; } + public decimal AdditionalCharge3 { get; set; } public decimal Total { get; set; } public string YearMonth { get; set; } diff --git a/IRaCIS.Core.Application/Financial/FinancialService.cs b/IRaCIS.Core.Application/Financial/FinancialService.cs index 390b498..d868f5d 100644 --- a/IRaCIS.Core.Application/Financial/FinancialService.cs +++ b/IRaCIS.Core.Application/Financial/FinancialService.cs @@ -609,6 +609,10 @@ namespace IRaCIS.Application.Services AdjudicationIn24H = workLoad.AdjudicationIn24H * trialCost.AdjudicationIn24H, AdjudicationIn48H = workLoad.AdjudicationIn48H * trialCost.AdjudicationIn48H, + RefresherTraining=workLoad.RefresherTraining * trialCost.RefresherTraining, + AdditionalCharge1 = workLoad.AdditionalCharge1 * trialCost.AdditionalCharge1, + AdditionalCharge2 = workLoad.AdditionalCharge2 * trialCost.AdditionalCharge2, + AdditionalCharge3 = workLoad.AdditionalCharge3 * trialCost.AdditionalCharge3, YearMonth = workLoad.YearMonth, @@ -621,7 +625,10 @@ namespace IRaCIS.Application.Services workLoad.Adjudication * trialCost.Adjudication + workLoad.AdjudicationIn24H * trialCost.AdjudicationIn24H + workLoad.AdjudicationIn48H * trialCost.AdjudicationIn48H + - workLoad.RefresherTraining * trialCost.RefresherTraining + workLoad.RefresherTraining * trialCost.RefresherTraining+ + workLoad.AdditionalCharge1 * trialCost.AdditionalCharge1 + + workLoad.AdditionalCharge2 * trialCost.AdditionalCharge2 + + workLoad.AdditionalCharge3 * trialCost.AdditionalCharge3 ) }; @@ -651,6 +658,9 @@ namespace IRaCIS.Application.Services AdjudicationIn24H = gWorkLoad.Sum(t => t.AdjudicationIn24H), AdjudicationIn48H = gWorkLoad.Sum(t => t.AdjudicationIn48H), RefresherTraining = gWorkLoad.Sum(t => t.RefresherTraining), + AdditionalCharge1 = gWorkLoad.Sum(t => t.AdditionalCharge1), + AdditionalCharge2 = gWorkLoad.Sum(t => t.AdditionalCharge2), + AdditionalCharge3 = gWorkLoad.Sum(t => t.AdditionalCharge3), }; query = from workLoad in workloadQuery @@ -678,6 +688,10 @@ namespace IRaCIS.Application.Services AdjudicationIn48H = workLoad.AdjudicationIn48H * trialCost.AdjudicationIn48H, Global = workLoad.Global * trialCost.Global, Downtime = workLoad.Downtime * trialCost.Downtime, + RefresherTraining = workLoad.RefresherTraining * trialCost.RefresherTraining, + AdditionalCharge1 = workLoad.AdditionalCharge1 * trialCost.AdditionalCharge1, + AdditionalCharge2 = workLoad.AdditionalCharge2 * trialCost.AdditionalCharge2, + AdditionalCharge3 = workLoad.AdditionalCharge3 * trialCost.AdditionalCharge3, Total = (workLoad.Downtime * trialCost.Downtime + workLoad.Training * trialCost.Training + @@ -688,7 +702,10 @@ namespace IRaCIS.Application.Services workLoad.Adjudication * trialCost.Adjudication + workLoad.AdjudicationIn24H * trialCost.AdjudicationIn24H + workLoad.AdjudicationIn48H * trialCost.AdjudicationIn48H + - workLoad.RefresherTraining * trialCost.RefresherTraining + workLoad.RefresherTraining * trialCost.RefresherTraining+ + workLoad.AdditionalCharge1 * trialCost.AdditionalCharge1 + + workLoad.AdditionalCharge2 * trialCost.AdditionalCharge2 + + workLoad.AdditionalCharge3 * trialCost.AdditionalCharge3 ) }; @@ -721,6 +738,9 @@ namespace IRaCIS.Application.Services workLoad.AdjudicationIn24H * trialCost.AdjudicationIn24H, AdjudicationIn48H = workLoad.AdjudicationIn48H * trialCost.AdjudicationIn48H, RefresherTraining = workLoad.RefresherTraining * trialCost.RefresherTraining, + AdditionalCharge1 = workLoad.AdditionalCharge1 * trialCost.AdditionalCharge1, + AdditionalCharge2 = workLoad.AdditionalCharge2 * trialCost.AdditionalCharge2, + AdditionalCharge3 = workLoad.AdditionalCharge3 * trialCost.AdditionalCharge3, ReviewerCode = doctor.Code, ChineseName = doctor.ChineseName, FirstName = doctor.FirstName, @@ -745,6 +765,10 @@ namespace IRaCIS.Application.Services Adjudication = gWorkLoad.Sum(t => t.Adjudication), AdjudicationIn24H = gWorkLoad.Sum(t => t.AdjudicationIn24H), AdjudicationIn48H = gWorkLoad.Sum(t => t.AdjudicationIn48H), + RefresherTraining = gWorkLoad.Sum(t => t.RefresherTraining), + AdditionalCharge1 = gWorkLoad.Sum(t => t.AdditionalCharge1), + AdditionalCharge2 = gWorkLoad.Sum(t => t.AdditionalCharge2), + AdditionalCharge3 = gWorkLoad.Sum(t => t.AdditionalCharge3), Total = gWorkLoad.Sum(t => t.Downtime) + gWorkLoad.Sum(t => t.Training) + @@ -755,7 +779,10 @@ namespace IRaCIS.Application.Services gWorkLoad.Sum(t => t.Adjudication) + gWorkLoad.Sum(t => t.AdjudicationIn24H) + gWorkLoad.Sum(t => t.AdjudicationIn48H) + - gWorkLoad.Sum(t => t.RefresherTraining) + gWorkLoad.Sum(t => t.RefresherTraining)+ + gWorkLoad.Sum(t => t.AdditionalCharge1)+ + gWorkLoad.Sum(t => t.AdditionalCharge2)+ + gWorkLoad.Sum(t => t.AdditionalCharge3) }); @@ -789,6 +816,9 @@ namespace IRaCIS.Application.Services workLoad.AdjudicationIn24H * trialCost.AdjudicationIn24H, AdjudicationIn48H = workLoad.AdjudicationIn48H * trialCost.AdjudicationIn48H, RefresherTraining = workLoad.RefresherTraining * trialCost.RefresherTraining, + AdditionalCharge1 = workLoad.AdditionalCharge1 * trialCost.AdditionalCharge1, + AdditionalCharge2 = workLoad.AdditionalCharge2 * trialCost.AdditionalCharge2, + AdditionalCharge3 = workLoad.AdditionalCharge3 * trialCost.AdditionalCharge3, }; @@ -805,6 +835,10 @@ namespace IRaCIS.Application.Services Adjudication = gWorkLoad.Sum(t => t.Adjudication), AdjudicationIn24H = gWorkLoad.Sum(t => t.AdjudicationIn24H), AdjudicationIn48H = gWorkLoad.Sum(t => t.AdjudicationIn48H), + RefresherTraining = gWorkLoad.Sum(t => t.RefresherTraining), + AdditionalCharge1 = gWorkLoad.Sum(t => t.AdditionalCharge1), + AdditionalCharge2 = gWorkLoad.Sum(t => t.AdditionalCharge2), + AdditionalCharge3 = gWorkLoad.Sum(t => t.AdditionalCharge3), Total = gWorkLoad.Sum(t => t.Downtime) + gWorkLoad.Sum(t => t.Training) + gWorkLoad.Sum(t => t.Timepoint) + @@ -814,7 +848,10 @@ namespace IRaCIS.Application.Services gWorkLoad.Sum(t => t.Adjudication) + gWorkLoad.Sum(t => t.AdjudicationIn24H) + gWorkLoad.Sum(t => t.AdjudicationIn48H) + - gWorkLoad.Sum(t => t.RefresherTraining) + gWorkLoad.Sum(t => t.RefresherTraining)+ + gWorkLoad.Sum(t => t.AdditionalCharge1)+ + gWorkLoad.Sum(t => t.AdditionalCharge2)+ + gWorkLoad.Sum(t => t.AdditionalCharge3) }); propName = queryParam.SortField == string.Empty ? "YearMonth" : queryParam.SortField;