malawi_hiv_program_reports 1.1.17 → 1.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c818eb00df67da231594873c08c20bb5df18a2c53433788a96e27a7ca1211bf9
-  data.tar.gz: fd99e8c2ca139a33ddd76a9eefbaef20dfcf6eee7c1b6290919e2240c39b9c63
+  metadata.gz: 59ce2b645e8862156cd2dfe62c5085eb8f92b940f3abb591d4ed90affc349a72
+  data.tar.gz: 2b4a8ba3fd2ee2e82ae0e645b6b52f8951bb04e2bc9f418faed1ff4052f14acf
 SHA512:
-  metadata.gz: f61982a9e3ce30521079abacdd89144d6c03d10fde293d5fbefcb61fac57a143e5680f5216eee22e8423f37d8b88014205f602003af0644a7a95078fed7d052c
-  data.tar.gz: ea196faf6b0a471e995e4885058acbc0a141c7fcbe948e502801648ed796fbea5e72bf1d0f28b556ea0ccd1404cbc78046928ebb5330acdcfd7068f54f16c924
+  metadata.gz: 645f9cbfdbeaf74c6b2da6035a3d336408d7e28663171557ecc2e68c7d53489d218408dd76980d870ef0d74dbc1238a57d388d194ac3195e3fe0953420e97d6e
+  data.tar.gz: f6b5ad1078a1a8c3c68faee0d74c71502dce1099797140ab72ca171d92e8bf585b00b750758c3dead290927266c5c90aa8b912e57786d04db53418c4c15e8a67

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

@@ -23,10 +23,7 @@ module MalawiHivProgramReports
         @definition = kwargs[:definition] || 'pepfar'
         @iteration = Concurrent::AtomicFixnum.new(0)
         @start_time = Time.now
-        @redis = Redis.new
-        @redis.set('cumulative_progress', 0)
-        @redis.set('cumulative_status', 'running')
-        @redis.set('cumulative_time_taken', 0)
+        prepare_redis
         definition = @definition.downcase
         raise ArgumentError, "Invalid outcomes definition: #{definition}" unless %w[moh pepfar].include?(definition)
       end
@@ -61,7 +58,7 @@ module MalawiHivProgramReports
         queue = Queue.new
         locations.each { |loc| queue << loc }
 
-        threads = Array.new(65) do
+        threads = Array.new(configured_threads) do
           Thread.new do
             until queue.empty?
               loc = begin
@@ -74,7 +71,7 @@ module MalawiHivProgramReports
               ActiveRecord::Base.connection_pool.with_connection do
                 process_data loc
                 current_iteration = iteration.increment
-                # update_progress(current_iteration, locations.size)
+                update_progress(current_iteration, locations.size)
               rescue StandardError => e
                 Rails.logger.info("Error processing location #{loc}: #{e.message}")
                 Rails.logger.info(e.backtrace.join("\n"))
@@ -88,6 +85,22 @@ module MalawiHivProgramReports
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
+      def configured_threads
+        threads = ::Utils::ConfigReader.application_read('max_threads')&.to_i
+        Rails::logger.info("Max threads: #{threads}")
+        threads.positive? ? threads : 60
+      rescue StandardError => e
+        Rails.logger.info("Error reading max threads: #{e.message}")
+        60
+      end
+
+      def prepare_redis
+        @redis = Redis.new
+        @redis.set('cumulative_progress', 0)
+        @redis.set('cumulative_status', 'running')
+        @redis.set('cumulative_time_taken', 0)
+      end
+
       # update progress in redis and channel
       def update_progress(current_iteration, total)
         percentage = (current_iteration.to_f / total * 100).round(2)

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/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.19
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2025-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Malawi HIV PROGRAM Reports for Ruby on Rails