diff --git a/Queries/Anzahl Termine nach Leistung in einem Jahr.txt b/Queries/Anzahl Termine nach Leistung in einem Jahr.txt index e666cd0f9..0a6b6bb69 100644 --- a/Queries/Anzahl Termine nach Leistung in einem Jahr.txt +++ b/Queries/Anzahl Termine nach Leistung in einem Jahr.txt @@ -6,7 +6,7 @@ SELECT YEAR(':Jahr_Start') AS Jahr, COUNT(CASE WHEN sd.ServiceCategoryOid = 47 THEN 1 END) AS 'Termine insgesamt', COUNT(CASE WHEN sr.ServiceDescriptionOid = 136 THEN 1 END) AS Ketteräume, - COUNT(CASE WHEN sr.ServiceDescriptionOid = 135 THEN 1 END) AS aufsuchend, + COUNT(CASE WHEN sr.ServiceDescriptionOid = 135 THEN 1 END) AS aufsuchend, COUNT(CASE WHEN sr.ServiceDescriptionOid = 125 THEN 1 END) AS Video, COUNT(CASE WHEN sr.ServiceDescriptionOid = 109 THEN 1 END) AS Telefonkontakt, COUNT(CASE WHEN sr.ServiceDescriptionOid = 112 THEN 1 END) AS Hilfeplangespräch, @@ -17,11 +17,13 @@ SELECT (COUNT(CASE WHEN sr.ServiceDescriptionOid = 135 THEN 1 END) / (COUNT(CASE WHEN sr.ServiceDescriptionOid = 136 THEN 1 END) + COUNT(CASE WHEN sr.ServiceDescriptionOid = 125 THEN 1 END))) AS 'aufsuchend / Ketteräume + Video' FROM servicerecord sr -JOIN costbearer2supportconcept cb2sc ON sr.CostBearer2SupportconceptOid = cb2sc.Oid -JOIN organisation org ON cb2sc.CostBearerOid = org.Oid +INNER JOIN costbearer2supportconcept cb2sc ON sr.CostBearer2SupportconceptOid = cb2sc.Oid +Inner Join costbearer cb ON cb.Oid = cb2sc.CostBearerOid +Right JOIN organisation org ON org.CostBearerOid = cb.Oid JOIN servicedescription sd ON sr.ServiceDescriptionOid = sd.Oid WHERE StartDate >= ':Jahr_Start' and EndDate <= ':Jahr_End' GROUP BY org.Name +HAVING COUNT(CASE WHEN sd.ServiceCategoryOid = 47 THEN 1 END) > 0 ORDER BY org.Name; -- SELECT * FROM `9383760246`.servicedescription where ServiceCategoryOid = 47; \ No newline at end of file