emr_ohsp_interface 1.2.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2ba0df688b91d1575492fa6baaf5c9e89a80f6b364eb92e100268e717260fb
-  data.tar.gz: 70ea97490458b7f611e558a59000dbf9c7987154cdadb581bf1f2935e7adf5c2
+  metadata.gz: 1c906580f753b4ecd4247310a6e86515ba23ac8f34a022d17c2d133eb8e35ce8
+  data.tar.gz: 0343e303c83d845d8e6764797157e056fdc4a34d3060e28d0978b80c32ed292a
 SHA512:
-  metadata.gz: 963c904f3a7e1cdaa64ac8c9df78a3ff0746c272796871bfde4e525084d4698ceb1c9fc8c36b2fca009f0784f534da87fa24077c66f095d9662047c90ee3d07e
-  data.tar.gz: 6d33652b469e327a19c3b3fa28ad7837598f62470d3baef1c6007d30574ad2fb25045a2cbba6e76980f97de726bbffd25d48307536070a870903942e410a4b1a
+  metadata.gz: 363dcd8068deb4bab8a6ce38463a173e7e32ea958eb0699fae6c9f8a9685ade0d5248227fd7584a3d562462941e6c270a40585aab5621faa7efee3b04191a8df
+  data.tar.gz: 447c8cbb8205eac3365d78b7105674829888ae55c8de36dbf4e4fdb917735ec0263db733d601ec5c10f55237b92b45c52f8f2fee5a956355ddca7473d7baea17

data/app/services/emr_ohsp_interface/emr_ohsp_interface_service.rb

@@ -443,8 +443,13 @@ 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",
@@ -452,68 +457,124 @@ module EmrOhspInterface
           "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",
-          "Acute respiratory infections U5 - new"
+          "Malaria under 5 years - new"
         ]
 
-        
-        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)
-
-          diag_map.each do |key, value|
-            collection[key] = { "ids" => [] }
+        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")
-              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
+              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
-            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
+
+            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?("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
+
+            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)
+            end
+
+            if key.eql?("Diarrhoea non - bloody -new cases (under5)")
+              collection[key] = disaggregate('less', concept_ids, start_date, end_date, type)
             end
+
           end
-          collection
-      end
+        end
+
+        collection
 
-      def registration_report(start_date=nil,end_date=nil)
-        ActiveRecord::Base.connection.select_all <<~SQL
-        SELECT
-        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
-          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)

data/lib/emr_ohsp_interface/version.rb

@@ -1,3 +1,3 @@
 module EmrOhspInterface
-  VERSION = '1.2.2'
+  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.2.2
+  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: 2023-09-25 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