From 729523389cd43e6371b09ee219d91c2f5c270e6f Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 29 May 2026 20:33:39 +0200 Subject: [PATCH 1/3] PerspektivenEV: Compile-Fehler behoben --- ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs index f84c85d05..411fffd0c 100644 --- a/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs +++ b/ReportImp/PerspektivenEV/Export/DatevExporterBthg.cs @@ -229,7 +229,7 @@ namespace PerspektivenEV.Export { sc = scs.Where(p => p.StartDate < lastDate && p.EndDate > new DateTime(date.Year, date.Month, 1)).FirstOrDefault(); } - var cb2sc = sc.CostBearer2SupportConceptList.Where(sc => sc.CostBearer.Organisation.Name != "EIGENANTEIL" && sc.CostBearer.Organisation.Name != "SELBSTZAHLER").FirstOrDefault(); + var cb2sc = sc.CostBearer2SupportConceptList.Where(sc1 => sc1.CostBearer.Organisation.Name != "EIGENANTEIL" && sc1.CostBearer.Organisation.Name != "SELBSTZAHLER").FirstOrDefault(); if (cb2sc != null && cb2sc.KontoHilfeplan != null && cb2sc.KontoHilfeplan.Length > 0) { debitor = cb2sc.KontoHilfeplan; From 5bc92e748c53f3e73eff839c46b2a34bf5bf6142 Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 29 May 2026 20:35:46 +0200 Subject: [PATCH 2/3] PerspektivenEV: In Zeiterfassung-Druck bei Mitarbeitern NPEs verhindern SupportOID=163832 --- .../PerspektivenEV/CustomReportCreator.cs | 13 ++++++----- .../PerspektivenEV/ServiceRecordListReport.cs | 22 ++++++++++++------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/ReportImp/PerspektivenEV/CustomReportCreator.cs b/ReportImp/PerspektivenEV/CustomReportCreator.cs index e08988fb0..c37461104 100644 --- a/ReportImp/PerspektivenEV/CustomReportCreator.cs +++ b/ReportImp/PerspektivenEV/CustomReportCreator.cs @@ -568,13 +568,14 @@ namespace PerspektivenEV public override XtraReport CreateServiceRecordListReport(long employeeOid, long customerOid, long supportConceptOid, long costbearer2SupportConceptOid, bool isLimitedToAdditionalServices, DateTimeSpan limitingTimeSpan) { - IBeWoReport lServiceRecordListReport = null; + IBeWoReport lServiceRecordListReport = new Leistungen(); - var customer = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(customerOid)); - if (customer.RelatedTeams.Any(t => t.Team.Name.ToLower().Contains("pfk"))) - lServiceRecordListReport = new LeistungenPFK(); - else - lServiceRecordListReport = new Leistungen(); + if (customerOid > 0) + { + var customer = MapperFactory.CustomerDC_Customer.MapToNewDC(DAOFactory.GenericDAO.GetByID(customerOid)); + if (customer.RelatedTeams.Any(t => t.Team.Name.ToLower().Contains("pfk"))) + lServiceRecordListReport = new LeistungenPFK(); + } var ro = ServiceRecordListRO.Create(employeeOid, customerOid, supportConceptOid, costbearer2SupportConceptOid, isLimitedToAdditionalServices, limitingTimeSpan); lServiceRecordListReport.SetReportDataSource(ro); diff --git a/ReportImp/PerspektivenEV/ServiceRecordListReport.cs b/ReportImp/PerspektivenEV/ServiceRecordListReport.cs index 7d9199b36..f61f6e9ac 100644 --- a/ReportImp/PerspektivenEV/ServiceRecordListReport.cs +++ b/ReportImp/PerspektivenEV/ServiceRecordListReport.cs @@ -23,15 +23,21 @@ namespace PerspektivenEV if (pRO.ServiceRecordDetailList.Count > 0) { - var c = DAOFactory.GenericDAO.LoadByID(pRO.ServiceRecordDetailList[0].ServiceRecord.Customer.CustomerOid); - var hauptbetreuer = c.Employee2CustomerList.FirstOrDefault( - e2c => e2c.ValueList.Any(ve => ve.Entry.SystemEntryID.HasValue && ve.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)); - pRO.CostBearer = String.Format("{0} {1}", hauptbetreuer.Employee.Person.FirstName, hauptbetreuer.Employee.Person.LastName); - // pRO.CostBearer = pRO.ServiceRecordDetailList[0].ServiceRecord.SupportConcept.Customer.MainAttendant; -> ist leer!!! - foreach (var stat in pRO.Statistics) + if (pRO.ServiceRecordDetailList[0].ServiceRecord.Customer != null) { - if (stat.BEApprovedPerWeek != 0) - lblFLS.Text = String.Format("{0}", Math.Round(stat.BEApprovedPerWeek * 52, 0)); + var c = DAOFactory.GenericDAO.LoadByID(pRO.ServiceRecordDetailList[0].ServiceRecord.Customer.CustomerOid); + var hauptbetreuer = c.Employee2CustomerList.FirstOrDefault( + e2c => e2c.ValueList.Any(ve => ve.Entry.SystemEntryID.HasValue && ve.Entry.SystemEntryID.Value == SystemEntryID.EmployeeRoleMainAttendant)); + pRO.CostBearer = String.Format("{0} {1}", hauptbetreuer.Employee.Person.FirstName, hauptbetreuer.Employee.Person.LastName); + // pRO.CostBearer = pRO.ServiceRecordDetailList[0].ServiceRecord.SupportConcept.Customer.MainAttendant; -> ist leer!!! + } + if (pRO.Statistics != null) + { + foreach (var stat in pRO.Statistics) + { + if (stat.BEApprovedPerWeek != 0) + lblFLS.Text = String.Format("{0}", Math.Round(stat.BEApprovedPerWeek * 52, 0)); + } } foreach (var sr in pRO.ServiceRecordDetailList) { From 5cb9abcea336bac02ec6c558d9c7afff6b988e08 Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 1 Jun 2026 16:16:20 +0200 Subject: [PATCH 3/3] =?UTF-8?q?DiakonieKKK:=20Im=20Sozio-LN=20in=20der=20S?= =?UTF-8?q?chl=C3=BCssel-Spalte=20bei=20Ma=C3=9Fnahmen=20ohne=20Abk=C3=BCr?= =?UTF-8?q?zung=20die=20Abk=C3=BCrzung=20des=20Parent-Ziels=20verwenden=20?= =?UTF-8?q?SupportOID=3D164119?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs index 66b8a0898..36b12a3be 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs @@ -50,6 +50,12 @@ namespace BeWo.DiakonieKKKleve s.GoalList += ", "; s.GoalList += goal.Abbreviation; } + else if (goal.Parent != null && !String.IsNullOrEmpty(goal.Parent.Abbreviation)) + { + if (s.GoalList.Length > 0) + s.GoalList += ", "; + s.GoalList += goal.Parent.Abbreviation; + } } } if (s.ServiceDescription.Contains("Gruppe")) //die erstellen meist über Mehrfachbuchung