malawi_hiv_program_reports 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d7725bbae83b356b36e8124d6e938b16bf43ca789948da6d9a89964b97f2d8
-  data.tar.gz: 9cd388fee4284e632399135f1dfcd7810ffe9b6c6bc8158ff70f6b3ed8431702
+  metadata.gz: b208d1cfb9b841533cb422c55be10119e1fbac4884b5ba86934c76080cff7053
+  data.tar.gz: 8d03344e5ff345f9a183a84bcd303375234d3a7c2a39c3562f0d3b57ef28cd25
 SHA512:
-  metadata.gz: fcb5645fe7df71c690e0d1c4548c4ccb7dc9c261ff8fea52bc19a134354ffc0b4faa9032ab56c55597b50ab3790b45205773a1df52f41d216d55473aa55f7f8d
-  data.tar.gz: f66a1b98edfe2fc4ecdf4594d91a9f9a1a6bfd6c279536f9cc2f74e7c9bb4f75571d6abfbdcd718cdcb9569139beb940ef81b949996cf760ebfee8f6f5cbbba8
+  metadata.gz: 20ff92a2f61133722d2815a84dd95320c9689696daf569d2007d3d4411e4ebc624d06f70bef48dab466f2dd3ed17618f3f0eb5f23a839090d03407dd84183d22
+  data.tar.gz: ebd07c5962a6e3cd19d17eae483a32cecc4bbee991281632f7e3eeef200a3550e9ad88e6f2a618c2b13216a091a5403b383a67b8730619f24db4c6c8d802a9f7

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

@@ -95,9 +95,9 @@ module MalawiHivProgramReports
             AND patient_state.voided = 0 #{site_manager(operator: 'AND', column: 'patient_state.site_id', location: @location)}
           WHERE patients.date_enrolled <= #{date} #{site_manager(operator: 'AND', column: 'patients.site_id', location: @location)}
           AND patient_state.date_created = (SELECT MAX(date_created)
-            FROM patient_state ps#{' '}
-            WHERE ps.patient_program_id = patient_state.patient_program_id #{site_manager(operator: 'AND', column: 'ps.site_id', location: @location)}#{' '}
-            AND ps.state = patient_state.state AND ps.voided = 0)
+            FROM patient_state ps
+            WHERE ps.patient_program_id = patient_state.patient_program_id #{site_manager(operator: 'AND', column: 'ps.site_id', location: @location)}
+            AND ps.state = patient_state.state AND ps.voided = 0 AND ps.start_date <= #{date})
           GROUP BY patients.patient_id
         SQL
       end

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

@@ -715,6 +715,7 @@ module MalawiHivProgramReports
                  }
                  (SELECT value_coded FROM obs
                   WHERE concept_id = 7563 AND person_id = patient_program.patient_id AND voided = 0 #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
+                  AND obs_datetime <= DATE(#{end_date}) + INTERVAL 1 DAY
                   ORDER BY obs_datetime DESC, date_created DESC LIMIT 1) as reason_for_starting_art,
                  pa.value AS occupation
           FROM patient_program

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails