malawi_hiv_program_reports 1.1.18 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a3e944fcb8f4a9e0d862b50321ead38c607a3488c002096735853b06922be5
-  data.tar.gz: fb58caba60b6795e915efaadd08fea81e2817129ef500843da95ba48047028aa
+  metadata.gz: 9452090ad1301bd223ba5fe909770f991b280a328a78f291959cc627b3a5445b
+  data.tar.gz: 69c727c81ebadf855040d3724dc557d43ef62abb8282c6164eef13a4f10ad4e9
 SHA512:
-  metadata.gz: 91ae6c317a44e67d502cc97f3d3d72d54ace89d8def8326f8fc2ea7901e1b4693c0754084b33a1bf9c9d32626dd840b72df1e1c56ee558547ed0ff5056756403
-  data.tar.gz: 8d52d72581ab43cc207e34bbb20ecf62d942cd104c854e0890c4b1712346d64a609907cd447c9f912298be40b78d0affd36e4be1a8ef123a86f7fd749258a83b
+  metadata.gz: 1f8d8117bd8d26f3b98b47d4e165a6cab08ef1f28955328ee4a32b14fe7151f2081b4d52e50f7ac1c8b00e6a57aaa0d540c93f02deaa43712a2a681b8d715a57
+  data.tar.gz: 70e3c528f4527b41e5a27daa6b2238342798d8e3b03e2befe51027e88822d138da486e4fc6652f1a9bae4cbc24cce1810277d1e0b258d49501c9d39689f78c4a

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

@@ -88,6 +88,8 @@ module MalawiHivProgramReports
           maternal_status = data['maternal_status']
           # 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
+
+          report[age_group.to_s][gender.to_s][regimen.to_s] << patient_id if regimen.to_s == '15P'
           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

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

@@ -6,7 +6,7 @@ module MalawiHivProgramReports
     # rubocop:disable Metrics/ClassLength
     class CohortDisaggregatedAdditions
       COHORT_REGIMENS = %w[
-        0P 2P 4PP 4PA 9PP 9PA 11PP 11PA 12PP 12PA 14PP 14PA 15PP 15PA 16P 17PP 17PA
+        0P 2P 4PP 4PA 9PP 9PA 11PP 11PA 12PP 12PA 14PP 14PA 15P 15PP 15PA 16P 17PP 17PA
         4A 5A 6A 7A 8A 9A 10A 11A 12A 13A 14A 15A 16A 17A
       ].freeze
 

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

@@ -75,6 +75,7 @@ module MalawiHivProgramReports
         fourteen_pp: 'Regimen 14PP',
         fourteen_pa: 'Regimen 14PA',
         fourteen_a: 'Regimen 14 A',
+        fifteen_p: 'Regimen 15P',
         fifteen_pp: 'Regimen 15PP',
         fifteen_pa: 'Regimen 15PA',
         fifteen_a: 'Regimen 15 A',

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

@@ -31,22 +31,6 @@ module MalawiHivProgramReports
         load_breast_feeding
       end
 
-      private 
-
-      def vl_maternal_status(patient_list)
-        return { FP: [], FBf: [] } if patient_list.blank?
-
-        pregnant = pregnant_women(patient_list).map { |woman| woman['person_id'].to_i }
-        return { FP: pregnant, FBf: [] } if (patient_list - pregnant).blank?
-
-        feeding = breast_feeding(patient_list - pregnant).map { |woman| woman['person_id'].to_i }
-
-        {
-          FP: pregnant,
-          FBf: feeding
-        }
-      end
-
       def pregnant_women(patient_list)
         ActiveRecord::Base.connection.execute <<~SQL
           SELECT person_id
@@ -63,6 +47,22 @@ module MalawiHivProgramReports
         SQL
       end
 
+      private 
+
+      def vl_maternal_status(patient_list)
+        return { FP: [], FBf: [] } if patient_list.blank?
+
+        pregnant = pregnant_women(patient_list).map { |woman| woman['person_id'].to_i }
+        return { FP: pregnant, FBf: [] } if (patient_list - pregnant).blank?
+
+        feeding = breast_feeding(patient_list - pregnant).map { |woman| woman['person_id'].to_i }
+
+        {
+          FP: pregnant,
+          FBf: feeding
+        }
+      end
+
       def load_pregnant_women
         ActiveRecord::Base.connection.execute <<~SQL
           INSERT INTO cdr_temp_maternal_status #{current_partition} (patient_id, site_id, maternal_status)

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

@@ -118,10 +118,8 @@ module MalawiHivProgramReports
       end
 
       def build_cohort_tables
