emr_ohsp_interface 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 649cb3e2144f053db93789503c1cd14bb48263a93c31d9fa92eb3edb30a54e42
-  data.tar.gz: 8f80cd97e51363c047610f2ac3661ca2cc967d81d1a475c157d9a402d3f009aa
+  metadata.gz: d1e6d6f7ebf7f3796248658b85ab540fdd507feb8d59b502aab9093169b5e80e
+  data.tar.gz: fd72dd7ab7ff0887d5abf195d608d45e5e2b103176511ba652455d6166035bb5
 SHA512:
-  metadata.gz: 7a965d0f5e3d1bbbf830bdba32faad6426ca5a34970b908808b7165e8fa5a1851688e54f1a16b6c38ee545a3e59440c74c5d074642009f648258a600e264977f
-  data.tar.gz: 483de992deb8ab577a65821ebb60b8f6aaeaeb209d5d570eccf27aa996eb13c2dd7f59a948b847bbaa1d1ced9c6c9dc5398edd6c7e1a136fd9ea3cec24726bec
+  metadata.gz: cb9dfa0297d65a8bf726c551e7e206e63f2c1438aa5b36a475e82eb984fea37efd8742f4c3b7e6fe3b06541cb5a43a2f486592136e2776c1554176e4042c61b7
+  data.tar.gz: 7c9f18ac0f992341f4567ccb13721ce4a92c467fdcdb94afcc6c43766f1ef9a9f9753c57024286b73ca1922cb79c79af98aad500c4c0997a1017f8ec1295e3a4

data/app/services/emr_ohsp_interface/emr_ohsp_interface_service.rb

@@ -11,6 +11,10 @@ module EmrOhspInterface
         config = JSON.parse(file)
       end
 
+      def server_config
+        config =YAML.load_file("#{Rails.root}/config/application.yml")
+      end
+
       def get_ohsp_facility_id
         file = File.open(Rails.root.join("db","idsr_metadata","emr_ohsp_facility_map.csv"))
         data = CSV.parse(file,headers: true)
@@ -129,11 +133,11 @@ module EmrOhspInterface
 
               #under_five
               under_five = data.select{|record| calculate_age(record["birthdate"]) < 5}.\
-                          collect{|record| record.person_id}
+                          collect{|record| record.person_id}.uniq
               options["<5yrs"] = under_five
               #above 5 years
               over_five = data.select{|record| calculate_age(record["birthdate"]) >=5 }.\
-                          collect{|record| record.person_id}
+                          collect{|record| record.person_id}.uniq
 
               options[">=5yrs"] =  over_five
 
@@ -439,138 +443,77 @@ module EmrOhspInterface
       end
 
       def generate_hmis_17_report(start_date=nil,end_date=nil)
-
         diag_map = settings["hmis_17_map"]
-    
-        #pull the data
-        type = EncounterType.find_by_name 'Outpatient diagnosis'
         collection = {}
-    
         special_indicators = [
           "Referals from other institutions",
           "OPD total attendance",
           "Referal to other institutions",
-          "Malaria 5 years and older - new"
+          "Malaria 5 years and older - new",
+          "HIV/AIDS - new"
         ]
-
         special_under_five_indicators = [
           "Measles under five years - new",
           "Pneumonia under 5 years- new",
           "Dysentery under 5 years - new",
           "Diarrhoea non - bloody -new cases (under5)",
-          "Malaria under 5 years - new"
+          "Malaria under 5 years - new",
+          "Acute respiratory infections U5 - new"
         ]
 
