his_emr_api_lab 1.0.2 → 1.1.1

data/app/services/lab/orders_search_service.rb

@@ -5,6 +5,14 @@ module Lab
   module OrdersSearchService
     class << self
       def find_orders(filters)
+        # A bit of hack-ish solution to have a patient's orders updated upon
+        # scanning of a patient. Done in this way to deal with LIMS' lack of
+        # a notification system for lab order updates. We are limited to polling
+        # for updates on a per order basis.
+        if filters[:patient_id]
+          Lab::UpdatePatientOrdersJob.perform_later(filters[:patient_id])
+        end
+
         extra_filters = pop_filters(filters, :date, :end_date, :status)
 
         orders = Lab::LabOrder.prefetch_relationships
@@ -17,6 +25,14 @@ module Lab
         orders.map { |order| Lab::LabOrderSerializer.serialize_order(order) }
       end
 
+      def find_orders_without_results(patient_id: nil)
+        query = Lab::LabOrder.where
+                             .not(order_id: Lab::LabResult.all.select(:order_id))
+        query = query.where(patient_id: patient_id) if patient_id
+
+        query
+      end
+
       def filter_orders_by_date(orders, date: nil, end_date: nil)
         date = date&.to_date
         end_date = end_date&.to_date
@@ -53,6 +69,8 @@ module Lab
           popped_params[filter.to_sym] = params.delete(filter)
         end
       end
+
+      def fetch_results(order); end
     end
   end
 end

data/app/services/lab/orders_service.rb

@@ -78,7 +78,7 @@ module Lab
         order.update!(concept_id: specimen_id,
                       discontinued: true,
                       discontinued_by: User.current.user_id,
-                      discontinued_date: params[:date]&.to_date || Date.today,
+                      discontinued_date: params[:date]&.to_date || Time.now,
                       discontinued_reason_non_coded: 'Sample drawn/updated')
         Lab::LabOrderSerializer.serialize_order(order)
       end
@@ -92,8 +92,10 @@ module Lab
         order.target_lab&.void(reason)
 
         order.tests.each { |test| test.void(reason) }
+        voided = order.void(reason)
+        Lab::VoidOrderJob.perform_later(order_id)
 
-        order.void(reason)
+        voided
       end
 
       private

data/db/migrate/20210610095024_fix_numeric_results_value_type.rb

@@ -0,0 +1,20 @@
+class FixNumericResultsValueType < ActiveRecord::Migration[5.2]
+  def up
+    results = Lab::LabResult.all.includes(:children)
+
+    ActiveRecord::Base.connection.transaction do
+      results.each do |result|
+        result.children.each do |measure|
+          next unless measure.value_text&.match?(/^[+-]?((\d+(\.\d+)?)|\.\d+)$/)
+
+          puts "Updating result value type for result measure ##{measure.obs_id}"
+          measure.value_numeric = measure.value_text
+          measure.value_text = nil
+          measure.save!
+        end
+      end
+    end
+  end
+
+  def down; end
+end

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.4.3
+- !ruby/object:Gem::Dependency
+  name: socket.io-client-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,8 @@ files:
 - app/controllers/lab/test_types_controller.rb
 - app/controllers/lab/tests_controller.rb
 - app/jobs/lab/application_job.rb
+- app/jobs/lab/update_patient_orders_job.rb
+- app/jobs/lab/void_order_job.rb
 - app/mailers/lab/application_mailer.rb
 - app/models/lab/application_record.rb
 - app/models/lab/lab_accession_number_counter.rb
@@ -251,12 +267,15 @@ files:
 - app/services/lab/labelling_service/order_label.rb
 - app/services/lab/lims/api/couchdb_api.rb
 - app/services/lab/lims/api/mysql_api.rb
+- app/services/lab/lims/api/rest_api.rb
+- app/services/lab/lims/api/ws_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
+- app/services/lab/lims/pull_worker.rb
+- app/services/lab/lims/push_worker.rb
 - app/services/lab/lims/utils.rb
 - app/services/lab/lims/worker.rb
 - app/services/lab/metadata.rb
@@ -270,6 +289,7 @@ files:
 - db/migrate/20210323080140_change_lims_id_to_string_in_lims_order_mapping.rb
 - db/migrate/20210326195504_add_order_revision_to_lims_order_mapping.rb
 - db/migrate/20210407071728_create_lab_lims_failed_imports.rb
+- db/migrate/20210610095024_fix_numeric_results_value_type.rb
 - lib/auto12epl.rb
 - lib/couch_bum/couch_bum.rb
 - lib/generators/lab/install/USAGE

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

@@ -1,34 +0,0 @@
-# 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