malawi_hiv_program_reports 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f86826f15ceb3f763a71ac85b14142481eb6177dea5e77d63b789c1f76955dfd
-  data.tar.gz: ae2542a2e7bc462c5fca169abb73503dfac6f4074eedd6c837a38ff7dbbf6a27
+  metadata.gz: 20d2d8f58b51e76a9e2338c73f4649128827925aaea7bed0bf5c072fe047877a
+  data.tar.gz: 190ec9f058e23928a2295663cdea975eaf0a819860382728539bdb9d80b69895
 SHA512:
-  metadata.gz: 2726026897b6c08fdfea543e57b82396897e2400849b39615135dff0b1a1caab8113c910cc1cdb98042ff2211a548c541d8e3c56b68157ca165142659830e4bb
-  data.tar.gz: 164b30ad7ca003e832cf4a31ba222c92cee0d04fd0f3aa9875a45ef879d8f33b4dca863ac6afdb60de0f6cfe54a18e799e036d249df9f6ed7be30fb7d6d310c4
+  metadata.gz: e615fa021b3a87a7c40832513d64f9746ef35eaeb49ff60cb7c5ad4ffdd3d3f27f8672e86bc1fae3a5a7c2903f4faf49e1cbf7d912457d56a1358c6803fb6378
+  data.tar.gz: cb09473dc350e4afaafecda703f65958823a3ff91c06c0538bfb1dfbb6f955b873473d568e9cb3c2a56d09105cb008610224e9ae474b259f187b164952c60f01

data/app/services/malawi_hiv_program_reports/arv_refill_periods.rb

@@ -50,8 +50,8 @@ module MalawiHivProgramReports
           disaggregated_age_group(p.birthdate, DATE('#{@end_date}')) age_group,
           p.patient_id, p.date_enrolled, p.birthdate, p.gender,
           outcome.cum_outcome AS outcome
-        FROM temp_earliest_start_date p
-        LEFT JOIN temp_patient_outcomes outcome USING(patient_id)
+        FROM cdr_temp_cohort_members #{current_partition} p
+        LEFT JOIN cdr_temp_patient_outcomes #{current_partition} outcome USING(patient_id)
         WHERE DATE(date_enrolled) <= DATE('#{@end_date}')
         AND cum_outcome = 'On antiretrovirals'
         #{@format == 'poc' ? "AND TIMESTAMPDIFF(year, p.birthdate, DATE('#{@end_date}')) BETWEEN #{@min_age} AND #{@max_age}" : ''};
@@ -127,26 +127,20 @@ module MalawiHivProgramReports
           o.patient_id, p.gender, p.birthdate, o.start_date,
           o.auto_expire_date, d.name, quantity, d.drug_id,
           TIMESTAMPDIFF(day, DATE(o.start_date), DATE(o.auto_expire_date)) prescribed_days
-        FROM orders o
-        INNER JOIN drug_order od ON od.order_id = o.order_id
-        #{site_manager(operator: 'AND', column: 'od.site_id', location: @location)}
+        FROM orders #{current_partition} o
+        INNER JOIN drug_order #{current_partition} od ON od.order_id = o.order_id
         INNER JOIN drug d ON d.drug_id = od.drug_inventory_id
         INNER JOIN concept_set s ON s.concept_id = d.concept_id
-        INNER JOIN person p ON p.person_id = o.patient_id
-        #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
-        INNER JOIN encounter e ON e.patient_id = p.person_id
-        #{site_manager(operator: 'AND', column: 'e.site_id', location: @location)}
+        INNER JOIN person #{current_partition} p ON p.person_id = o.patient_id
+        INNER JOIN encounter #{current_partition} e ON e.patient_id = p.person_id
         WHERE s.concept_set = #{arv_concept_set} AND o.voided = 0
-        #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
         AND DATE(o.start_date) = (
-          SELECT DATE(MAX(t.start_date)) FROM orders t
-          INNER JOIN drug_order t2 ON t2.order_id = t.order_id
-          #{site_manager(operator: 'AND', column: 't2.site_id', location: @location)}
+          SELECT DATE(MAX(t.start_date)) FROM orders #{current_partition} t
+          INNER JOIN drug_order #{current_partition} t2 ON t2.order_id = t.order_id
           INNER JOIN drug t3 ON t3.drug_id = t2.drug_inventory_id
           INNER JOIN concept_set t4 ON t4.concept_id = t3.concept_id
           WHERE t.patient_id = #{patient_id}
           AND t.voided = 0 AND t.start_date <= '#{@end_date}'
-          #{site_manager(operator: 'AND', column: 't.site_id', location: @location)}
           AND t4.concept_set = #{arv_concept_set} AND t2.quantity > 0
         ) AND e.program_id = #{program_id} AND o.patient_id = #{patient_id}
         AND od.quantity > 0 AND e.encounter_type = #{encounter_type}
@@ -219,7 +213,6 @@ module MalawiHivProgramReports
       concept_id = ::ConceptName.find_by_name('Weight (Kg)').concept_id
       weight_details = ::Observation.where("person_id = ? AND concept_id = ?
           AND obs_datetime <= ? 
-          #{site_manager(operator: 'AND', column: 'site_id', location: @location)}
           AND ( CAST(value_numeric as DECIMAL(4,1)) > 0 OR
           CAST(value_text as DECIMAL(4,1)) > 0)", patient_id,
                                            concept_id, @end_date).order('obs_datetime DESC, date_created DESC')
@@ -255,30 +248,24 @@ module MalawiHivProgramReports
           o.patient_id, p.gender, p.birthdate, o.start_date,
           o.auto_expire_date, d.name, quantity, d.drug_id, identifier arv_number,
           TIMESTAMPDIFF(day, DATE(o.start_date), DATE(o.auto_expire_date)) prescribed_days
-        FROM orders o
-        INNER JOIN drug_order od ON od.order_id = o.order_id
-        #{site_manager(operator: 'AND', column: 'od.site_id', location: @location)}
+        FROM orders #{current_partition} o
+        INNER JOIN drug_order #{current_partition} od ON od.order_id = o.order_id
         INNER JOIN drug d ON d.drug_id = od.drug_inventory_id
         INNER JOIN concept_set s ON s.concept_id = d.concept_id
-        INNER JOIN person p ON p.person_id = o.patient_id
-        #{site_manager(operator: 'AND', column: 'p.site_id', location: @location)}
-        INNER JOIN encounter e ON e.patient_id = p.person_id
-        #{site_manager(operator: 'AND', column: 'e.site_id', location: @location)}
+        INNER JOIN person #{current_partition} p ON p.person_id = o.patient_id
+        INNER JOIN encounter #{current_partition} e ON e.patient_id = p.person_id
         AND e.program_id = #{program_id}
-        LEFT JOIN patient_identifier i ON  i.patient_id = o.patient_id
+        LEFT JOIN patient_identifier #{current_partition} i ON  i.patient_id = o.patient_id
         AND i.identifier_type = #{identifier_type}
         AND LENGTH(identifier) > 0 AND i.voided = 0
         WHERE s.concept_set = #{arv_concept_set} AND o.voided = 0
-        #{site_manager(operator: 'AND', column: 'o.site_id', location: @location)}
         AND DATE(o.start_date) = (
           SELECT DATE(MAX(t.start_date)) FROM orders t
-          INNER JOIN drug_order t2 ON t2.order_id = t.order_id
-          #{site_manager(operator: 'AND', column: 't2.site_id', location: @location)}
+          INNER JOIN drug_order #{current_partition} t2 ON t2.order_id = t.order_id
           INNER JOIN drug t3 ON t3.drug_id = t2.drug_inventory_id
           INNER JOIN concept_set t4 ON t4.concept_id = t3.concept_id
           WHERE t.patient_id = #{patient_id}
           AND t.voided = 0 AND t.start_date <= '#{@end_date}'
-          #{site_manager(operator: 'AND', column: 't.site_id', location: @location)}
           AND t4.concept_set = #{arv_concept_set} AND t2.quantity > 0
         )AND e.program_id = #{program_id} AND o.patient_id = #{patient_id}
         AND od.quantity > 0 GROUP BY o.order_id;

data/lib/malawi_hiv_program_reports/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails