malawi_hiv_program_reports 1.1.16 → 1.1.17

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

@@ -6,9 +6,8 @@ module MalawiHivProgramReports
     # Patients who started TPT just before the start of the current
     # and have finished within the current reporting period.
     class TbPrev3
+      attr_reader :start_date, :end_date, :check_date, :cut_off_point, :occupation, :location, :report
 
-      attr_reader :start_date, :end_date, :check_date, :cut_off_point, :occupation, :location
-      
       include MalawiHivProgramReports::Adapters::Moh::Custom
       include Utils
       include MalawiHivProgramReports::Utils::CommonSqlQueryUtils
@@ -23,56 +22,160 @@ module MalawiHivProgramReports
       end
 
       def find_report
-        report = init_report
+        process_data
+        flatten_the_report
+      rescue StandardError => e
+        Rails.logger.error("Error generating TB Prev3 report: #{e.message}")
+        Rails.logger.error(e.backtrace.join("\n"))
+        raise e
+      end
+
+      def fetch_individual_report(patient_id)
+        individual_tpt_report(patient_id)
+      end
+
+      private
+
+      def init_report
+        pepfar_age_groups.each_with_object({}) do |age_group, report|
+          report[age_group] = %w[Male Female].each_with_object({}) do |gender, gender_sub_report|
+            gender_sub_report[gender] = %w[6H 3HP].each_with_object({}) do |tpt, tpt_sub_report|
+              tpt_sub_report[tpt] = initialize_tpt_metrics
+            end
+          end
+        end
+      end
+
+      def process_data
+        @report = init_report
+        addittional_groups
         patients = group_patients_by_tpt_course(patients_on_tpt)
 
-        load_patients_into_report(report, patients.six_h, '6H') do |patient|
+        load_patients_into_report(patients.six_h, '6H') do |patient|
           # 6H has a constant dosage of 1 pill per day
           patient_completed_tpt?(patient, '6H')
         end
 
-        load_patients_into_report(report, patients.three_hp, '3HP') do |patient|
+        load_patients_into_report(patients.three_hp, '3HP') do |patient|
           # 3HP daily dosages vary by patient weight can't use easily use pills
           # to determine course completion
           patient_completed_tpt?(patient, '3HP')
         end
-
-        report
       end
 
-      def fetch_individual_report(patient_id)
-        individual_tpt_report(patient_id)
+      def initialize_tpt_metrics
+        {
+          started_new_on_art: [],
+          started_previously_on_art: [],
+          completed_new_on_art: [],
+          completed_previously_on_art: []
+        }
       end
 
-      private
-
-      def init_report
-        pepfar_age_groups.each_with_object({}) do |age_group, report|
-          report[age_group] = %w[M F Unknown].each_with_object({}) do |gender, gender_sub_report|
-            gender_sub_report[gender] = %w[6H 3HP].each_with_object({}) do |tpt, tpt_sub_report|
-              tpt_sub_report[tpt] = {
-                started_new_on_art: [],
-                started_previously_on_art: [],
-                completed_new_on_art: [],
-                completed_previously_on_art: []
-              }
-            end
+      def addittional_groups
+        @report['All'] = {}
+        %w[Male FP FNP FBf].each do |key|
+          @report['All'][key] = %w[6H 3HP].each_with_object({}) do |tpt, tpt_sub_report|
+            tpt_sub_report[tpt] = initialize_tpt_metrics
           end
         end
       end
 
-      def load_patients_into_report(report, patients, tpt, &patient_has_completed_tpt)
+      def load_patients_into_report(patients, tpt, &patient_has_completed_tpt)
         patients.each do |patient|
           next if patient['transfer_in'] == 1 && !patient_has_completed_tpt[patient]
 
           age_group = patient['age_group']
-          gender = patient['gender']&.first&.upcase || 'Unknown'
+          gender = patient['gender']
           tpt_states = find_patient_tpt_state(patient, &patient_has_completed_tpt)
 
           tpt_states.each do |tpt_state|
