malawi_hiv_program_reports 1.0.17 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2528255432f2df888bfc40d425af064647391095c2a0ceebe9512e348fbe2f63
-  data.tar.gz: 75916f779053f8acf6e1aa4ef258668961266eff12eadd92bdd4cd3cbf3e5a7f
+  metadata.gz: f86826f15ceb3f763a71ac85b14142481eb6177dea5e77d63b789c1f76955dfd
+  data.tar.gz: ae2542a2e7bc462c5fca169abb73503dfac6f4074eedd6c837a38ff7dbbf6a27
 SHA512:
-  metadata.gz: 7f98b4442247cc8fce9df43887e4ee9cccfdae8017d15fd8f67a301c89428cf54a1c1e411c9e61fc4c56f99de41a45a2732303063ecf7b17a18b46efedba8aa3
-  data.tar.gz: c3d0300aa8341c5bc387cf3ff89b854012d2b093cd058453278fbb378129b0e29ddd650a973d53d0e830953779e922e5a81a5c214006b7cbc53788473a86fa19
+  metadata.gz: 2726026897b6c08fdfea543e57b82396897e2400849b39615135dff0b1a1caab8113c910cc1cdb98042ff2211a548c541d8e3c56b68157ca165142659830e4bb
+  data.tar.gz: 164b30ad7ca003e832cf4a31ba222c92cee0d04fd0f3aa9875a45ef879d8f33b4dca863ac6afdb60de0f6cfe54a18e799e036d249df9f6ed7be30fb7d6d310c4

data/app/services/malawi_hiv_program_reports/adapters/moh/custom.rb

@@ -187,6 +187,10 @@ module MalawiHivProgramReports
           "DATE_PART('#{interval}', #{date2}::timestamp - #{date1}::timestamp)" if adapter == 'postgresql'
         end
 
+        def current_partition
+          "PARTITION (p#{@location})"
+        end
+
         # this is a min filter
         # @occupation: object
         def min_filt(occupation)

data/app/services/malawi_hiv_program_reports/arv_refill_periods.rb

@@ -7,6 +7,7 @@ module MalawiHivProgramReports
     include MalawiHivProgramReports::Adapters::Moh::Custom
     include MalawiHivProgramReports::Utils::ModelUtils
     include Utils
+    include Pepfar::Utils
 
     def initialize(start_date:, end_date:, min_age:, max_age:, org:, initialize_tables:, **kwargs)
       @start_date = start_date.to_date.strftime('%Y-%m-%d 00:00:00')
@@ -17,6 +18,7 @@ module MalawiHivProgramReports
       @initialize_tables = (initialize_tables == 'true')
       @occupation = kwargs[:occupation]
       @location = kwargs[:location]
+      @format = kwargs[:format] || 'poc'
     end
 
     def find_report
@@ -40,23 +42,56 @@ module MalawiHivProgramReports
 
       if @initialize_tables
         report_type = (/pepfar/i.match?(@org) ? 'pepfar' : 'moh')
-        MalawiHivProgramReports::Moh::CohortBuilder.new(outcomes_definition: report_type, location: @location).init_temporary_tables(@start_date,
-                                                                                                                @end_date, @occupation)
+        MalawiHivProgramReports::Moh::CohortBuilder.new(outcomes_definition: report_type, location: @location).   init_temporary_tables(@start_date, @end_date, @occupation)
       end
 
       patients = ActiveRecord::Base.connection.select_all <<~SQL
         SELECT
+          disaggregated_age_group(p.birthdate, DATE('#{@end_date}')) age_group,
           p.patient_id, p.date_enrolled, p.birthdate, p.gender,
           outcome.cum_outcome AS outcome
         FROM temp_earliest_start_date p
         LEFT JOIN temp_patient_outcomes outcome USING(patient_id)
         WHERE DATE(date_enrolled) <= DATE('#{@end_date}')
-        AND TIMESTAMPDIFF(year, p.birthdate, DATE('#{@end_date}')) BETWEEN #{@min_age} AND #{@max_age}
-        AND cum_outcome = 'On antiretrovirals';
+        AND cum_outcome = 'On antiretrovirals'
+        #{@format == 'poc' ? "AND TIMESTAMPDIFF(year, p.birthdate, DATE('#{@end_date}')) BETWEEN #{@min_age} AND #{@max_age}" : ''};
       SQL
 
       return {} if patients.blank?
 
+      def init_report
+        pepfar_age_groups.each_with_object({}) do |age_group, report|
+          report[age_group] = ['M', 'F'].each_with_object({}) do |gender, age_group_report|
+            age_group_report[gender] = {
+              less_than_3months: [],
+              three_to_five_months: [],
+              greater_than_six_months: []
+            }
+          end
+        end
+      end
+
+      if @format === 'pepfar'
+        return patients.uniq.each_with_object(init_report) do |patient, report|
+          age_group = patient['age_group']
+          gender = patient['gender']
+
+          dispensing_days = get_dispensing_info(patient['patient_id'], encounter_type, arv_concept_set, program_id)
+          
+          return [] if dispensing_days.blank?
+
+          if dispensing_days < 90
+            report[age_group][gender][:greater_than_six_months] << patient['patient_id']
+          end
+          if dispensing_days >= 90 && dispensing_days <= 152
+            report[age_group][gender][:three_to_five_months] << patient['patient_id']
+          end
+          if dispensing_days >= 153
+            report[age_group][gender][:greater_than_six_months] << patient['patient_id']
+          end
+        end
+      end
+
       data = []
       patients.each do |p|
         data  << [p['patient_id'].to_i, p['gender'], p['birthdate']]

data/app/services/malawi_hiv_program_reports/moh/cumulative_cohort.rb

