his_emr_api_lab 1.1.14 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f655e84314f6a25a8ecce1668132e93bbd1a175efd35cb832792b94cc9d33e42
-  data.tar.gz: 298f226847e19dd868e7caf487b00b49dc306bed4ca2c2a0f2c07765278598e5
+  metadata.gz: ecb22c6981cf4627f8b862fc958949e9d8bce3258533fc7369f5ecbb51f7e35f
+  data.tar.gz: f361eade238cfceb9fa6d8ac390166c8747d017755e6ce543bb8d2b1222277ba
 SHA512:
-  metadata.gz: 132e7e46b9c9c6468651b1ebde2ce182852cc17992a54928b49b3605191c53f81ab324e21657d1b421ac317d48c51cd2a73c24d11f94cd5ca4f0d47714c04d9b
-  data.tar.gz: c49d8d971697158bf1646027935ed1e95cb825a161fef18a9d658affb7e1493b24b0f70748d8c61d4a9e69d81e00d5d3f3395eec7ea4c4189401b992a27d97f5
+  metadata.gz: b5ac8fff26842cdec49086800174748e8fdc36c76c8843d03cc7da2f14dd068843854775c795682739dbcc6923c3afa6bcefa9a6d73f1dc590441cb971aed7e5
+  data.tar.gz: f4aa9129aa56bbc4aa6dff749511a6b15556adc91383bb0dfdc040f065817974e3e21ec8d0f6d8cc0716b5e4e1341c94024665a87a9bf33c9a1081e041180bea

data/app/controllers/lab/orders_controller.rb

@@ -8,14 +8,15 @@ module Lab
         OrdersService.order_test(order_params)
       end
 
+      orders.each { |order| Lab::PushOrderJob.perform_later(order.fetch(:order_id)) }
+
       render json: orders, status: :created
     end
 
     def update
       specimen = params.require(:specimen).permit(:concept_id)
-
-      order = OrdersService.update_order(params[:id], specimen: specimen,
-                                                      force_update: params[:force_update])
+      order = OrdersService.update_order(params[:id], specimen: specimen, force_update: params[:force_update])
+      Lab::PushOrderJob.perform_later(order.fetch(:order_id))
 
       render json: order
     end
@@ -23,11 +24,13 @@ module Lab
     def index
       filters = params.permit(%i[patient_id accession_number date status])
 
+      Lab::UpdatePatientOrdersJob.perform_later(filters[:patient_id]) if filters[:patient_id]
       render json: OrdersSearchService.find_orders(filters)
     end
 
     def destroy
       OrdersService.void_order(params[:id], params[:reason])
+      Lab::VoidOrderJob.perform_later(params[:id])
 
       render status: :no_content
     end

data/app/controllers/lab/tests_controller.rb

@@ -14,7 +14,8 @@ class Lab::TestsController < ::ApplicationController
     order_id, test_concepts = test_params.require(%i[order_id tests])
     date = test_params[:date] || Date.today
 
-    tests = service.create_tests(Order.find(order_id), date, test_concepts)
+    tests = service.create_tests(Lab::LabOrder.find(order_id), date, test_concepts)
+    Lab::PushOrderJob.perform_later(order_id)
 
     render json: tests, status: :created
   end

data/app/models/lab/lab_order.rb

@@ -44,19 +44,11 @@ module Lab
     scope :drawn, -> { where.not(concept_id: ConceptName.where(name: 'Unknown').select(:concept_id)) }
     scope :not_drawn, -> { where(concept_id: ConceptName.where(name: 'Unknown').select(:concept_id)) }
 
-    after_save :queue_lims_push
-
     def self.prefetch_relationships
       includes(:reason_for_test,
                :requesting_clinician,
                :target_lab,
                tests: [:result])
     end
-
-    private
-
-    def queue_lims_push
-      Lab::PushOrderJob.perform_later(order_id)
-    end
   end
 end

data/app/services/lab/lims/api/rest_api.rb

