diff --git a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs index fd8f0edab..5650b92d0 100644 --- a/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs +++ b/ReportImp/DiakonieKKKleve/ServicesOverviewReport.cs @@ -21,6 +21,7 @@ namespace BeWo.DiakonieKKKleve public void SetReportDataSource(ServicesOverviewRO pRO) { double minTotal = 0; + double minFk = 0; bool showAssi = false; bool showPflege = false; bool showAb = false; @@ -36,7 +37,6 @@ namespace BeWo.DiakonieKKKleve if (s.ServiceCategory.StartsWith("FLS")) { minTotal += s.Minutes; - } else if (s.ServiceCategory.StartsWith("Assistenz")) { @@ -53,6 +53,7 @@ namespace BeWo.DiakonieKKKleve if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) { s.Notice5 = "F"; + minFk += s.Minutes; } servicesBillable.Add(s); @@ -107,7 +108,7 @@ namespace BeWo.DiakonieKKKleve bindingSource1.DataSource = pRO; lblSummeMinuten.Text = string.Format("{0:0.##}", minTotal); - lblSummeMinutenFaktor.Text = string.Format("{0:0.##}", pRO.TotalFLMoFehlkontakte * 1.2 + pRO.TotalFLMFehlkontakte); + lblSummeMinutenFaktor.Text = string.Format("{0:0.##}", (minTotal - minFk) * 1.2 + minFk); var approved = pRO.ApprovedFLSPerWeek; var stats = GetStatistics(pRO);