openmrs_data_sanitizer 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1ff9af55bd7fa8cc3659a91ffd9995cb6f91b7b5c1297b31c99fbb7c264f5d
-  data.tar.gz: 5fe2a537ea70364ab0d3dd5da607f12627799154d46f14581527f6a38ac39eea
+  metadata.gz: 40a55f5fb47f9307da0c2e0a5905f5554dee6688c1f4abf09889c4a7852fca95
+  data.tar.gz: 18ebfa45e8aefdd2fd3bf0cab02d0187ba9d3ac16e4f37e50a9de982cacd4e6d
 SHA512:
-  metadata.gz: d20b6330c65ec39e01f0602dd540c9c8f77df1670a28efc581bf08918957c6620a83eaf2944065757d6714ae0507d63669adb7f40b2e2746d4f6e9444e43c094
-  data.tar.gz: 1382c14116c18556c52c47da591095250dbf44fff7ace6dfbf37f3bad4ad8310bd75dedff4e1c5ab0b578ac69e06913c90751be73944f538317ce5fb09e0a0e9
+  metadata.gz: 6db161bf332f91467f74e8f489cc536d06aac21689dc8114e296d70fbb1851d25a58face6b05141634d74806bbd9ea03a17d509ba87e8605e22a94795c8902fd
+  data.tar.gz: 9b0dfacd32c8bbbf5d9154bcf1402878e279bbf756ee37300d179e8d456d43b589ba857af87156619372679c798c713eae2505b42d671ed185db8c9b4884a1f1

data/app/services/openmrs_data_sanitizer/data_aggregator.rb

@@ -832,8 +832,8 @@ module OpenmrsDataSanitizer
         INSERT INTO #{schema}.data_sanitizer_arv_orders(patient_id, order_id, encounter_id, visit_date, drug_id, drug_name, units, equivalent_daily_dose, instructions, start_date, runout_date, quantity)
         SELECT e.patient_id, o.order_id, o.encounter_id, DATE(o.start_date) AS visit_date, da.drug_inventory_id AS drug_id, d.name AS drug_name, d.units, da.equivalent_daily_dose, o.instructions, DATE(o.start_date), DATE(o.auto_expire_date), da.quantity
         FROM #{schema}.orders o
-        INNER JOIN #{schema}.encounter e ON e.encounter_id = o.encounter_id AND e.program_id = 1 AND e.encounter_type = 54
-        INNER JOIN #{schema}.drug_order da ON da.order_id = o.order_id AND o.voided = 0 AND da.quantity > 0
+        INNER JOIN #{schema}.encounter e ON e.encounter_id = o.encounter_id AND e.program_id = 1 AND e.voided = 0
+        INNER JOIN #{schema}.drug_order da ON da.order_id = o.order_id AND da.quantity > 0
         INNER JOIN #{schema}.drug d ON d.drug_id = da.drug_inventory_id
         INNER JOIN #{schema}.arv_drug ad ON ad.drug_id = d.drug_id
         WHERE o.voided = 0

data/lib/openmrs_data_sanitizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenmrsDataSanitizer
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openmrs_data_sanitizer
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Mwatha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby