malawi_hiv_program_reports 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af23c66f80f04922477b707fe4978ca1234e06814761e657a4e9a27c8bb433e3
-  data.tar.gz: 762826dfec0aafbf978fc024ab7dafca271d3d6588128c9d4a9180a0ffcf86ab
+  metadata.gz: ed231eff9bb9c45a7d57027366c82fc112fc1de0cb6c4f457cd87bfeed1bd908
+  data.tar.gz: 3b9a9292285146cac5a4f202bf2d2266fdf323f1acdb67a94706efee322f4afe
 SHA512:
-  metadata.gz: dad18495c08f5e2ca3db34adad758449cdf147dbd8c9edabbb8b771f68e0dda3d4ae88d47082a24fa5ef62f52e74f603676f8bef15d896ae93947ba529421132
-  data.tar.gz: e3497d0e34c8397efec79d71d6e77e805b3d580e1b8096856a04a2e97d6fe7da73612bf593a58c680b13b93c73778f014d61ea3edfb5ba7fe690e31f62fbc778
+  metadata.gz: 2dab0b971e5a76b0097586837b7adb5869d5c0d34563824cc79d02b8cce0679f22a1afce0955b3a733663e017a6886ccced14f924dd5636f34026c05fc6649b4
+  data.tar.gz: 7015b44578a5bdfaea8a15c2b85b03823688b5a13fdf37e683612549c257376c0583117a28b03332d4af53c2561069c1b5d406862fd341ba15e0c724b0bbdfe7

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

@@ -188,7 +188,9 @@ module MalawiHivProgramReports
         end
 
         def current_partition
-          "PARTITION (p#{@location})"
+          return "PARTITION (p#{@location})" unless @location.blank?
+
+          ''
         end
 
         # this is a min filter

data/app/services/malawi_hiv_program_reports/cohort/disaggregated.rb

