malawi_hiv_program_reports 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d17044e31a6c36f8b4469283f763c0269fb5ae59d42861b24b050194326c44
-  data.tar.gz: '029b6065fb4148d0d4ae1bd450b3bbf5cffded9060e2928c334c3a971c13d610'
+  metadata.gz: 26fde8ba891270aa134af13992809a7b5216f8782c2277cecb8761c2ab33c20a
+  data.tar.gz: 1fb79cfb698b076a3ed023c6ab460bf315115e32eb9829bd2cf08749c6603426
 SHA512:
-  metadata.gz: 41235cd3c34531df48b9ae40b732ee7b73517b808dd35d61926704e5fcb532a5754737b7dd81ddb7a855036c9cf4c158d82bcfac65011588cfb6fd639f5c119d
-  data.tar.gz: 2e458bf9233151036c5dd42b26542732862cd5e6483dc8e9a6870db076f23c68f9619d4db3f94857a2ff4ea308d72150dddfc02583feaf894ff4f449faa68d34
+  metadata.gz: 4f408a0b8d22481bfb47d2a4a7128c35cd9c3e51e4beb058b8f241e9e7ebc750e87e4605980ff010a5f04116e3d5d1e05b05ab43456985bb7fea25e4c2b712c8
+  data.tar.gz: c1f738a66863e86a0d688c8166ec14068fc44c2e095f2e0a7dcd2d0077491eb1151f3d5c614a1ab9616389f4010f124f4f1c57d2b2af776f3a7ce2da1203dbb9

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

@@ -183,7 +183,7 @@ module MalawiHivProgramReports
 
       def update_outcomes
         if check_if_table_exists('cdr_temp_patient_outcomes')
-          MalawiHivProgramReports::Moh::CumulativeOutcome.new(end_date:, start_date:, definition:,
+          MalawiHivProgramReports::Moh::CumulativeOutcome.new(end_date:, start_date:, definition: type,
                                                               rebuild: 'true', location:).find_report
         else
           rebuild_report
@@ -191,8 +191,8 @@ module MalawiHivProgramReports
       end
 
       def rebuild_report
-        MalawiHivProgramReports::Moh::CumulativeCohort.new(definition:, start_date:, end_date:,
-                                                           locations: [location], rebuild: 'true').find_report
+        MalawiHivProgramReports::Moh::CumulativeCohort.new(definition: type, start_date:, end_date:,
+                                                           locations: location, rebuild: 'true').find_report
       end
 
       def check_if_table_exists(table_name)

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

@@ -409,6 +409,7 @@ module MalawiHivProgramReports
             AND patient_type.voided = 0
             AND patient_type.concept_id = 3289 -- Type of patient
             AND patient_type.obs_datetime < DATE(#{end_date}) + INTERVAL 1 DAY
+          INNER JOIN encounter PARTITION (p#{location}) AS obs_encounter ON obs_encounter.encounter_id = patient_type.encounter_id AND obs_encounter.voided = 0 AND obs_encounter.program_id = 1 -- HIV PROGRAM
           LEFT JOIN encounter PARTITION (p#{location}) AS clinic_registration ON clinic_registration.patient_id  = e.patient_id
             AND clinic_registration.program_id = 1 -- HIV PROGRAM
             AND clinic_registration.encounter_type = 9 -- HIV CLINIC REGISTRATION

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

@@ -205,7 +205,8 @@ module MalawiHivProgramReports
           INNER JOIN program_workflow_state pws ON pws.program_workflow_state_id = ps.state AND pws.retired = 0
           INNER JOIN concept_name cn ON cn.concept_id = pws.concept_id AND cn.concept_name_type = 'FULLY_SPECIFIED' AND cn.voided = 0
           LEFT JOIN patient_state PARTITION (p#{location}) AS ps2 ON ps.patient_program_id = ps2.patient_program_id AND ps.start_date = ps2.start_date AND ps.date_created < ps2.date_created AND ps2.voided = 0
-          WHERE ps2.patient_program_id IS NULL AND ps.voided = 0
+            AND ps2.start_date < DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'}
+          WHERE ps2.patient_program_id IS NULL AND ps.voided = 0 AND ps.start_date < DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'}
           GROUP BY mps.patient_id
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), state = VALUES(state), outcomes = VALUES(outcomes)
         SQL
@@ -243,7 +244,7 @@ module MalawiHivProgramReports
           SELECT tesd.patient_id, 'Patient died', MAX(ps.start_date), #{location}, 1
           FROM cdr_temp_cohort_members PARTITION (p#{location}) tesd
           INNER JOIN patient_program PARTITION (p#{location}) pp ON pp.patient_id = tesd.patient_id AND pp.program_id = 1 AND pp.voided = 0
-          INNER JOIN patient_state PARTITION (p#{location}) ps ON ps.patient_program_id = pp.patient_program_id AND ps.state = 3 AND ps.voided = 0 AND ps.start_date <= #{end_date}
+          INNER JOIN patient_state PARTITION (p#{location}) ps ON ps.patient_program_id = pp.patient_program_id AND ps.state = 3 AND ps.voided = 0 AND ps.start_date < DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'}
           WHERE tesd.patient_id NOT IN (SELECT patient_id FROM cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location}) WHERE step = 1)
           AND tesd.date_enrolled < DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'}
           GROUP BY tesd.patient_id
@@ -258,7 +259,7 @@ module MalawiHivProgramReports
           INSERT INTO cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location})
           SELECT patients.patient_id,patients.cum_outcome,patients.outcome_date, #{location}, 2
           FROM cdr_temp_current_state#{start ? '_start' : ''} PARTITION (p#{location}) AS patients
-          WHERE (patients.patient_id) NOT IN (SELECT patient_id FROM cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location})  WHERE step = 1)
+          WHERE patients.patient_id NOT IN (SELECT patient_id FROM cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location})  WHERE step = 1)
           AND patients.outcomes = 1
           AND patients.state IN (
             SELECT pws.program_workflow_state_id state

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails