From ed1e8265c4e0565b9023863f2e00c6e71d32c719 Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 19 Mar 2025 18:17:24 +0100 Subject: [PATCH 1/2] =?UTF-8?q?DiakonieKKKleve:=20Preis=20f=C3=BCr=20Einze?= =?UTF-8?q?ltherapie=20wurde=20in=20Soziotherapie-Rechnungserstellung=20ni?= =?UTF-8?q?cht=20richtig=20ermittelt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onieKKKleveSoziotherapieInvoiceCreation.cs | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) 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"; From eac53214e89877b9ad9a13b0a78bb45f631b8ef3 Mon Sep 17 00:00:00 2001 From: Kojo Date: Wed, 19 Mar 2025 18:20:01 +0100 Subject: [PATCH 2/2] =?UTF-8?q?DiakonieKKKleve:=20Bugfix=20Finanzauswertun?= =?UTF-8?q?g=20f=C3=BCr=20Hausbesuchspauschale=20(Praxistermin=20wurde=20a?= =?UTF-8?q?ls=20Hausbesuch=20mitgez=C3=A4hlt)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReportImp/DiakonieKKKleve/Finanzauswertung.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) {