malawi_hiv_program_reports 1.0.23 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13a308e891673d2c03b82b355cbd1cb30acf9562bd4710e90b975563a7b9a5d0
-  data.tar.gz: 5a347a6889a9bf4cedd109e83df9146c21265b38e4aab1999ca1db3dca5f7fd6
+  metadata.gz: 062d15881512b1cc583e750ad84ad6d48c5ae101bfe115faa29661f92a5a4c5f
+  data.tar.gz: e8b0ee4083537c6880f2ac0f362e647a02c670cf73f50af6db92b2b31cf1855a
 SHA512:
-  metadata.gz: f918d797106fafc2c0ea27b5f529dbee2403583be90428e679ec27b5d2bd4bc97a541c5ee369cf7122ec9b52d63be1bb01331833e40a7c7e8ebbc950d612d319
-  data.tar.gz: 882a731d6f7f538e3d4cbd81fe9052ac54b15dd5b304b49d27abb097876de56daf9d4e6fcbbe5310fd69fa9003fdb3e01834071e7732afcf292ea56f895e11da
+  metadata.gz: 9e262010a9b6b969e1cba70790c82ff8b4da89f45d3b902307ce5a9f9a9364f51e9f32077d9a7c962b3505f33e7f93834b424d233c9d1e4ea5c128a0db6b7304
+  data.tar.gz: 7663c5ba36fd8346e41aa41b432951fc286da066c89a63f7966cd28be6a843247d66ed1869e31414793673dd2db3cba1c972d17666924833fa8de40916901c41

data/app/services/malawi_hiv_program_reports/arv_refill_periods.rb

@@ -15,7 +15,7 @@ module MalawiHivProgramReports
       @min_age = min_age
       @max_age = max_age
       @org = org
-      @initialize_tables = (initialize_tables == 'true')
+      @initialize_tables = (initialize_tables.to_s == "true")
       @occupation = kwargs[:occupation]
       @location = kwargs[:location]
       @format = kwargs[:format] || 'poc'
@@ -260,7 +260,7 @@ module MalawiHivProgramReports
         AND LENGTH(identifier) > 0 AND i.voided = 0
         WHERE s.concept_set = #{arv_concept_set} AND o.voided = 0
         AND DATE(o.start_date) = (
-          SELECT DATE(MAX(t.start_date)) FROM orders t
+          SELECT DATE(MAX(t.start_date)) FROM orders #{current_partition} t
           INNER JOIN drug_order #{current_partition} t2 ON t2.order_id = t.order_id
           INNER JOIN drug t3 ON t3.drug_id = t2.drug_inventory_id
           INNER JOIN concept_set t4 ON t4.concept_id = t3.concept_id
@@ -289,7 +289,6 @@ module MalawiHivProgramReports
           INNER JOIN moh_regimen_ingredient i ON r.regimen_id = i.regimen_id
           AND r.regimen_index = #{regimen_index}
           INNER JOIN moh_regimen_doses d ON i.dose_id = d.dose_id #{weight_sql}
-          #{site_manager(operator: 'AND', column: 'r.site_id', location: @location)}
           GROUP BY min_weight, max_weight, drug_inventory_id;
         SQL
 

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

@@ -121,7 +121,7 @@ module MalawiHivProgramReports
             start_date DATE NOT NULL,
             end_date DATE NOT NULL,
             status VARCHAR(50) NOT NULL,
-            time_taken DECIMAL(40,2) DEFAULT NULL,
+            time_taken DECIMAL(40,2) DEFAULT NULL
           ) ENGINE=InnoDB DEFAULT CHARSET=utf8
         SQL
       end

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

@@ -62,7 +62,6 @@ module MalawiHivProgramReports
             #{function_manager(function: 'disaggregated_age_group', location: @location, args: "p.birthdate::date, '#{end_date.to_date}::date'")} age_group
           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')}
         SQL
 
