From 58eee3dcb1309f3ff91f254e20f06a113c7aa643 Mon Sep 17 00:00:00 2001 From: viv3ckj Date: Mon, 27 Jan 2025 12:59:58 +0000 Subject: [PATCH] Add has_pf_consultation constraint to denominators of scripts --- analysis/measures_definition_pf_breakdown.py | 5 ++++- analysis/measures_definition_pf_consultation_med_counts.py | 4 ++-- analysis/measures_definition_pf_medications.py | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/analysis/measures_definition_pf_breakdown.py b/analysis/measures_definition_pf_breakdown.py index 551abcc..4ccb2c3 100644 --- a/analysis/measures_definition_pf_breakdown.py +++ b/analysis/measures_definition_pf_breakdown.py @@ -75,8 +75,11 @@ "ethnicity": ethnicity_combined, } +pf_consultation_events = select_events(selected_events, codelist=pf_consultation_events_dict["pf_consultation_services_combined"]) +has_pf_consultation = pf_consultation_events.exists_for_patient() + # Define the denominator as the number of patients registered -denominator = registration.exists_for_patient() & patients.sex.is_in(["male", "female"]) +denominator = registration.exists_for_patient() & patients.sex.is_in(["male", "female"]) & has_pf_consultation # Create measures for pharmacy first services for pharmacy_first_event, codelist in pf_consultation_events_dict.items(): diff --git a/analysis/measures_definition_pf_consultation_med_counts.py b/analysis/measures_definition_pf_consultation_med_counts.py index 5962fa6..8074076 100644 --- a/analysis/measures_definition_pf_consultation_med_counts.py +++ b/analysis/measures_definition_pf_consultation_med_counts.py @@ -34,7 +34,7 @@ ) pharmacy_first_ids = pharmacy_first_events.consultation_id -has_pharmacy_first_consultation = pharmacy_first_events.exists_for_patient() +has_pf_consultation = pharmacy_first_events.exists_for_patient() # Select Pharmacy First consultations during interval date range selected_medications = select_events( @@ -57,7 +57,7 @@ denominator = ( registration.exists_for_patient() & patients.sex.is_in(["male", "female"]) - & has_pharmacy_first_consultation + & has_pf_consultation ) measures.define_measure( diff --git a/analysis/measures_definition_pf_medications.py b/analysis/measures_definition_pf_medications.py index 97b8fc9..e46e0be 100644 --- a/analysis/measures_definition_pf_medications.py +++ b/analysis/measures_definition_pf_medications.py @@ -25,7 +25,7 @@ ) pharmacy_first_ids = pharmacy_first_events.consultation_id -has_pharmacy_first_consultation = pharmacy_first_events.exists_for_patient() +has_pf_consultation = pharmacy_first_events.exists_for_patient() # Select medications prescribed with PF consultation ID selected_medications = select_events(medications, start_date=INTERVAL.start_date, end_date=INTERVAL.end_date).where( @@ -51,6 +51,7 @@ registration.exists_for_patient() & patients.sex.is_in(["male", "female"]) & has_pharmacy_first_medication + & has_pf_consultation ) measures.define_measure(