malawi_hiv_program_reports 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a08c2c660947b3a6cef7293babf4b2fcb24c1e64dd8cd890f631d7afad67b638
-  data.tar.gz: 70dcb9fc2ea37d029c1ebbb3b86fa569c843f689277deec5a017f00d9934e7ff
+  metadata.gz: 6b0b18ac14704b02389c59bca8c5e49c80fa48b381ec37faf25a26dbe9995c90
+  data.tar.gz: 8ad3b0382ec582c6e8289f599e65591011e15969b7f0ddba40f71e87bd626bad
 SHA512:
-  metadata.gz: ec1e203183395cf35beb1b08f5fadd50b090888f61586712dc71ddf81316284ffa4d4aca5d32208942605f5cef05d0731a63a4d6d8420a30afcf4e22ecf6452b
-  data.tar.gz: 67084f90cfe2d6e38d21abb1473161f45936f03b876addcd839044e1cf7aaec03ff10b5988138d6ed99a06b3865ad08c56d56a520d9f6459905d785cdf48a786
+  metadata.gz: bcbbb974329cd00cfe4b57d3d6bb154c669952cf91a1996b89aee8df63086cd35b7cdf5435173f42d329ac7e00eb4d966f57e13e440aa5aa494c26584e8f2c89
+  data.tar.gz: 3dfd717d6d6364097edaf7397c5b3380542d74f4eba5bbfd89911c562da8def22584d0adc574e7c45b358f7247bcf7925db8832aebf83b7cb0e1078f03eadbc7

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

@@ -92,6 +92,7 @@ module MalawiHivProgramReports
         cohort_struct.quarterly_all_males = males(quarter_start_date, end_date)
 
         # Pregnant females (all ages)
+        create_temp_pregnant_obs(start_date, end_date)
         cohort_struct.pregnant_females_all_ages = pregnant_females_all_ages(start_date, end_date)
         cohort_struct.cum_pregnant_females_all_ages = pregnant_females_all_ages(cum_start_date, end_date)
         cohort_struct.quarterly_pregnant_females_all_ages = pregnant_females_all_ages(quarter_start_date, end_date)
@@ -1944,27 +1945,36 @@ module MalawiHivProgramReports
         SQL
       end
 
+      def create_temp_pregnant_obs(start_date, end_date)
+        ActiveRecord::Base.connection.execute 'DROP TABLE IF EXISTS temp_pregnant_obs;'
+        ActiveRecord::Base.connection.execute <<~SQL
+          CREATE TABLE temp_pregnant_obs
+          SELECT o.person_id,o.value_coded, o.obs_datetime, o.site_id
+          FROM obs o
+          WHERE o.concept_id IN (6131,1755,7972,7563)
+            AND o.value_coded IN (1065,1755)#{' '}
+            AND o.voided = 0 #{site_manager(operator: 'AND', column: 'o.location_id', location: @location)}
+            AND o.obs_datetime >= '#{start_date}' AND o.obs_datetime < '#{end_date}' + INTERVAL 1 DAY;
+        SQL
+        ActiveRecord::Base.connection.execute 'CREATE INDEX fre_person ON temp_pregnant_obs(person_id);'
+        ActiveRecord::Base.connection.execute 'CREATE INDEX fre_obs_time ON temp_pregnant_obs(obs_datetime);'
+      end
+
       def pregnant_females_all_ages(start_date, end_date)
-        yes_concept_id = concept('Yes').concept_id
-        preg_concept_id = concept('IS PATIENT PREGNANT?').concept_id
-        patient_preg_concept_id = concept('PATIENT PREGNANT').concept_id
-        preg_at_initiation_concept_id = concept('PREGNANT AT INITIATION?').concept_id
-        reason_for_starting_concept_id = concept('Reason for ART eligibility').concept_id
+        concept('Yes').concept_id
+        concept('IS PATIENT PREGNANT?').concept_id
+        concept('PATIENT PREGNANT').concept_id
+        concept('PREGNANT AT INITIATION?').concept_id
+        concept('Reason for ART eligibility').concept_id
 
         # (patient_id_plus_date_enrolled || []).each do |patient_id, date_enrolled|
         registered = ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT patients.*, obs.value_coded
-          FROM temp_earliest_start_date AS patients
-          INNER JOIN obs
-            ON obs.person_id = patients.patient_id
-            AND #{in_manager(column: 'obs.concept_id', values: [preg_concept_id, patient_preg_concept_id, preg_at_initiation_concept_id, reason_for_starting_concept_id])}
-            AND obs.obs_datetime >= patients.earliest_start_date
-            AND obs.obs_datetime < #{interval_manager(date: 'patients.earliest_start_date', value: 1, interval: 'DAY', operator: '+')}
-            AND #{in_manager(column: 'obs.value_coded', values: [yes_concept_id, patient_preg_concept_id])}
-            AND obs.voided = 0 #{site_manager(operator: 'AND', column: 'obs.site_id', location: @location)}
-          WHERE patients.gender IN ('F','Female')
-            AND patients.date_enrolled BETWEEN '#{start_date}' AND '#{end_date}' #{site_manager(operator: 'AND', column: 'patients.site_id', location: @location)}
-          GROUP BY patient_id #{@adapter == 'mysql2' ? '' : ',obs.value_coded'}
+          SELECT tesd.*, ft.value_coded
+          FROM temp_earliest_start_date tesd#{' '}
+          INNER JOIN temp_pregnant_obs ft ON ft.person_id = tesd.patient_id AND DATE(ft.obs_datetime) = DATE(tesd.earliest_start_date)
+            AND tesd.gender = 'F'
+          WHERE tesd.gender = 'F' and tesd.date_enrolled >= DATE('#{start_date}') AND tesd.date_enrolled <= DATE('#{end_date}') #{site_manager(operator: 'AND', column: 'tesd.site_id', location: @location)}
+          GROUP BY tesd.patient_id
         SQL
 
         pregnant_at_initiation = ActiveRecord::Base.connection.select_all <<~SQL

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

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