@@ -119,14 +118,10 @@ module MalawiHivProgramReports
             #{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 #{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 #{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)}
             WHERE p.program_id = 1 #{%w[Military Civilian].include?(@occupation) ? 'AND' : ''} #{occupation_filter(occupation: @occupation, field_name: 'value', table_name: 'a', include_clause: false)}
               AND DATE(s.start_date) < '#{start_date.to_date}'
-              #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
               AND #{function_manager(function: 'pepfar_patient_outcome', location: @location, args: "p.patient_id::int, '#{start_date.to_date}'::date, #{@location}::int")} = 'On antiretrovirals'
               AND pe.person_id NOT IN (#{drug_refills_and_external_consultation_list})
             GROUP BY p.patient_id
@@ -144,15 +139,11 @@ module MalawiHivProgramReports
             #{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 #{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 #{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)}
             WHERE p.program_id = 1 #{%w[Military Civilian].include?(@occupation) ? 'AND' : ''} #{occupation_filter(occupation: @occupation, field_name: 'value', table_name: 'a', include_clause: false)}
               AND DATE(s.start_date) BETWEEN DATE('#{start_date}') AND DATE('#{end_date}')
               AND pe.person_id NOT IN (#{drug_refills_and_external_consultation_list})
-            #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
             GROUP BY p.patient_id
             HAVING date_enrolled IS NOT NULL AND date_enrolled BETWEEN DATE('#{start_date}') AND DATE('#{end_date}');
         SQL

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

@@ -166,7 +166,7 @@ module MalawiHivProgramReports
             DATE(MIN(pregnant_or_breastfeeding.obs_datetime)) AS maternal_status_date
           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)}