-        diag_map.each do |key,value|
-          options = {"ids"=>nil}
-          concept_ids = ConceptName.where(name: value).collect{|cn| cn.concept_id}
-    
-          if !special_indicators.include?(key) && !special_under_five_indicators.include?(key)
-            data = Encounter.where('encounter_datetime BETWEEN ? AND ?
-            AND encounter_type = ? AND value_coded IN (?)
-            AND concept_id IN(6543, 6542)',
-            start_date.to_date.strftime('%Y-%m-%d 00:00:00'),
-            end_date.to_date.strftime('%Y-%m-%d 23:59:59'),type.id,concept_ids).\
-            joins('INNER JOIN obs ON obs.encounter_id = encounter.encounter_id
-            INNER JOIN person p ON p.person_id = encounter.patient_id').\
-            select('encounter.encounter_type, obs.value_coded, p.*')
-    
-            all = data.collect{|record| record.person_id}
-    
-    
-            options["ids"] = all
-    
-            collection[key] = options
-          else
-            if key.eql?("Referals from other institutions") 
-              _type = EncounterType.find_by_name 'PATIENT REGISTRATION'
-              visit_type = ConceptName.find_by_name 'Type of visit'
-      
-              data = Encounter.where('encounter_datetime BETWEEN ? AND ?
-              AND encounter_type = ? AND value_coded IS NOT NULL
-              AND obs.concept_id = ?', start_date.to_date.strftime('%Y-%m-%d 00:00:00'),
-              end_date.to_date.strftime('%Y-%m-%d 23:59:59'),_type.id, visit_type.concept_id).\
-              joins('INNER JOIN obs ON obs.encounter_id = encounter.encounter_id
-              INNER JOIN person p ON p.person_id = encounter.patient_id
-              INNER JOIN concept_name c ON c.concept_id = 6541').\
-              select('encounter.encounter_type, obs.value_coded, obs.obs_datetime, p.*, c.name visit_type').\
-              group('p.person_id, encounter.encounter_id')
-
-              all = data.collect{|record| record.person_id}
-    
-              options["ids"] = all
-      
-              collection[key] = options
-            end
-
-            if key.eql?("OPD total attendance")
-              _type = EncounterType.find_by_name 'PATIENT REGISTRATION'
-              visit_type = ConceptName.find_by_name 'Type of visit'
+        
+        reg_data = registration_report(start_date,end_date)
        
-              data = Encounter.where('encounter_datetime BETWEEN ? AND ?
-              AND encounter_type = ? AND value_coded IS NOT NULL
-              AND obs.concept_id = ?', start_date.to_date.strftime('%Y-%m-%d 00:00:00'),
-              end_date.to_date.strftime('%Y-%m-%d 23:59:59'),_type.id, visit_type.concept_id).\
-              joins('INNER JOIN obs ON obs.encounter_id = encounter.encounter_id
-              INNER JOIN person p ON p.person_id = encounter.patient_id
-              INNER JOIN concept_name c ON c.concept_id = obs.value_coded
-              LEFT JOIN person_name n ON n.person_id = encounter.patient_id AND n.voided = 0
-              RIGHT JOIN person_address a ON a.person_id = encounter.patient_id').\
-              select('encounter.encounter_type, n.family_name, n.given_name,
-              obs.value_coded, obs.obs_datetime, p.*, c.name visit_type,
-              a.state_province district, a.township_division ta, a.city_village village').\
-              order('n.date_created DESC').group('n.person_id, encounter.encounter_id')
-
-              all = data.collect{|record| record.person_id}
-    
-              options["ids"] = all
-      
-              collection[key] = options
-            end
-
-            if key.eql?("Referal to other institutions")
-              data = Observation.where("obs_datetime BETWEEN ? AND ?
-              AND concept_id = ?",start_date.to_date.strftime('%Y-%m-%d 00:00:00'),
-              end_date.to_date.strftime('%Y-%m-%d 23:59:59'),'7414').\
-              joins('LEFT JOIN location l ON l.location_id = obs.value_text').\
-              select('obs.person_id').order('obs_datetime DESC')
-
-              all = data.collect{|record| record.person_id}
-
-              options["ids"] = all
-      
-              collection[key] = options
-            end
-
-            if key.eql?("Measles under five years - new")
-              collection[key] = disaggregate('less',concept_ids, start_date, end_date, type)
-            end
-
-            if key.eql?("Pneumonia under 5 years- new")
-              collection[key] = disaggregate('less', concept_ids, start_date, end_date, type)
-            end
-
-            if key.eql?("Malaria under 5 years - new")
-              collection[key] = disaggregate('less', concept_ids, start_date, end_date, type)
-            end
-
-            if key.eql?("Malaria 5 years and older - new")
-              collection[key] = disaggregate('greater',concept_ids, start_date, end_date, type)
-            end
-
-            if key.eql?("Dysentery under 5 years - new")
-              collection[key] = disaggregate('less', concept_ids, start_date, end_date, type)
+        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)
+
+          diag_map.each do |key, value|
+            collection[key] = { "ids" => [] }
+            if key.eql?("OPD total attendance")
+              collection[key]["ids"] = reg_data.map { |item| item[1] }
+            else
+              if key.eql?("Referals from other institutions")
+                reg_data = reg_data.rows.group_by(&:shift)
+                collection[key]["ids"]= reg_data['Referral'].flatten
+              end
             end
-
-            if key.eql?("Diarrhoea non - bloody -new cases (under5)")
-              collection[key] = disaggregate('less', concept_ids, start_date, end_date, type)
+            data.each do |phrase, counts|
+              next unless value.include?(phrase)
+            
+              counts.each do |label, count|
+                if !key.eql?("Malaria 5 years and older - new") && !special_under_five_indicators.include?(key)
+                  collection[key]["ids"] << count
+                else
+                  if ((special_under_five_indicators.include?(key) && label.eql?("less_than_5")) ||
+                      (key.eql?("Malaria 5 years and older - new") && label.eql?("more_than_5")))
+                    collection[key]["ids"] << count
+                  end
+                end
+              end
             end
-
           end
-        end
-
-        collection
+          collection
+      end
 
+      def registration_report(start_date=nil,end_date=nil)
+        ActiveRecord::Base.connection.select_all <<~SQL
+        SELECT
+          c.name AS visit_type,
+          obs.person_id
+          FROM `encounter`
+          LEFT JOIN obs ON obs.encounter_id = encounter.encounter_id AND obs.voided = 0
+          LEFT JOIN concept_name c ON c.concept_id = obs.value_coded 
+          AND c.name IN ('New patient','Revisiting','Referral') AND c.voided = 0
+          WHERE
+              encounter.voided = 0
+              AND  DATE(encounter_datetime) BETWEEN '#{start_date}' AND '#{end_date}'
+              AND encounter.program_id = 14 -- OPD program
+          GROUP BY encounter.patient_id, DATE(encounter_datetime);
+        SQL
       end
 
       def generate_notifiable_disease_conditions_report(start_date=nil,end_date=nil)
@@ -632,7 +575,7 @@ module EmrOhspInterface
       def weeks_generator
 
         weeks = Hash.new
-        first_day = ((Date.today.year.to_s)+"-01-01").to_date
+        first_day = (Date.today - (11).month).at_beginning_of_month
         wk_of_first_day = first_day.cweek
 
         if wk_of_first_day > 1
@@ -671,7 +614,7 @@ module EmrOhspInterface
       def send_data(data,type)
         # method used to post data to the server
         #prepare payload here
-        conn = settings["headers"]
+        conn = server_config['ohsp']
         payload = {
           "dataSet" =>get_data_set_id(type),
           "period"=>(type.eql?("weekly") ? weeks_generator.last[0] : months_generator.first[0]),
@@ -733,18 +676,18 @@ module EmrOhspInterface
                                             headers:{'Content-Type'=> 'application/json'},
                                             payload: payload.to_json,
                                             #headers: {accept: :json},
-                                            user: conn["user"],
-                                            password: conn["pass"])
+                                            user: conn["username"],
+                                            password: conn["password"])
 
         puts send
       end
 
       def send_data_to_sms_portal(data, concept_name_collection)
-        conn2 = settings["sms_server"]
+        conn2 = server_config['idsr_sms']
         data = data.select {|k,v| v.select {|kk,vv| vv.length > 0}.length > 0}
         payload = {
-          "email"=> conn2["user"],
-          "password" => conn2["pass"],
+          "email"=> conn2["username"],
+          "password" => conn2["password"],
           "emr_facility_id" => Location.current_health_center.id,
           "emr_facility_name" => Location.current_health_center.name,
           "payload" => data,

data/lib/emr_ohsp_interface/version.rb

@@ -1,3 +1,3 @@
 module EmrOhspInterface
-  VERSION = '1.1.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emr_ohsp_interface
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Justin Manda, Petros Kayange, and Dominic Kasanga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails