malawi_hiv_program_reports 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f074dc44fc448956bea3c452a3b95a930b01d71357826666e5e0820dfc5340df
-  data.tar.gz: 675f722dbc8c93e3bfdd0cde1e160801f0bd55c9159703eadd49d8963adbd730
+  metadata.gz: 1e9cba775f0bc9cd2eaa2f0d078186ce06a39b90bb2012a55b7e1430e675dd6b
+  data.tar.gz: ffa4ed80f23149a3c41e1a0c90dd31de1a27325275655f2a292c850bae667fb3
 SHA512:
-  metadata.gz: '095bfc87622d4516d50dea06daac994c9528fa8a182e9d2afee41aecbbd05bc63c9dafbdfc44006028c7e9469456e9d5c9d4a09e6fd1eaf494679d28c7ac9f6e'
-  data.tar.gz: 867e696edf6d2fd7318c3227ad82e262e0b1b275323b5f151f587e138cf1e80eec59fe0c612032ecfcb009d07bca5df1040a72d82aa3c6af9be7f9302bb83998
+  metadata.gz: 0546e2d29b71951cf95ca6df50f82ca5e380e4a203cbbd23287aa48fe536503c1426eba5944693adac9b7291b6e685426659ad73616eebf91bba4694013ea2bb
+  data.tar.gz: 07dca51e1fe44552a13896ecb1106f2e68240b05e462a72985b83bf250716b757c8b862cb37fba6e47333a4e1e8bf35d400500f71555f526a975e9449fd5cbea

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

@@ -5,7 +5,7 @@ module MalawiHivProgramReports
     # Disaggregated cohort report
     # rubocop:disable Metrics/ClassLength
     class Disaggregated
-      attr_accessor :type, :start_date, :end_date, :rebuild, :occupation, :report, :maternal, :location
+      attr_accessor :type, :start_date, :end_date, :rebuild, :occupation, :report, :maternal, :location, :aggregation
 
       include MalawiHivProgramReports::Utils::ModelUtils
       include MalawiHivProgramReports::Pepfar::Utils
@@ -16,6 +16,7 @@ module MalawiHivProgramReports
         @start_date = start_date
         @end_date = end_date
         @rebuild = kwargs[:rebuild]&.casecmp?('true')
+        @aggregation = kwargs[:aggregation]&.casecmp?('false')
         @occupation = kwargs[:occupation]
         @location = kwargs[:location]
         @maternal = {}
@@ -38,7 +39,7 @@ module MalawiHivProgramReports
 
       def process_initialization
         init_report
-        init_aggregate_rows
+        init_aggregate_rows if aggregation
       end
 
       def init_report
@@ -61,7 +62,7 @@ module MalawiHivProgramReports
 
       def init_cohort_section(cursor)
         cursor['tx_curr'] = []
-        (COHORT_REGIMENS + ['Unknown']).each do |regimen|
+        COHORT_REGIMENS.each do |regimen|
           cursor[regimen] = []
         end
         cursor['unknown'] = []
@@ -77,7 +78,7 @@ module MalawiHivProgramReports
       def process_db_data
         fetch_data.each do |data|
           age_group = data['age_group']
-          regimen = data['regimen'] || 'Unknown'
+          regimen = data['regimen'] || 'unknown'
           patient_id = data['patient_id']
           # we need to handle regimes that only have one P to become PP. Otherwise if it is already PP or PA we leave
           # it as is. Regimens are in this format NUMBERLETTERS
@@ -86,7 +87,7 @@ module MalawiHivProgramReports
           report[age_group.to_s][gender.to_s][regimen.to_s] << patient_id
           report[age_group.to_s][gender.to_s]['tx_curr'] << patient_id
           report[age_group.to_s][gender.to_s]['total'] << patient_id
-          process_aggregate_rows(gender:, regimen:, patient_id:)
+          process_aggregate_rows(gender:, regimen:, patient_id:) if aggregation
         end
       end
 

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

@@ -66,6 +66,7 @@ module MalawiHivProgramReports
         # HIC SUNT DRACONIS: The order of the operations below matters,
         # do not change it unless you know what you are doing!!!
         load_patients_who_died(start:)
+        load_other_patient_who_died(start:)
         load_patients_who_stopped_treatment(start:)
         load_patients_without_drug_orders(start:)
         load_patients_on_treatment(start:)
@@ -94,7 +95,7 @@ module MalawiHivProgramReports
             AND drug_order.site_id = o.site_id AND drug_order.quantity > 0
             AND drug_order.drug_inventory_id IN (#{arv_drug})
           WHERE o.order_type_id = 1 -- drug order
-            AND o.start_date < (DATE(#{start ? start_date : end_date}) + INTERVAL 1 DAY)
+            AND o.start_date < (DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'})
             AND o.voided = 0
           GROUP BY o.patient_id
           ON DUPLICATE KEY UPDATE start_date = VALUES(start_date), min_order_date = VALUES(min_order_date)
@@ -110,8 +111,8 @@ module MalawiHivProgramReports
           INNER JOIN drug_order PARTITION (p#{location}) ON drug_order.order_id = o.order_id AND drug_order.quantity > 0
             AND drug_order.drug_inventory_id IN (#{arv_drug})
           WHERE o.order_type_id = 1 -- drug order
-            AND o.start_date < (DATE(#{start ? start_date : end_date}) + INTERVAL 1 DAY)
-            AND o.start_date >= (DATE(#{start ? prev_date : start_date}) + INTERVAL 1 DAY)
+            AND o.start_date < (DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'})
+            AND o.start_date >= (DATE(#{start ? prev_date : start_date}) #{start ? '' : '+ INTERVAL 1 DAY'})
             AND o.voided = 0
           GROUP BY o.patient_id
           ON DUPLICATE KEY UPDATE start_date = VALUES(start_date), min_order_date = VALUES(min_order_date)
@@ -185,7 +186,7 @@ module MalawiHivProgramReports
           SELECT pp.patient_id, #{location}, MAX(ps.start_date) start_date
           FROM patient_state PARTITION (p#{location}) AS ps
           INNER JOIN patient_program PARTITION (p#{location}) AS pp ON pp.patient_program_id = ps.patient_program_id AND pp.program_id = 1 AND pp.voided = 0
-          WHERE ps.start_date < DATE(#{end_date}) + INTERVAL 1 DAY
+          WHERE ps.start_date < DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'}
             AND ps.voided = 0 AND pp.patient_id IN (SELECT patient_id FROM cdr_temp_cohort_members PARTITION (p#{location}))
           GROUP BY pp.patient_id
           HAVING start_date IS NOT NULL
@@ -228,28 +229,28 @@ module MalawiHivProgramReports
       def load_patients_who_died(start: false)
         ActiveRecord::Base.connection.execute <<~SQL
           INSERT INTO cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location})
-          SELECT patients.patient_id, 'Patient died', patient_state.start_date, #{location}, 1
-          FROM cdr_temp_cohort_members PARTITION (p#{location}) AS patients
-          INNER JOIN patient_program PARTITION (p#{location})
-            ON patient_program.patient_id = patients.patient_id
-            AND patient_program.program_id = 1
-            AND patient_program.voided = 0
-          INNER JOIN patient_state PARTITION (p#{location})
-            ON patient_state.patient_program_id = patient_program.patient_program_id
-            AND patient_state.state = (#{program_states('Patient died').limit(1).to_sql})
-            AND patient_state.start_date < DATE(#{end_date}) + INTERVAL 1 DAY
-            AND patient_state.voided = 0
-          WHERE patients.date_enrolled <= DATE(#{end_date})
-          AND patient_state.date_created = (
-            SELECT MAX(date_created)
-            FROM patient_state PARTITION (p#{location}) ps
-            WHERE ps.patient_program_id = patient_state.patient_program_id
-            AND ps.state = patient_state.state AND ps.voided = 0 AND ps.start_date <= #{end_date})
+          SELECT patients.patient_id, 'Patient died', patients.outcome_date, #{location}, 1
+          FROM cdr_temp_current_state#{start ? '_start' : ''} PARTITION (p#{location}) AS patients
+          WHERE patients.outcomes = 1 AND patients.cum_outcome = 'Patient died'
           GROUP BY patients.patient_id
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
       end
 
+      def load_other_patient_who_died(start: false)
+        ActiveRecord::Base.connection.execute <<~SQL
+          INSERT INTO cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location})
+          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}
+          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
+          ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
+        SQL
+      end
+
       # Loads all patients with an outcome of transferred out or
       # treatment stopped into temp_patient_outcomes table.
       def load_patients_who_stopped_treatment(start: false)
@@ -278,7 +279,7 @@ module MalawiHivProgramReports
           INSERT INTO cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location})
           SELECT patients.patient_id, 'Unknown', NULL, #{location}, 3
           FROM cdr_temp_cohort_members PARTITION (p#{location}) AS patients
-          WHERE date_enrolled <= #{end_date}
+          WHERE date_enrolled < DATE(#{start ? start_date : end_date}) #{start ? '' : '+ INTERVAL 1 DAY'}
             AND (patient_id) NOT IN (SELECT patient_id FROM cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location}) WHERE step IN (1, 2, 3, 4))
             AND (patient_id) NOT IN (SELECT patient_id FROM cdr_temp_max_drug_orders#{start ? '_start' : ''} PARTITION (p#{location}))
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
@@ -292,7 +293,7 @@ module MalawiHivProgramReports
           SELECT patients.patient_id, 'On antiretrovirals', COALESCE(cs.outcome_date, patients.start_date), #{location}, 4
           FROM cdr_temp_min_auto_expire_date#{start ? '_start' : ''} PARTITION (p#{location}) AS patients
           LEFT JOIN cdr_temp_current_state#{start ? '_start' : ''} PARTITION (p#{location}) AS cs ON cs.patient_id = patients.patient_id AND cs.site_id = patients.site_id
-          WHERE patients.#{definition == 'pepfar' ? 'pepfar_defaulter_date' : 'moh_defaulter_date'} > #{end_date}
+          WHERE patients.#{definition == 'pepfar' ? 'pepfar_defaulter_date' : 'moh_defaulter_date'} > DATE(#{start ? start_date : end_date}) #{start ? '- INTERVAL 1 DAY' : ''}
           AND (patients.patient_id) NOT IN (SELECT patient_id FROM cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location}) WHERE step IN (1, 2, 3))
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
@@ -304,7 +305,7 @@ module MalawiHivProgramReports
           SELECT patients.patient_id, 'Defaulted', patients.#{definition == 'pepfar' ? 'pepfar_defaulter_date' : 'moh_defaulter_date'},#{location}, 5
           FROM cdr_temp_current_medication#{start ? '_start' : ''} PARTITION (p#{location}) AS patients
           LEFT JOIN cdr_temp_current_state#{start ? '_start' : ''} PARTITION (p#{location}) AS cs ON cs.patient_id = patients.patient_id
-          WHERE patients.#{definition == 'pepfar' ? 'pepfar_defaulter_date' : 'moh_defaulter_date'} <= #{end_date}
+          WHERE patients.#{definition == 'pepfar' ? 'pepfar_defaulter_date' : 'moh_defaulter_date'} <= DATE(#{start ? start_date : end_date}) #{start ? '- INTERVAL 1 DAY' : ''}
           AND (patients.patient_id) NOT IN (SELECT patient_id FROM cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location}) WHERE step IN (1, 2, 3, 4))
           ON DUPLICATE KEY UPDATE cum_outcome = VALUES(cum_outcome), outcome_date = VALUES(outcome_date), step = VALUES(step)
         SQL
@@ -314,7 +315,7 @@ module MalawiHivProgramReports
       def load_defaulters(start: false)
         ActiveRecord::Base.connection.execute <<~SQL
           INSERT INTO cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location})
-          SELECT patient_id, #{patient_outcome_function('patient_id', 'site_id')}, NULL, #{location}, 6
+          SELECT patient_id, #{patient_outcome_function('patient_id', 'site_id', start)}, NULL, #{location}, 6
           FROM cdr_temp_cohort_members PARTITION (p#{location})
           WHERE date_enrolled <= #{end_date}
           AND (patient_id, site_id) NOT IN (SELECT patient_id, site_id FROM cdr_temp_patient_outcomes#{start ? '_start' : ''} PARTITION (p#{location}) WHERE step IN (1, 2, 3, 4, 5))
@@ -325,10 +326,10 @@ module MalawiHivProgramReports
       # ===================================
       #  Function Management Region
       # ===================================
-      def patient_outcome_function(sql_column, site_id)
+      def patient_outcome_function(sql_column, site_id, start)
         case definition
-        when 'moh' then "patient_outcome(#{sql_column}, #{end_date}, #{site_id})"
-        when 'pepfar' then "pepfar_patient_outcome(#{sql_column}, #{end_date}, #{site_id})"
+        when 'moh' then "patient_outcome(#{sql_column}, #{start ? "'#{start_date.to_date - 1.day}'" : end_date}, #{site_id})"
+        when 'pepfar' then "pepfar_patient_outcome(#{sql_column}, #{start ? "'#{start_date.to_date - 1.day}'" : end_date}, #{site_id})"
         else raise "Invalid outcomes definition: #{definition}"
         end
       end

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

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