his_emr_api_lab 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f48eba209b710d53ac07d89c95e335f9578a2b2b2137550b8b48f0032355f9
-  data.tar.gz: e6930b341721036f4aaeb8ab64551eb1ed4d35e6b80314d181488265e1cda0ba
+  metadata.gz: '00645812f301ba486329bfe76c91406af972fb152d9b08be82ca09bedb1715a2'
+  data.tar.gz: 9c1f1136ed92e903059e40adb0c66aa6f4ed7057fce3d71e70b973655df08679
 SHA512:
-  metadata.gz: 2f9873af33a53537e59143efd1bf6b36fe5af1201be7cd463c42d14417babfb31640f3a46e12bd5dc73d709fa6075ea619a1faf868143f1f3f9a641341342c85
-  data.tar.gz: dbc656255bdb6c160a71771c06532d533ec90f38a6d7e37f5d1880564dcacf874097fe2c5ce424da60602117674135fec6859dda4380f3c4ef20cf4fd3235777
+  metadata.gz: 5894ad876b761667077801c771b39d4f8dd7347a0cebe10886c513d6d2c9401dec7296c6dbf66788f5e2ceff05b15368de96c1c49a4223a560c1f44e5154ea95
+  data.tar.gz: c85f640154e2612b0b3943cc2332f7de7ee65db3a8401a241c55e53d9061cadb5ea24e69a4ca9d4a647f6468a6d5fa6160e2a8126d0e68865f551cab85e1e2c3

data/app/services/lab/lims/worker.rb

@@ -139,9 +139,17 @@ module Lab
       def find_patient_by_nhid(nhid)
         national_id_type = PatientIdentifierType.where(name: ['National id', 'Old Identification Number'])
         identifiers = PatientIdentifier.where(type: national_id_type, identifier: nhid)
+                                       .joins('INNER JOIN person ON person.person_id = patient_identifier.patient_id AND person.voided  = 0')
         if identifiers.count.zero?
-          identifiers = PatientIdentifier.unscoped.where(voided: 1, type: national_id_type, identifier: nhid)
+          identifiers = PatientIdentifier.unscoped
+                                         .where(voided: 1, type: national_id_type, identifier: nhid)
+                                         .joins('INNER JOIN person ON person.person_id = patient_identifier.patient_id AND person.voided  = 0')
         end
+
+        # Joining to person above to ensure that the person is not voided,
+        # it was noted at one site that there were some people that were voided
+        # upon merging but the patient and patient_identifier was not voided
+
         return nil if identifiers.count.zero?
 
         patients = Patient.where(patient_id: identifiers.select(:patient_id))

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest