malawi_hiv_program_reports 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b0b18ac14704b02389c59bca8c5e49c80fa48b381ec37faf25a26dbe9995c90
-  data.tar.gz: 8ad3b0382ec582c6e8289f599e65591011e15969b7f0ddba40f71e87bd626bad
+  metadata.gz: 88faa7e9640f4c16749d15f38fe4dc3ae068850cda349e2f5816b9fd3452c4b5
+  data.tar.gz: 11134ce6349f51dee3e3cb5507e2d03c26d2c6dd9ab21993fc61cf31938c9e6a
 SHA512:
-  metadata.gz: bcbbb974329cd00cfe4b57d3d6bb154c669952cf91a1996b89aee8df63086cd35b7cdf5435173f42d329ac7e00eb4d966f57e13e440aa5aa494c26584e8f2c89
-  data.tar.gz: 3dfd717d6d6364097edaf7397c5b3380542d74f4eba5bbfd89911c562da8def22584d0adc574e7c45b358f7247bcf7925db8832aebf83b7cb0e1078f03eadbc7
+  metadata.gz: 4e5ab0ea1bcbeabad67e7f9b1ef7d0fb29c7477f6fbda180e757df8d1ae6729af1e0f393b4a754f981358e57cbb96fafabb09a2cd42dd3122673e63908121f51
+  data.tar.gz: 6222839d0182b965055094bbeb1a7ddfa7b364df27bc544acaa6e31a542ab9aac36a6741ff937423b919d5d9912708cf467a3a0312ff94c956a8fc5a5cccbcf9

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

@@ -1978,20 +1978,12 @@ module MalawiHivProgramReports
         SQL
 
         pregnant_at_initiation = ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT patient_id, #{function_manager(function: 'patient_reason_for_starting_art', location: @location,
-                                                args: "patient_id, #{@location}")}  reason_concept_id
+          SELECT patient_id
           FROM temp_earliest_start_date
           WHERE date_enrolled BETWEEN '#{start_date}' AND '#{end_date}'
             AND gender IN ('F','Female') #{site_manager(operator: 'AND', column: 'site_id', location: @location)}
+            AND reason_for_starting_art IN (6131,1755,7972,7563)
           GROUP BY patient_id
-          HAVING #{if @adapter == 'mysql2'
-                     'reason_concept_id IN (1755, 7972, 6131)'
-                   else
-                     in_manager(column: function_manager(function: 'patient_reason_for_starting_art', location: @location, args: "patient_id, #{@location}").to_s,
-                                values: [
-                                  1755, 7972, 6131
-                                ])
-                   end};
         SQL
         pregnant_at_initiation_ids = []
         (pregnant_at_initiation || []).each do |patient|

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

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