@@ -0,0 +1,204 @@
+# frozen_string_literal: true
+
+module MalawiHivProgramReports
+  module Cohort
+    # Disaggregated cohort report
+    # rubocop:disable Metrics/ClassLength
+    class Disaggregated
+      attr_accessor :type, :start_date, :end_date, :rebuild, :occupation, :report, :maternal, :location
+
+      include MalawiHivProgramReports::Utils::ModelUtils
+      include MalawiHivProgramReports::Pepfar::Utils
+      include MalawiHivProgramReports::Adapters::Moh::Custom
+
+      def initialize(start_date:, end_date:, **kwargs)
+        @type = kwargs[:definition] || 'pepfar'
+        @start_date = start_date
+        @end_date = end_date
+        @rebuild = kwargs[:rebuild]&.casecmp?('true')
+        @occupation = kwargs[:occupation]
+        @location = kwargs[:location]
+        @maternal = {}
+
+        # raise an error if location is empty
+        raise 'Location cannot be empty' if @location.blank?
+      end
+
+      def find_report
+        rebuild_report if rebuild
+        process_initialization
+        process_data
+        flatten_and_sort_data
+      end
+
+      private
+
+      GENDER = %w[M F].freeze
+      AGGREGATE_GENDER_ROWS = %w[M FP FNP FBf].freeze
+
+      def process_initialization
+        init_report
+        init_aggregate_rows
+      end
+
+      def init_report
+        @report = pepfar_age_groups.each_with_object({}) do |age_group, report|
+          report[age_group] = {}
+          GENDER.each do |gender|
+            report[age_group][gender] = {}
+            init_cohort_section(report[age_group][gender])
+          end
+        end
+      end
+
+      def init_aggregate_rows
+        report['All'] = {}
+        AGGREGATE_GENDER_ROWS.each do |gender|
+          report['All'][gender] = {}
+          init_cohort_section(report['All'][gender])
+        end
+      end
+
+      def init_cohort_section(cursor)
+        cursor['tx_curr'] = []
+        (COHORT_REGIMENS + ['Unknown']).each do |regimen|
+          cursor[regimen] = []
+        end
+        cursor['unknown'] = []
+        cursor['total'] = []
+      end
+
+      def process_data
+        process_db_data
+        process_maternal_data
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      def process_db_data
+        fetch_data.each do |data|
+          age_group = data['age_group']
+          regimen = data['regimen'] || 'Unknown'
+          patient_id = data['patient_id']
+          # we need to handle regimes that only have one P to become PP. Otherwise if it is already PP or PA we leave
+          # it as is. Regimens are in this format NUMBERLETTERS
+          regimen = regimen.gsub(/(\d+[A-Za-z]*P)\z/, '\1P') if regimen.match?(/\A\d+[A-Za-z]*[^P]P\z/)
+          gender = data['gender']
+          report[age_group.to_s][gender.to_s][regimen.to_s] << patient_id
+          report[age_group.to_s][gender.to_s]['tx_curr'] << patient_id
+          report[age_group.to_s][gender.to_s]['total'] << patient_id
+          process_aggregate_rows(gender:, regimen:, patient_id:)
+        end
+      end
+
+      def process_maternal_data
+        result = MalawiHivProgramReports::Pepfar::ViralLoadCoverage2.new(start_date:, end_date:, location:)
+                                                                    .vl_maternal_status(maternal.keys)
+        # result comes in this form: { FP: [], FBf: [] }
+        # we need to loop through the keys
+        result.each_key do |key|
+          result[key].each do |patient_id|
+            report['All'][key.to_s]['tx_curr'] << patient_id
+            report['All'][key.to_s][maternal[patient_id].to_s] << patient_id
+            report['All'][key.to_s]['total'] << patient_id
+          end
+        end
+      end
+      # rubocop:enable Metrics/AbcSize
+
+      def process_aggregate_rows(gender:, regimen:, patient_id:)
+        if gender == 'M'
+          report['All']['M']['tx_curr'] << patient_id
+          report['All']['M'][regimen.to_s] << patient_id
+          report['All']['M']['total'] << patient_id
+        else
+          maternal[patient_id] = regimen
+        end
+      end
+
+      # we need to flatten the data
+      def flatten_data
+        flat_data = []
+        report.each do |age_group, gender_data|
+          gender_data.each do |gender, regimen_data|
+            flat_data << {
+              'age_group' => age_group,
+              'gender' => gender,
+              **regimen_data
+            }
+          end
+        end
+        flat_data
+      end
+
+      def flatten_and_sort_data
+        flat_data = flatten_data
+
+        age_group_order = ['Unknown', '<1 year', '1-4 years', '5-9 years', '10-14 years', '15-19 years',
+                           '20-24 years', '25-29 years', '30-34 years', '35-39 years', '40-44 years', '45-49 years',
+                           '50-54 years', '55-59 years', '60-64 years', '65-69 years', '70-74 years', '75-79 years',
+                           '80-84 years', '85-89 years', '90 plus years', 'All']
+        gender_order = %w[F M FP FNP FBF]
+
+        flat_data.sort_by do |row|
+          [age_group_order.index(row['age_group']) || Float::INFINITY,
+           gender_order.index(row['gender']) || Float::INFINITY]
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def fetch_data
+        ActiveRecord::Base.connection.select_all <<~SQL
+          SELECT
+              prescriptions.patient_id,
+              COALESCE(regimens.name, 'unknown') AS regimen,
+              prescriptions.age_group,
+              prescriptions.gender
+          FROM (
+              SELECT
+                  tcm.patient_id,
+                  GROUP_CONCAT(DISTINCT(tcm.drug_id) ORDER BY tcm.drug_id ASC) AS drugs,
+                  disaggregated_age_group(date(earliest_start_date.birthdate), date('#{end_date}')) AS age_group,
+                  earliest_start_date.gender
+              FROM cdr_temp_current_medication #{current_partition} tcm
+              INNER JOIN cdr_temp_patient_outcomes #{current_partition} AS outcomes ON outcomes.patient_id = tcm.patient_id AND outcomes.cum_outcome = 'On antiretrovirals'
+              INNER JOIN cdr_temp_cohort_members #{current_partition} AS earliest_start_date ON earliest_start_date.patient_id = tcm.patient_id
+              GROUP BY tcm.patient_id
+          ) AS prescriptions
+          LEFT JOIN (
+              SELECT GROUP_CONCAT(drug.drug_id ORDER BY drug.drug_id ASC) AS drugs, regimen_name.name AS name
+              FROM moh_regimen_combination AS combo
+              INNER JOIN moh_regimen_combination_drug AS drug USING (regimen_combination_id)
+              INNER JOIN moh_regimen_name AS regimen_name USING (regimen_name_id)
+              GROUP BY combo.regimen_combination_id
+          ) AS regimens ON regimens.drugs = prescriptions.drugs
+        SQL
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def update_outcomes
+        if check_if_table_exists('cdr_temp_patient_outcomes')
+          MalawiHivProgramReports::Moh::CumulativeOutcome.new(end_date:, start_date:, definition:,
+                                                              rebuild: 'true', location:).find_report
+        else
+          rebuild_report
+        end
+      end
+
+      def rebuild_report
+        MalawiHivProgramReports::Moh::CumulativeCohort.new(definition:, start_date:, end_date:,
+                                                           locations: [location], rebuild: 'true').find_report
+      end
+
+      def check_if_table_exists(table_name)
+        result = ActiveRecord::Base.connection.select_one <<~SQL
+          SELECT COUNT(*) AS count
+          FROM information_schema.tables
+          WHERE table_schema = DATABASE()
+          AND table_name = '#{table_name}'
+        SQL
+        result['count'].to_i.positive?
+      end
+    end
+    # rubocop:enable Metrics/ClassLength
+  end
+end

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

