diff --git a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs index 316574a93..1f2af1f21 100644 --- a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs +++ b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs @@ -406,6 +406,8 @@ namespace PerspektivenEV.Export { if (scapEnt.ServiceCategory.Abbreviation.Contains("BWHTK")) itemDesc = "ieH HTK"; + else if (scapEnt.ServiceCategory.Abbreviation.Contains("BWTr")) + itemDesc = "ieH Trauma"; else if (scapEnt.ServiceCategory.Abbreviation.Contains("BWKB")) itemDesc = "ieH KB"; else if (scapEnt.ServiceCategory.Abbreviation.Contains("BWFFM")) @@ -442,6 +444,8 @@ namespace PerspektivenEV.Export return "496100"; else if (itemDesc.Contains("ieH HTK")) return "495800"; + else if (itemDesc.Contains("ieH Trauma")) + return "495800"; else if (itemDesc.Contains("ieH FFM")) return "495801"; else if (itemDesc.Contains("ieH KB")) @@ -463,6 +467,8 @@ namespace PerspektivenEV.Export return "495806"; else if (itemDesc.Contains("ieH HTK") || itemDesc.Contains("BW HTK")) return "495803"; + else if (itemDesc.Contains("ieH Trauma") || itemDesc.Contains("BW Tr")) + return "495803"; else if (itemDesc.Contains("ieH KB") || itemDesc.Contains("BW KB")) return "495803"; else if (itemDesc.Contains("TS")) //scheint nicht vorzukommen, aber man weiß ja nie @@ -503,6 +509,8 @@ namespace PerspektivenEV.Export { if (scapEnt.ServiceCategory.Abbreviation.Contains("BWHTK")) itemDesc = "ieH HTK"; + else if (scapEnt.ServiceCategory.Abbreviation.Contains("BWTr")) + itemDesc = "ieH Trauma"; else if (scapEnt.ServiceCategory.Abbreviation.Contains("BWKB")) itemDesc = "ieH KB"; else if (scapEnt.ServiceCategory.Abbreviation.Contains("BWFFM")) @@ -524,7 +532,7 @@ namespace PerspektivenEV.Export return "350"; else if (itemDesc.Contains("ieH HTK") || itemDesc.Contains("BW HTK")) return "150"; - else if (itemDesc.Contains("ieH Trauma")) + else if (itemDesc.Contains("ieH Trauma")) // neues ambulante Angebot - mittelfristig vermutlich eigene Kostenstelle return "150"; else if (itemDesc.Contains("ieH KB") || itemDesc.Contains("BW KB")) return "150"; diff --git a/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs b/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs index 176b1c79e..366fffc6d 100644 --- a/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs +++ b/ReportImp/PerspektivenEV/Invoicing/CollectiveInvoiceCreationBthg.cs @@ -102,7 +102,7 @@ namespace PerspektivenEV.Invoicing accountingPeriodStart = invoicePeriod.StartDate; accountingPeriodEnd = invoicePeriod.EndDate; - //Einmaliges Laden der Preise um nicht bei jeder Bewilligung neu zu starten + //Einmaliges Laden der Preise um nicht bei jeder Bewilligung neu zu starten - bei denen sind Preise für jede Kostenstelle vorgehalten, im Moment aber überall ein Preis var preise = DAOFactory.GenericDAO.GetAllActive(); var pauschVar = GetPreis(preise, "BW HTK QA Fahrzeit pro Minute", (DateTime)accountingPeriodStart); if (pauschVar != 0) @@ -365,6 +365,10 @@ namespace PerspektivenEV.Invoicing { ii.ItemDescription += " ieH HTK"; } + else if (cat.Abbreviation.StartsWith("Tr")) + { + ii.ItemDescription += " ieH Trauma"; + } else if (cat.Abbreviation.StartsWith("FFM")) { ii.ItemDescription += " ieH FFM";