From b67dd630767066757eda995e830311588cb9bfa9 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Thu, 14 Dec 2023 13:53:01 +0100 Subject: [PATCH] =?UTF-8?q?AwoDortmund/Invoicing/SoziotherapieFinanceROCre?= =?UTF-8?q?ation=20=C3=84nderung=20der=20Preishinterlegung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Invoicing/SoziotherapieFinanceROCreation.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ReportImp/AwoDortmund/Invoicing/SoziotherapieFinanceROCreation.cs b/ReportImp/AwoDortmund/Invoicing/SoziotherapieFinanceROCreation.cs index 8532513f3..4f1202b21 100644 --- a/ReportImp/AwoDortmund/Invoicing/SoziotherapieFinanceROCreation.cs +++ b/ReportImp/AwoDortmund/Invoicing/SoziotherapieFinanceROCreation.cs @@ -64,11 +64,13 @@ namespace AwoDortmund.Invoicing { var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); ii.ItemDescription = ii.ItemDescription = iServiceRecord.ServiceDescription.CategoryName; - if (ii.ItemDescription.Contains("Soziotherapie")) + if (ii.ItemPeriodEnd < new DateTime(2023, 11, 01) && ii.ItemDescription.Contains("Soziotherapie")) + { ii.AmountPerUnit = preisSoziotherapie60min; - ii.RateFactor = null; - ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; - ii.GrossAmountTotal = ii.AmountTotal; + ii.RateFactor = null; + ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; + ii.GrossAmountTotal = ii.AmountTotal; + } return ii; } @@ -83,7 +85,7 @@ namespace AwoDortmund.Invoicing var list = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc); - var ii = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap); + var ii = CreateHausbesuchspauschale(serviceRecordsInPeriod, invoicePeriod, scap, preise); list.AddRange(ii); return list; @@ -106,11 +108,12 @@ namespace AwoDortmund.Invoicing return 0; } - public virtual IList CreateHausbesuchspauschale(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap) + public virtual IList CreateHausbesuchspauschale(List serviceRecordsInPeriod, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap, IList preise) { //Dictionary differentDays = new Dictionary(); IList items = new List(); decimal hausbesuchspauschale = 7.8m; + hausbesuchspauschale = GetPreis(preise, "Hausbesuchspauschale", invoicePeriod.StartDate); int countHausbesuch = 0;