@@ -78,7 +78,7 @@ module MalawiHivProgramReports
       # rubocop:enable Metrics/MethodLength
 
       def reprocess_failed
-        failed_locs = failed_locs&.map { |loc| loc[:site_id] }
+        failed_locs = failed_sites&.map { |loc| loc[:site_id] }
         return if failed_locs.empty?
 
         process_thread(locations: failed_locs)

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

@@ -25,6 +25,11 @@ module MalawiHivProgramReports
         ].freeze
       end
 
+      COHORT_REGIMENS = %w[
+        0P 2P 4PP 4PA 9PP 9PA 11PP 11PA 12PP 12PA 14PP 14PA 15PP 15PA 16P 17PP 17PA
+        4A 5A 6A 7A 8A 9A 10A 11A 12A 13A 14A 15A 16A 17A
+      ].freeze
+
       ##
       # Returns the drilldown information for all specified patients (ie patient_ids)
       #
@@ -54,8 +59,8 @@ module MalawiHivProgramReports
       # In some clinics like Lighthouse Filing numbers are used exclusively and in other
       # sites, ARV Numbers are used.
       def pepfar_patient_identifier_type
-        name = GlobalProperty.find_by(property: 'use.filing.numbers')&.property_value 
-        name = (name.present? && name == 'true') ? 'Filing number' : 'ARV Number'
+        name = GlobalProperty.find_by(property: 'use.filing.numbers')&.property_value
+        name = name.present? && name == 'true' ? 'Filing number' : 'ARV Number'
         ::PatientIdentifierType.where(name:).select(:patient_identifier_type_id)
       end
 
@@ -95,25 +100,25 @@ module MalawiHivProgramReports
         hiv_clinic_registration_id = ::EncounterType.find_by_name('HIV CLINIC REGISTRATION').encounter_type_id
 
         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
-            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
-            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
-            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: '+')}
-            ) 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: '+')}
-              ) 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: '+')}
-              ) 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)
-            GROUP BY p.person_id
-            ORDER BY hiv_registration.encounter_datetime DESC, refill.obs_datetime DESC, external.obs_datetime DESC
-          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
+          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
+          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
+          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: '+')}
+          ) 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: '+')}
+            ) 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: '+')}
+            ) 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)
+          GROUP BY p.person_id
+          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
@@ -138,7 +143,8 @@ module MalawiHivProgramReports
       def patient_on_tb_treatment?(patient_id)
         ::Observation.where(person_id: patient_id, concept_id: ::ConceptName.find_by_name('TB status').concept_id,
                             value_coded: ::ConceptName.find_by_name('Confirmed TB on treatment').concept_id)
-                     .where("obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY', operator: '+')}").exists?
+                     .where("obs_datetime < #{interval_manager(date: end_date, value: 1, interval: 'DAY',
+                                                               operator: '+')}").exists?
       end
     end
   end

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

@@ -9,18 +9,17 @@ module MalawiHivProgramReports
     # 4. for the sample drawns available pick the latest sample drawn within the reporting period
     # 5. for the results pick the latest result within the reporting period
     class ViralLoadCoverage2
-        
-        include Utils
-        include MalawiHivProgramReports::Utils::CommonSqlQueryUtils
-        include MalawiHivProgramReports::Adapters::Moh::Custom
-        include MalawiHivProgramReports::Utils::ModelUtils
-        attr_reader :start_date, :end_date, :location
+      include Utils
+      include MalawiHivProgramReports::Utils::CommonSqlQueryUtils
+      include MalawiHivProgramReports::Adapters::Moh::Custom
+      include MalawiHivProgramReports::Utils::ModelUtils
+      attr_reader :start_date, :end_date, :location
 
       def initialize(start_date:, end_date:, **kwargs)
         @start_date = start_date&.to_date
         raise InvalidParameterError, 'start_date is required' unless @start_date
 
