emr_ohsp_interface 1.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 649cb3e2144f053db93789503c1cd14bb48263a93c31d9fa92eb3edb30a54e42
-  data.tar.gz: 8f80cd97e51363c047610f2ac3661ca2cc967d81d1a475c157d9a402d3f009aa
+  metadata.gz: 1c906580f753b4ecd4247310a6e86515ba23ac8f34a022d17c2d133eb8e35ce8
+  data.tar.gz: 0343e303c83d845d8e6764797157e056fdc4a34d3060e28d0978b80c32ed292a
 SHA512:
-  metadata.gz: 7a965d0f5e3d1bbbf830bdba32faad6426ca5a34970b908808b7165e8fa5a1851688e54f1a16b6c38ee545a3e59440c74c5d074642009f648258a600e264977f
-  data.tar.gz: 483de992deb8ab577a65821ebb60b8f6aaeaeb209d5d570eccf27aa996eb13c2dd7f59a948b847bbaa1d1ced9c6c9dc5398edd6c7e1a136fd9ea3cec24726bec
+  metadata.gz: 363dcd8068deb4bab8a6ce38463a173e7e32ea958eb0699fae6c9f8a9685ade0d5248227fd7584a3d562462941e6c270a40585aab5621faa7efee3b04191a8df
+  data.tar.gz: 447c8cbb8205eac3365d78b7105674829888ae55c8de36dbf4e4fdb917735ec0263db733d601ec5c10f55237b92b45c52f8f2fee5a956355ddca7473d7baea17

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
 
@@ -450,7 +454,8 @@ module EmrOhspInterface
           "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 = [
@@ -504,27 +509,18 @@ module EmrOhspInterface
             end
 
             if key.eql?("OPD total attendance")
-              _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 = 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
-      
+              programID = Program.find_by_name 'OPD Program'
+              data = Encounter.find_by_sql(
+                "SELECT patient_id, DATE_FORMAT(encounter_datetime,'%Y-%m-%d') enc_date
+                FROM encounter e
+                LEFT OUTER JOIN person p ON p.person_id = e.patient_id
+                WHERE e.voided = 0 AND encounter_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 program_id ='" + programID.program_id.to_s + "'
+                GROUP BY enc_date"
+              ).map{|e| e. patient_id}
+        
+              options["ids"] = data
               collection[key] = options
             end
 
@@ -534,11 +530,19 @@ module EmrOhspInterface
               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?("HIV/AIDS - new")
+              data =  ActiveRecord::Base.connection.select_all(
+                "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
+              all = data.collect{|record| record["patient_id"]}
               options["ids"] = all
-      
               collection[key] = options
             end
 
@@ -632,7 +636,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 +675,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 +737,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 = '2.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emr_ohsp_interface
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.2.0
 platform: ruby
 authors:
-- Justin Manda, Petros Kayange, and Dominic Kasanga
+- Justin Manda, Petros Kayange, Dominic Kasanga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2023-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.3
+        version: 7.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.4
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.4.3
+        version: 7.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +66,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: 
 email:
 - justinmandah@gmail.com, kayangepetros@gmail.com, dominickasanga@gmail.com
@@ -120,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: This in a gem that facilitates interfacing of EMR, One Health Surveillance