emr_ohsp_interface 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0223562697c86dc3dc5e2e0090f447b27d3d6375dd1d1ff7cdb7fb706a7f84
-  data.tar.gz: b9102f891cf79cbc20d89ad6edf65662dd97fd3f9fe0cf2505b3fdb1c728386e
+  metadata.gz: c1e2f8f301b8057aed4f7ddb6e62eefd3c8108171cd949d5c329134ccae53c66
+  data.tar.gz: aa4515b396f441535ba766eb68ea0c71ea481f42f285dd457b7f1520fecb9bc8
 SHA512:
-  metadata.gz: 79cc7e22960e8c66ba9b062d7913950be036a1385c56f67ff391f041b1c2fe35d1bda9699f75dd1919a03f2bfff34748ce6b1d47dd4bc30791c77890330eb901
-  data.tar.gz: 13a729509212714349e6cfa6969e80bae9025716481e1182b236a8d788dbc0307e45faf89c753435ebd9dee6181786282ba256c64b427e5c627371927c942b56
+  metadata.gz: a5e32307d05ce57d5badf73902fe312b1944ac66be0caa055da6dc05123c9219e63e6c9288fe85edd03069ace7c4c750557454a1cee16542a407e87ee00185c8
+  data.tar.gz: 9faf563358135620f679014461235bcfb05df09e7337e343746da1117bdaf3ea475133ae05b1282359d3f6f03fd791919af4b74fa713ba513fec113f26450482

data/app/services/emr_ohsp_interface/emr_ohsp_interface_service.rb

@@ -127,7 +127,7 @@ module EmrOhspInterface
         encounters = ['OUTPATIENT DIAGNOSIS','ADMISSION DIAGNOSIS']
 
         report_struct = indicators.each_with_object({}) do |indicator, report|
-          report[indicator] = ['<5 yrs','>=5 yrs'].each_with_object({}) do |group, sub_report|
+          report[indicator.downcase] = ['<5 yrs','>=5 yrs'].each_with_object({}) do |group, sub_report|
             sub_report[group] = {
               outpatient_cases: [],
               inpatient_cases: [],
@@ -138,14 +138,6 @@ module EmrOhspInterface
           end
         end
 
-        admitted_patient_died = Proc.new do |patient|
-          visit_type = patient['visit_type']
-          dead = patient['dead']
-
-          visit_type == 'ADMISSION DIAGNOSIS' && dead
-        end
-
-
         diagonised = ActiveRecord::Base.connection.select_all <<~SQL
           SELECT
             e.patient_id,
@@ -168,23 +160,15 @@ module EmrOhspInterface
             AND obs.concept_id IN (#{ConceptName.where(name: diagnosis_concepts).pluck(:concept_id).join(',')})
             AND obs.value_coded IN (#{ConceptName.where(name: indicators).pluck(:concept_id).join(',')})
           GROUP BY
-            p.person_id
+            p.person_id, obs.concept_id
         SQL
 
         malaria_tests = lab_results(test_types: ['Malaria Screening'], start_date: start_date, end_date: end_date)
 
         tested_patient_ids = malaria_tests.map{|patient| patient['patient_id']}
 
-        tested_positive = Proc.new do |patient|
-          patient_id = patient['patient_id']
-          return false unless tested_patient_ids.include?(patient_id)
-
-          results = malaria_tests.find{|test| test['patient_id'] == patient_id}['results']
-          ['positive', 'parasites seen'].include?(results)
-        end
-
         diagonised.each do |patient|
-          diagnosis = patient['diagnosis']
+          diagnosis = patient['diagnosis']&.downcase
           visit_type = patient['visit_type']
           patient_id = patient['patient_id']
           birthdate = patient['birthdate']
@@ -197,14 +181,29 @@ module EmrOhspInterface
           report_struct[diagnosis][age_group][:outpatient_cases] << patient_id if visit_type == 'OUTPATIENT DIAGNOSIS'
           report_struct[diagnosis][age_group][:inpatient_cases] << patient_id if visit_type == 'ADMISSION DIAGNOSIS'
           report_struct[diagnosis][age_group][:tested_malaria] << patient_id if tested_patient_ids.include?(patient_id)
-          report_struct[diagnosis][age_group][:tested_positive_malaria] << patient_id if tested_positive.call(patient)
-          report_struct[diagnosis][age_group][:inpatient_cases_death] << patient_id if admitted_patient_died.call(patient)
+          report_struct[diagnosis][age_group][:tested_positive_malaria] << patient_id if tested_positive(tested_patient_ids, patient)
+          report_struct[diagnosis][age_group][:inpatient_cases_death] << patient_id if admitted_patient_died(patient)
         end
         
         report_struct
           
       end
 
+      def tested_positive(ids, patient)
+        patient_id = patient['patient_id']
+        return false unless ids.include?(patient_id)
+
+        results = malaria_tests.find{|test| test['patient_id'] == patient_id}['results']
+        ['positive', 'parasites seen'].include?(results)
+      end
+
+      def admitted_patient_died(patient)
+        visit_type = patient['visit_type']
+        dead = patient['dead']
+
+        visit_type == 'ADMISSION DIAGNOSIS' && dead
+      end
+
       #idsr monthly report
       def generate_monthly_idsr_report(request=nil,start_date=nil,end_date=nil)
         diag_map = settings["monthly_idsr_map"]
@@ -902,4 +901,4 @@ module EmrOhspInterface
     end
   end
 
-end
+end

data/lib/emr_ohsp_interface/version.rb

@@ -1,3 +1,3 @@
 module EmrOhspInterface
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emr_ohsp_interface
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Justin Manda, Petros Kayange, Dominic Kasanga