@@ -223,7 +223,7 @@ module MalawiHivProgramReports
       # rubocop:disable Metrics/MethodLength
       def cohort_members(location)
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_cohort_members
+          INSERT INTO cdr_temp_cohort_members PARTITION (p#{location})
           SELECT
               pcm.patient_id,
               pcm.site_id,
@@ -252,7 +252,7 @@ module MalawiHivProgramReports
 
       def potential_cohort_members(location)
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_potential_cohort_members
+          INSERT INTO cdr_temp_potential_cohort_members PARTITION (p#{location})
           SELECT
               pp.patient_id,
               pp.site_id,
@@ -275,7 +275,7 @@ module MalawiHivProgramReports
 
       def min_drug_orders(location)
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_min_drug_orders
+          INSERT INTO cdr_temp_min_drug_orders PARTITION (p#{location})
           SELECT o.patient_id, o.site_id, DATE(MIN(o.start_date)) start_date
           FROM orders o
           INNER JOIN drug_order do ON do.order_id = o.order_id AND do.site_id = o.site_id AND do.quantity > 0
@@ -300,7 +300,7 @@ module MalawiHivProgramReports
 
       def transfer_ins(location)
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_transfer_ins
+          INSERT INTO cdr_temp_transfer_ins PARTITION (p#{location})
           SELECT o.person_id, o.site_id, DATE(MIN(o.value_datetime)) value_datetime
           FROM obs o
           INNER JOIN encounter e ON e.patient_id = o.person_id AND e.site_id = o.site_id AND e.encounter_id = o.encounter_id
@@ -316,7 +316,7 @@ module MalawiHivProgramReports
 
       def external_clients(location)
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_external_clients
+          INSERT INTO cdr_temp_external_clients PARTITION (p#{location})
           SELECT e.patient_id, e.site_id, GROUP_CONCAT(DISTINCT(patient_type.value_coded)) AS patient_types, clinic_registration.encounter_id
           FROM patient_program as e
           INNER JOIN obs AS patient_type ON patient_type.person_id = e.patient_id
@@ -342,7 +342,7 @@ module MalawiHivProgramReports
 
       def cdr_other_patient_types(location)
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_other_patient_types
+          INSERT INTO cdr_other_patient_types PARTITION (p#{location})
           SELECT o.person_id, o.site_id
           FROM obs o
           WHERE o.concept_id = 3289 -- Type of patient
@@ -358,7 +358,7 @@ module MalawiHivProgramReports
 
       def reason_for_starting_art(location)
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_reason_for_starting_art
+          INSERT INTO cdr_reason_for_starting_art PARTITION (p#{location})
           SELECT a.person_id, a.site_id, a.value_coded
           FROM obs a
           INNER JOIN cdr_temp_potential_cohort_members ct ON ct.patient_id = a.person_id AND ct.site_id = a.site_id

data/app/services/malawi_hiv_program_reports/moh/cumulative_outcome.rb

@@ -23,7 +23,7 @@ module MalawiHivProgramReports
         process_data
         end_time = Time.now
         total_time_in_minutes = ((end_time - start_time) / 60).round(2)
-        Rails.logger.info("Cumulative Outcome report completed in #{total_time_in_minutes} minutes")
+        Rails.logger.info("Cumulative Outcome report completed in #{total_time_in_minutes} minutes for location: #{location}")
         { cumulative_outcome_time: total_time_in_minutes, definition: }
       end
 
@@ -70,7 +70,7 @@ module MalawiHivProgramReports
 
       def load_max_drug_orders
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_max_drug_orders
+          INSERT INTO cdr_temp_max_drug_orders PARTITION (p#{location})
           SELECT o.patient_id, o.site_id, MAX(o.start_date) AS start_date
           FROM orders o
           INNER JOIN cdr_temp_cohort_members tesd ON tesd.patient_id = o.patient_id AND tesd.site_id = o.site_id
@@ -87,7 +87,7 @@ module MalawiHivProgramReports
 
       def load_min_auto_expire_date
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_min_auto_expire_date
+          INSERT INTO cdr_temp_min_auto_expire_date PARTITION (p#{location})
           SELECT patient_id, o.site_id, MIN(auto_expire_date) AS auto_expire_date
           FROM orders o
           INNER JOIN cdr_temp_max_drug_orders USING (patient_id, site_id, start_date)
@@ -104,7 +104,7 @@ module MalawiHivProgramReports
 
       def load_max_appointment_date
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_max_patient_appointment
+          INSERT INTO cdr_temp_max_patient_appointment PARTITION (p#{location})
           SELECT o.person_id, o.site_id, DATE(MAX(o.value_datetime)) appointment_date
           FROM obs o
           INNER JOIN encounter e ON e.encounter_id = o.encounter_id AND e.site_id = o.site_id AND e.voided = 0
@@ -118,7 +118,7 @@ module MalawiHivProgramReports
 
       def load_max_patient_state
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_max_patient_state
+          INSERT INTO cdr_temp_max_patient_state PARTITION (p#{location})
           SELECT pp.patient_id, pp.site_id, MAX(ps.start_date) start_date
           FROM patient_state ps
           INNER JOIN patient_program pp ON pp.patient_program_id = ps.patient_program_id AND pp.site_id = ps.site_id AND pp.program_id = 1 AND pp.voided = 0
@@ -134,7 +134,7 @@ module MalawiHivProgramReports
       # into the temp_patient_outcomes table.
       def load_patients_who_died
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patients.patient_id, 'Patient died', patient_state.start_date, patients.site_id, 1
           FROM cdr_temp_cohort_members AS patients
           INNER JOIN patient_program
@@ -163,7 +163,7 @@ module MalawiHivProgramReports
       # treatment stopped into temp_patient_outcomes table.
       def load_patients_who_stopped_treatment
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patients.patient_id,
                  (
                    SELECT name FROM concept_name
@@ -192,7 +192,7 @@ module MalawiHivProgramReports
             AND max_patient_state.site_id = patient_state.site_id
             AND max_patient_state.start_date = patient_state.start_date
           WHERE patients.date_enrolled <= #{end_date} AND patients.site_id = #{location}
-            AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes WHERE step = 1)
+            AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes PARTITION (p#{location}) WHERE step = 1)
           GROUP BY patients.patient_id, patients.site_id
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
@@ -201,7 +201,7 @@ module MalawiHivProgramReports
       # Load all patients on Pre-ART.
       def load_patients_on_pre_art
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patients.patient_id,
                 CASE
                   WHEN #{current_defaulter_function('patients.patient_id', 'patients.site_id')} = 1 THEN 'Defaulted'
@@ -226,7 +226,7 @@ module MalawiHivProgramReports
             AND max_patient_state.site_id = patient_state.site_id
             AND max_patient_state.start_date = patient_state.start_date
           WHERE patients.date_enrolled <= #{end_date} AND patients.site_id = #{location}
-            AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes WHERE step IN (1, 2))
+            AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes PARTITION (p#{location}) WHERE step IN (1, 2))
           GROUP BY patients.patient_id, patients.site_id
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
@@ -235,7 +235,7 @@ module MalawiHivProgramReports
       # Load all patients without a state
       def load_patients_without_state
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patients.patient_id,
                  CASE
                     WHEN #{current_defaulter_function('patients.patient_id', 'patients.site_id')} = 1 THEN 'Defaulted'
@@ -254,7 +254,7 @@ module MalawiHivProgramReports
               FROM patient_state
               WHERE start_date < DATE(#{end_date}) + INTERVAL 1 DAY AND voided = 0
             )
-            AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes WHERE step IN (1, 2, 3))
+            AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes PARTITION (p#{location}) WHERE step IN (1, 2, 3))
           GROUP BY patients.patient_id, patients.site_id
           HAVING cum_outcome = 'Defaulted'
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
@@ -265,14 +265,14 @@ module MalawiHivProgramReports
       # without a quantity.
       def load_patients_without_drug_orders
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patients.patient_id,
                  'Unknown',
                  NULL, patients.site_id, 5
           FROM cdr_temp_cohort_members AS patients
           WHERE date_enrolled <= #{end_date} AND site_id = #{location}
-            AND (patient_id, site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes WHERE step IN (1, 2, 3, 4))
-            AND (patient_id, site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_max_drug_orders)
+            AND (patient_id, site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes PARTITION (p#{location}) WHERE step IN (1, 2, 3, 4))
+            AND (patient_id, site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_max_drug_orders PARTITION (p#{location}))
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
       end
@@ -280,7 +280,7 @@ module MalawiHivProgramReports
       # Loads all patients who are on treatment
       def load_patients_on_treatment
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patients.patient_id, 'On antiretrovirals', patient_state.start_date, patients.site_id, 6
           FROM cdr_temp_cohort_members AS patients
           INNER JOIN patient_program
@@ -310,7 +310,7 @@ module MalawiHivProgramReports
             AND first_order_to_expire.site_id = patient_program.site_id
             AND (first_order_to_expire.auto_expire_date >= #{end_date} OR TIMESTAMPDIFF(DAY,first_order_to_expire.auto_expire_date, #{end_date}) <= #{@definition == 'pepfar' ? 28 : 56})
           WHERE patients.date_enrolled <= #{end_date} AND patients.site_id = #{location}
-           AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes WHERE step IN (1, 2, 3, 4, 5))
+           AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes PARTITION (p#{location}) WHERE step IN (1, 2, 3, 4, 5))
           GROUP BY patients.patient_id, patients.site_id
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
@@ -318,7 +318,7 @@ module MalawiHivProgramReports
 
       def load_without_clinical_contact
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patients.patient_id, 'Defaulted', null, patients.site_id, 7
           FROM cdr_temp_cohort_members AS patients
           INNER JOIN patient_program
@@ -349,7 +349,7 @@ module MalawiHivProgramReports
             AND first_order_to_expire.auto_expire_date < #{end_date}
             AND TIMESTAMPDIFF(DAY,first_order_to_expire.auto_expire_date, #{end_date}) >= 365
           WHERE patients.date_enrolled <= #{end_date} AND patients.site_id = #{location}
-          AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes WHERE step IN (1, 2, 3, 4, 5, 6))
+          AND (patients.patient_id, patients.site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes PARTITION (p#{location}) WHERE step IN (1, 2, 3, 4, 5, 6))
           GROUP BY patients.patient_id, patients.site_id
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
@@ -358,11 +358,11 @@ module MalawiHivProgramReports
       # Load defaulters
       def load_defaulters
         ActiveRecord::Base.connection.execute <<~SQL
-          INSERT INTO cdr_temp_patient_outcomes
+          INSERT INTO cdr_temp_patient_outcomes PARTITION (p#{location})
           SELECT patient_id, #{patient_outcome_function('patient_id', 'site_id')}, NULL, site_id, 8
           FROM cdr_temp_cohort_members
           WHERE date_enrolled <= #{end_date} AND site_id = #{location}
-          AND (patient_id, site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes WHERE step IN (1, 2, 3, 4, 5, 6, 7))
+          AND (patient_id, site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes PARTITION (p#{location}) WHERE step IN (1, 2, 3, 4, 5, 6, 7))
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
       end

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

@@ -32,8 +32,8 @@ module MalawiHivProgramReports
           p.birthdate AS birthdate,
           p.gender,
           MIN(pi.identifier)
-          FROM person p
-          LEFT JOIN patient_identifier pi ON pi.patient_id = p.person_id AND pi.voided = 0 AND pi.identifier_type = 4
+          FROM person #{current_partition} p
+          LEFT JOIN patient_identifier #{current_partition} pi ON pi.patient_id = p.person_id AND pi.voided = 0 AND pi.identifier_type = 4
           WHERE p.voided = 0
           AND #{in_manager(column: 'p.person_id', values: ids)}
           #{site_manager(operator: 'AND', column: 'p.site_id', location: location)}

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

@@ -50,25 +50,25 @@ module MalawiHivProgramReports
             o.patient_id, drug.drug_id, o.order_id, i.identifier,
             drug.name, d.quantity, o.start_date, obs.value_numeric,
             person.birthdate, person.gender
-          FROM orders o
-          INNER JOIN drug_order d ON d.order_id = o.order_id AND d.quantity > 0
-          INNER JOIN drug ON drug.drug_id = d.drug_inventory_id
-          INNER JOIN arv_drug On arv_drug.drug_id = drug.drug_id
-          INNER JOIN temp_patient_outcomes t ON o.patient_id = t.patient_id AND t.cum_outcome = 'On antiretrovirals'
-          INNER JOIN person ON person.person_id = o.patient_id AND person.voided = 0
+          FROM orders #{current_partition} o
+          INNER JOIN drug_order #{current_partition} d ON d.order_id = o.order_id AND d.quantity > 0
+          INNER JOIN drug #{current_partition} ON drug.drug_id = d.drug_inventory_id
+          INNER JOIN arv_drug #{current_partition} On arv_drug.drug_id = drug.drug_id
+          INNER JOIN temp_patient_outcomes #{current_partition} t ON o.patient_id = t.patient_id AND t.cum_outcome = 'On antiretrovirals'
+          INNER JOIN person #{current_partition} ON person.person_id = o.patient_id AND person.voided = 0
           #{site_manager(operator: 'AND', column: 'person.site_id', location: @location)}
           INNER JOIN (
             SELECT MAX(o.start_date) start_date, o.patient_id
-            FROM orders o
-            INNER JOIN drug_order dor ON dor.order_id = o.order_id AND dor.quantity > 0
-              AND dor.drug_inventory_id IN (SELECT drug_id FROM arv_drug)
+            FROM orders #{current_partition} o
+            INNER JOIN drug_order #{current_partition} dor ON dor.order_id = o.order_id AND dor.quantity > 0
+              AND dor.drug_inventory_id IN (SELECT drug_id FROM arv_drug #{current_partition})
             WHERE o.voided = 0
               AND o.start_date <= '#{@end_date.to_date.strftime("%Y-%m-%d 23:59:59")}'
               AND o.start_date >= '#{@start_date.to_date.strftime("%Y-%m-%d 00:00:00")}'
             GROUP BY o.patient_id
           ) lor ON lor.start_date = o.start_date AND lor.patient_id = o.patient_id
-          LEFT JOIN obs on obs.order_id = o.order_id AND obs.concept_id=#{pills_dispensed} AND obs.voided = 0
-          LEFT JOIN patient_identifier i ON i.patient_id = o.patient_id
+          LEFT JOIN obs #{current_partition} on obs.order_id = o.order_id AND obs.concept_id=#{pills_dispensed} AND obs.voided = 0
+          LEFT JOIN patient_identifier #{current_partition} i ON i.patient_id = o.patient_id
             AND i.identifier_type = #{patient_identifier_type} AND i.voided = 0
           WHERE o.voided = 0
             AND o.start_date <= '#{@end_date.to_date.strftime("%Y-%m-%d 23:59:59")}'
@@ -121,7 +121,7 @@ module MalawiHivProgramReports
         encounter_type_id = ::EncounterType.find_by_name('DISPENSING').id
         arv_concept_id = ::ConceptName.find_by_name('Antiretroviral drugs').concept_id
 
-        drug_ids = ::Drug.joins('INNER JOIN concept_set s ON s.concept_id = drug.concept_id')\
+        drug_ids = ::Drug.joins('INNER JOIN concept_set #{current_partition} s ON s.concept_id = drug.concept_id')\
                        .where('s.concept_set = ?', arv_concept_id).map(&:drug_id)
 
         ActiveRecord::Base.connection.execute('drop table if exists tmp_latest_arv_dispensation ;')
@@ -129,7 +129,7 @@ module MalawiHivProgramReports
         ActiveRecord::Base.connection.execute("
           create table tmp_latest_arv_dispensation AS
             SELECT patient_id,DATE(MAX(start_date)) as start_date
-            FROM orders INNER JOIN drug_order t USING (order_id)
+            FROM orders #{current_partition} INNER JOIN drug_order #{current_partition} t USING (order_id)
             WHERE
             (
               start_date BETWEEN '#{@start_date.to_date.strftime('%Y-%m-%d 00:00:00')}' AND '#{@end_date.to_date.strftime('%Y-%m-%d 23:59:59')}'
@@ -146,10 +146,10 @@ module MalawiHivProgramReports
             o.order_id,
             MIN(d.quantity),
             MIN(drug.name)
-          FROM orders o
-          INNER JOIN drug_order d ON o.order_id = d.order_id
-          INNER JOIN drug ON d.drug_inventory_id = drug.drug_id
-          INNER JOIN tmp_latest_arv_dispensation k on (o.patient_id = k.patient_id and DATE(o.start_date) =  k.start_date)
+          FROM orders #{current_partition} o
+          INNER JOIN drug_order #{current_partition} d ON o.order_id = d.order_id
+          INNER JOIN drug #{current_partition} ON d.drug_inventory_id = drug.drug_id
+          INNER JOIN tmp_latest_arv_dispensation #{current_partition} k on (o.patient_id = k.patient_id and DATE(o.start_date) =  k.start_date)
           WHERE #{in_manager(column: 'd.drug_inventory_id', values: drug_ids)}
           AND d.quantity > 0 AND o.voided = 0 AND o.start_date BETWEEN '#{@start_date.to_date.strftime('%Y-%m-%d 00:00:00')}'
           AND '#{@end_date.to_date.strftime('%Y-%m-%d 23:59:59')}' 
@@ -169,9 +169,9 @@ module MalawiHivProgramReports
                 date_antiretrovirals_started(CAST(p.patient_id AS INT), CAST(MIN(s.start_date) AS DATE), CAST(#{@location} AS INT)) AS earliest_start_date
             FROM
                 ((patient_program p
-                LEFT JOIN person pe ON (pe.person_id = p.patient_id))
-                LEFT JOIN patient_state s ON (p.patient_program_id = s.patient_program_id))
-                LEFT JOIN person ON (person.person_id = p.patient_id)
+                LEFT JOIN person #{current_partition} pe ON (pe.person_id = p.patient_id))
+                LEFT JOIN patient_state #{current_partition} s ON (p.patient_program_id = s.patient_program_id))
+                LEFT JOIN person #{current_partition} ON (person.person_id = p.patient_id)
             WHERE
                 (p.voided = 0
                 AND s.voided = 0
@@ -184,7 +184,7 @@ module MalawiHivProgramReports
       end
 
       def max_patient_order_date(patient_id)
-        drug_ids = Drug.joins('INNER JOIN concept_set s ON s.concept_id = drug.concept_id')\
+        drug_ids = Drug.joins('INNER JOIN concept_set #{current_partition} s ON s.concept_id = drug.concept_id')\
                        .where('s.concept_set = ?', ConceptName.find_by_name('Antiretroviral drugs').concept_id).map(&:drug_id)
 
         Order.joins(drug_order: :drug)
@@ -202,7 +202,7 @@ module MalawiHivProgramReports
         encounter_type_id = EncounterType.find_by_name('DISPENSING').id
         arv_concept_id = ConceptName.find_by_name('Antiretroviral drugs').concept_id
 
-        drug_ids = Drug.joins('INNER JOIN concept_set s ON s.concept_id = drug.concept_id')\
+        drug_ids = Drug.joins('INNER JOIN concept_set #{current_partition} s ON s.concept_id = drug.concept_id')\
                        .where('s.concept_set = ?', arv_concept_id).map(&:drug_id)
         max_order_date = max_patient_order_date(patient_id)
         orders = Order.joins(drug_order: :drug)
@@ -258,9 +258,9 @@ module MalawiHivProgramReports
               SELECT
                 p.birthdate, p.gender, i.identifier arv_number,
                 n.given_name, n.family_name
-              FROM person p
-              LEFT JOIN person_name n ON n.person_id = p.person_id AND n.voided = 0
-              LEFT JOIN patient_identifier i ON i.patient_id = p.person_id
+              FROM person #{current_partition} p
+              LEFT JOIN person_name #{current_partition} n ON n.person_id = p.person_id AND n.voided = 0
+              LEFT JOIN patient_identifier #{current_partition} i ON i.patient_id = p.person_id
               AND i.identifier_type = 4 AND i.voided = 0
               WHERE p.person_id = #{patient_id} GROUP BY p.person_id
               ORDER BY n.date_created DESC, i.date_created DESC;
@@ -305,7 +305,7 @@ module MalawiHivProgramReports
 
 
           outcome_status = ActiveRecord::Base.connection.select_one <<~SQL
-            SELECT cum_outcome FROM temp_patient_outcomes WHERE patient_id = #{patient_id};
+            SELECT cum_outcome FROM temp_patient_outcomes #{current_partition} WHERE patient_id = #{patient_id};
           SQL
 
           next if outcome_status.blank?
@@ -333,9 +333,9 @@ module MalawiHivProgramReports
               SELECT
                 p.birthdate, p.gender, i.identifier arv_number,
                 n.given_name, n.family_name, p.person_id
-              FROM person p
-              LEFT JOIN person_name n ON n.person_id = p.person_id AND n.voided = 0
-              LEFT JOIN patient_identifier i ON i.patient_id = p.person_id
+              FROM person #{current_partition} p
+              LEFT JOIN person_name #{current_partition} n ON n.person_id = p.person_id AND n.voided = 0
+              LEFT JOIN patient_identifier #{current_partition} i ON i.patient_id = p.person_id
               AND i.identifier_type = 4 AND i.voided = 0
               WHERE p.person_id = #{patient_id} 
               GROUP BY p.person_id, n.given_name, n.family_name, i.identifier, p.birthdate, p.gender
@@ -401,17 +401,17 @@ module MalawiHivProgramReports
       #   ActiveRecord::Base.connection.select_one <<~SQL
       #     SELECT lab_result_obs.obs_datetime AS result_date,
       #     CONCAT (COALESCE(measure.value_modifier, '='),' ',COALESCE(measure.value_numeric, measure.value_text, '')) as result
-      #     FROM obs AS lab_result_obs
-      #     INNER JOIN orders
+      #     FROM obs #{current_partition} AS lab_result_obs
+      #     INNER JOIN orders #{current_partition}
       #       ON orders.order_id = lab_result_obs.order_id
       #       AND orders.voided = 0
-      #     INNER JOIN obs AS measure
+      #     INNER JOIN obs #{current_partition} AS measure
       #       ON measure.obs_group_id = lab_result_obs.obs_id
       #       AND measure.voided = 0
       #     INNER JOIN (
       #       SELECT concept_id, name
-      #       FROM concept_name
-      #       INNER JOIN concept USING (concept_id)
+      #       FROM concept_name #{current_partition}
+      #       INNER JOIN USING (concept_id)
       #       WHERE concept.retired = 0
       #       AND name NOT LIKE 'Lab test result'
       #       GROUP BY concept_id
@@ -429,8 +429,8 @@ module MalawiHivProgramReports
       def latest_vl_orders(patient_list)
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT odr.patient_id, MAX(start_date) AS order_date
-          FROM obs o
-          INNER JOIN orders odr ON odr.order_id = o.order_id AND odr.voided = 0 AND DATE(odr.start_date) <= '#{@end_date}'
+          FROM obs #{current_partition} o
+          INNER JOIN orders #{current_partition} odr ON odr.order_id = o.order_id AND odr.voided = 0 AND DATE(odr.start_date) <= '#{@end_date}'
           WHERE o.concept_id = #{::ConceptName.find_by_name('Test Type').concept_id}
           AND o.value_coded = #{::ConceptName.find_by_name('HIV viral load').concept_id}
           AND o.voided = 0
@@ -444,11 +444,11 @@ module MalawiHivProgramReports
           SELECT o.person_id AS patient_id,
           o.obs_datetime AS result_date,
           CONCAT (COALESCE(o.value_modifier, '='),' ',COALESCE(o.value_numeric, o.value_text, '')) AS result
-          FROM obs o
+          FROM obs #{current_partition} o
           INNER JOIN (
             SELECT MAX(obs_datetime) AS obs_datetime, person_id
-            FROM obs co
-            INNER JOIN orders odr ON odr.order_id = co.order_id AND odr.voided = 0
+            FROM obs #{current_partition} co
+            INNER JOIN orders #{current_partition} odr ON odr.order_id = co.order_id AND odr.voided = 0
             WHERE co.concept_id = #{::ConceptName.find_by_name('HIV viral load').concept_id}
             AND co.voided = 0
             AND co.obs_datetime <= '#{@end_date}'
@@ -456,7 +456,7 @@ module MalawiHivProgramReports
             AND #{in_manager(column: 'co.person_id', values: patient_list)}
             GROUP BY co.person_id
           ) AS latest_vl ON latest_vl.obs_datetime = o.obs_datetime AND latest_vl.person_id = o.person_id
-          INNER JOIN orders odr ON odr.order_id = o.order_id AND odr.voided = 0
+          INNER JOIN orders #{current_partition} odr ON odr.order_id = o.order_id AND odr.voided = 0
           WHERE o.concept_id = #{::ConceptName.find_by_name('HIV viral load').concept_id}
           AND o.voided = 0 AND o.obs_datetime <= '#{@end_date}'
           AND (o.value_numeric IS NOT NULL || o.value_text IS NOT NULL)

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

@@ -138,17 +138,17 @@ module MalawiHivProgramReports
           	orders.order_id, orders.start_date, drug_order.quantity, drug.name,
           	orders.patient_id, obs.value_numeric, orders.start_date,
           	patient_identifier.identifier,drug.drug_id
-          FROM orders
-          INNER JOIN drug_order ON drug_order.order_id = orders.order_id AND drug_order.quantity > 0
-          INNER JOIN arv_drug ON arv_drug.drug_id = drug_order.drug_inventory_id
-          INNER JOIN drug ON drug.drug_id = arv_drug.drug_id
-          INNER JOIN encounter ON encounter.encounter_id = orders.encounter_id
+          FROM orders #{current_partition}
+          INNER JOIN drug_order #{current_partition} ON drug_order.order_id = orders.order_id AND drug_order.quantity > 0
+          INNER JOIN arv_drug #{current_partition} ON arv_drug.drug_id = drug_order.drug_inventory_id
+          INNER JOIN drug #{current_partition} ON drug.drug_id = arv_drug.drug_id
+          INNER JOIN encounter #{current_partition} ON encounter.encounter_id = orders.encounter_id
           	AND encounter.program_id = #{::Program.find_by(name: 'HIV PROGRAM').id}
             #{site_manager(operator: 'AND', column: 'encounter.site_id', location: @location)}
-          INNER JOIN obs ON obs.order_id = orders.order_id AND obs.voided = 0
+          INNER JOIN obs #{current_partition} ON obs.order_id = orders.order_id AND obs.voided = 0
           	AND obs.concept_id = #{amount_dispensed} AND obs.value_numeric > 0
             #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
-            LEFT JOIN patient_identifier ON patient_identifier.patient_id = orders.patient_id
+            LEFT JOIN patient_identifier #{current_partition} ON patient_identifier.patient_id = orders.patient_id
           	AND patient_identifier.identifier_type = #{identifier_type}
           	AND patient_identifier.voided = 0
             #{site_manager(operator: 'AND', column: 'patient_identifier.site_id', location: @location)}

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

@@ -85,11 +85,11 @@ module MalawiHivProgramReports
         start_date = ActiveRecord::Base.connection.select_one <<-SQL
             SELECT
                 DATE(MIN(o.start_date)) date
-            FROM person p
-            INNER JOIN orders o ON o.patient_id = p.person_id
-            INNER JOIN drug_order t ON o.order_id = t.order_id
-            INNER JOIN drug d ON d.drug_id = t.drug_inventory_id
-            INNER JOIN encounter e ON e.patient_id = o.patient_id AND e.program_id = 1
+            FROM person #{current_partition} p
+            INNER JOIN orders #{current_partition} o ON o.patient_id = p.person_id
+            INNER JOIN drug_order #{current_partition} t ON o.order_id = t.order_id
+            INNER JOIN drug #{current_partition} d ON d.drug_id = t.drug_inventory_id
+            INNER JOIN encounter #{current_partition} e ON e.patient_id = o.patient_id AND e.program_id = 1
             WHERE o.voided = 0 AND o.patient_id = #{patient_id}
             AND d.concept_id = 656 AND t.quantity > 0;
         SQL
@@ -146,11 +146,11 @@ module MalawiHivProgramReports
             SELECT
                 o.patient_id, t.drug_inventory_id, t.quantity,
                 o.start_date, o.auto_expire_date
-            FROM person p
-            INNER JOIN orders o ON o.patient_id = p.person_id
-            INNER JOIN drug_order t ON o.order_id = t.order_id
-            INNER JOIN drug d ON d.drug_id = t.drug_inventory_id
-            INNER JOIN encounter e ON e.patient_id = o.patient_id AND e.program_id = 1
+            FROM person #{current_partition} p
+            INNER JOIN orders #{current_partition} o ON o.patient_id = p.person_id
+            INNER JOIN drug_order #{current_partition} t ON o.order_id = t.order_id
+            INNER JOIN drug #{current_partition} d ON d.drug_id = t.drug_inventory_id
+            INNER JOIN encounter #{current_partition} e ON e.patient_id = o.patient_id AND e.program_id = 1
             WHERE o.voided = 0 AND (o.start_date
             BETWEEN '#{initiation_start_date}' AND '#{@completion_end_date}')
             AND d.concept_id = 656 AND t.quantity > 0