malawi_hiv_program_reports 1.0.17 → 1.0.19

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

@@ -99,37 +99,37 @@ module MalawiHivProgramReports
                  person.birthdate,
                  disaggregated_age_group(person.birthdate, DATE(#{end_date})) AS age_group,
                  GROUP_CONCAT(DISTINCT orders.concept_id SEPARATOR ',') AS drug_concepts
-          FROM person
-          LEFT JOIN patient_identifier
+          FROM person #{current_partition}
+          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 (SELECT patient_identifier_type_id FROM patient_identifier_type WHERE name = 'ARV Number')
-          INNER JOIN patient_program
+            AND patient_identifier.identifier_type IN (SELECT patient_identifier_type_id FROM patient_identifier_type #{current_partition} WHERE name = 'ARV Number')
+          INNER JOIN patient_program #{current_partition}
             ON patient_program.patient_id = person.person_id
-            AND patient_program.program_id IN (SELECT program_id FROM program WHERE name = 'HIV PROGRAM')
+            AND patient_program.program_id IN (SELECT program_id FROM program #{current_partition} WHERE name = 'HIV PROGRAM')
             AND patient_program.voided = 0
-          INNER JOIN patient_state
+          INNER JOIN patient_state #{current_partition}
             ON patient_state.patient_program_id = patient_program.patient_program_id
             AND patient_state.state = 7 /* State: 7 == On antiretrovirals */
             AND patient_state.start_date < DATE(#{start_date})
             AND patient_state.voided = 0
-          INNER JOIN encounter AS prescription_encounter
+          INNER JOIN encounter #{current_partition} AS prescription_encounter
             ON prescription_encounter.patient_id = patient_program.patient_id
-            AND prescription_encounter.program_id IN (SELECT program_id FROM program WHERE name = 'HIV PROGRAM')
+            AND prescription_encounter.program_id IN (SELECT program_id FROM program #{current_partition} WHERE name = 'HIV PROGRAM')
             AND prescription_encounter.encounter_type IN (SELECT encounter_type_id FROM encounter_type WHERE name = 'Treatment')
             AND prescription_encounter.encounter_datetime >= DATE(#{start_date}) - INTERVAL 6 MONTH
             AND prescription_encounter.encounter_datetime < DATE(#{start_date})
             AND prescription_encounter.voided = 0
-          INNER JOIN orders
+          INNER JOIN orders #{current_partition}
             ON orders.encounter_id = prescription_encounter.encounter_id
-            AND orders.order_type_id IN (SELECT order_type_id FROM order_type WHERE name = 'Drug order')
+            AND orders.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
             AND orders.start_date >= DATE(#{start_date}) - INTERVAL 6 MONTH
             AND orders.start_date < DATE(#{start_date})
             AND orders.voided = 0
-          INNER JOIN concept_name
+          INNER JOIN concept_name #{current_partition}
             ON concept_name.concept_id = orders.concept_id
             AND concept_name.name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')
-          INNER JOIN drug_order
+          INNER JOIN drug_order #{current_partition}
             ON drug_order.order_id = orders.order_id
             AND drug_order.quantity > 0
           WHERE person.voided = 0
@@ -139,39 +139,39 @@ module MalawiHivProgramReports
                  are classified as new on TPT.
                */
               SELECT DISTINCT encounter.patient_id
-              FROM encounter
-              INNER JOIN orders
+              FROM encounter #{current_partition}
+              INNER JOIN orders #{current_partition}
                 ON orders.encounter_id = encounter.encounter_id
-                AND orders.concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Rifapentine', 'Isoniazid') AND voided = 0)
-                AND orders.order_type_id IN (SELECT order_type_id FROM order_type WHERE name = 'Drug order')
+                AND orders.concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Rifapentine', 'Isoniazid') AND voided = 0)
+                AND orders.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
                 AND orders.start_date < DATE(#{start_date}) - INTERVAL 6 MONTH
                 AND orders.start_date >= DATE(#{start_date}) - INTERVAL 15 MONTH
                 AND orders.voided = 0
-              INNER JOIN drug_order
+              INNER JOIN drug_order #{current_partition}
                 ON drug_order.order_id = orders.order_id
                 AND drug_order.quantity > 0
-              WHERE encounter.program_id IN (SELECT program_id FROM program WHERE name = 'HIV PROGRAM')
-                AND encounter.encounter_type IN (SELECT encounter_type_id FROM encounter_type WHERE name = 'Treatment')
+              WHERE encounter.program_id IN (SELECT program_id FROM program #{current_partition} WHERE name = 'HIV PROGRAM')
+                AND encounter.encounter_type IN (SELECT encounter_type_id FROM WHERE name = 'Treatment')
                 AND encounter.encounter_datetime < DATE(#{start_date}) - INTERVAL 6 MONTH
                 AND encounter.encounter_datetime >= DATE(#{start_date}) - INTERVAL 15 MONTH
                 AND encounter.voided = 0
             ) AND person.person_id NOT IN (
             /* External consultations */
             SELECT DISTINCT registration_encounter.patient_id
-            FROM patient_program
-            INNER JOIN program ON program.name = 'HIV PROGRAM'
-            INNER JOIN encounter AS registration_encounter
+            FROM patient_program #{current_partition}
+            INNER JOIN program #{current_partition} ON program.name = 'HIV PROGRAM'
+            INNER JOIN encounter #{current_partition} AS registration_encounter
               ON registration_encounter.patient_id = patient_program.patient_id
               AND registration_encounter.program_id = patient_program.program_id
               AND registration_encounter.encounter_datetime < DATE(#{end_date}) + INTERVAL 1 DAY
               AND registration_encounter.voided = 0
             INNER JOIN (
               SELECT MAX(encounter.encounter_datetime) AS encounter_datetime, encounter.patient_id
-              FROM encounter
+              FROM encounter #{current_partition}
               INNER JOIN encounter_type
                 ON encounter_type.encounter_type_id = encounter.encounter_type
                 AND encounter_type.name = 'Registration'
-              INNER JOIN program
+              INNER JOIN program #{current_partition}
                 ON program.program_id = encounter.program_id
                 AND program.name = 'HIV PROGRAM'
               WHERE encounter.encounter_datetime < DATE(#{end_date}) AND encounter.voided = 0
@@ -179,10 +179,10 @@ module MalawiHivProgramReports
             ) AS max_registration_encounter
               ON max_registration_encounter.patient_id = registration_encounter.patient_id
               AND max_registration_encounter.encounter_datetime = registration_encounter.encounter_datetime
-            INNER JOIN obs AS patient_type_obs
+            INNER JOIN obs #{current_partition} AS patient_type_obs
               ON patient_type_obs.encounter_id = registration_encounter.encounter_id
-              AND patient_type_obs.concept_id IN (SELECT concept_id FROM concept_name WHERE name = 'Type of patient' AND voided = 0)
-              AND patient_type_obs.value_coded IN (SELECT concept_id FROM concept_name WHERE name IN ('Drug refill', 'External consultation') AND voided = 0)
+              AND patient_type_obs.concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name = 'Type of patient' AND voided = 0)
+              AND patient_type_obs.value_coded IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Drug refill', 'External consultation') AND voided = 0)
               AND patient_type_obs.voided = 0
             WHERE patient_program.voided = 0
           )

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

@@ -129,29 +129,29 @@ module MalawiHivProgramReports
                  person.gender,
                  person.birthdate,
                  #{function_manager(function: 'disaggregated_age_group', location: @location, args: "person.birthdate::date, #{@end_date}::date")} AS age_group
-          FROM person
-          LEFT JOIN patient_identifier
+          FROM person #{current_partition}
+          LEFT JOIN patient_identifier #{current_partition}
             ON patient_identifier.patient_id = person.person_id
             AND patient_identifier.voided = 0
-            AND #{in_manager(column: 'patient_identifier.identifier_type', values: "(SELECT patient_identifier_type_id FROM patient_identifier_type WHERE name = 'ARV Number')")}
+            AND #{in_manager(column: 'patient_identifier.identifier_type', values: "(SELECT patient_identifier_type_id FROM patient_identifier_type #{current_partition} WHERE name = 'ARV Number')")}
             #{site_manager(operator: 'AND', column: 'patient_identifier.site_id', location: @location)}
           LEFT JOIN (#{current_occupation_query}) AS current_occupation ON current_occupation.person_id = person.person_id
           #{site_manager(operator: 'AND', column: 'current_occupation.site_id', location: @location)}
           INNER JOIN(
               SELECT denominator_encounter.patient_id AS patient_id, patient_state.start_date AS start_date
-              FROM person
-              INNER JOIN patient_program
+              FROM person #{current_partition}
+              INNER JOIN patient_program #{current_partition}
                 ON patient_program.patient_id = person.person_id
-                AND #{in_manager(column: 'patient_program.program_id', values: "(SELECT program_id FROM program WHERE name = 'HIV PROGRAM')")}
+                AND #{in_manager(column: 'patient_program.program_id', values: "(SELECT program_id FROM program #{current_partition} WHERE name = 'HIV PROGRAM')")}
                 AND patient_program.voided = 0
-              INNER JOIN patient_state
+              INNER JOIN patient_state #{current_partition}
                 ON patient_state.patient_program_id = patient_program.patient_program_id
                 AND patient_state.state = 7 /* State: 7 == On antiretrovirals */
                 AND patient_state.start_date < DATE(#{start_date})
                 AND patient_state.voided = 0
-              INNER JOIN encounter AS denominator_encounter
+              INNER JOIN encounter #{current_partition} AS denominator_encounter
                 ON denominator_encounter.patient_id = patient_program.patient_id
-                AND #{in_manager(column: 'denominator_encounter.program_id', values: "(SELECT program_id FROM program WHERE name = 'HIV PROGRAM')")}
+                AND #{in_manager(column: 'denominator_encounter.program_id', values: "(SELECT program_id FROM program #{current_partition} WHERE name = 'HIV PROGRAM')")}
                 AND #{in_manager(column: 'denominator_encounter.encounter_type', values: "(SELECT encounter_type_id FROM encounter_type WHERE name = 'Treatment')")}
                 AND denominator_encounter.encounter_datetime >= #{interval_manager(date: start_date, value: 6, interval: 'MONTH', operator: '-')}
                 AND denominator_encounter.encounter_datetime <= DATE(#{start_date})
@@ -159,23 +159,23 @@ module MalawiHivProgramReports
                  #{site_manager(operator: 'AND', column: 'patient_program.site_id', location: @location)}
               GROUP BY denominator_encounter.patient_id, patient_state.start_date
           ) AS denominator_patient ON denominator_patient.patient_id = person.person_id
-          INNER JOIN encounter AS prescription_encounter
+          INNER JOIN encounter #{current_partition} AS prescription_encounter
             ON prescription_encounter.patient_id = denominator_patient.patient_id
             AND prescription_encounter.program_id = 1
             AND #{in_manager(column: 'prescription_encounter.encounter_type', values: "(SELECT encounter_type_id FROM encounter_type WHERE name = 'Treatment')")}
             AND prescription_encounter.encounter_datetime >= #{interval_manager(date: start_date, value: 6, interval: 'MONTH', operator: '-')}
             AND prescription_encounter.encounter_datetime <= DATE(#{end_date})
             AND prescription_encounter.voided = 0
-          INNER JOIN orders
+          INNER JOIN orders #{current_partition}
             ON orders.encounter_id = prescription_encounter.encounter_id
-            AND #{in_manager(column: 'orders.order_type_id', values: "(SELECT order_type_id FROM order_type WHERE name = 'Drug order')")}
+            AND #{in_manager(column: 'orders.order_type_id', values: "(SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')")}
             AND orders.start_date >= #{interval_manager(date: start_date, value: 6, interval: 'MONTH', operator: '-')}
             AND orders.start_date <= CAST(#{end_date} as DATE)
             AND orders.voided = 0
-          INNER JOIN concept_name
+          INNER JOIN concept_name #{current_partition}
             ON concept_name.concept_id = orders.concept_id
             AND #{in_manager(column: 'concept_name.name', values: "'Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine'" )}
-          INNER JOIN drug_order
+          INNER JOIN drug_order #{current_partition}
             ON drug_order.order_id = orders.order_id
             AND drug_order.quantity > 0
           WHERE person.voided = 0 #{%w[Military Civilian].include?(@occupation) ? 'AND' : ''} #{occupation_filter(occupation: @occupation, field_name: 'value', table_name: 'current_occupation', include_clause: false)}
@@ -183,20 +183,20 @@ module MalawiHivProgramReports
             AND person.person_id NOT IN (
             /* External consultations */
             SELECT DISTINCT registration_encounter.patient_id
-            FROM patient_program pp
-            INNER JOIN program p ON p.program_id = pp.program_id AND p.name = 'HIV PROGRAM' AND p.retired = 0
-            INNER JOIN encounter AS registration_encounter
+            FROM patient_program #{current_partition} pp
+            INNER JOIN program #{current_partition} p ON p.program_id = pp.program_id AND p.name = 'HIV PROGRAM' AND p.retired = 0
+            INNER JOIN encounter #{current_partition} AS registration_encounter
               ON registration_encounter.patient_id = pp.patient_id
               AND registration_encounter.program_id = pp.program_id
               AND registration_encounter.encounter_datetime < #{interval_manager(date: end_date, value: 1, interval: 'MONTH', operator: '+')}
               AND registration_encounter.voided = 0
             INNER JOIN (
               SELECT MAX(encounter.encounter_datetime) AS encounter_datetime, encounter.patient_id
-              FROM encounter
+              FROM encounter #{current_partition}
               INNER JOIN encounter_type
                 ON encounter_type.encounter_type_id = encounter.encounter_type
                 AND encounter_type.name = 'Registration'
-              INNER JOIN program
+              INNER JOIN program #{current_partition}
                 ON program.program_id = encounter.program_id
                 AND program.name = 'HIV PROGRAM'
               WHERE encounter.encounter_datetime < CAST(#{end_date} AS DATE) AND encounter.voided = 0
@@ -204,10 +204,10 @@ module MalawiHivProgramReports
             ) AS max_registration_encounter
               ON max_registration_encounter.patient_id = registration_encounter.patient_id
               AND max_registration_encounter.encounter_datetime = registration_encounter.encounter_datetime
-            INNER JOIN obs AS patient_type_obs
+            INNER JOIN obs #{current_partition} AS patient_type_obs
               ON patient_type_obs.encounter_id = registration_encounter.encounter_id
-              AND #{in_manager(column: 'patient_type_obs.concept_id', values: "(SELECT concept_id FROM concept_name WHERE name = 'Type of patient' AND voided = 0)")}
-              AND #{in_manager(column: 'patient_type_obs.value_coded', values: "(SELECT concept_id FROM concept_name WHERE name IN ('Drug refill', 'External consultation') AND voided = 0)")}
+              AND #{in_manager(column: 'patient_type_obs.concept_id', values: "(SELECT concept_id FROM concept_name #{current_partition} WHERE name = 'Type of patient' AND voided = 0)")}
+              AND #{in_manager(column: 'patient_type_obs.value_coded', values: "(SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Drug refill', 'External consultation') AND voided = 0)")}
               AND patient_type_obs.voided = 0
             WHERE pp.voided = 0
           )
@@ -236,22 +236,22 @@ module MalawiHivProgramReports
                 END AS transfer_in,
                 MAX(o.start_date) AS last_dispensed_date,
                 MAX(o.auto_expire_date) AS auto_expire_date
-            FROM orders o
-            INNER JOIN concept_name cn
+            FROM orders #{current_partition} o
+            INNER JOIN concept_name #{current_partition} cn
               ON cn.concept_id = o.concept_id
               AND cn.name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')
               #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            LEFT JOIN obs tpt_transfer_in_obs
+            LEFT JOIN obs #{current_partition} tpt_transfer_in_obs
               ON tpt_transfer_in_obs.person_id = o.patient_id
               AND tpt_transfer_in_obs.concept_id = #{::ConceptName.find_by_name('TPT Drugs Received').concept_id}
               AND tpt_transfer_in_obs.voided = 0
               #{site_manager(operator: 'AND', column: 'tpt_transfer_in_obs.site_id', location: @location)}
-              AND tpt_transfer_in_obs.value_drug IN (SELECT drug_id FROM drug WHERE concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
-            INNER JOIN drug_order dor
+              AND tpt_transfer_in_obs.value_drug IN (SELECT drug_id FROM drug #{current_partition} WHERE concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
+            INNER JOIN drug_order #{current_partition} dor
               ON dor.order_id = o.order_id
               AND dor.quantity > 0
             WHERE DATE(o.start_date) BETWEEN DATE(#{c_start_date}) AND DATE(#{c_end_date})
-            AND o.order_type_id IN (SELECT order_type_id FROM order_type WHERE name = 'Drug order')
+            AND o.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
             AND o.voided = 0
             AND o.patient_id = #{patient_id}
             GROUP BY o.patient_id
@@ -291,11 +291,11 @@ module MalawiHivProgramReports
                 WHEN o.value_drug = #{isoniazid_rifapentine_drug.drug_id} THEN '3HP'
                 ELSE '6H'
               END AS course
-            FROM obs o
+            FROM obs #{current_partition} o
             WHERE o.concept_id = #{::ConceptName.find_by_name('TPT Drugs Received').concept_id}
             AND o.voided = 0
             #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            AND o.value_drug IN (SELECT drug_id FROM drug WHERE concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
+            AND o.value_drug IN (SELECT drug_id FROM drug #{current_partition} WHERE concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
             AND o.person_id = #{patient_id}
             AND o.value_numeric IS NOT NULL
             AND DATE(o.obs_datetime) <= DATE(#{start_date})
@@ -312,10 +312,10 @@ module MalawiHivProgramReports
                 WHEN o.concept_id = #{isoniazid_rifapentine_concept.concept_id} THEN '3HP'
                 ELSE '6H'
               END AS course
-            FROM orders o
-            INNER JOIN encounter e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV PROGRAM */
-            INNER JOIN drug_order dor ON dor.order_id = o.order_id AND dor.quantity > 0
-            WHERE o.order_type_id IN (SELECT order_type_id FROM order_type WHERE name = 'Drug order')
+            FROM orders #{current_partition} o
+            INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV PROGRAM */
+            INNER JOIN drug_order #{current_partition} dor ON dor.order_id = o.order_id AND dor.quantity > 0
+            WHERE o.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
             AND o.voided = 0
             #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
             AND o.concept_id IN (#{::ConceptName.where(name: ['Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine']).select(:concept_id).to_sql})
@@ -340,11 +340,11 @@ module MalawiHivProgramReports
                 WHEN o.value_drug = #{isoniazid_rifapentine_drug.drug_id} THEN '3HP'
                 ELSE '6H'
               END AS course
-            FROM obs o
+            FROM obs #{current_partition} o
             WHERE o.concept_id = #{::ConceptName.find_by_name('TPT Drugs Received').concept_id}
             AND o.voided = 0
             #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            AND o.value_drug IN (SELECT drug_id FROM drug WHERE concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
+            AND o.value_drug IN (SELECT drug_id FROM drug #{current_partition} WHERE concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
             AND o.person_id = #{patient_id}
             AND o.value_numeric IS NOT NULL
             AND DATE(o.obs_datetime) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
@@ -361,10 +361,10 @@ module MalawiHivProgramReports
                 WHEN o.concept_id = #{isoniazid_rifapentine_concept.concept_id} THEN '3HP'
                 ELSE '6H'
               END AS course
-            FROM orders o
-            INNER JOIN encounter e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV PROGRAM */
-            INNER JOIN drug_order dor ON dor.order_id = o.order_id AND dor.quantity > 0
-            WHERE o.order_type_id IN (SELECT order_type_id FROM order_type WHERE name = 'Drug order')
+            FROM orders #{current_partition} o
+            INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV PROGRAM */
+            INNER JOIN drug_order #{current_partition} dor ON dor.order_id = o.order_id AND dor.quantity > 0
+            WHERE o.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
             AND o.voided = 0
             #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
             AND o.concept_id IN (#{::ConceptName.where(name: ['Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine']).select(:concept_id).to_sql})

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

@@ -60,7 +60,7 @@ module MalawiHivProgramReports
             p.person_id patient_id, birthdate, gender,
             #{function_manager(function: 'pepfar_patient_outcome', location: @location, args: "p.person_id::int, '#{end_date.to_date}'::date, #{@location}::int")} outcome,
             #{function_manager(function: 'disaggregated_age_group', location: @location, args: "p.birthdate::date, '#{end_date.to_date}::date'")} age_group
-          FROM person p
+          FROM person #{current_partition} p
           WHERE #{in_manager(column: 'p.person_id', values: patient_ids)}
           #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
           GROUP BY p.person_id #{group_by_columns('p.birthdate, p.gender')}
@@ -117,10 +117,10 @@ module MalawiHivProgramReports
             pe.gender,
             #{function_manager(function: 'patient_date_enrolled', location: @location, args: "p.patient_id::int, #{@location}::int")} AS date_enrolled,
             #{function_manager(function: 'date_antiretrovirals_started', location: @location, args: "p.patient_id::int, MIN(s.start_date)::date, #{@location}::int")} AS earliest_start_date
-          FROM patient_program p
-            INNER JOIN person pe ON pe.person_id = p.patient_id AND pe.voided = 0
+          FROM patient_program #{current_partition} p
+            INNER JOIN person #{current_partition} pe ON pe.person_id = p.patient_id AND pe.voided = 0
             #{site_manager(operator: 'AND', column: 'pe.site_id', location: @location)}
-            INNER JOIN patient_state s ON p.patient_program_id = s.patient_program_id AND s.voided = 0 AND s.state = 7
+            INNER JOIN patient_state #{current_partition} s ON p.patient_program_id = s.patient_program_id AND s.voided = 0 AND s.state = 7
             #{site_manager(operator: 'AND', column: 's.site_id', location: @location)}
             LEFT JOIN (#{current_occupation_query}) a ON a.person_id = p.patient_id
             #{site_manager(operator: 'AND', column: 'a.site_id', location: @location)}
@@ -142,10 +142,10 @@ module MalawiHivProgramReports
             pe.gender,
             #{function_manager(function: 'patient_date_enrolled', location: @location, args: "p.patient_id::int, #{@location}::int")} AS date_enrolled,
             #{function_manager(function: 'date_antiretrovirals_started', location: @location, args: "p.patient_id::int, MIN(s.start_date)::date, #{@location}::int")} AS earliest_start_date
-          FROM patient_program p
-            INNER JOIN person pe ON pe.person_id = p.patient_id AND pe.voided = 0
+          FROM patient_program #{current_partition} p
+            INNER JOIN person #{current_partition} pe ON pe.person_id = p.patient_id AND pe.voided = 0
             #{site_manager(operator: 'AND', column: 'pe.site_id', location: @location)}
-            INNER JOIN patient_state s ON p.patient_program_id = s.patient_program_id AND s.voided = 0 AND s.state = 7
+            INNER JOIN patient_state #{current_partition} s ON p.patient_program_id = s.patient_program_id AND s.voided = 0 AND s.state = 7
             #{site_manager(operator: 'AND', column: 's.site_id', location: @location)}
             LEFT JOIN (#{current_occupation_query}) a ON a.person_id = p.patient_id
             #{site_manager(operator: 'AND', column: 'a.site_id', location: @location)}

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

@@ -164,32 +164,32 @@ module MalawiHivProgramReports
             pp.earliest_start_date,
             preg_or_breast.name AS maternal_status,
             DATE(MIN(pregnant_or_breastfeeding.obs_datetime)) AS maternal_status_date
-          FROM temp_earliest_start_date pp
-          INNER JOIN person pe ON pe.person_id = pp.patient_id AND pe.voided = 0
+          FROM cdr_temp_cohort_members pp
+          INNER JOIN person #{current_partition} pe ON pe.person_id = pp.patient_id AND pe.voided = 0
           #{site_manager(operator: 'AND', column: 'pe.site_id', location: @location)}
           LEFT JOIN (
             SELECT max(o.obs_datetime) AS obs_datetime, o.person_id
-            FROM obs o
+            FROM obs #{current_partition} o
             INNER JOIN concept_name cn ON cn.concept_id = o.concept_id AND cn.name = 'CD4 count' AND cn.voided = 0
-            INNER JOIN patient_program pp ON pp.patient_id = o.person_id
+            INNER JOIN patient_program #{current_partition} pp ON pp.patient_id = o.person_id
                 AND pp.program_id = #{program('HIV PROGRAM').id}
                 AND pp.voided = 0
-            INNER JOIN patient_state ps ON ps.patient_program_id = pp.patient_program_id AND ps.voided = 0 AND ps.state = 7 AND ps.start_date <= DATE('#{end_date}')
+            INNER JOIN patient_state #{current_partition} ps ON ps.patient_program_id = pp.patient_program_id AND ps.voided = 0 AND ps.state = 7 AND ps.start_date <= DATE('#{end_date}')
             WHERE o.concept_id = #{concept_name('CD4 count').concept_id} AND o.voided = 0
             #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}#{'            '}
             AND o.obs_datetime <= '#{end_date}' AND o.obs_datetime >= '#{start_date}'
             GROUP BY o.person_id
           ) current_cd4 ON current_cd4.person_id = pp.patient_id
-          LEFT JOIN obs o ON o.person_id = pp.patient_id AND o.concept_id = #{concept_name('CD4 count').concept_id} AND o.voided = 0 AND o.obs_datetime = current_cd4.obs_datetime
+          LEFT JOIN obs #{current_partition} o ON o.person_id = pp.patient_id AND o.concept_id = #{concept_name('CD4 count').concept_id} AND o.voided = 0 AND o.obs_datetime = current_cd4.obs_datetime
           #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-          LEFT JOIN obs transfer_in ON transfer_in.person_id = pp.patient_id
+          LEFT JOIN obs #{current_partition} transfer_in ON transfer_in.person_id = pp.patient_id
             AND transfer_in.concept_id = #{concept_name('Ever registered at ART clinic').concept_id}
             AND transfer_in.voided = 0
             AND transfer_in.value_coded = #{concept_name('Yes').concept_id}
             AND transfer_in.obs_datetime <= '#{end_date}'
             AND transfer_in.obs_datetime >= '#{start_date}'
             #{site_manager(operator: 'AND', column: 'transfer_in.site_id', location: @location)}
-          LEFT JOIN obs pregnant_or_breastfeeding ON pregnant_or_breastfeeding.person_id = pp.patient_id
+          LEFT JOIN obs #{current_partition} pregnant_or_breastfeeding ON pregnant_or_breastfeeding.person_id = pp.patient_id
             AND pregnant_or_breastfeeding.concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Breast feeding?', 'Breast feeding', 'Breastfeeding', 'Is patient pregnant?', 'patient pregnant') AND voided = 0)
             AND pregnant_or_breastfeeding.voided = 0
             AND pregnant_or_breastfeeding.value_coded = #{concept_name('Yes').concept_id}

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

@@ -163,11 +163,11 @@ module MalawiHivProgramReports
                     WHEN cd4_result.value_numeric > 200 THEN 'cd4_greater_than_or_equal_to_200'
                     ELSE 'unknown_cd4_count'
                 END cd4_count_group
-            FROM patient_program
-            INNER JOIN person ON person.person_id = patient_program.patient_id
+            FROM patient_program #{current_partition}
+            INNER JOIN person #{current_partition} ON person.person_id = patient_program.patient_id
             #{site_manager(operator: 'AND', column: 'person.site_id', location: @location)}
             /* Select patients that were on treatment before start of reporting period */
-            INNER JOIN patient_state AS patient_ever_on_treatment
+            INNER JOIN patient_state #{current_partition} AS patient_ever_on_treatment
               ON patient_ever_on_treatment.patient_program_id = patient_program.patient_program_id
               AND patient_ever_on_treatment.state = 7
               AND patient_ever_on_treatment.start_date < DATE(#{start_date})
@@ -175,8 +175,8 @@ module MalawiHivProgramReports
             /* Get patient's state at the start of the quarter. */
             INNER JOIN (
               SELECT patient_program_id, MAX(patient_state.date_created) AS date_created
-              FROM patient_state
-              INNER JOIN patient_program USING (patient_program_id)
+              FROM patient_state #{current_partition}
+              INNER JOIN patient_program #{current_partition} USING (patient_program_id)
               WHERE patient_state.voided = 0
                 AND patient_program.voided = 0
                 AND patient_program.program_id = 1
@@ -184,7 +184,7 @@ module MalawiHivProgramReports
               GROUP BY patient_program_id
             ) AS date_of_last_patient_state_before_quarter
               ON date_of_last_patient_state_before_quarter.patient_program_id = patient_program.patient_program_id
-            LEFT JOIN patient_state AS patient_state_at_start_of_quarter
+            LEFT JOIN patient_state #{current_partition} AS patient_state_at_start_of_quarter
               ON patient_state_at_start_of_quarter.patient_program_id = date_of_last_patient_state_before_quarter.patient_program_id
               #{site_manager(operator: 'AND', column: 'patient_state_at_start_of_quarter.site_id', location: @location)}
               AND patient_state_at_start_of_quarter.date_created = date_of_last_patient_state_before_quarter.date_created
@@ -192,15 +192,15 @@ module MalawiHivProgramReports
             /* Select patients who received ART within the reporting period. */
             INNER JOIN (
               SELECT DISTINCT encounter.patient_id, orders.start_date
-              FROM encounter
-              INNER JOIN orders
+              FROM encounter #{current_partition}
+              INNER JOIN orders #{current_partition}
                 ON orders.encounter_id = encounter.encounter_id
                 AND DATE(orders.start_date) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
                 AND orders.voided = 0
-              INNER JOIN drug_order
+              INNER JOIN drug_order #{current_partition}
                 ON drug_order.order_id = orders.order_id
                 AND drug_order.quantity > 0
-                AND drug_order.drug_inventory_id IN (SELECT DISTINCT drug_id FROM arv_drug)
+                AND drug_order.drug_inventory_id IN (SELECT DISTINCT drug_id FROM arv_drug #{current_partition})
               WHERE encounter.voided = 0
                 AND encounter.program_id = 1
                 AND DATE(encounter.encounter_datetime) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
@@ -209,8 +209,8 @@ module MalawiHivProgramReports
             /* Ensure that patients are on ART at the end of the quarter */
             INNER JOIN (
               SELECT patient_program_id, MAX(patient_state.date_created) AS date_created
-              FROM patient_state
-              INNER JOIN patient_program USING (patient_program_id)
+              FROM patient_state #{current_partition}
+              INNER JOIN patient_program #{current_partition} USING (patient_program_id)
               WHERE patient_state.voided = 0
                 AND patient_program.voided = 0
                 AND patient_program.program_id = 1
@@ -220,7 +220,7 @@ module MalawiHivProgramReports
               ON date_of_last_patient_state_in_quarter.patient_program_id = patient_program.patient_program_id
 
               /*Not sure why Walter had this section in but I believe its not neccessary*/
-              /*INNER JOIN patient_state AS patient_state_at_end_of_quarter
+              /*INNER JOIN patient_state #{current_partition} AS patient_state_at_end_of_quarter
               ON patient_state_at_end_of_quarter.patient_program_id = patient_program.patient_program_id
               AND patient_state_at_end_of_quarter.date_created = date_of_last_patient_state_before_quarter.date_created
               AND patient_state_at_end_of_quarter.state = 7*/
@@ -231,17 +231,17 @@ module MalawiHivProgramReports
                the current_defaulter function. */
             LEFT JOIN (
               SELECT DISTINCT encounter.patient_id
-              FROM encounter
-              INNER JOIN orders
+              FROM encounter #{current_partition}
+              INNER JOIN orders #{current_partition}
                 ON orders.encounter_id = encounter.encounter_id
                 AND orders.voided = 0
                 #{site_manager(operator: 'AND', column: 'orders.site_id', location: @location)}
                 AND DATE(orders.start_date) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
                 AND DATE(orders.auto_expire_date) >= (DATE(#{end_date}) - INTERVAL 30 DAY)
-              INNER JOIN drug_order
+              INNER JOIN drug_order #{current_partition}
                 ON drug_order.order_id = orders.order_id
                 AND drug_order.quantity > 0
-                AND drug_order.drug_inventory_id IN (SELECT DISTINCT drug_id FROM arv_drug)
+                AND drug_order.drug_inventory_id IN (SELECT DISTINCT drug_id FROM arv_drug #{current_partition})
               WHERE encounter.program_id = 1
                 AND DATE(encounter.encounter_datetime) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
                 AND encounter.voided = 0
@@ -249,14 +249,14 @@ module MalawiHivProgramReports
               ON patients_with_orders_at_end_of_quarter.patient_id = patient_program.patient_id
             LEFT JOIN (
                 SELECT max(o.obs_datetime) AS obs_datetime, o.person_id
-                FROM obs o
+                FROM obs #{current_partition} o
                 INNER JOIN concept_name cn ON cn.concept_id = o.concept_id AND cn.name = 'CD4 count'
                 #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
                 WHERE o.concept_id = #{concept('CD4 count').concept_id} AND o.voided = 0
                 AND o.obs_datetime <= #{end_date} AND o.obs_datetime >= #{start_date}
                 GROUP BY o.person_id
             ) current_cd4 ON current_cd4.person_id = patient_program.patient_id
-            LEFT JOIN obs cd4_result ON cd4_result.person_id = patient_program.patient_id AND cd4_result.concept_id = #{concept('CD4 count').concept_id} AND cd4_result.voided = 0
+            LEFT JOIN obs #{current_partition} cd4_result ON cd4_result.person_id = patient_program.patient_id AND cd4_result.concept_id = #{concept('CD4 count').concept_id} AND cd4_result.voided = 0
             #{site_manager(operator: 'AND', column: 'cd4_result.site_id', location: @location)}
             #  Not sure why we are matching the two dates but the result was excluding cd4 results for patients.
             # AND cd4_result.obs_datetime = current_cd4.obs_datetime
@@ -266,10 +266,10 @@ module MalawiHivProgramReports
             before the start of the reporting period */
               AND patient_program.patient_id NOT IN (
                 SELECT DISTINCT orders.patient_id
-                FROM orders
-                INNER JOIN drug_order USING (order_id)
+                FROM orders #{current_partition}
+                INNER JOIN drug_order #{current_partition} USING (order_id)
                 INNER JOIN arv_drug ON arv_drug.drug_id = drug_inventory_id
-                INNER JOIN patient_program
+                INNER JOIN patient_program #{current_partition}
                   ON patient_program.patient_id = orders.patient_id
                   AND patient_program.program_id = 1
                    #{site_manager(operator: 'AND', column: 'orders.site_id', location: @location)}