diff --git a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs index 02a63c2fc..efaae274a 100644 --- a/ReportImp/DiakonieKKKleve/Finanzauswertung.cs +++ b/ReportImp/DiakonieKKKleve/Finanzauswertung.cs @@ -270,7 +270,7 @@ namespace BeWo.DiakonieKKKleve } else { - if (!sr.ServiceDescription.Name.ToLower().Contains("telefon")) + if (sr.ServiceDescription.Name.ToLower().Contains("aufsuchend")) { if (!hatHBimZeitraum && sr.Start >= start && sr.Start < end.Date.AddDays(1)) { diff --git a/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs b/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs index 99f955a09..e56e9a73c 100644 --- a/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs +++ b/ReportImp/DiakonieKKKleve/Invoicing/DiakonieKKKleveSoziotherapieInvoiceCreation.cs @@ -1,7 +1,9 @@ -using BeWo.Data.Entities; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Service.Invoicing; using BS.Shared.Core; using BS.Shared.DataContracts; +using BS.Shared.Services; using System; using System.Collections.Generic; using System.Linq; @@ -14,8 +16,26 @@ namespace DiakonieKKKleve.Invoicing { public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, BS.Shared.Services.Calculations calc) { - var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); - + var ii= new InvoiceItem(); + BillingData bd = calc.GetBillingData(iServiceRecord); + ii.AmountPerUnit = bd.AmountPerUnit; + ii.UnitCount = bd.UnitCount; + ii.AmountTotal = bd.AmountTotal; + ii.ItemPeriodStart = bd.BillingPeriodStart; + ii.ItemPeriodEnd = bd.BillingPeriodEnd; + ii.RateFactor = bd.RateFactor; + ii.GrossAmountTotal = bd.GrossAmountTotal; + ii.AccountingInterval = bd.AccountingInterval; + ii.ItemDescription = iServiceRecord.ServiceDescription.Name; + ii.ServiceRecord = DAOFactory.GenericDAO.LoadByID(iServiceRecord.ServiceRecordOid.Value); + if (scap != null) + ii.SupportConceptApprovalPeriodOid = scap.Oid; + if (iServiceRecord.ServiceDescription.Name.ToLower().Contains("fehlkontakt") || (iServiceRecord.ServiceDescription.ProzentAbrechnung.HasValue && iServiceRecord.ServiceDescription.ProzentAbrechnung.Value < 100)) + { + ii.RateFactor = null; + ii.GrossAmountTotal = ii.AmountTotal; + } + if (ii.ItemDescription.ToLower().Contains("probe")) { ii.UnitDescription = "GPos: 2001607";