-            report[age_group][gender][tpt][tpt_state] << patient
+            add_to_report(age_group, gender, tpt, tpt_state, patient)
+          end
+        end
+      end
+
+      def flatten_the_report
+        result = []
+        @report.each do |age_group, genders|
+          genders.each do |gender, tpts|
+            tpts.each do |tpt, states|
+              result << process_age_group_report(age_group, gender, tpt, states)
+            end
+          end
+        end
+        combined = combine_entries(result)
+        sort_flattened_report(combined)
+      end
+
+      def combine_entries(flattened_report)
+        ## currently we will have two entries of age_group and gender
+        ## we need to combine them into one
+        ## example [{age_group: '20-25 years', gender: 'Female', 3hp_started_new_on_art: [10] ...}, {age_group: '20-25 years', gender: 'Female', 6hp_started_new_on_art: [10] ...}]
+        ## should be combined to [{age_group: '20-25 years', gender: 'Female', 3hp_started_new_on_art: [10], 6hp_started_new_on_art: [10] ...}]
+
+        result = {}
+
+        flattened_report.each do |entry|
+          age_group = entry[:age_group]
+          gender = entry[:gender]
+          key = "#{age_group}_#{gender}"
+
+          if result.key?(key)
+            entry.each do |k, v|
+              next if %i[age_group gender].include?(k)
+
+              result[key][k] ||= []
+              result[key][k] += v
+            end
+          else
+            result[key] = entry.dup
           end
         end
+
+        result.values
+      end
+
+      def sort_flattened_report(result)
+        new_group = pepfar_age_groups.map { |age_group| age_group }
+        new_group << 'All'
+        gender_scores = { 'Female' => 0, 'Male' => 1, 'FNP' => 3, 'FP' => 2, 'FBf' => 4 }
+        result_scores = result.sort_by do |item|
+          gender_score = gender_scores[item[:gender]] || 999
+          age_group_score = new_group.index(item[:age_group]) || 999
+          [gender_score, age_group_score]
+        end
+        # remove all unknown age groups
+        result_scores.reject { |item| item[:age_group].match?(/unknown/i) }
+      end
+
+      def process_age_group_report(age_group, gender, tpt, states)
+        {
+          age_group:,
+          gender:,
+          "#{tpt}_started_new_on_art": states[:started_new_on_art],
+          "#{tpt}_started_previously_on_art": states[:started_previously_on_art],
+          "#{tpt}_completed_new_on_art": states[:completed_new_on_art],
+          "#{tpt}_completed_previously_on_art": states[:completed_previously_on_art]
+        }
+      end
+
+      def add_to_report(age_group, gender, tpt, tpt_state, patient)
+        @report[age_group][gender][tpt][tpt_state] << patient['patient_id']
+        if gender == 'Male'
+          report['All'][gender][tpt][tpt_state] << patient['patient_id']
+          return
+        end
+
+        maternal_status = patient['maternal_status']
+        case maternal_status
+        when 'FP'
+          @report['All']['FP'][tpt][tpt_state] << patient['patient_id']
+        when 'FBf'
+          @report['All']['FBf'][tpt][tpt_state] << patient['patient_id']
+        else
+          @report['All']['FNP'][tpt][tpt_state] << patient['patient_id']
+        end
       end
 
       def find_patient_tpt_state(patient, &patient_has_completed_tpt)
@@ -121,97 +224,42 @@ module MalawiHivProgramReports
 
       def fetch_patients_on_tpt
         ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT person.person_id AS patient_id,
-                 patient_identifier.identifier AS arv_number,
+          SELECT denominator_patient.patient_id,
                  DATE(MIN(orders.start_date)) AS tpt_initiation_date,
