malawi_hiv_program_reports 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed231eff9bb9c45a7d57027366c82fc112fc1de0cb6c4f457cd87bfeed1bd908
-  data.tar.gz: 3b9a9292285146cac5a4f202bf2d2266fdf323f1acdb67a94706efee322f4afe
+  metadata.gz: f074dc44fc448956bea3c452a3b95a930b01d71357826666e5e0820dfc5340df
+  data.tar.gz: 675f722dbc8c93e3bfdd0cde1e160801f0bd55c9159703eadd49d8963adbd730
 SHA512:
-  metadata.gz: 2dab0b971e5a76b0097586837b7adb5869d5c0d34563824cc79d02b8cce0679f22a1afce0955b3a733663e017a6886ccced14f924dd5636f34026c05fc6649b4
-  data.tar.gz: 7015b44578a5bdfaea8a15c2b85b03823688b5a13fdf37e683612549c257376c0583117a28b03332d4af53c2561069c1b5d406862fd341ba15e0c724b0bbdfe7
+  metadata.gz: '095bfc87622d4516d50dea06daac994c9528fa8a182e9d2afee41aecbbd05bc63c9dafbdfc44006028c7e9469456e9d5c9d4a09e6fd1eaf494679d28c7ac9f6e'
+  data.tar.gz: 867e696edf6d2fd7318c3227ad82e262e0b1b275323b5f151f587e138cf1e80eec59fe0c612032ecfcb009d07bca5df1040a72d82aa3c6af9be7f9302bb83998

data/app/services/malawi_hiv_program_reports/pepfar/viral_load_coverage2.rb

@@ -124,14 +124,15 @@ module MalawiHivProgramReports
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT o.person_id, o.value_coded
           FROM obs #{current_partition} o
-          LEFT JOIN obs #{current_partition} a ON a.obs_id = o.obs_id and a.obs_datetime > o.obs_datetime and a.concept_id in (#{pregnant_concepts.to_sql}) and a.voided = 0
+          LEFT JOIN obs #{current_partition} a ON a.person_id = o.person_id AND a.obs_datetime > o.obs_datetime AND a.concept_id IN (#{pregnant_concepts.to_sql}) AND a.voided = 0
           AND a.obs_datetime >= DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND a.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
           WHERE a.obs_id is null
-            and o.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
+            AND o.obs_datetime >= DATE(#{ActiveRecord::Base.connection.quote(start_date)})
+            AND o.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
             AND o.voided = 0
             AND o.concept_id in (#{pregnant_concepts.to_sql})
-            AND o.value_coded IN (#{yes_concepts.join(',')})
             AND o.person_id IN (#{patient_list.join(',')})
+            AND o.value_coded IN (#{yes_concepts.join(',')})
           GROUP BY o.person_id
         SQL
       end
@@ -140,14 +141,15 @@ module MalawiHivProgramReports
         ActiveRecord::Base.connection.select_all <<~SQL
           SELECT o.person_id, o.value_coded
           FROM obs #{current_partition} o
-          LEFT JOIN obs #{current_partition} a ON a.obs_id = o.obs_id and a.obs_datetime > o.obs_datetime and a.concept_id in (#{breast_feeding_concepts.to_sql}) and a.voided = 0
+          LEFT JOIN obs #{current_partition} a ON a.person_id = o.person_id AND a.obs_datetime > o.obs_datetime AND a.concept_id IN (#{breast_feeding_concepts.to_sql}) AND a.voided = 0
           AND a.obs_datetime >= DATE(#{ActiveRecord::Base.connection.quote(start_date)}) AND a.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
           WHERE a.obs_id is null
-            and o.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
+            AND o.obs_datetime >= DATE(#{ActiveRecord::Base.connection.quote(start_date)})
+            AND o.obs_datetime < DATE(#{ActiveRecord::Base.connection.quote(end_date)}) + INTERVAL 1 DAY
             AND o.voided = 0
             AND o.concept_id IN (#{breast_feeding_concepts.to_sql})
-            AND o.value_coded IN (#{yes_concepts.join(',')})
             AND o.person_id IN (#{patient_list.join(',')})
+            AND o.value_coded IN (#{yes_concepts.join(',')})
           GROUP BY o.person_id
         SQL
       end

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

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