From 16c72a73e9681b4659e3a5b99abb7eca734445fa Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 21 Apr 2026 15:45:48 +0200 Subject: [PATCH] =?UTF-8?q?Queries/Hilfepl=C3=A4ne=20mit=20aktuellen=20Bew?= =?UTF-8?q?illigungen=20-=20mit=20Stunden=20und=20Leistungskategorien=20f?= =?UTF-8?q?=C3=BCr=20Herrn=20Ferchland=20SupportOID=3D160602?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...n - mit Stunden und Leistungskategorien.txt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Queries/Hilfepläne mit aktuellen Bewilligungen - mit Stunden und Leistungskategorien.txt b/Queries/Hilfepläne mit aktuellen Bewilligungen - mit Stunden und Leistungskategorien.txt index 3ddf61f68..53ffbac33 100644 --- a/Queries/Hilfepläne mit aktuellen Bewilligungen - mit Stunden und Leistungskategorien.txt +++ b/Queries/Hilfepläne mit aktuellen Bewilligungen - mit Stunden und Leistungskategorien.txt @@ -5,17 +5,20 @@ SELECT p.LastName AS Nachname, p.FirstName AS Vorname, o.`Name` AS Kostentraeger, + cb2sc.RequestedStartDate AS 'Beantragt von', + cb2sc.RequestedEndDate AS 'Beantragt bis', cb2sc.ApprovedStartDate AS 'Bewilligt von', cb2sc.ApprovedEndDate AS 'Bewilligt bis', MAX(CASE WHEN scap.rn = 1 THEN cat1.Name END) AS 'Bewilligung 1', - MAX(CASE WHEN scap.rn = 1 THEN ROUND(scap.ApprovedBEPerInterval, 2) END) AS 'Stunden 1', - MAX(CASE WHEN scap.rn = 2 THEN cat2.Name END) AS 'Bewilligung 2', + MAX(CASE WHEN scap.rn = 1 THEN ROUND(scap.ApprovedBEPerInterval, 2) END) AS 'Stunden 1', + MAX(CASE WHEN scap.rn = 1 THEN scap.Notice END) AS 'Bemerkungen 1', + MAX(CASE WHEN scap.rn = 2 THEN cat2.Name END) AS 'Bewilligung 2', MAX(CASE WHEN scap.rn = 2 THEN ROUND(scap.ApprovedBEPerInterval, 2) END) AS 'Stunden 2', + MAX(CASE WHEN scap.rn = 2 THEN scap.Notice END) AS 'Bemerkungen 2', MAX(CASE WHEN scap.rn = 3 THEN cat3.Name END) AS 'Bewilligung 3', - MAX(CASE WHEN scap.rn = 3 THEN ROUND(scap.ApprovedBEPerInterval, 2) END) AS 'Stunden 3' - -- MAX(CASE WHEN scap.rn = 4 THEN ROUND(scap.ApprovedBEPerInterval, 2) END) AS 'Stunden 4', - -- MAX(CASE WHEN scap.rn = 4 THEN CONCAT(DATE_FORMAT(scap.Start, '%d.%m.%Y'), ' - ', DATE_FORMAT(scap.EndDate, '%d.%m.%Y'), ' ', cat4.Name) END) AS 'Bewilligung 4' -FROM `person` p + MAX(CASE WHEN scap.rn = 3 THEN ROUND(scap.ApprovedBEPerInterval, 2) END) AS 'Stunden 3', + MAX(CASE WHEN scap.rn = 3 THEN scap.Notice END) AS 'Bemerkungen 3' + FROM `person` p INNER JOIN `customer` c ON p.Oid = c.PersonOid LEFT JOIN team2customer t2c ON c.Oid = t2c.CustomerOid LEFT JOIN team t ON t2c.TeamOid = t.Oid @@ -25,7 +28,7 @@ INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid` INNER JOIN `organisation` o ON cb.`Oid` = o.`CostBearerOid` INNER JOIN ( SELECT s1.Oid, s1.CostBearer2SupportConceptOid, s1.ApprovedBEPerInterval, - s1.Start, s1.EndDate, s1.ServiceCategoryOid, + s1.Start, s1.EndDate, s1.Notice, s1.ServiceCategoryOid, COUNT(s2.Oid) + 1 AS rn FROM `supportconceptapprovalperiod` s1 LEFT JOIN `supportconceptapprovalperiod` s2 @@ -41,9 +44,6 @@ INNER JOIN ( LEFT JOIN servicecategory cat1 ON scap.ServiceCategoryOid = cat1.Oid AND scap.rn = 1 LEFT JOIN servicecategory cat2 ON scap.ServiceCategoryOid = cat2.Oid AND scap.rn = 2 LEFT JOIN servicecategory cat3 ON scap.ServiceCategoryOid = cat3.Oid AND scap.rn = 3 -LEFT JOIN servicecategory cat4 ON scap.ServiceCategoryOid = cat4.Oid AND scap.rn = 4 -WHERE c.IsActive = 1 - AND sc.IsActive = 1 -GROUP BY p.Oid, p.LastName, p.FirstName, p.DateOfBirth, - o.`Name`, cb2sc.ApprovedStartDate, cb2sc.ApprovedEndDate +WHERE c.IsActive = 1 AND sc.IsActive = 1 +GROUP BY p.Oid, p.LastName, p.FirstName, p.DateOfBirth, o.`Name`, cb2sc.ApprovedStartDate, cb2sc.ApprovedEndDate ORDER BY t.Name, p.LastName; \ No newline at end of file