From 30ab2d5fc15ec4e1f7138f3fc2a5f9eeabe87093 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Thu, 22 Jun 2023 15:14:31 +0200 Subject: [PATCH] =?UTF-8?q?MH:=20Autismus=20K=C3=B6ln=20Bonn=20Rechnungsen?= =?UTF-8?q?twicklung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Invoicing/DefaultInvoiceCreation.cs | 12 ++++++------ .../Invoicing/FactorInvoiceCreation.cs | 12 ++++++------ .../Invoicing/SelbstzahlerInvoiceCreation.cs | 12 ++++++------ .../Service/AbrechenbarkeitenHelper.cs | 16 ++++++++-------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ReportImp/AutismusKoelnBonn/Invoicing/DefaultInvoiceCreation.cs b/ReportImp/AutismusKoelnBonn/Invoicing/DefaultInvoiceCreation.cs index b2f17ac91..f2010283f 100644 --- a/ReportImp/AutismusKoelnBonn/Invoicing/DefaultInvoiceCreation.cs +++ b/ReportImp/AutismusKoelnBonn/Invoicing/DefaultInvoiceCreation.cs @@ -172,12 +172,12 @@ namespace AutismusKoelnBonn.Invoicing var invoiceItem = new InvoiceItem(); BillingData bd = calc.GetBillingData(iServiceRecord); - if (iServiceRecord.ServiceDescription.Name.ToLower() == "wegezeit") - { - bd.AmountPerUnit = AbrechenbarkeitenHelper.GetWegezeitBetrag(scap.CostBearer2SupportConcept.CostBearer.Organisation.VarFieldValueList); - bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit; - bd.GrossAmountTotal = bd.AmountTotal; - } + //if (iServiceRecord.ServiceDescription.Name.ToLower() == "wegezeit") + //{ + // bd.AmountPerUnit = AbrechenbarkeitenHelper.GetWegezeitBetrag(scap.CostBearer2SupportConcept.CostBearer.Organisation.VarFieldValueList); + // bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit; + // bd.GrossAmountTotal = bd.AmountTotal; + //} invoiceItem.AmountPerUnit = bd.AmountPerUnit; invoiceItem.UnitCount = bd.UnitCount; diff --git a/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs b/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs index 93942a9df..084ace560 100644 --- a/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs +++ b/ReportImp/AutismusKoelnBonn/Invoicing/FactorInvoiceCreation.cs @@ -153,12 +153,12 @@ namespace AutismusKoelnBonn.Invoicing var invoiceItem = new InvoiceItem(); BillingData bd = calc.GetBillingData(iServiceRecord); - if (iServiceRecord.ServiceDescription.Name.ToLower() == "wegezeit") - { - bd.AmountPerUnit = AbrechenbarkeitenHelper.GetWegezeitBetrag(scap.CostBearer2SupportConcept.CostBearer.Organisation.VarFieldValueList); - bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit; - bd.GrossAmountTotal = bd.AmountTotal; - } + //if (iServiceRecord.ServiceDescription.Name.ToLower() == "wegezeit") + //{ + // bd.AmountPerUnit = AbrechenbarkeitenHelper.GetWegezeitBetrag(scap.CostBearer2SupportConcept.CostBearer.Organisation.VarFieldValueList); + // bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit; + // bd.GrossAmountTotal = bd.AmountTotal; + //} invoiceItem.ItemDescription = iServiceRecord.ServiceDescription.Name; //iServiceRecord.Employee + " - " + iServiceRecord.ServiceDescription.Name; invoiceItem.AmountPerUnit = bd.AmountPerUnit; diff --git a/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs b/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs index 1502fa1ba..b491e989a 100644 --- a/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs +++ b/ReportImp/AutismusKoelnBonn/Invoicing/SelbstzahlerInvoiceCreation.cs @@ -189,12 +189,12 @@ namespace AutismusKoelnBonn.Invoicing var invoiceItem = new InvoiceItem(); BillingData bd = calc.GetBillingData(iServiceRecord); - if (iServiceRecord.ServiceDescription.Name.ToLower() == "wegezeit") - { - bd.AmountPerUnit = AbrechenbarkeitenHelper.GetWegezeitBetrag(scap.CostBearer2SupportConcept.CostBearer.Organisation.VarFieldValueList); - bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit; - bd.GrossAmountTotal = bd.AmountTotal; - } + //if (iServiceRecord.ServiceDescription.Name.ToLower() == "wegezeit") + //{ + // bd.AmountPerUnit = AbrechenbarkeitenHelper.GetWegezeitBetrag(scap.CostBearer2SupportConcept.CostBearer.Organisation.VarFieldValueList); + // bd.AmountTotal = bd.UnitCount * bd.AmountPerUnit; + // bd.GrossAmountTotal = bd.AmountTotal; + //} invoiceItem.AmountPerUnit = bd.AmountPerUnit; invoiceItem.UnitCount = bd.UnitCount; diff --git a/ReportImp/AutismusKoelnBonn/Service/AbrechenbarkeitenHelper.cs b/ReportImp/AutismusKoelnBonn/Service/AbrechenbarkeitenHelper.cs index e81511827..0fed99bef 100644 --- a/ReportImp/AutismusKoelnBonn/Service/AbrechenbarkeitenHelper.cs +++ b/ReportImp/AutismusKoelnBonn/Service/AbrechenbarkeitenHelper.cs @@ -45,14 +45,14 @@ namespace AutismusKoelnBonn.Service return abrechenbarkeitenDict; } - public static decimal? GetWegezeitBetrag(IList varFieldValueList) - { - var betragVarField = varFieldValueList.FirstOrDefault(vv => vv.VarFieldDefOid == 4); + //public static decimal? GetWegezeitBetrag(IList varFieldValueList) + //{ + // var betragVarField = varFieldValueList.FirstOrDefault(vv => vv.VarFieldDefOid == 4); - if (betragVarField != null) - return Convert.ToDecimal(Utils.XMLDeserializeFromString(betragVarField.SerializedValue, Type.GetType(betragVarField.TypeName))); - else - return 0m; - } + // if (betragVarField != null) + // return Convert.ToDecimal(Utils.XMLDeserializeFromString(betragVarField.SerializedValue, Type.GetType(betragVarField.TypeName))); + // else + // return 0m; + //} } }