malawi_hiv_program_reports 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b208d1cfb9b841533cb422c55be10119e1fbac4884b5ba86934c76080cff7053
-  data.tar.gz: 8d03344e5ff345f9a183a84bcd303375234d3a7c2a39c3562f0d3b57ef28cd25
+  metadata.gz: 577d1f703cd4fa86123a4728cc6d88a373ad300a984cb44538713c8361f9149c
+  data.tar.gz: 411a5c315f87573ecd8450990774e6e1f3313da05a42817b79057b5320bf8f0a
 SHA512:
-  metadata.gz: 20ff92a2f61133722d2815a84dd95320c9689696daf569d2007d3d4411e4ebc624d06f70bef48dab466f2dd3ed17618f3f0eb5f23a839090d03407dd84183d22
-  data.tar.gz: ebd07c5962a6e3cd19d17eae483a32cecc4bbee991281632f7e3eeef200a3550e9ad88e6f2a618c2b13216a091a5403b383a67b8730619f24db4c6c8d802a9f7
+  metadata.gz: 50c1ccfb88c9618276ef45af6150ffb1c8b60e26815b3f6cb5e2252e3d9a03a655bf22df23000d413644024de687f2630405ad3ca5c1c35d67a87dba764100f5
+  data.tar.gz: 7a359ad17a0b1cd0fe9fd048b18e5a96f395ff046098a70950b6d28b375ba884b83b53d201d4c0ac78762002c77c3f9dbaeafca6df9781b792c50e30107f210e

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

@@ -745,10 +745,10 @@ module MalawiHivProgramReports
             AND prescription_encounter.program_id = patient_program.program_id
             AND prescription_encounter.encounter_datetime < DATE(#{end_date}) + INTERVAL 1 DAY
             AND prescription_encounter.encounter_type IN (SELECT encounter_type_id FROM encounter_type WHERE name LIKE 'Treatment')
-            AND prescription_encounter.voided = 0 */
+            AND prescription_encounter.voided = 0
           LEFT JOIN temp_register_start_date AS patient_type_obs
             ON patient_type_obs.patient_id = patient_program.patient_id #{site_manager(operator: 'AND', column: 'patient_type_obs.site_id', location: @location)}
-          /*INNER JOIN orders AS art_order
+          INNER JOIN orders AS art_order
             ON art_order.patient_id = patient_program.patient_id
             -- AND art_order.encounter_id = prescription_encounter.encounter_id
             AND art_order.concept_id IN (SELECT concept_id FROM concept_set WHERE concept_set = 1085)
@@ -1944,27 +1944,37 @@ 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
+        create_temp_pregnant_obs(start_date, end_date)
+        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.8'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 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