-        @end_date = end_date&.to_date || @start_date + 12.months
+        @end_date = end_date&.to_date || (@start_date + 12.months)
         raise InvalidParameterError, "start_date can't be greater than end_date" if @start_date > @end_date
 
         @occupation = kwargs.delete(:occupation)
@@ -56,9 +55,9 @@ module MalawiHivProgramReports
         start = Time.now
         results = clients_on_art
         # get all clients that are females from results
-        @maternal_status = vl_maternal_status(results.map do |patient|
+        @maternal_status = vl_maternal_status(results.filter_map do |patient|
                                                 patient['patient_id'] if patient['gender'] == 'F'
-                                              end.compact)
+                                              end)
         if @type.blank? || @type == 'poc'
           Parallel.each(results, in_threads: 20) do |patient|
             process_client_eligibility(patient)
@@ -111,7 +110,7 @@ module MalawiHivProgramReports
         length = 12
         length = 6 if patient['maternal_status'] == 'FP'
         length = 6 if patient['maternal_status'] == 'FBf'
-        length = 6 if patient['current_regimen'].to_s.match(/P/i)
+        length = 6 if /P/i.match?(patient['current_regimen'].to_s)
 
         if patient['vl_order_date'] && patient['vl_order_date'].to_date >= end_date - 12.months && patient['vl_order_date'].to_date <= end_date
           return false
@@ -125,27 +124,14 @@ module MalawiHivProgramReports
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT o.person_id, o.value_coded
           FROM obs #{current_partition} o
-          INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.encounter_type IN (#{encounter_types.to_sql})
-          #{site_manager(operator: 'AND', column: 'e.site_id', location: @location)}
-          INNER JOIN person #{current_partition} p ON o.person_id = e.patient_id AND LEFT(p.gender, 1) = 'F'
-          #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
-          INNER JOIN (
-            SELECT person_id, MAX(obs_datetime) AS obs_datetime
-            FROM obs #{current_partition}
-            INNER JOIN encounter #{current_partition} ON encounter.encounter_id = obs.encounter_id AND encounter.encounter_type IN (#{encounter_types.to_sql}) AND encounter.voided = 0
-            #{site_manager(operator: 'AND', column: 'encounter.site_id', location: @location)}
-            WHERE obs.concept_id IN (#{pregnant_concepts.to_sql})
-              AND obs.obs_datetime BETWEEN DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
-              AND obs.voided = 0
-              #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
-            GROUP BY person_id
-          ) AS max_obs ON max_obs.person_id = o.person_id AND max_obs.obs_datetime = o.obs_datetime
-          #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-          WHERE o.concept_id IN (#{pregnant_concepts.to_sql})
+          LEFT JOIN obs #{current_partition} a ON a.obs_id = o.obs_id and a.obs_datetime > o.obs_datetime and a.concept_id in (#{pregnant_concepts.to_sql}) and a.voided = 0
+          AND a.obs_datetime >= DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND a.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
+          WHERE a.obs_id is null
+            and o.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
             AND o.voided = 0
+            AND o.concept_id in (#{pregnant_concepts.to_sql})
             AND o.value_coded IN (#{yes_concepts.join(',')})
             AND o.person_id IN (#{patient_list.join(',')})
-            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
           GROUP BY o.person_id
         SQL
       end
@@ -154,27 +140,14 @@ module MalawiHivProgramReports
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT o.person_id, o.value_coded
           FROM obs #{current_partition} o
-          INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.encounter_type IN (#{encounter_types.to_sql})
-          #{site_manager(operator: 'AND', column: 'e.site_id', location: @location)}
-          INNER JOIN person #{current_partition} p ON o.person_id = e.patient_id AND LEFT(p.gender, 1) = 'F'
-          #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
-          INNER JOIN (
-            SELECT person_id, MAX(obs_datetime) AS obs_datetime
-            FROM obs #{current_partition}
-            INNER JOIN encounter #{current_partition} ON encounter.encounter_id = obs.encounter_id AND encounter.encounter_type IN (#{encounter_types.to_sql}) AND encounter.voided = 0
-            #{site_manager(operator: 'AND', column: 'encounter.site_id', location: @location)}
-            WHERE obs.concept_id IN (#{breast_feeding_concepts.to_sql})
-              AND obs.obs_datetime BETWEEN DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
-              AND obs.voided = 0
-              #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
-            GROUP BY person_id
-          ) AS max_obs ON max_obs.person_id = o.person_id AND max_obs.obs_datetime = o.obs_datetime
-          #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-          WHERE o.concept_id IN (#{breast_feeding_concepts.to_sql})
+          LEFT JOIN obs #{current_partition} a ON a.obs_id = o.obs_id and a.obs_datetime > o.obs_datetime and a.concept_id in (#{breast_feeding_concepts.to_sql}) and a.voided = 0
+          AND a.obs_datetime >= DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND a.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
+          WHERE a.obs_id is null
+            and o.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
             AND o.voided = 0
+            AND o.concept_id IN (#{breast_feeding_concepts.to_sql})
             AND o.value_coded IN (#{yes_concepts.join(',')})
             AND o.person_id IN (#{patient_list.join(',')})
-            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
           GROUP BY o.person_id
         SQL
       end
@@ -191,22 +164,22 @@ module MalawiHivProgramReports
 
       def refresh_outcomes_table
         MalawiHivProgramReports::Moh::CohortBuilder.new(outcomes_definition: 'pepfar', location: @location)
-                      .init_temporary_tables(@start_date, @end_date, nil)
+                                                   .init_temporary_tables(@start_date, @end_date, nil)
       end
 
       def create_patients_alive_and_on_art_query
         ActiveRecord::Base.connection.select_all(
           <<~SQL
             SELECT tpo.patient_id, LEFT(tesd.gender, 1) AS gender, disaggregated_age_group(tesd.birthdate, DATE('#{end_date.to_date}')) age_group
-            FROM temp_patient_outcomes #{current_partition} tpo
-            INNER JOIN temp_earliest_start_date #{current_partition} tesd ON tesd.patient_id = tpo.patient_id
+            FROM cdr_temp_patient_outcomes #{current_partition} tpo
+            INNER JOIN cdr_temp_cohort_members #{current_partition} tesd ON tesd.patient_id = tpo.patient_id
             WHERE tpo.cum_outcome = 'On antiretrovirals'
           SQL
         )
       end
 
       def load_tx_curr_into_report(report, patients)
-        report.each do |age_group, _data|
+        report.each_key do |age_group|
           %i[M F].each do |gender|
             report[age_group][gender][:tx_curr] ||= []
             report[age_group][gender][:tx_curr] = populate_tx_curr(patients, age_group, gender) || []
@@ -217,11 +190,9 @@ module MalawiHivProgramReports
       def populate_tx_curr(patients, age_group, gender)
         patients.select do |patient|
           (patient['age_group'] == age_group && patient['gender'].to_sym == gender) && patient['patient_id']
-        end&.map {|a| a['patient_id']}
+        end&.map { |a| a['patient_id'] }
       end
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
       def load_patient_tests_into_report(report, clients)
         find_patients_with_viral_load(clients).each do |patient|
           age_group = patient['age_group']

data/app/services/malawi_hiv_program_reports/report_map.rb

@@ -7,7 +7,7 @@ module MalawiHivProgramReports
       'APPOINTMENTS' => MalawiHivProgramReports::Clinic::AppointmentsReport,
       'ARV_REFILL_PERIODS' => MalawiHivProgramReports::ArvRefillPeriods,
       'COHORT' => MalawiHivProgramReports::Moh::ArtCohort,
-      'COHORT_DISAGGREGATED' => MalawiHivProgramReports::Moh::CohortDisaggregated,
+      'COHORT_DISAGGREGATED' => MalawiHivProgramReports::Cohort::Disaggregated,
       'COHORT_DISAGGREGATED_ADDITIONS' => MalawiHivProgramReports::Moh::CohortDisaggregatedAdditions,
       'COHORT_SURVIVAL_ANALYSIS' => MalawiHivProgramReports::Moh::CohortSurvivalAnalysis,
       'DRUG_DISPENSATIONS' => MalawiHivProgramReports::Clinic::DrugDispensations,

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,6 +125,7 @@ files:
 - app/services/malawi_hiv_program_reports/clinic/viral_load_results.rb
 - app/services/malawi_hiv_program_reports/clinic/visits_report.rb
 - app/services/malawi_hiv_program_reports/clinic/vl_collection.rb
+- app/services/malawi_hiv_program_reports/cohort/disaggregated.rb
 - app/services/malawi_hiv_program_reports/cohort/outcomes.rb
 - app/services/malawi_hiv_program_reports/cohort/regimens.rb
 - app/services/malawi_hiv_program_reports/cohort/side_effects.rb