diff --git a/IRaCIS.Core.Application.Contracts/StatisticsViewModel.cs b/IRaCIS.Core.Application.Contracts/StatisticsViewModel.cs index 9761ab2..9a04fe1 100644 --- a/IRaCIS.Core.Application.Contracts/StatisticsViewModel.cs +++ b/IRaCIS.Core.Application.Contracts/StatisticsViewModel.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using IRaCIS.Core.Application.Contracts.RequestAndResponse; @@ -82,6 +82,10 @@ namespace IRaCIS.Application.ViewModels public int Global { get; set; } public decimal RefresherTraining { get; set; } + + public decimal AdditionalCharge1 { get; set; } + public decimal AdditionalCharge2 { get; set; } + public decimal AdditionalCharge3 { get; set; } public int PersonalTotal { get; set; } } diff --git a/IRaCIS.Core.Application/StatisticsService.cs b/IRaCIS.Core.Application/StatisticsService.cs index 503bd1f..505d088 100644 --- a/IRaCIS.Core.Application/StatisticsService.cs +++ b/IRaCIS.Core.Application/StatisticsService.cs @@ -118,6 +118,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), }; var query = from w in workloadQuery @@ -149,6 +152,9 @@ namespace IRaCIS.Application.Services Global = w.Global, Downtime = w.Downtime, RefresherTraining=w.RefresherTraining, + AdditionalCharge1 = w.AdditionalCharge1, + AdditionalCharge2 = w.AdditionalCharge2, + AdditionalCharge3 = w.AdditionalCharge3, PersonalTotal = w.Timepoint + w.TimepointIn24H + w.TimepointIn48H + w.Adjudication + w.AdjudicationIn24H + w.AdjudicationIn48H + w.Global