+          #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
           LEFT JOIN (
             SELECT max(o.obs_datetime) AS obs_datetime, o.person_id
             FROM obs #{current_partition} o
@@ -176,24 +176,20 @@ module MalawiHivProgramReports
                 AND pp.voided = 0
             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 #{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 #{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 #{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}
-            #{site_manager(operator: 'AND', column: 'pregnant_or_breastfeeding.site_id', location: @location)}
             LEFT JOIN concept_name preg_or_breast ON preg_or_breast.concept_id = pregnant_or_breastfeeding.concept_id AND preg_or_breast.voided = 0
           WHERE pp.date_enrolled <= '#{end_date}' AND pp.date_enrolled >= '#{start_date}'
           GROUP BY pp.patient_id

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

@@ -93,8 +93,8 @@ module MalawiHivProgramReports
 
         def process_age_group_report(age_group, gender, age_group_report)
           {
-            age_group: age_group,
-            gender: gender,
+            age_group:,
+            gender:,
             cd4_less_than_200: age_group_report[:cd4_less_than_200],
             cd4_greater_than_or_equal_to_200: age_group_report[:cd4_greater_than_or_equal_to_200],
             unknown_cd4_count: age_group_report[:unknown_cd4_count],
@@ -122,7 +122,7 @@ module MalawiHivProgramReports
 
         def tx_rtt
           ActiveRecord::Base.connection.select_all <<~SQL
-             SELECT patient_program.patient_id,
+            SELECT patient_program.patient_id,
             #{function_manager(function: 'disaggregated_age_group', location: @location, args: "person.birthdate::date, #{@end_date}::date")} AS age_group,
             person.gender,
             IF(
@@ -165,7 +165,6 @@ module MalawiHivProgramReports
                 END cd4_count_group
             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 #{current_partition} AS patient_ever_on_treatment
               ON patient_ever_on_treatment.patient_program_id = patient_program.patient_program_id
@@ -186,7 +185,6 @@ module MalawiHivProgramReports
               ON date_of_last_patient_state_before_quarter.patient_program_id = patient_program.patient_program_id
             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
               AND patient_state_at_start_of_quarter.state IN (6, 12) /* 2: TO, 6: Tx Stopped, 12: Defaulted */
             /* Select patients who received ART within the reporting period. */
@@ -200,7 +198,7 @@ module MalawiHivProgramReports
               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 #{current_partition})
+                AND drug_order.drug_inventory_id IN (SELECT DISTINCT drug_id FROM arv_drug)
               WHERE encounter.voided = 0
                 AND encounter.program_id = 1
                 AND DATE(encounter.encounter_datetime) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
@@ -220,7 +218,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 #{current_partition} AS patient_state_at_end_of_quarter
+              /*INNER JOIN patient_state 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*/
@@ -235,13 +233,12 @@ module MalawiHivProgramReports
               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 #{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 #{current_partition})
+                AND drug_order.drug_inventory_id IN (SELECT DISTINCT drug_id FROM arv_drug)
               WHERE encounter.program_id = 1
                 AND DATE(encounter.encounter_datetime) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
                 AND encounter.voided = 0
@@ -251,19 +248,17 @@ module MalawiHivProgramReports
                 SELECT max(o.obs_datetime) AS obs_datetime, o.person_id
                 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
+                WHERE o.concept_id = #{concept_name('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 #{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)}
+            LEFT JOIN obs #{current_partition} cd4_result ON cd4_result.person_id = patient_program.patient_id AND cd4_result.concept_id = #{concept_name('CD4 count').concept_id} AND cd4_result.voided = 0
             #  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
             LEFT JOIN (#{current_occupation_query}) a ON a.person_id = patient_program.patient_id
             WHERE patient_program.program_id = 1 #{%w[Military Civilian].include?(@occupation) ? 'AND' : ''} #{occupation_filter(occupation: @occupation, field_name: 'value', table_name: 'a', include_clause: false)}
-            /* Ensure that the patients retrieved, did not receive ART within 28 days
-            before the start of the reporting period */
+              /* Ensure that the patients retrieved, did not receive ART within 28 days
+                 before the start of the reporting period */
               AND patient_program.patient_id NOT IN (
                 SELECT DISTINCT orders.patient_id
                 FROM orders #{current_partition}
@@ -272,15 +267,13 @@ module MalawiHivProgramReports
                 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)}
                 WHERE ((DATE(orders.start_date )BETWEEN (DATE(#{start_date}) - INTERVAL 30 DAY) AND DATE(#{start_date}))
                        OR (DATE(orders.auto_expire_date) BETWEEN (DATE(#{start_date}) - INTERVAL 30 DAY) AND DATE(#{start_date})))
                   AND orders.voided = 0
               )
             GROUP BY patient_program.patient_id
             HAVING initial_outcome IN ('Defaulted', 'Treatment stopped')
-               AND final_outcome = 'On antiretrovirals'
-               AND initial_outcome_date IS NOT NULL;
+               AND final_outcome = 'On antiretrovirals';
           SQL
         end
       end

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

@@ -81,7 +81,7 @@ module MalawiHivProgramReports
       def build_cohort_tables
         return unless rebuild_outcome || @occupation.present?
 
-        cohort_builder = MalawiHivProgramReports::Moh::CumulativeCohort.new(
+        MalawiHivProgramReports::Moh::CumulativeCohort.new(
           start_date: start_date,
           end_date: end_date,
           locations: [@location.to_s],
@@ -126,19 +126,20 @@ module MalawiHivProgramReports
             SELECT o.person_id, MAX(o.obs_datetime) AS obs_datetime, tesd.earliest_start_date, tesd.gender, tesd.birthdate
             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)}
             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)}
+            AND o.voided = 0 AND o.obs_datetime BETWEEN '#{start_date}' AND '#{end_date}'
             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 #{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 screen_method.voided = 0
+            AND screen_method.person_id = o.person_id
             AND DATE(screen_method.obs_datetime) = DATE(current_obs.obs_datetime)
           LEFT JOIN concept_name vcn ON vcn.concept_id = screen_method.value_coded AND vcn.voided = 0 AND vcn.name IN ('CXR', 'MWRD')
           WHERE o.concept_id = #{::ConceptName.find_by_name('TB status').concept_id}
-          AND o.voided = 0 #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
+          AND o.voided = 0
           AND o.value_coded IN (SELECT concept_id FROM concept_name WHERE name IN ('TB Suspected', 'TB NOT suspected') AND voided = 0)
           AND o.obs_datetime BETWEEN '#{start_date}' AND '#{end_date}'
           GROUP BY o.person_id
@@ -195,26 +196,27 @@ module MalawiHivProgramReports
             prev.tb_confirmed_date prev_reading
             #{@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)}
+          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
           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)}
+          AND tcd.voided = 0 AND tcd.person_id = o.person_id
           LEFT JOIN (
             SELECT
               o.person_id,
               COALESCE(MAX(tcd.value_datetime),MAX(o.obs_datetime)) AS tb_confirmed_date
             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)}
+              AND tcd.voided = 0 AND tcd.person_id = o.person_id
             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}
-            AND o.voided = 0 #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
+            AND o.voided = 0
             AND o.obs_datetime <= '#{start_date}'
             GROUP BY o.person_id
           ) prev ON prev.person_id = o.person_id
           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}
-          AND o.voided = 0 #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
+          AND o.voided = 0
           AND o.obs_datetime BETWEEN '#{start_date}' AND '#{end_date}'
           GROUP BY o.person_id
         SQL
@@ -236,8 +238,10 @@ module MalawiHivProgramReports
         <<~SQL
           SELECT tpo.patient_id, LEFT(tesd.gender, 1) AS gender, disaggregated_age_group(tesd.birthdate, DATE('#{end_date.to_date}')) age_group
           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)}
