From 4d2f0f52f7f863d289a34bbec7ff19271e666242 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 25 Sep 2023 14:32:13 +0200 Subject: [PATCH] SPZRatingen/SoziotherapieLeistungsnachweis Nacharbeiten --- .../SoziotherapieLeistungsnachweis.cs | 10 +++-- ...SoziotherapieLeistungsnachweis.designer.cs | 41 +++++++++---------- .../SoziotherapieLeistungsnachweis.resx | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.cs b/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.cs index 0cc66a685..0e7d2780a 100644 --- a/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.cs +++ b/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.cs @@ -36,13 +36,16 @@ namespace SpzRatingen s.Minutes = s.Minutes * (double)pRO.RateFactor; gesamt += s.Minutes; } + s.Notice5 = "E"; //Einzel if (s.ServiceDescription.Contains("Probation") || s.ServiceDescription.Contains("(P)")) + { s.Notice5 = "P"; - else if (s.Minutes == s.GroupMinutes) - s.Notice5 = "E"; - else if (s.Minutes != s.GroupMinutes) + } + else if (s.ServiceDescription.Contains("(G)")) + { s.Notice5 = "G"; + } if (s.ServiceDescription.Contains("(A)")) { @@ -61,6 +64,7 @@ namespace SpzRatingen s.ServiceDescription = "(E)"; } + ServicesOverviewRO.CreateSignatureString(s); } diff --git a/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.designer.cs b/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.designer.cs index 93c6bb0ec..789018075 100644 --- a/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.designer.cs +++ b/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.designer.cs @@ -74,7 +74,6 @@ namespace SpzRatingen this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); @@ -104,6 +103,7 @@ namespace SpzRatingen this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -613,33 +613,20 @@ namespace SpzRatingen // // bottomMarginBand1 // - this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel5}); - this.bottomMarginBand1.HeightF = 54.95828F; + this.bottomMarginBand1.HeightF = 35.66659F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrLabel5 - // - this.xrLabel5.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(1109F, 30.29169F); - this.xrLabel5.StylePriority.UseBorders = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = resources.GetString("xrLabel5.Text"); - this.xrLabel5.Visible = false; - // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel20, this.xrLabel3, this.xrLabel11, this.xrLabel8, this.xrLabel6, this.cellGesamt}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); - this.ReportFooter.HeightF = 140.125F; + this.ReportFooter.HeightF = 178.6667F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // @@ -794,7 +781,7 @@ namespace SpzRatingen // this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedEndDate", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EndDate", "{0:dd.MM.yyyy}")}); this.xrLabel19.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(378.4589F, 184.1667F); this.xrLabel19.Name = "xrLabel19"; @@ -807,7 +794,7 @@ namespace SpzRatingen // this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedStartDate", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "StartDate", "{0:dd.MM.yyyy}")}); this.xrLabel10.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(124.8126F, 184.1667F); this.xrLabel10.Name = "xrLabel10"; @@ -944,6 +931,18 @@ namespace SpzRatingen this.fieldGroup.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldGroup.Name = "fieldGroup"; // + // xrLabel20 + // + this.xrLabel20.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0.001049042F, 148.375F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(1085.229F, 30.29169F); + this.xrLabel20.StylePriority.UseBorders = false; + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.Text = resources.GetString("xrLabel20.Text"); + this.xrLabel20.Visible = false; + // // LeistungsnachweisSoziotherapie // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -966,7 +965,7 @@ namespace SpzRatingen this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(30, 30, 50, 55); + this.Margins = new System.Drawing.Printing.Margins(30, 30, 50, 36); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -1052,7 +1051,7 @@ namespace SpzRatingen private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRPictureBox picSignature; + private DevExpress.XtraReports.UI.XRLabel xrLabel20; } } diff --git a/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.resx b/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.resx index 342788d4e..af9245dc1 100644 --- a/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.resx +++ b/ReportImp/SPZRatingen/SoziotherapieLeistungsnachweis.resx @@ -120,7 +120,7 @@ 21, 17 - + Die Daten werden von der gesetzlichen Krankenkasse zur Erfüllung der Aufgaben nach § 284 Abs. 1 Nr. 8 SGB V erhoben und verarbeitet. Nach dem Vertrag nach 132b SGB V in Verbindung mit § 37a SGB V zur Versorgung mit Soziotherapie sind Sie verpflichtet, die erforderlichen Angaben zu machen. \ No newline at end of file