malawi_hiv_program_reports 1.1.18 → 1.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a3e944fcb8f4a9e0d862b50321ead38c607a3488c002096735853b06922be5
-  data.tar.gz: fb58caba60b6795e915efaadd08fea81e2817129ef500843da95ba48047028aa
+  metadata.gz: 59ce2b645e8862156cd2dfe62c5085eb8f92b940f3abb591d4ed90affc349a72
+  data.tar.gz: 2b4a8ba3fd2ee2e82ae0e645b6b52f8951bb04e2bc9f418faed1ff4052f14acf
 SHA512:
-  metadata.gz: 91ae6c317a44e67d502cc97f3d3d72d54ace89d8def8326f8fc2ea7901e1b4693c0754084b33a1bf9c9d32626dd840b72df1e1c56ee558547ed0ff5056756403
-  data.tar.gz: 8d52d72581ab43cc207e34bbb20ecf62d942cd104c854e0890c4b1712346d64a609907cd447c9f912298be40b78d0affd36e4be1a8ef123a86f7fd749258a83b
+  metadata.gz: 645f9cbfdbeaf74c6b2da6035a3d336408d7e28663171557ecc2e68c7d53489d218408dd76980d870ef0d74dbc1238a57d388d194ac3195e3fe0953420e97d6e
+  data.tar.gz: f6b5ad1078a1a8c3c68faee0d74c71502dce1099797140ab72ca171d92e8bf585b00b750758c3dead290927266c5c90aa8b912e57786d04db53418c4c15e8a67

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.18'
+  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.18
+  version: 1.1.19
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2025-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails