malawi_hiv_program_reports 1.0.17 → 1.0.20

data/app/services/malawi_hiv_program_reports/pepfar/tx_tb.rb

@@ -19,7 +19,9 @@ module MalawiHivProgramReports
       end
 
       def find_report
-        drop_temporary_tables
+        drop_temporary_tables unless @location
+        delete_patients_in_temp_table if @location
+
         create_temp_earliest_start_date unless temp_eartliest_start_date_exists?
         init_report
         build_cohort_tables
@@ -62,26 +64,55 @@ module MalawiHivProgramReports
         }
       end
 
+      def delete_patients_in_temp_table
+        if ActiveRecord::Base.connection.table_exists?('temp_tb_screened') 
+          execute_action("DELETE FROM temp_tb_screened WHERE site_id = #{@location}")
+        end 
+        if ActiveRecord::Base.connection.table_exists?('temp_tb_confirmed_and_on_treatment')
+          execute_action("DELETE FROM temp_tb_confirmed_and_on_treatment WHERE site_id = #{@location}")
+        end
+      end
+
       def drop_temporary_tables
-        execute_action('DROP TABLE IF EXISTS temp_tb_screened;')
-        execute_action('DROP TABLE IF EXISTS temp_tb_confirmed_and_on_treatment;')
+        execute_action("DROP TABLE IF EXISTS temp_tb_screened;")
+        execute_action("DROP TABLE IF EXISTS temp_tb_confirmed_and_on_treatment;")
       end
 
       def build_cohort_tables
         return unless rebuild_outcome || @occupation.present?
 
-        cohort_builder = MalawiHivProgramReports::Moh::CohortBuilder.new(outcomes_definition: 'pepfar',
-                                                                         location: @location)
-        cohort_builder.init_temporary_tables(start_date, end_date, @occupation)
+        cohort_builder = MalawiHivProgramReports::Moh::CumulativeCohort.new(
+          start_date: start_date,
+          end_date: end_date,
+          locations: [@location.to_s],
+          rebuild: rebuild_outcome
+        ).find_report
       end
 
       def process_tb_screening
         execute_action(create_temp_tb_screened_query)
+        execute_action(insert_temp_tb_screened_query)
+      end
+
+      def create_temp_tb_screened_query 
+        <<~SQL
+          CREATE TABLE IF NOT EXISTS temp_tb_screened(
+            patient_id INT(11) NOT NULL,
+            gender VARCHAR(255) NULL,
+            screened_date DATE NULL,
+            enrollment_date DATE NULL,
+            age_group VARCHAR(255) NULL,
+            tb_status VARCHAR(255) NULL,
+            screening_methods VARCHAR(255) DEFAULT NULL,
+            site_id INT(11) DEFAULT 1,
+            PRIMARY KEY (patient_id, site_id)
+          )
+        SQL
       end
 
-      def create_temp_tb_screened_query
+      def insert_temp_tb_screened_query
         <<~SQL
-          CREATE TABLE temp_tb_screened AS
+          INSERT INTO temp_tb_screened
           SELECT
             o.person_id as patient_id,
             LEFT(current_obs.gender, 1) AS gender, MAX(o.obs_datetime) AS screened_date,
@@ -89,18 +120,19 @@ module MalawiHivProgramReports
             disaggregated_age_group(current_obs.birthdate, DATE('#{end_date.to_date}')) AS age_group,
             cn.name AS tb_status,
             GROUP_CONCAT(DISTINCT vcn.name) AS screening_methods
-          FROM obs o
+            #{@location ? ", #{@location}" : 1} AS site_id
+          FROM obs #{current_partition} o
           INNER JOIN (
             SELECT o.person_id, MAX(o.obs_datetime) AS obs_datetime, tesd.earliest_start_date, tesd.gender, tesd.birthdate
-            FROM obs o
-            INNER JOIN temp_earliest_start_date tesd ON tesd.patient_id = o.person_id
+            FROM obs #{current_partition} o
+            INNER JOIN cdr_temp_cohort_members tesd ON tesd.patient_id = o.person_id
             WHERE o.concept_id = #{::ConceptName.find_by_name('TB status').concept_id}
             AND o.value_coded IN (SELECT concept_id FROM concept_name WHERE name IN ('TB Suspected', 'TB NOT suspected') AND voided = 0)
             AND o.voided = 0 AND o.obs_datetime BETWEEN '#{start_date}' AND '#{end_date}' #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
             GROUP BY o.person_id
           ) current_obs ON current_obs.person_id = o.person_id AND current_obs.obs_datetime = o.obs_datetime
           INNER JOIN concept_name cn ON cn.concept_id = o.value_coded AND cn.voided = 0
-          LEFT JOIN obs screen_method ON screen_method.concept_id = #{::ConceptName.find_by_name('TB screening method used').concept_id}
+          LEFT JOIN obs #{current_partition} screen_method ON screen_method.concept_id = #{::ConceptName.find_by_name('TB screening method used').concept_id}
             AND screen_method.voided = 0 #{site_manager(operator: 'AND', column: 'screen_method.site_id', location: @location)}
             AND screen_method.person_id = o.person_id#{' '}
             AND DATE(screen_method.obs_datetime) = DATE(current_obs.obs_datetime)
@@ -114,22 +146,42 @@ module MalawiHivProgramReports
       end
 
       def temp_eartliest_start_date_exists?
-        ActiveRecord::Base.connection.table_exists?('temp_earliest_start_date')
+        ActiveRecord::Base.connection.table_exists?('cdr_temp_cohort_members')
       end
 
       def create_temp_earliest_start_date
-        cohort_builder = MalawiHivProgramReports::Moh::CohortBuilder.new(outcomes_definition: 'pepfar',
-                                                                         location: @location)
-        cohort_builder.init_temporary_tables(start_date, end_date, @occupation)
+        MalawiHivProgramReports::Moh::CumulativeCohort.new(
+          start_date: start_date,
+          end_date: end_date,
+          locations: [@location],
+          rebuild: rebuild_outcome
+        ).find_report
       end
 
       def process_tb_confirmed_and_on_treatment
         execute_action(create_temp_tb_confirmed_query)
+        execute_action(insert_temp_tb_confirmed_query)
       end
 
       def create_temp_tb_confirmed_query
         <<~SQL
-          CREATE TABLE temp_tb_confirmed_and_on_treatment AS
+          CREATE TABLE IF NOT EXISTS temp_tb_confirmed_and_on_treatment(
+            patient_id INT(11) NOT NULL,
+            gender VARCHAR(255) NULL,
+            age_group VARCHAR(255) NOT NULL,
+            tb_confirmed_date DATE NULL,
+            has_tb_confirmed_date BOOLEAN NOT NULL,
+            enrollment_date DATE NULL,
+            prev_reading DATE,
+            site_id INT(11) DEFAULT 1,
+            PRIMARY KEY (patient_id, site_id)
+          )
+        SQL
+      end
+
+      def insert_temp_tb_confirmed_query
+        <<~SQL
+          INSERT INTO temp_tb_confirmed_and_on_treatment
           SELECT
             o.person_id as patient_id,
             LEFT(p.gender, 1) AS gender,
@@ -141,17 +193,18 @@ module MalawiHivProgramReports
             END AS has_tb_confirmed_date,
             tesd.earliest_start_date as enrollment_date,
             prev.tb_confirmed_date prev_reading
-          FROM obs o
-          INNER JOIN temp_earliest_start_date tesd ON tesd.patient_id = o.person_id #{site_manager(operator: 'AND', column: 'tesd.site_id', location: @location)}
-          INNER JOIN person p ON p.person_id = o.person_id AND p.voided = 0 #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
-          LEFT JOIN obs tcd ON tcd.concept_id = #{::ConceptName.find_by_name('TB treatment start date').concept_id}
+            #{@location ? ", #{@location}" : ''} AS site_id
+          FROM obs #{current_partition} o
+          INNER JOIN cdr_temp_cohort_members tesd ON tesd.patient_id = o.person_id #{site_manager(operator: 'AND', column: 'tesd.site_id', location: @location)}
+          INNER JOIN person #{current_partition} p ON p.person_id = o.person_id AND p.voided = 0 #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
+          LEFT JOIN obs #{current_partition} tcd ON tcd.concept_id = #{::ConceptName.find_by_name('TB treatment start date').concept_id}
           AND tcd.voided = 0 AND tcd.person_id = o.person_id #{site_manager(operator: 'AND', column: 'tcd.site_id', location: @location)}
           LEFT JOIN (
             SELECT
               o.person_id,
               COALESCE(MAX(tcd.value_datetime),MAX(o.obs_datetime)) AS tb_confirmed_date
-            FROM obs o
-            LEFT JOIN obs tcd ON tcd.concept_id = #{::ConceptName.find_by_name('TB treatment start date').concept_id}
+            FROM obs #{current_partition} o
+            LEFT JOIN obs #{current_partition} tcd ON tcd.concept_id = #{::ConceptName.find_by_name('TB treatment start date').concept_id}
               AND tcd.voided = 0 AND tcd.person_id = o.person_id #{site_manager(operator: 'AND', column: 'tcd.site_id', location: @location)}
             WHERE o.concept_id = #{::ConceptName.find_by_name('TB status').concept_id}
             AND o.value_coded = #{::ConceptName.find_by_name('Confirmed TB on treatment').concept_id}
@@ -182,8 +235,8 @@ module MalawiHivProgramReports
       def create_patients_alive_and_on_art_query
         <<~SQL
           SELECT tpo.patient_id, LEFT(tesd.gender, 1) AS gender, disaggregated_age_group(tesd.birthdate, DATE('#{end_date.to_date}')) age_group
-          FROM temp_patient_outcomes tpo
-          INNER JOIN temp_earliest_start_date tesd ON tesd.patient_id = tpo.patient_id #{site_manager(operator: 'AND', column: 'tesd.site_id', location: @location)}
+          FROM cdr_temp_patient_outcomes #{current_partition} tpo
+          INNER JOIN cdr_temp_cohort_members tesd ON tesd.patient_id = tpo.patient_id #{site_manager(operator: 'AND', column: 'tesd.site_id', location: @location)}
           WHERE tpo.cum_outcome = 'On antiretrovirals' #{site_manager(operator: 'AND', column: 'tpo.site_id', location: @location)}
         SQL
       end
@@ -269,6 +322,7 @@ module MalawiHivProgramReports
         <<~SQL
           SELECT tbs.patient_id, tbs.enrollment_date, LEFT(tbs.gender, 1) AS gender, tbs.age_group, tbs.tb_status, tbs.screened_date, tbs.screening_methods
           FROM temp_tb_screened tbs
+          #{site_manager(operator: 'WHERE', column: 'tbs.site_id', location: @location)}
         SQL
       end
 
@@ -277,6 +331,7 @@ module MalawiHivProgramReports
           SELECT t.patient_id, t.gender, t.age_group, t.enrollment_date, t.tb_confirmed_date
           FROM temp_tb_confirmed_and_on_treatment t
           WHERE t.tb_confirmed_date > '#{start_date}'
+          #{site_manager(operator: 'AND', column: 't.site_id', location: @location)}
           AND (t.has_tb_confirmed_date = TRUE OR t.prev_reading IS NULL OR TIMESTAMPDIFF(MONTH,t.prev_reading, t.tb_confirmed_date) > 6)
         SQL
       end

data/app/services/malawi_hiv_program_reports/pepfar/utils.rb

@@ -37,7 +37,7 @@ module MalawiHivProgramReports
       def pepfar_patient_drilldown_information(patients, current_date)
         raise ::ArgumentError, "current_date can't be nil" unless current_date
 
-        ::Person.joins("LEFT JOIN patient_identifier ON patient_identifier.patient_id = person.person_id
+        ::Person.joins("LEFT JOIN patient_identifier #{current_partition} ON patient_identifier.patient_id = person.person_id
                           AND patient_identifier.voided = 0
                           AND patient_identifier.identifier_type IN (#{pepfar_patient_identifier_type.to_sql})")
                 .where(person_id: patients)
@@ -96,22 +96,22 @@ module MalawiHivProgramReports
 
         ActiveRecord::Base.connection.select_all("
             SELECT p.person_id patient_id
-            FROM person p
-            INNER JOIN patient_program pp ON pp.patient_id = p.person_id AND pp.program_id = #{::Program.find_by_name('HIV PROGRAM').id} AND pp.voided = 0
+            FROM person #{current_partition} p
+            INNER JOIN patient_program #{current_partition} pp ON pp.patient_id = p.person_id AND pp.program_id = #{::Program.find_by_name('HIV PROGRAM').id} AND pp.voided = 0
             #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
-            INNER JOIN patient_state ps ON ps.patient_program_id = pp.patient_program_id AND ps.state = 7 AND ps.start_date IS NOT NULL
+            INNER JOIN patient_state #{current_partition} ps ON ps.patient_program_id = pp.patient_program_id AND ps.state = 7 AND ps.start_date IS NOT NULL
             #{site_manager(operator: 'AND', column: 'ps.site_id', location: @location)}
-            LEFT JOIN encounter as hiv_registration ON hiv_registration.patient_id = p.person_id AND hiv_registration.encounter_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) AND hiv_registration.encounter_type = #{hiv_clinic_registration_id} AND hiv_registration.voided = 0
+            LEFT JOIN encounter #{current_partition} as hiv_registration ON hiv_registration.patient_id = p.person_id AND hiv_registration.encounter_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) AND hiv_registration.encounter_type = #{hiv_clinic_registration_id} AND hiv_registration.voided = 0
             #{site_manager(operator: 'AND', column: 'hiv_registration.site_id', location: @location)}
             LEFT JOIN (
-              SELECT * FROM obs WHERE concept_id = #{type_of_patient_concept} AND voided = 0 AND value_coded = #{new_patient_concept} AND obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY', operator: '+')}
+              SELECT * FROM obs #{current_partition} WHERE concept_id = #{type_of_patient_concept} AND voided = 0 AND value_coded = #{new_patient_concept} AND obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY', operator: '+')}
             #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
             ) AS new_patient ON p.person_id = new_patient.person_id
             LEFT JOIN (
-              SELECT * FROM obs WHERE concept_id = #{type_of_patient_concept} AND voided = 0 AND value_coded = #{drug_refill_concept} AND obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY', operator: '+')} #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
+              SELECT * FROM obs #{current_partition} WHERE concept_id = #{type_of_patient_concept} AND voided = 0 AND value_coded = #{drug_refill_concept} AND obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY', operator: '+')} #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
               ) AS refill ON p.person_id = refill.person_id
             LEFT JOIN (
-              SELECT * FROM obs WHERE concept_id = #{type_of_patient_concept} AND voided = 0 AND value_coded = #{external_concept} AND obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY', operator: '+')} #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
+              SELECT * FROM obs #{current_partition} WHERE concept_id = #{type_of_patient_concept} AND voided = 0 AND value_coded = #{external_concept} AND obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY', operator: '+')} #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
               ) AS external ON p.person_id = external.person_id
             WHERE (refill.value_coded IS NOT NULL OR external.value_coded IS NOT NULL)
             AND NOT (hiv_registration.encounter_id IS NOT NULL OR new_patient.value_coded IS NOT NULL)

data/app/services/malawi_hiv_program_reports/pepfar/viral_load_coverage2.rb

@@ -124,15 +124,15 @@ module MalawiHivProgramReports
       def pregnant_women(patient_list)
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT o.person_id, o.value_coded
-          FROM obs o
-          INNER JOIN encounter e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.encounter_type IN (#{encounter_types.to_sql})
+          FROM obs #{current_partition} o
+          INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.encounter_type IN (#{encounter_types.to_sql})
           #{site_manager(operator: 'AND', column: 'e.site_id', location: @location)}
-          INNER JOIN person p ON o.person_id = e.patient_id AND LEFT(p.gender, 1) = 'F'
+          INNER JOIN person #{current_partition} p ON o.person_id = e.patient_id AND LEFT(p.gender, 1) = 'F'
           #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
           INNER JOIN (
             SELECT person_id, MAX(obs_datetime) AS obs_datetime
-            FROM obs
-            INNER JOIN encounter ON encounter.encounter_id = obs.encounter_id AND encounter.encounter_type IN (#{encounter_types.to_sql}) AND encounter.voided = 0
+            FROM obs #{current_partition}
+            INNER JOIN encounter #{current_partition} ON encounter.encounter_id = obs.encounter_id AND encounter.encounter_type IN (#{encounter_types.to_sql}) AND encounter.voided = 0
             #{site_manager(operator: 'AND', column: 'encounter.site_id', location: @location)}
             WHERE obs.concept_id IN (#{pregnant_concepts.to_sql})
               AND obs.obs_datetime BETWEEN DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
@@ -153,15 +153,15 @@ module MalawiHivProgramReports
       def breast_feeding(patient_list)
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT o.person_id, o.value_coded
-          FROM obs o
-          INNER JOIN encounter e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.encounter_type IN (#{encounter_types.to_sql})
+          FROM obs #{current_partition} o
+          INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.encounter_type IN (#{encounter_types.to_sql})
           #{site_manager(operator: 'AND', column: 'e.site_id', location: @location)}
-          INNER JOIN person p ON o.person_id = e.patient_id AND LEFT(p.gender, 1) = 'F'
+          INNER JOIN person #{current_partition} p ON o.person_id = e.patient_id AND LEFT(p.gender, 1) = 'F'
           #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
           INNER JOIN (
             SELECT person_id, MAX(obs_datetime) AS obs_datetime
-            FROM obs
-            INNER JOIN encounter ON encounter.encounter_id = obs.encounter_id AND encounter.encounter_type IN (#{encounter_types.to_sql}) AND encounter.voided = 0
+            FROM obs #{current_partition}
+            INNER JOIN encounter #{current_partition} ON encounter.encounter_id = obs.encounter_id AND encounter.encounter_type IN (#{encounter_types.to_sql}) AND encounter.voided = 0
             #{site_manager(operator: 'AND', column: 'encounter.site_id', location: @location)}
             WHERE obs.concept_id IN (#{breast_feeding_concepts.to_sql})
               AND obs.obs_datetime BETWEEN DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
@@ -198,8 +198,8 @@ module MalawiHivProgramReports
         ActiveRecord::Base.connection.select_all(
           <<~SQL
             SELECT tpo.patient_id, LEFT(tesd.gender, 1) AS gender, disaggregated_age_group(tesd.birthdate, DATE('#{end_date.to_date}')) age_group
-            FROM temp_patient_outcomes tpo
-            INNER JOIN temp_earliest_start_date tesd ON tesd.patient_id = tpo.patient_id
+            FROM temp_patient_outcomes #{current_partition} tpo
+            INNER JOIN temp_earliest_start_date #{current_partition} tesd ON tesd.patient_id = tpo.patient_id
             WHERE tpo.cum_outcome = 'On antiretrovirals'
           SQL
         )
@@ -267,10 +267,10 @@ module MalawiHivProgramReports
         @adverse_outcomes ||= ActiveRecord::Base.connection.select_all(
           <<~SQL
             SELECT pws.program_workflow_state_id state
-            FROM program_workflow pw
-            INNER JOIN concept_name pcn ON pcn.concept_id = pw.concept_id AND pcn.concept_name_type = 'FULLY_SPECIFIED' AND pcn.voided = 0
-            INNER JOIN program_workflow_state pws ON pws.program_workflow_id = pw.program_workflow_id AND pws.retired = 0
-            INNER JOIN concept_name cn ON cn.concept_id = pws.concept_id AND cn.concept_name_type = 'FULLY_SPECIFIED' AND cn.voided = 0
+            FROM program_workflow #{current_partition} pw
+            INNER JOIN concept_name #{current_partition} pcn ON pcn.concept_id = pw.concept_id AND pcn.concept_name_type = 'FULLY_SPECIFIED' AND pcn.voided = 0
+            INNER JOIN program_workflow_state #{current_partition} pws ON pws.program_workflow_id = pw.program_workflow_id AND pws.retired = 0
+            INNER JOIN concept_name #{current_partition} cn ON cn.concept_id = pws.concept_id AND cn.concept_name_type = 'FULLY_SPECIFIED' AND cn.voided = 0
             WHERE pw.program_id = 1 AND pw.retired = 0 AND pws.terminal = 1
           SQL
         ).map { |state| state['state'] }
@@ -287,18 +287,18 @@ module MalawiHivProgramReports
             current_state.state,
             current_state.start_date outcome_date,
             current_order.start_date vl_order_date
-          FROM orders ab
-          INNER JOIN person p ON p.person_id = ab.patient_id AND p.voided = 0
+          FROM orders #{current_partition} ab
+          INNER JOIN person #{current_partition} p ON p.person_id = ab.patient_id AND p.voided = 0
           #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
-          INNER JOIN drug_order dor ON dor.order_id = ab.order_id AND dor.quantity > 0
+          INNER JOIN drug_order #{current_partition} dor ON dor.order_id = ab.order_id AND dor.quantity > 0
           #{site_manager(operator: 'AND', column: 'dor.site_id', location: @location)}
-          INNER JOIN arv_drug ad ON dor.drug_inventory_id = ad.drug_id
-          INNER JOIN patient_program pp ON pp.patient_id = ab.patient_id AND pp.voided = 0 AND pp.program_id = 1
+          INNER JOIN arv_drug #{current_partition} ad ON dor.drug_inventory_id = ad.drug_id
+          INNER JOIN patient_program #{current_partition} pp ON pp.patient_id = ab.patient_id AND pp.voided = 0 AND pp.program_id = 1
           #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
           INNER JOIN (
             SELECT a.site_id, a.patient_program_id, a.state, a.start_date, a.end_date
-            FROM patient_state a
-            LEFT OUTER JOIN patient_state b ON a.patient_program_id = b.patient_program_id
+            FROM patient_state #{current_partition} a
+            LEFT OUTER JOIN patient_state #{current_partition} b ON a.patient_program_id = b.patient_program_id
             #{site_manager(operator: 'AND', column: 'b.site_id', location: @location)}
             AND a.start_date < b.start_date
             #{site_manager(operator: 'AND', column: 'a.site_id', location: @location)}
@@ -306,24 +306,24 @@ module MalawiHivProgramReports
             WHERE b.patient_program_id IS NULL AND a.end_date IS NULL AND a.voided = 0
           ) current_state ON current_state.patient_program_id = pp.patient_program_id
           #{site_manager(operator: 'AND', column: 'current_state.site_id', location: @location)}
-          LEFT OUTER JOIN orders b ON ab.patient_id = b.patient_id
+          LEFT OUTER JOIN orders #{current_partition} b ON ab.patient_id = b.patient_id
             AND ab.order_id = b.order_id
             AND ab.auto_expire_date < b.auto_expire_date
             AND b.voided = 0 AND b.order_type_id = 1
             #{site_manager(operator: 'AND', column: 'b.site_id', location: @location)}
           LEFT JOIN (#{current_occupation_query}) a ON a.person_id = ab.patient_id
           #{site_manager(operator: 'AND', column: 'a.site_id', location: @location)}
-          LEFT JOIN patient_identifier pid ON pid.patient_id = pp.patient_id AND pid.identifier_type IN (#{pepfar_patient_identifier_type.to_sql}) AND pid.voided = 0
+          LEFT JOIN patient_identifier #{current_partition} pid ON pid.patient_id = pp.patient_id AND pid.identifier_type IN (#{pepfar_patient_identifier_type.to_sql}) AND pid.voided = 0
           #{site_manager(operator: 'AND', column: 'pid.site_id', location: @location)}
           LEFT JOIN (
             SELECT ab.patient_id, MAX(ab.start_date) start_date
-            FROM orders ab
-            INNER JOIN concept_name
+            FROM orders #{current_partition} ab
+            INNER JOIN concept_name #{current_partition}
               ON concept_name.concept_id = ab.concept_id
               AND concept_name.name IN ('Blood', 'DBS (Free drop to DBS card)', 'DBS (Using capillary tube)', '50:50 Normal Plasma')
               AND concept_name.voided = 0
               #{site_manager(operator: 'AND', column: 'ab.site_id', location: @location)}
-            LEFT OUTER JOIN orders b ON ab.patient_id = b.patient_id
+            LEFT OUTER JOIN orders #{current_partition} b ON ab.patient_id = b.patient_id
             AND ab.order_id = b.order_id
             AND ab.start_date < b.start_date
             AND b.voided = 0
@@ -364,40 +364,40 @@ module MalawiHivProgramReports
                  COALESCE(reason_for_test_value.name, reason_for_test.value_text) AS reason_for_test,
                  result.value_modifier AS result_modifier,
                  COALESCE(result.value_numeric, result.value_text) AS result_value
-          FROM orders
-          INNER JOIN person patient ON patient.person_id = orders.patient_id AND patient.voided = 0
+          FROM orders #{current_partition}
+          INNER JOIN person #{current_partition} patient ON patient.person_id = orders.patient_id AND patient.voided = 0
           #{site_manager(operator: 'AND', column: 'patient.site_id', location: @location)}
-          INNER JOIN order_type
+          INNER JOIN order_type #{current_partition}
             ON order_type.order_type_id = orders.order_type_id
             AND order_type.name = 'Lab'
             AND order_type.retired = 0
-          INNER JOIN concept_name
+          INNER JOIN concept_name #{current_partition}
             ON concept_name.concept_id = orders.concept_id
             AND concept_name.name IN ('Blood', 'DBS (Free drop to DBS card)', 'DBS (Using capillary tube)', 'Plasma')
             AND concept_name.voided = 0
-          LEFT JOIN obs AS reason_for_test
+          LEFT JOIN obs #{current_partition} AS reason_for_test
             ON reason_for_test.order_id = orders.order_id
-            AND reason_for_test.concept_id IN (SELECT concept_id FROM concept_name WHERE name LIKE 'Reason for test' AND voided = 0)
+            AND reason_for_test.concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name LIKE 'Reason for test' AND voided = 0)
             AND reason_for_test.voided = 0
             #{site_manager(operator: 'AND', column: 'reason_for_test.site_id', location: @location)}
-          LEFT JOIN concept_name AS reason_for_test_value
+          LEFT JOIN concept_name #{current_partition} AS reason_for_test_value
             ON reason_for_test_value.concept_id = reason_for_test.value_coded
             AND reason_for_test_value.voided = 0
-          LEFT JOIN obs AS result
+          LEFT JOIN obs #{current_partition} AS result
             ON result.order_id = orders.order_id
-            AND result.concept_id IN (SELECT concept_id FROM concept_name WHERE name LIKE 'HIV Viral load' AND voided = 0)
+            AND result.concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name LIKE 'HIV Viral load' AND voided = 0)
             AND result.voided = 0
             AND (result.value_text IS NOT NULL OR result.value_numeric IS NOT NULL)
             #{site_manager(operator: 'AND', column: 'result.site_id', location: @location)}
           INNER JOIN (
             /* Get the latest order dates for each patient */
             SELECT orders.patient_id, MAX(orders.start_date) AS start_date
-            FROM orders
-            INNER JOIN order_type
+            FROM orders #{current_partition}
+            INNER JOIN order_type #{current_partition}
               ON order_type.order_type_id = orders.order_type_id
               AND order_type.name = 'Lab'
               AND order_type.retired = 0
-            INNER JOIN concept_name
+            INNER JOIN concept_name #{current_partition}
               ON concept_name.concept_id = orders.concept_id
               AND concept_name.name IN ('Blood', 'DBS (Free drop to DBS card)', 'DBS (Using capillary tube)', 'Plasma')
               AND concept_name.voided = 0
@@ -409,7 +409,7 @@ module MalawiHivProgramReports
           ) AS latest_patient_order_date
             ON latest_patient_order_date.patient_id = orders.patient_id
             AND latest_patient_order_date.start_date = orders.start_date
-          LEFT JOIN patient_identifier
+          LEFT JOIN patient_identifier #{current_partition}
             ON patient_identifier.patient_id = orders.patient_id
             AND patient_identifier.identifier_type IN (#{pepfar_patient_identifier_type.to_sql})
             AND patient_identifier.voided = 0

data/lib/malawi_hiv_program_reports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MalawiHivProgramReports
-  VERSION = '1.0.17'
+  VERSION = '1.0.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.20
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Malawi HIV PROGRAM Reports for Ruby on Rails