+          INNER JOIN cdr_temp_cohort_members tesd ON tesd.patient_id = tpo.patient_id 
+          #{site_manager(operator: 'AND', column: 'tesd.site_id', location: @location)}
+          #{site_manager(operator: 'AND', column: 'tpo.site_id', location: @location)}
+          WHERE tpo.cum_outcome = 'On antiretrovirals'
         SQL
       end
 

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

@@ -94,30 +94,27 @@ module MalawiHivProgramReports
         external_concept = ::ConceptName.find_by_name('External consultation').concept_id
         hiv_clinic_registration_id = ::EncounterType.find_by_name('HIV CLINIC REGISTRATION').encounter_type_id
 
-        ActiveRecord::Base.connection.select_all("
+        res = ActiveRecord::Base.connection.select_all <<~SQL
             SELECT p.person_id patient_id
             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 #{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 #{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 #{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 #{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)}
+              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: '+')}
               ) AS refill ON p.person_id = refill.person_id
             LEFT JOIN (
-              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)}
+              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: '+')}
               ) 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)
-            #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
             GROUP BY p.person_id
-            ORDER BY hiv_registration.encounter_datetime DESC, refill.obs_datetime DESC, external.obs_datetime DESC;").each do |record|
+            ORDER BY hiv_registration.encounter_datetime DESC, refill.obs_datetime DESC, external.obs_datetime DESC
+          SQL
+        res.each do |record|
           to_remove << record['patient_id'].to_i
         end
         to_remove.join(',')

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

@@ -46,13 +46,12 @@ module MalawiHivProgramReports
         ActiveRecord::Base.connection.adapter_name.downcase
         <<~SQL
           SELECT a.person_id, a.value, a.site_id
-          FROM person_attribute a
-          LEFT OUTER JOIN person_attribute b
-          ON a.person_attribute_id = b.person_attribute_id #{site_manager(operator: 'AND', column: 'b.site_id', location: @location)}
+          FROM person_attribute #{current_partition} a
+          LEFT OUTER JOIN person_attribute #{current_partition} b
+          ON a.person_attribute_id = b.person_attribute_id
           AND a.date_created < b.date_created
-          AND b.voided = 0 #{site_manager(operator: 'AND', column: 'a.site_id', location: @location)}
+          AND b.voided = 0
           WHERE b.person_attribute_id IS NULL AND a.person_attribute_type_id = 13 AND a.voided = 0
-          #{site_manager(operator: 'AND', column: 'a.site_id', location: @location)}
         SQL
       end
 

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.25
 platform: ruby
 authors:
 - Roy Chanunkha