@@ -377,7 +377,7 @@ class Lab::Lims::Api::RestApi
     orders_without_specimen(patient_id).each { |order| orders[order.order_id] = order }
     orders_without_results(patient_id).each { |order| orders[order.order_id] = order }
     orders_without_reason(patient_id).each { |order| orders[order.order_id] = order }
-
+    
     orders.values
   end
 
@@ -394,8 +394,10 @@ class Lab::Lims::Api::RestApi
 
   def orders_without_results(patient_id = nil)
     Rails.logger.debug('Looking for orders without a result')
+    # Lab::OrdersSearchService.find_orders_without_results(patient_id: patient_id)
+    #                         .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id).where("pulled_at IS NULL"))
     Lab::OrdersSearchService.find_orders_without_results(patient_id: patient_id)
-                            .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id))
+                             .where(order_id: Lab::LimsOrderMapping.select(:order_id))
   end
 
   def orders_without_reason(patient_id = nil)

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

@@ -45,7 +45,7 @@ module Lab
           end
 
           update_last_seq(context.current_seq)
-        rescue DuplicateNHID
+        rescue Lab::Lims::DuplicateNHID
           logger.warn("Failed to import order due to duplicate patient NHID: #{order_dto[:patient][:id]}")
           save_failed_import(order_dto, "Duplicate local patient NHID: #{order_dto[:patient][:id]}")
         rescue MissingAccessionNumber
@@ -102,7 +102,7 @@ module Lab
                           .distinct(:patient_id)
                           .all
 
-        raise DuplicateNHID, "Duplicate National Health ID: #{nhid}" if patients.size > 1
+        raise Lab::Lims::DuplicateNHID, "Duplicate National Health ID: #{nhid}" if patients.size > 1
 
         patients.first
       end
@@ -182,14 +182,14 @@ module Lab
 
       def update_results(order, lims_results)
         logger.debug("Updating results for order ##{order[:accession_number]}: #{lims_results}")
-
+        
         lims_results.each do |test_name, test_results|
           test = find_test(order['id'], test_name)
           unless test
             logger.warn("Couldn't find test, #{test_name}, in order ##{order[:id]}")
             next
           end
-
+          
           next if test.result || test_results['results'].blank?
 
           measures = test_results['results'].map do |indicator, value|
@@ -198,7 +198,7 @@ module Lab
 
             measure
           end
-
+          
           measures = measures.compact
           next if measures.empty?
 

data/app/services/lab/orders_search_service.rb

@@ -5,14 +5,6 @@ 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
@@ -39,13 +31,9 @@ module Lab
         date = date&.to_date
         end_date = end_date&.to_date
 
-        if date && end_date
-          return orders.where('start_date BETWEEN ? AND ?', date, end_date + 1.day)
-        end
+        return orders.where('start_date BETWEEN ? AND ?', date, end_date + 1.day) if date && end_date
 
-        if date
-          return orders.where('start_date BETWEEN ? AND ?', date, date + 1.day)
-        end
+        return orders.where('start_date BETWEEN ? AND ?', date, date + 1.day) if date
 
         return orders.where('start_date < ?', end_date + 1.day) if end_date
 

data/app/services/lab/orders_service.rb

@@ -100,7 +100,6 @@ module Lab
 
         order.tests.each { |test| test.void(reason) }
         voided = order.void(reason)
-        Lab::VoidOrderJob.perform_later(order_id)
 
         voided
       end

data/lib/lab/version.rb

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

data/lib/logger_multiplexor.rb

@@ -23,10 +23,16 @@ class LoggerMultiplexor
   end
 
   def method_missing(method_name, *args)
-    @loggers.each { |logger| logger.method(method_name).call(*args) }
+    if respond_to_missing?(method_name)
+      @loggers.each { |logger| logger.send(method_name, *args) }
+    else
+      super
+    end
   end
 
   def respond_to_missing?(method_name)
-    @loggers.all? { |logger| logger.respond_to_missing?(method_name) }
+    @loggers.all? do |logger|
+      logger.respond_to?(method_name)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.18
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -319,7 +319,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/EGPAFMalawiHIS/his_emr_api_lab
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -334,8 +334,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API
 test_files: []