his_emr_api_lab 0.0.9 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f94bc637e3770937243a3fe93f770909dc00e5de54fdf9e8c53c7cb8a4afcd2
-  data.tar.gz: a13aafea421131fd8d95c1175fedbdfc921c72772b6e3ca9196a9a189f69a5c0
+  metadata.gz: fb42401918667c79dc2f78a1ce8f32cd611abd12650686142546e28396eb7cf4
+  data.tar.gz: 76fd320373a81bf3b10b42aeca93a381e63d112f66ee977618778b9f56c1b8f7
 SHA512:
-  metadata.gz: 50c2770e1181641d3cdac4d355f209b663a1f6b1969b3b9c3fb5b449a8876ebf3171fd57c0034b48dfd7a1d24c789555048d00a982586e29fe718202af1ee15b
-  data.tar.gz: c8730aa9b485c346096238cb7837fc09b2ffe735ef2104990336ca49d6c40902205f7bc9676966210d19ddbd253ee32a67947ce427c3ad8d7ecccb173c40d612
+  metadata.gz: dfcb51b5aeb60f0910ab62fdbca15e7cf13bcf450c625755eb29a15556122d5de40e92d4ffd7d7a1141b2bebd1d285bc567fa0ed87280c5bc501a0d52ee6cdb1
+  data.tar.gz: 9cb56acdbcc7559dd0106b8af3eab31141cbe1e9ca13d36094a3cb25dcc0d632a1fb910db9b6312000ca83563e2c118acf819816fecb29288e3390d74cecbdb1

data/app/services/lab/labelling_service/order_label.rb

@@ -60,11 +60,14 @@ module Lab
       def drawer
         return 'N/A' if order.concept_id == unknown_concept.concept_id
 
-        name = PersonName.find_by_person_id(order.creator)
-        return "#{name.given_name} #{name.family_name}" if name
+        drawer_id = User.find(order.discontinued_by || order.creator).person_id
+        draw_date = (order.discontinued_date || order.start_date).strftime('%d/%^b/%Y %H:%M:%S')
 
-        user = User.find(order.creator)
-        user&.username || 'N/A'
+        name = PersonName.find_by_person_id(drawer_id)
+        return "#{name.given_name} #{name.family_name} #{draw_date}" if name
+
+        user = User.find_by_user_id(drawer_id)
+        user ? "#{user.username} #{draw_date}" : 'N/A'
       end
 
       def specimen

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative './api'
+require_relative './order_dto'
+
+module Lab
+  module Lims
+    ##
+    # Manage LIMS orders that failed to import
+    module FailedImports
+      class << self
+        ##
+        # Retrieve all imports that failed
+        def failed_imports(start_id = 0, limit = 20)
+          Lab::LimsFailedImport.where('id >= ?', start_id).limit(limit)
+        end
+
+        ##
+        # Forcefully imports a failed import into a patient
+        def force_import(failed_import_id, _patient_id)
+          failed_import = Lab::LimsFailedImport.find(failed_import_id)
+          order_dto = Lab::Lims::OrderDTO.new(lims_api.find_order(failed_import.lims_id))
+          byebug
+        end
+
+        private
+
+        def lims_api
+          @lims_api ||= Lab::Lims::Api.new
+        end
+      end
+    end
+  end
+end

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

@@ -44,7 +44,7 @@ module Lab
   module Lims
     module Migrator
       class MigratorApi < Api
-        MAX_THREADS = 6
+        MAX_THREADS = (ENV.fetch('MIGRATION_WORKERS') { 6 }).to_i
 
         attr_reader :rejections
 

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

@@ -66,6 +66,8 @@ module Lab
           Date.strptime(str_date, '%d-%m-%Y').strftime('%Y-%m-%d')
         elsif str_date.match?(/(\d{4}\d{2}\d{2})\d+/)
           Date.strptime(str_date, '%Y%m%d').strftime('%Y-%m-%d')
+        elsif str_date.match?(%r{\d{2}/\d{2}/\d{4}})
+          str_date.to_date.to_s
         else
           Rails.logger.warn("Invalid date: #{str_date}")
           parse_date(fallback_date)

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.9'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.14
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -252,6 +252,7 @@ files:
 - app/services/lab/lims/api.rb
 - app/services/lab/lims/config.rb
 - app/services/lab/lims/exceptions.rb
+- app/services/lab/lims/failed_imports.rb
 - app/services/lab/lims/migrator.rb
 - app/services/lab/lims/order_dto.rb
 - app/services/lab/lims/order_serializer.rb