emr_ohsp_interface 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e6d6f7ebf7f3796248658b85ab540fdd507feb8d59b502aab9093169b5e80e
-  data.tar.gz: fd72dd7ab7ff0887d5abf195d608d45e5e2b103176511ba652455d6166035bb5
+  metadata.gz: 51e67ca380161c3475a914fdaffac759ec33a74e875610258ebe11232fabeb68
+  data.tar.gz: b64970d9939289e2a1f505cea79259d2ff0f1dc112727e7a9584f40345ace00b
 SHA512:
-  metadata.gz: cb9dfa0297d65a8bf726c551e7e206e63f2c1438aa5b36a475e82eb984fea37efd8742f4c3b7e6fe3b06541cb5a43a2f486592136e2776c1554176e4042c61b7
-  data.tar.gz: 7c9f18ac0f992341f4567ccb13721ce4a92c467fdcdb94afcc6c43766f1ef9a9f9753c57024286b73ca1922cb79c79af98aad500c4c0997a1017f8ec1295e3a4
+  metadata.gz: 4f93b70ae454c88f5f553667469af7b8ef27b718787cdd2fdd2997539cbacdcc262ad87943b5ce10feb072f8ce14381dccc52bedd0cc4d1d4fdace4b119c9d15
+  data.tar.gz: 3d7df6cac86977741353a21ca19e507d7f93bd60228362cf08c700657fbaf49ed96c0f72791a2c195f93643149ed240d3771f114822d407ece87c0ac35a69d2a

data/app/services/emr_ohsp_interface/emr_ohsp_interface_service.rb

@@ -467,7 +467,7 @@ module EmrOhspInterface
         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').\
+          INNER JOIN person p ON p.person_id = obs.person_id').group(["obs.person_id","c.name","DATE(obs_datetime)"]).\
           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)
 
@@ -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']&.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 = '1.2.1'
+  VERSION = '1.2.3'
 end

metadata

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