From 383bb4d06c3f9f970f7869f3f38f35bcb6b67bf6 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 20 Jun 2023 15:41:40 +0200 Subject: [PATCH] Soziotherapie um Gruppen erweitert --- ...koneKKKleveSoziotherapieInvoiceCreation.cs | 6 +++++- .../LeistungsnachweisSoziotherapie.cs | 20 +++++++++++++++---- ...LeistungsnachweisSoziotherapie.designer.cs | 19 ++++++++++++++++++ 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs index 3ab413f5e..efeac67dd 100644 --- a/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs +++ b/ReportImp/DiakonieKKKleve/Invoicing/DiakoneKKKleveSoziotherapieInvoiceCreation.cs @@ -79,6 +79,10 @@ namespace DiakonieKKKleve.Invoicing { ii.UnitDescription = "GPos: 2001607"; } + if (ii.ItemDescription.ToLower().Contains("gruppentherapie")) + { + ii.UnitDescription = "GPos: 2002672"; + } else if (ii.ItemDescription.ToLower().Contains("telefon")) { if (iServiceRecord.RoundedDuration <= 30) @@ -182,7 +186,7 @@ namespace DiakonieKKKleve.Invoicing foreach (var sr in serviceRecordsInPeriod) { - if (!sr.ServiceDescription.Name.ToLower().Contains("telefon")) + if (!sr.ServiceDescription.Name.ToLower().Contains("telefon") && !sr.ServiceDescription.Name.ToLower().Contains("gruppe")) { countHausbesuch++; } diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs index 8cd36bcfd..46c71d334 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs @@ -23,6 +23,8 @@ namespace BeWo.DiakonieKKKleve public void SetReportDataSource(ServicesOverviewRO pRO) { double gesamt = 0; + double gesamtGruppe = 0; + if (pRO.Services != null) { foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) @@ -35,7 +37,6 @@ namespace BeWo.DiakonieKKKleve pRO.ApprovedEndDate = String.Format("{0:dd.MM.yyyy}", serviceRecord.CostBearer2SupportConcept.ApprovedEndDate); var srDc = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(serviceRecord); - s.GoalList = String.Empty; if (srDc.Goals != null && srDc.Goals.Count > 0) { @@ -50,6 +51,15 @@ namespace BeWo.DiakonieKKKleve } } } + if (s.IsGroup) + { + gesamtGruppe += s.Minutes; + s.ServiceDescription = "E"; + } + else + { + gesamt += s.Minutes; + } if (s.ServiceDescription.Contains("Video")) { @@ -59,7 +69,7 @@ namespace BeWo.DiakonieKKKleve { s.ServiceDescription = "T"; } - else if (s.ServiceDescription.Contains("Einrichtung")) + else if (s.ServiceDescription.Contains("Einrichtung") || s.ServiceDescription == "E" || s.ServiceDescription.Contains("Gruppe")) { s.ServiceDescription = "E"; } @@ -67,14 +77,16 @@ namespace BeWo.DiakonieKKKleve { s.ServiceDescription = "A"; } - gesamt += s.Minutes; } - } SetzeAdresseUndIk(pRO); cellGesamt.Text = String.Format("{0:0.00}", gesamt / 60); + if (gesamtGruppe > 0) + { + cellGesamtGruppe.Text = String.Format("{0:0.00}", gesamtGruppe / 60); + } this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs index b69ba29a7..a74a1d33c 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs @@ -60,6 +60,7 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.cellGesamtGruppe = new DevExpress.XtraReports.UI.XRLabel(); this.cellGesamt = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); @@ -377,6 +378,7 @@ namespace BeWo.DiakonieKKKleve // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.cellGesamtGruppe, this.cellGesamt, this.xrLabel8, this.xrLabel6, @@ -386,6 +388,22 @@ namespace BeWo.DiakonieKKKleve this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // cellGesamtGruppe + // + this.cellGesamtGruppe.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.cellGesamtGruppe.BorderWidth = 1F; + this.cellGesamtGruppe.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.cellGesamtGruppe.LocationFloat = new DevExpress.Utils.PointFloat(535.0005F, 0F); + this.cellGesamtGruppe.Name = "cellGesamtGruppe"; + this.cellGesamtGruppe.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.cellGesamtGruppe.SizeF = new System.Drawing.SizeF(85F, 24.25F); + this.cellGesamtGruppe.StylePriority.UseBorders = false; + this.cellGesamtGruppe.StylePriority.UseBorderWidth = false; + this.cellGesamtGruppe.StylePriority.UseFont = false; + this.cellGesamtGruppe.StylePriority.UsePadding = false; + this.cellGesamtGruppe.StylePriority.UseTextAlignment = false; + this.cellGesamtGruppe.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // // cellGesamt // this.cellGesamt.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -803,5 +821,6 @@ namespace BeWo.DiakonieKKKleve private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRLabel cellGesamtGruppe; } }