malawi_hiv_program_reports 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f760361da4c9737b3c6e1a656bc241a2b00b293bb55a8ea87140b80b17791944
-  data.tar.gz: 38d1370e27a37f4cf05c1693aeb2520cededf24def54ff9dc9aacc2a37058b54
+  metadata.gz: bf17f7c17c9197b1aab5936d0ab803ca2c5260898078907ca9a6b81f9b664faa
+  data.tar.gz: f43489a7292fbc4e1f76c05f75d5765d00430387bf8773da8fd571601927067c
 SHA512:
-  metadata.gz: 44185581748db309173379260ff86ad76c64dcae1689c7e4d306b4930d80e0f6e0f670382fdc931c171da06bc18debd657ce149ebc848aa455aa5edfb3a758ca
-  data.tar.gz: 19693969f34e6401039883a0c4974d2426e77262420b465db8123293a5f0ba086e91798b5cc06d14ef6263aaccb4df9b3c4c982cb1187ebbeb8d69fd876c37f2
+  metadata.gz: 865b057424aa1fb3ad3d8b04797cece85c7d0e7965ee0cad112d6e97ba4d36215d8c581c8bfb13c95111cc6bbb8e8894358ca9b9df500d7deea426661dcb3534
+  data.tar.gz: ba0d487f35f1a9f75417f50803ef68a1bd2598a440c0ce95b1b547f01c0d843aacaa821f0090ec33d9f36672ee632b5104d4a0e3767e41468fdfe1d2e271c1c0

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

@@ -94,6 +94,10 @@ module MalawiHivProgramReports
             AND patient_state.start_date < #{interval_manager(date:, value: 1, interval: 'DAY', operator: '+')}
             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)
           GROUP BY patients.patient_id
         SQL
       end

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

@@ -882,7 +882,7 @@ module MalawiHivProgramReports
           INNER JOIN temp_other_patient_types tmp ON tmp.patient_id = pp.patient_id #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
           INNER JOIN obs o ON pp.patient_id = o.person_id AND o.concept_id = #{type_of_patient_concept} #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
           AND o.value_coded = #{new_patient_concept}
-          AND o.voided = 0 AND o.obs_datetime < DATE(#{end_date}) + INTERVAL 1 DAY
+          AND o.voided = 0 AND o.obs_datetime < DATE('#{end_date}') + INTERVAL 1 DAY
           WHERE pp.program_id = 1 #{site_manager(operator: 'AND', column: 'pp.site_id', location: @location)}
           GROUP BY pp.patient_id #{@adapter == 'mysql2' ? '' : ', pp.site_id'}
         SQL

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Roy Chanunkha