emr_ohsp_interface 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86336368f0f6cbc641d1e348ca0b22ceb80e8ee948bc4659d8b8e60d70d249d3
-  data.tar.gz: b8b7dbb8e07193f0f05870a20e5c00fc29c5d74762bf037579a0a557244a01fa
+  metadata.gz: 6ca9634e36555a67204142daadaef5e7c15c390654d5481ee41c753c8b040e33
+  data.tar.gz: f12fa09bf6867abff6f52e31902989b6d16cb5938644fc2095417186c48074d3
 SHA512:
-  metadata.gz: 5c5cda9dbcd781ed721ba4f1e1e6ba71f31a7588887602c49955fbdb386cf97a00dc2629ae2aa6c8cf6f10b4b36b93c08b4a5390886a9f62c0935177009d6800
-  data.tar.gz: 5fb825a8002a881f4a897da1c729ee8e566d474749aef17a7780967ca7cb2b13fe6ee6d8eabad3ba8a2bcadbea996487594ccf7de0cfbb7aeb8fc0cb4d806594
+  metadata.gz: bb7b7599d5c501e5784b5ee039df5eb04f4c8b417aaf9049648436e2d67d1b435d6b9cfd4c63e4b007c6db410f1f712e5387e4731a512daed54f820b1f5a3d83
+  data.tar.gz: 076bee885a2a2c8634ac7a81676be77dd32f2b7d8acf459b10163e3de435ada2de4885492d00f2c43cb9de8bde517021a26b22f57105b4fcd5202d9982666cd7

data/app/services/emr_ohsp_interface/emr_ohsp_interface_service.rb

@@ -170,7 +170,7 @@ module EmrOhspInterface
                         "SELECT * FROM temp_earliest_start_date
                             WHERE date_enrolled BETWEEN '#{start_date}' AND '#{end_date}'
                             AND date_enrolled = earliest_start_date
-                             GROUP BY patient_id" ).to_hash
+                             GROUP BY patient_id" )
 
               under_five = data.select{|record| calculate_age(record["birthdate"]) < 5 }.\
                              collect{|record| record["patient_id"]}
@@ -349,7 +349,7 @@ module EmrOhspInterface
                 "SELECT * FROM temp_earliest_start_date
                   WHERE date_enrolled BETWEEN '#{start_date}' AND '#{end_date}'
                   AND date_enrolled = earliest_start_date
-                  GROUP BY patient_id" ).to_hash
+                  GROUP BY patient_id" )
     
               over_and_15_49 = data.select{|record| calculate_age(record["birthdate"])  >= 15 && calculate_age(record["birthdate"]) <=49 }.\
                      collect{|record| record["patient_id"]}
@@ -464,12 +464,12 @@ module EmrOhspInterface
         
         reg_data = registration_report(start_date,end_date)
        
-        data =Observation.where("obs_datetime BETWEEN ? AND ? AND c.voided = ? AND obs.concept_id IN (?) ",
-          start_date.to_date.strftime('%Y-%m-%d 00:00:00'), end_date.to_date.strftime('%Y-%m-%d 23:59:59'),0, [6543, 6542]).\
-          joins('INNER JOIN concept_name c ON c.concept_id = obs.value_coded
-          INNER JOIN person p ON p.person_id = obs.person_id').\
-          pluck("c.name, CASE WHEN  (SELECT timestampdiff(year, birthdate, '#{end_date.to_date.strftime('%Y-%m-%d')}')) >= 5 THEN 'more_than_5' 
-          ELSE 'less_than_5' END AS age_group,p.person_id").group_by(&:shift)
+        data =Observation.where(Arel.sql("obs_datetime BETWEEN '#{start_date.to_date.strftime('%Y-%m-%d 00:00:00')}' AND '#{end_date.to_date.strftime('%Y-%m-%d 23:59:59')}' AND c.voided = 0 AND obs.concept_id IN (6543, 6542) "))\
+                          .joins(Arel.sql('INNER JOIN concept_name c ON c.concept_id = obs.value_coded
+          INNER JOIN person p ON p.person_id = obs.person_id'))\
+                          .pluck(Arel.sql("c.name, CASE WHEN  (SELECT timestampdiff(year, birthdate, '#{end_date.to_date.strftime('%Y-%m-%d')}')) >= 5 THEN 'more_than_5'
+          ELSE 'less_than_5' END AS age_group,p.person_id")).group_by(&:shift)
+
 
           diag_map.each do |key, value|
             collection[key] = { "ids" => [] }
@@ -478,7 +478,7 @@ module EmrOhspInterface
             else
               if key.eql?("Referals from other institutions")
                 reg_data = reg_data.rows.group_by(&:shift)
-                collection[key]["ids"]= reg_data['Referral'].flatten
+                collection[key]["ids"]= reg_data['Referral'] ? reg_data['Referral'].flatten : []
               end
             end
             data.each do |phrase, counts|
@@ -502,7 +502,7 @@ module EmrOhspInterface
       def registration_report(start_date=nil,end_date=nil)
         ActiveRecord::Base.connection.select_all <<~SQL
         SELECT
-          c.name AS visit_type,
+        MIN(IFNULL(c.name, 'Unidentified')) AS visit_type,
           obs.person_id
           FROM `encounter`
           LEFT JOIN obs ON obs.encounter_id = encounter.encounter_id AND obs.voided = 0

data/lib/emr_ohsp_interface/version.rb

@@ -1,3 +1,3 @@
 module EmrOhspInterface
-  VERSION = '2.2.1'
+  VERSION = '2.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emr_ohsp_interface
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Justin Manda, Petros Kayange, Dominic Kasanga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2024-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: This in a gem that facilitates interfacing of EMR, One Health Surveillance