-                 #{function_manager(function: 'date_antiretrovirals_started', location: @location, args: "person.person_id::int, MIN(denominator_patient.start_date)::date, #{@location}::int")} AS art_start_date,
-                 #{function_manager(function: 'patient_outcome', location: @location, args: "person.person_id::int, #{@end_date}::date, #{@location}::int")} AS outcome,
-                 person.gender,
-                 person.birthdate,
-                 #{function_manager(function: 'disaggregated_age_group', location: @location, args: "person.birthdate::date, #{@end_date}::date")} AS age_group
-          FROM person #{current_partition}
-          LEFT JOIN patient_identifier #{current_partition}
-            ON patient_identifier.patient_id = person.person_id
-            AND patient_identifier.voided = 0
-            AND #{in_manager(column: 'patient_identifier.identifier_type', values: "(SELECT patient_identifier_type_id FROM patient_identifier_type #{current_partition} WHERE name = 'ARV Number')")}
-            #{site_manager(operator: 'AND', column: 'patient_identifier.site_id', location: @location)}
-          LEFT JOIN (#{current_occupation_query}) AS current_occupation ON current_occupation.person_id = person.person_id
-          #{site_manager(operator: 'AND', column: 'current_occupation.site_id', location: @location)}
-          INNER JOIN(
-              SELECT denominator_encounter.patient_id AS patient_id, patient_state.start_date AS start_date
-              FROM person #{current_partition}
-              INNER JOIN patient_program #{current_partition}
-                ON patient_program.patient_id = person.person_id
-                AND #{in_manager(column: 'patient_program.program_id', values: "(SELECT program_id FROM program #{current_partition} WHERE name = 'HIV PROGRAM')")}
-                AND patient_program.voided = 0
-              INNER JOIN patient_state #{current_partition}
-                ON patient_state.patient_program_id = patient_program.patient_program_id
-                AND patient_state.state = 7 /* State: 7 == On antiretrovirals */
-                AND patient_state.start_date < DATE(#{start_date})
-                AND patient_state.voided = 0
-              INNER JOIN encounter #{current_partition} AS denominator_encounter
-                ON denominator_encounter.patient_id = patient_program.patient_id
-                AND #{in_manager(column: 'denominator_encounter.program_id', values: "(SELECT program_id FROM program #{current_partition} WHERE name = 'HIV PROGRAM')")}
-                AND #{in_manager(column: 'denominator_encounter.encounter_type', values: "(SELECT encounter_type_id FROM encounter_type WHERE name = 'Treatment')")}
-                AND denominator_encounter.encounter_datetime >= #{interval_manager(date: start_date, value: 6, interval: 'MONTH', operator: '-')}
-                AND denominator_encounter.encounter_datetime <= DATE(#{start_date})
-                AND denominator_encounter.voided = 0
-                 #{site_manager(operator: 'AND', column: 'patient_program.site_id', location: @location)}
-              GROUP BY denominator_encounter.patient_id, patient_state.start_date
-          ) AS denominator_patient ON denominator_patient.patient_id = person.person_id
+                 denominator_patient.earliest_start_date AS art_start_date,
+                 outcome.cum_outcome,
+                 CASE denominator_patient.gender
+                  WHEN 'M' THEN 'Male'
+                  WHEN 'F' THEN 'Female'
+                  ELSE 'Unknown'
+                 END gender,
+                 c.maternal_status,
+                 denominator_patient.birthdate,
+                 disaggregated_age_group(denominator_patient.birthdate, DATE(#{end_date})) AS age_group
+          FROM cdr_temp_cohort_members #{current_partition} denominator_patient
+          LEFT JOIN cdr_temp_maternal_status #{current_partition} c ON c.patient_id = denominator_patient.patient_id
+          INNER JOIN cdr_temp_patient_outcomes #{current_partition} outcome ON denominator_patient.patient_id = outcome.patient_id
           INNER JOIN encounter #{current_partition} AS prescription_encounter
             ON prescription_encounter.patient_id = denominator_patient.patient_id
-            AND prescription_encounter.program_id = 1
-            AND #{in_manager(column: 'prescription_encounter.encounter_type', values: "(SELECT encounter_type_id FROM encounter_type WHERE name = 'Treatment')")}
-            AND prescription_encounter.encounter_datetime >= #{interval_manager(date: start_date, value: 6, interval: 'MONTH', operator: '-')}
+            AND prescription_encounter.program_id = 1 /* HIV Program */
+            AND prescription_encounter.encounter_type = (SELECT encounter_type_id FROM encounter_type WHERE name = 'Treatment' LIMIT 1)
+            AND prescription_encounter.encounter_datetime >= DATE(#{start_date}) - INTERVAL 6 MONTH
             AND prescription_encounter.encounter_datetime <= DATE(#{end_date})
             AND prescription_encounter.voided = 0
-          INNER JOIN orders #{current_partition}
+          INNER JOIN orders #{current_partition} AS orders
             ON orders.encounter_id = prescription_encounter.encounter_id
-            AND #{in_manager(column: 'orders.order_type_id', values: "(SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')")}
-            AND orders.start_date >= #{interval_manager(date: start_date, value: 6, interval: 'MONTH', operator: '-')}
-            AND orders.start_date <= CAST(#{end_date} as DATE)
+            AND orders.order_type_id = (SELECT order_type_id FROM order_type WHERE name = 'Drug order' LIMIT 1)
+            AND orders.start_date >= DATE(#{start_date}) - INTERVAL 6 MONTH
+            AND orders.start_date <= DATE(#{end_date})
             AND orders.voided = 0
-          INNER JOIN concept_name #{current_partition}
+          INNER JOIN concept_name
             ON concept_name.concept_id = orders.concept_id
-            AND #{in_manager(column: 'concept_name.name', values: "'Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine'" )}
-          INNER JOIN drug_order #{current_partition}
+            AND concept_name.name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')
+          INNER JOIN drug_order #{current_partition} AS drug_order
             ON drug_order.order_id = orders.order_id
             AND drug_order.quantity > 0
-          WHERE person.voided = 0 #{%w[Military Civilian].include?(@occupation) ? 'AND' : ''} #{occupation_filter(occupation: @occupation, field_name: 'value', table_name: 'current_occupation', include_clause: false)}
-           #{site_manager(operator: 'AND', column: 'person.site_id', location: @location)}
-            AND person.person_id NOT IN (
-            /* External consultations */
-            SELECT DISTINCT registration_encounter.patient_id
-            FROM patient_program #{current_partition} pp
-            INNER JOIN program #{current_partition} p ON p.program_id = pp.program_id AND p.name = 'HIV PROGRAM' AND p.retired = 0
-            INNER JOIN encounter #{current_partition} AS registration_encounter
-              ON registration_encounter.patient_id = pp.patient_id
-              AND registration_encounter.program_id = pp.program_id
-              AND registration_encounter.encounter_datetime < #{interval_manager(date: end_date, value: 1, interval: 'MONTH', operator: '+')}
-              AND registration_encounter.voided = 0
-            INNER JOIN (
-              SELECT MAX(encounter.encounter_datetime) AS encounter_datetime, encounter.patient_id
-              FROM encounter #{current_partition}
-              INNER JOIN encounter_type
-                ON encounter_type.encounter_type_id = encounter.encounter_type
-                AND encounter_type.name = 'Registration'
-              INNER JOIN program #{current_partition}
-                ON program.program_id = encounter.program_id
-                AND program.name = 'HIV PROGRAM'
-              WHERE encounter.encounter_datetime < CAST(#{end_date} AS DATE) AND encounter.voided = 0
-              GROUP BY encounter.patient_id
-            ) AS max_registration_encounter
-              ON max_registration_encounter.patient_id = registration_encounter.patient_id
-              AND max_registration_encounter.encounter_datetime = registration_encounter.encounter_datetime
-            INNER JOIN obs #{current_partition} AS patient_type_obs
-              ON patient_type_obs.encounter_id = registration_encounter.encounter_id
-              AND #{in_manager(column: 'patient_type_obs.concept_id', values: "(SELECT concept_id FROM concept_name #{current_partition} WHERE name = 'Type of patient' AND voided = 0)")}
-              AND #{in_manager(column: 'patient_type_obs.value_coded', values: "(SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Drug refill', 'External consultation') AND voided = 0)")}
-              AND patient_type_obs.voided = 0
-            WHERE pp.voided = 0
-          )
-          GROUP BY person.person_id #{group_by_columns('patient_identifier.identifier, person.gender, person.birthdate, denominator_patient.start_date')}
+          WHERE denominator_patient.date_enrolled < DATE(#{start_date}) AND denominator_patient.gender IN ('M', 'F')
+          GROUP BY denominator_patient.patient_id
         SQL
       end
 
@@ -220,41 +268,39 @@ module MalawiHivProgramReports
         c_start_date = ActiveRecord::Base.connection.quote(result[:start_date])
         c_end_date = ActiveRecord::Base.connection.quote(client_tpt_end_date(patient_id, c_start_date))
         ActiveRecord::Base.connection.select_one <<-SQL
-            SELECT
-                CASE
-                  WHEN tpt_transfer_in_obs.value_datetime IS NULL THEN DATE(MIN(o.start_date))
-                  WHEN tpt_transfer_in_obs.value_datetime > MIN(o.start_date) THEN DATE(MIN(o.start_date))
-                  ELSE DATE(tpt_transfer_in_obs.value_datetime)
-                END AS tpt_initiation_date,
-                COUNT(DISTINCT(DATE(o.start_date))) AS months_on_tpt,
-                SUM(dor.quantity) + SUM(CASE WHEN tpt_transfer_in_obs.value_numeric IS NOT NULL THEN tpt_transfer_in_obs.value_numeric ELSE 0 END) AS total_pills_taken,
-                SUM(DATEDIFF(o.auto_expire_date, o.start_date)) + SUM(CASE WHEN tpt_transfer_in_obs.value_datetime IS NOT NULL THEN DATEDIFF(tpt_transfer_in_obs.obs_datetime, tpt_transfer_in_obs.value_datetime) ElSE 0 END) AS total_days_on_medication,
-                GROUP_CONCAT(DISTINCT o.concept_id SEPARATOR ',') AS drug_concepts,
-                CASE
-                  WHEN tpt_transfer_in_obs.value_numeric IS NOT NULL THEN 1
-                  ELSE 0
-                END AS transfer_in,
-                MAX(o.start_date) AS last_dispensed_date,
-                MAX(o.auto_expire_date) AS auto_expire_date
-            FROM orders #{current_partition} o
-            INNER JOIN concept_name #{current_partition} cn
-              ON cn.concept_id = o.concept_id
-              AND cn.name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')
-              #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            LEFT JOIN obs #{current_partition} tpt_transfer_in_obs
-              ON tpt_transfer_in_obs.person_id = o.patient_id
-              AND tpt_transfer_in_obs.concept_id = #{::ConceptName.find_by_name('TPT Drugs Received').concept_id}
-              AND tpt_transfer_in_obs.voided = 0
-              #{site_manager(operator: 'AND', column: 'tpt_transfer_in_obs.site_id', location: @location)}
-              AND tpt_transfer_in_obs.value_drug IN (SELECT drug_id FROM drug #{current_partition} WHERE concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
-            INNER JOIN drug_order #{current_partition} dor
-              ON dor.order_id = o.order_id
-              AND dor.quantity > 0
-            WHERE DATE(o.start_date) BETWEEN DATE(#{c_start_date}) AND DATE(#{c_end_date})
-            AND o.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
-            AND o.voided = 0
-            AND o.patient_id = #{patient_id}
-            GROUP BY o.patient_id
+          SELECT
+              CASE
+                WHEN tpt_transfer_in_obs.value_datetime IS NULL THEN DATE(MIN(o.start_date))
+                WHEN tpt_transfer_in_obs.value_datetime > MIN(o.start_date) THEN DATE(MIN(o.start_date))
+                ELSE DATE(tpt_transfer_in_obs.value_datetime)
+              END AS tpt_initiation_date,
+              COUNT(DISTINCT(DATE(o.start_date))) AS months_on_tpt,
+              SUM(dor.quantity) + SUM(CASE WHEN tpt_transfer_in_obs.value_numeric IS NOT NULL THEN tpt_transfer_in_obs.value_numeric ELSE 0 END) AS total_pills_taken,
+              SUM(DATEDIFF(o.auto_expire_date, o.start_date)) + SUM(CASE WHEN tpt_transfer_in_obs.value_datetime IS NOT NULL THEN DATEDIFF(tpt_transfer_in_obs.obs_datetime, tpt_transfer_in_obs.value_datetime) ElSE 0 END) AS total_days_on_medication,
+              GROUP_CONCAT(DISTINCT o.concept_id SEPARATOR ',') AS drug_concepts,
+              CASE
+                WHEN tpt_transfer_in_obs.value_numeric IS NOT NULL THEN 1
+                ELSE 0
+              END AS transfer_in,
+              MAX(o.start_date) AS last_dispensed_date,
+              MAX(o.auto_expire_date) AS auto_expire_date
+          FROM orders #{current_partition} o
+          INNER JOIN concept_name cn
+            ON cn.concept_id = o.concept_id
+            AND cn.name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')
+          LEFT JOIN obs #{current_partition} tpt_transfer_in_obs
+            ON tpt_transfer_in_obs.person_id = o.patient_id
+            AND tpt_transfer_in_obs.concept_id = #{ConceptName.find_by_name('TPT Drugs Received').concept_id}
+            AND tpt_transfer_in_obs.voided = 0
+            AND tpt_transfer_in_obs.value_drug IN (SELECT drug_id FROM drug WHERE concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
+          INNER JOIN drug_order #{current_partition} dor
+            ON dor.order_id = o.order_id
+            AND dor.quantity > 0
+          WHERE DATE(o.start_date) BETWEEN DATE(#{c_start_date}) AND DATE(#{c_end_date})
+          AND o.order_type_id IN (SELECT order_type_id FROM order_type WHERE name = 'Drug order')
+          AND o.voided = 0
+          AND o.patient_id = #{patient_id}
+          GROUP BY o.patient_id
         SQL
       end
 
@@ -292,13 +338,12 @@ module MalawiHivProgramReports
                 ELSE '6H'
               END AS course
             FROM obs #{current_partition} o
-            WHERE o.concept_id = #{::ConceptName.find_by_name('TPT Drugs Received').concept_id}
-            AND o.voided = 0
-            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            AND o.value_drug IN (SELECT drug_id FROM drug #{current_partition} WHERE concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
-            AND o.person_id = #{patient_id}
-            AND o.value_numeric IS NOT NULL
-            AND DATE(o.obs_datetime) <= DATE(#{start_date})
+            WHERE o.concept_id = #{ConceptName.find_by_name('TPT Drugs Received').concept_id}
+              AND o.voided = 0
+              AND o.value_drug IN (SELECT drug_id FROM drug WHERE concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
+              AND o.person_id = #{patient_id}
+              AND o.value_numeric IS NOT NULL
+              AND DATE(o.obs_datetime) <= DATE(#{start_date})
             GROUP BY DATE(o.obs_datetime)
             ORDER BY DATE(o.obs_datetime) DESC
           )
@@ -313,15 +358,14 @@ module MalawiHivProgramReports
                 ELSE '6H'
               END AS course
             FROM orders #{current_partition} o
-            INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV PROGRAM */
+            INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV Program */
             INNER JOIN drug_order #{current_partition} dor ON dor.order_id = o.order_id AND dor.quantity > 0
-            WHERE o.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
-            AND o.voided = 0
-            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            AND o.concept_id IN (#{::ConceptName.where(name: ['Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine']).select(:concept_id).to_sql})
-            AND o.patient_id = #{patient_id}
-            AND o.auto_expire_date IS NOT NULL
-            AND DATE(o.start_date) <= DATE(#{start_date})
+            WHERE o.order_type_id = (SELECT order_type_id FROM order_type WHERE name = 'Drug order' LIMIT 1)
+              AND o.voided = 0
+              AND o.concept_id IN (#{ConceptName.where(name: ['Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine']).select(:concept_id).to_sql})
+              AND o.patient_id = #{patient_id}
+              AND o.auto_expire_date IS NOT NULL
+              AND DATE(o.start_date) <= DATE(#{start_date})
             GROUP BY DATE(o.start_date)
             ORDER BY DATE(o.start_date) DESC
           )
@@ -341,13 +385,12 @@ module MalawiHivProgramReports
                 ELSE '6H'
               END AS course
             FROM obs #{current_partition} o
-            WHERE o.concept_id = #{::ConceptName.find_by_name('TPT Drugs Received').concept_id}
-            AND o.voided = 0
-            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            AND o.value_drug IN (SELECT drug_id FROM drug #{current_partition} WHERE concept_id IN (SELECT concept_id FROM concept_name #{current_partition} WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
-            AND o.person_id = #{patient_id}
-            AND o.value_numeric IS NOT NULL
-            AND DATE(o.obs_datetime) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
+            WHERE o.concept_id = #{ConceptName.find_by_name('TPT Drugs Received').concept_id}
+              AND o.voided = 0
+              AND o.value_drug IN (SELECT drug_id FROM drug WHERE concept_id IN (SELECT concept_id FROM concept_name WHERE name IN ('Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine')))
+              AND o.person_id = #{patient_id}
+              AND o.value_numeric IS NOT NULL
+              AND DATE(o.obs_datetime) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
             GROUP BY DATE(o.obs_datetime)
             ORDER BY DATE(o.obs_datetime) DESC
           )
@@ -362,15 +405,14 @@ module MalawiHivProgramReports
                 ELSE '6H'
               END AS course
             FROM orders #{current_partition} o
-            INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV PROGRAM */
+            INNER JOIN encounter #{current_partition} e ON e.encounter_id = o.encounter_id AND e.voided = 0 AND e.program_id = 1 /* HIV Program */
             INNER JOIN drug_order #{current_partition} dor ON dor.order_id = o.order_id AND dor.quantity > 0
-            WHERE o.order_type_id IN (SELECT order_type_id FROM order_type #{current_partition} WHERE name = 'Drug order')
-            AND o.voided = 0
-            #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
-            AND o.concept_id IN (#{::ConceptName.where(name: ['Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine']).select(:concept_id).to_sql})
-            AND o.patient_id = #{patient_id}
-            AND o.auto_expire_date IS NOT NULL
-            AND DATE(o.start_date) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
+            WHERE o.order_type_id = (SELECT order_type_id FROM order_type WHERE name = 'Drug order' LIMIT 1)
+              AND o.voided = 0
+              AND o.concept_id IN (#{ConceptName.where(name: ['Rifapentine', 'Isoniazid', 'Isoniazid/Rifapentine']).select(:concept_id).to_sql})
+              AND o.patient_id = #{patient_id}
+              AND o.auto_expire_date IS NOT NULL
+              AND DATE(o.start_date) BETWEEN DATE(#{start_date}) AND DATE(#{end_date})
             GROUP BY DATE(o.start_date)
             ORDER BY DATE(o.start_date) DESC
           )
@@ -414,7 +456,7 @@ module MalawiHivProgramReports
       end
 
       def isoniazid_rifapentine_drug
-        @isoniazid_rifapentine_drug ||= ::Drug.find_by!(concept_id: isoniazid_rifapentine_concept.concept_id)
+        @isoniazid_rifapentine_drug ||= Drug.find_by!(concept_id: isoniazid_rifapentine_concept.concept_id)
       end
     end
   end

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

@@ -20,6 +20,7 @@ module MalawiHivProgramReports
         raise 'Location is required' if @location.blank?
 
         @report = init_report
+        addittional_groups
       end
 
       def find_report
@@ -33,20 +34,31 @@ module MalawiHivProgramReports
 
       private
 
-      GENDER = %w[Male Female Unknown].freeze
+      GENDER = %w[Male Female].freeze
 
       def init_report
         pepfar_age_groups.each_with_object({}) do |age_group, report|
           report[age_group] = GENDER.each_with_object({}) do |gender, age_group_report|
-            age_group_report[gender] = {
-              less_than_three_months: [],
-              three_to_five_months: [],
-              greater_than_six_months: []
-            }
+            age_group_report[gender] = initialize_gender_metrics
           end
         end
       end
 
+      def addittional_groups
+        @report['All'] = {}
+        %w[Male FP FNP FBf].each do |key|
+          @report['All'][key] = initialize_gender_metrics
+        end
+      end
+
+      def initialize_gender_metrics
+        {
+          less_than_three_months: [],
+          three_to_five_months: [],
+          greater_than_six_months: []
+        }
+      end
+
       def process_age_group_report(age_group, gender, age_group_report)
         {
           age_group:,
@@ -60,7 +72,11 @@ module MalawiHivProgramReports
       def flatten_the_report
         result = []
         report.each do |age_group, age_group_report|
+          next if age_group == 'Unknown'
+
           age_group_report.each_key do |gender|
+            next if gender == 'Unknown' # skip unknown
+
             result << process_age_group_report(age_group, gender, age_group_report[gender])
           end
         end
@@ -77,24 +93,7 @@ module MalawiHivProgramReports
         result_scores.reject { |item| item[:age_group].match?(/unknown/i) }
       end
 
-      def process_data
-        patients = ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT tesd.patient_id,
-              CASE tesd.gender
-                WHEN 'M' THEN 'Male'
-                WHEN 'F' THEN 'Female'
-                ELSE 'Unknown'
-              END gender,
-              disaggregated_age_group(tesd.birthdate, '#{end_date}') age_group,
-              TIMESTAMPDIFF(DAY, tcm.start_date, tcm.auto_expire_date) prescribed_days
-          FROM cdr_temp_cohort_members #{current_partition} tesd#{' '}
-          INNER JOIN cdr_temp_patient_outcomes #{current_partition} tpo ON tpo.patient_id = tesd.patient_id AND tpo.cum_outcome = 'On antiretrovirals'
-          INNER JOIN cdr_temp_min_auto_expire_date #{current_partition} tcm ON tcm.patient_id = tesd.patient_id
-          WHERE tesd.date_enrolled <= '#{end_date}'
-        SQL
-
-        return report if patients.blank?
-
+      def process_indicators(patients)
         patients.each do |patient|
           prescribe_days = patient['prescribed_days'].to_i
           age_group = patient['age_group']
@@ -110,8 +109,47 @@ module MalawiHivProgramReports
 
           report[age_group][gender][indicator.to_sym] << patient['patient_id']
         end
+      end
+
+      def aggregation(age_group, gender, indicator, patient)
+        report[age_group][gender][indicator.to_sym] << patient['patient_id']
+        if gender == 'Male'
+          report['All'][gender][indicator.to_sym] << patient['patient_id']
+          return
+        end
+
+        maternal_status = patient['maternal_status']
+        case maternal_status
+        when 'FP'
+          @report['All']['FP'][indicator.to_sym] << patient['patient_id']
+        when 'FBf'
+          @report['All']['FBf'][indicator.to_sym] << patient['patient_id']
+        else
+          @report['All']['FNP'][indicator.to_sym] << patient['patient_id']
+        end
+      end
+
+      def process_data
+        patients = ActiveRecord::Base.connection.select_all <<~SQL
+          SELECT tesd.patient_id,
+              CASE tesd.gender
+                WHEN 'M' THEN 'Male'
+                WHEN 'F' THEN 'Female'
+                ELSE 'Unknown'
+              END gender,
+              c.maternal_status,
+              disaggregated_age_group(tesd.birthdate, '#{end_date}') age_group,
+              TIMESTAMPDIFF(DAY, tcm.start_date, tcm.auto_expire_date) prescribed_days
+          FROM cdr_temp_cohort_members #{current_partition} tesd
+          INNER JOIN cdr_temp_patient_outcomes #{current_partition} tpo ON tpo.patient_id = tesd.patient_id AND tpo.cum_outcome = 'On antiretrovirals'
+          INNER JOIN cdr_temp_min_auto_expire_date #{current_partition} tcm ON tcm.patient_id = tesd.patient_id
+          LEFT JOIN cdr_temp_maternal_status #{current_partition} c ON c.patient_id = tesd.patient_id
+          WHERE tesd.date_enrolled <= '#{end_date}' AND tesd.gender IN ('M', 'F')
+        SQL
+
+        return report if patients.blank?
 
-        report
+        process_indicators(patients)
       end
     end
   end