-        return unless rebuild_outcome || @occupation.present?
-
         MalawiHivProgramReports::Moh::CumulativeCohort.new(
-          start_date:,
+          start_date: (end_date - 2.months).beginning_of_month,
           end_date:,
           locations: [@location.to_s],
           rebuild: rebuild_outcome
@@ -166,6 +164,8 @@ module MalawiHivProgramReports
             cn.name AS tb_status,
             GROUP_CONCAT(DISTINCT vcn.name) AS screening_methods
           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 obs #{current_partition} o ON o.person_id = tesd.patient_id
             AND o.voided = 0 AND o.concept_id = #{tb_status}
             AND o.obs_datetime BETWEEN '#{start_date}' AND '#{end_date}'
@@ -176,6 +176,11 @@ module MalawiHivProgramReports
             AND acurr.obs_datetime > o.obs_datetime
             AND acurr.obs_datetime BETWEEN '#{start_date}' AND '#{end_date}'
             AND acurr.value_coded IN (#{tb_status_results})
+          INNER JOIN obs #{current_partition} patient_present ON patient_present.person_id = o.person_id
+            AND patient_present.concept_id = #{ConceptName.find_by_name('Patient present').concept_id}
+            AND patient_present.value_coded = #{ConceptName.find_by_name('Yes').concept_id}
+            AND patient_present.voided = 0
+            AND patient_present.obs_datetime BETWEEN '#{start_date}' AND '#{end_date}'
           LEFT JOIN obs #{current_partition} screen_method ON screen_method.concept_id = #{tb_screening_method}
             AND screen_method.voided = 0
             AND screen_method.person_id = o.person_id
@@ -335,9 +340,15 @@ module MalawiHivProgramReports
       end
 
       def process_method(methods:, **kwargs)
-        indicator = :symptom_screen_alone if methods.blank?
-        indicator = :cxr_screen if methods&.include?('cxr') && !methods&.include?('mwrd')
-        indicator = :mwrd_screen if methods&.include?('mwrd')
+        indicator = nil
+
+        if methods.include?('mwrd')
+          indicator = :mwrd_screen
+        elsif methods.include?('cxr')
+          indicator = :cxr_screen
+        else
+          indicator = :symptom_screen_alone
+        end
 
         process_aggreggation_rows(kwargs[:age_group], kwargs[:gender], indicator, kwargs[:patient_id], kwargs[:maternal_status])
       end

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

@@ -26,7 +26,7 @@ module MalawiHivProgramReports
       end
 
       COHORT_REGIMENS = %w[
-        0P 2P 4PP 4PA 9PP 9PA 11PP 11PA 12PP 12PA 14PP 14PA 15PP 15PA 16P 17PP 17PA
+        0P 2P 4PP 4PA 9PP 9PA 11PP 11PA 12PP 12PA 14PP 14PA 15P 15PP 15PA 16P 17PP 17PA
         4A 5A 6A 7A 8A 9A 10A 11A 12A 13A 14A 15A 16A 17A
       ].freeze
 

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

@@ -36,10 +36,10 @@ module MalawiHivProgramReports
       def vl_maternal_status(patient_list)
         return { FP: [], FBf: [] } if patient_list.blank?
 
-        pregnant = pregnant_women(patient_list).map { |woman| woman['person_id'].to_i }
+        pregnant = maternal_status.pregnant_women(patient_list).map { |woman| woman['patient_id'].to_i }
         return { FP: pregnant, FBf: [] } if (patient_list - pregnant).blank?
 
-        feeding = breast_feeding(patient_list - pregnant).map { |woman| woman['person_id'].to_i }
+        feeding = maternal_status.breast_feeding(patient_list - pregnant).map { |woman| woman['patient_id'].to_i }
 
         {
           FP: pregnant,
@@ -120,40 +120,6 @@ module MalawiHivProgramReports
         true
       end
 
-      def pregnant_women(patient_list)
-        ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT o.person_id, o.value_coded
-          FROM obs #{current_partition} o
-          LEFT JOIN obs #{current_partition} a ON a.person_id = o.person_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(start_date)})
-            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.person_id IN (#{patient_list.join(',')})
-            AND o.value_coded IN (#{yes_concepts.join(',')})
-          GROUP BY o.person_id
-        SQL
-      end
-
-      def breast_feeding(patient_list)
-        ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT o.person_id, o.value_coded
-          FROM obs #{current_partition} o
-          LEFT JOIN obs #{current_partition} a ON a.person_id = o.person_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(start_date)})
-            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.person_id IN (#{patient_list.join(',')})
-            AND o.value_coded IN (#{yes_concepts.join(',')})
-          GROUP BY o.person_id
-        SQL
-      end
-
       def build_report(report)
         refresh_outcomes_table
         load_tx_curr_into_report(report, create_patients_alive_and_on_art_query)
@@ -395,26 +361,18 @@ module MalawiHivProgramReports
         SQL
       end
 
-      def yes_concepts
-        @yes_concepts ||= ::ConceptName.where(name: 'Yes').select(:concept_id).map do |record|
-          record['concept_id'].to_i
-        end
-      end
-
-      def pregnant_concepts
-        @pregnant_concepts ||= ::ConceptName.where(name: ['Is patient pregnant?', 'patient pregnant'])
-                                            .select(:concept_id)
-      end
-
-      def breast_feeding_concepts
-        @breast_feeding_concepts ||= ::ConceptName.where(name: ['Breast feeding?', 'Breast feeding', 'Breastfeeding'])
-                                                  .select(:concept_id)
-      end
-
       def encounter_types
         @encounter_types ||= ::EncounterType.where(name: ['HIV CLINIC CONSULTATION', 'HIV STAGING'])
                                             .select(:encounter_type_id)
       end
+
+      def maternal_status
+        ArtService::Reports::MaternalStatus.new(
+          start_date:,
+          end_date:,
+          occupation:
+        )
+      end
     end
   end
 end

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.20
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2025-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails