Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include archived HES tables in report #218

Merged
merged 3 commits into from
Feb 26, 2025
Merged

Include archived HES tables in report #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
764b247
Include archived HES tables in report
inglesp Feb 26, 2025
0aa0588
Update T1OO checks for new table name
inglesp Feb 26, 2025
72383bc
Ignore false positives from sqlfluff
inglesp Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 51 additions & 12 deletions analysis/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ FROM CodedEvent
WHERE
CONVERT(DATE, ConsultationDate) >= @from_date
AND CONVERT(DATE, ConsultationDate) <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY CONVERT(DATE, ConsultationDate)

UNION ALL
Expand All @@ -25,7 +25,7 @@ FROM Appointment
WHERE
CONVERT(DATE, SeenDate) >= @from_date
AND CONVERT(DATE, SeenDate) <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY CONVERT(DATE, SeenDate)

UNION ALL
Expand All @@ -38,7 +38,20 @@ FROM APCS
WHERE
Admission_Date >= @from_date
AND Admission_Date <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Admission_Date

UNION ALL

SELECT
'APCS_ARCHIVED' AS table_name,
Admission_Date AS event_date,
COUNT(*) AS event_count
FROM APCS_ARCHIVED
WHERE
Admission_Date >= @from_date
AND Admission_Date <= @to_date
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Admission_Date

UNION ALL
Expand All @@ -51,7 +64,7 @@ FROM CPNS
WHERE
DateOfDeath >= @from_date
AND DateOfDeath <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY DateOfDeath

UNION ALL
Expand All @@ -64,7 +77,20 @@ FROM EC
WHERE
Arrival_Date >= @from_date
AND Arrival_Date <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Arrival_Date

UNION ALL

SELECT
'EC_ARCHIVED' AS table_name,
Arrival_Date AS event_date,
COUNT(*) AS event_count
FROM EC_ARCHIVED
WHERE
Arrival_Date >= @from_date
AND Arrival_Date <= @to_date
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Arrival_Date

UNION ALL
Expand All @@ -77,7 +103,20 @@ FROM OPA
WHERE
Appointment_Date >= @from_date
AND Appointment_Date <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Appointment_Date

UNION ALL

SELECT
'OPA_ARCHIVED' AS table_name,
Appointment_Date AS event_date,
COUNT(*) AS event_count
FROM OPA_ARCHIVED
WHERE
Appointment_Date >= @from_date
AND Appointment_Date <= @to_date
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Appointment_Date

UNION ALL
Expand All @@ -90,7 +129,7 @@ FROM ICNARC
WHERE
CONVERT(DATE, IcuAdmissionDateTime) >= @from_date
AND CONVERT(DATE, IcuAdmissionDateTime) <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY CONVERT(DATE, IcuAdmissionDateTime)

UNION ALL
Expand All @@ -103,7 +142,7 @@ FROM ONS_Deaths
WHERE
dod >= @from_date
AND dod <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY dod

UNION ALL
Expand All @@ -116,7 +155,7 @@ FROM SGSS_Positive
WHERE
Earliest_Specimen_Date >= @from_date
AND Earliest_Specimen_Date <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Earliest_Specimen_Date

UNION ALL
Expand All @@ -129,7 +168,7 @@ FROM SGSS_Negative
WHERE
Earliest_Specimen_Date >= @from_date
AND Earliest_Specimen_Date <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Earliest_Specimen_Date

UNION ALL
Expand All @@ -142,7 +181,7 @@ FROM SGSS_AllTests_Positive
WHERE
Specimen_Date >= @from_date
AND Specimen_Date <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Specimen_Date

UNION ALL
Expand All @@ -155,7 +194,7 @@ FROM SGSS_AllTests_Negative
WHERE
Specimen_Date >= @from_date
AND Specimen_Date <= @to_date
AND Patient_ID IN (SELECT Patient_ID FROM AllowedPatientsWithTypeOneDissent)
AND Patient_ID NOT IN (SELECT Patient_ID FROM PatientsWithTypeOneDissent)
GROUP BY Specimen_Date

ORDER BY table_name, event_date, event_count
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ skip_glob = [".direnv", "venv", ".venv"]

[tool.sqlfluff.core]
dialect = "tsql"
exclude_rules = "CP02"
exclude_rules = ["CP02", "RF02"]