his_emr_api_lab 2.4.9 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f0e2b1fd0f7372571d684a23a529651631e55a271d1355aa1d12f8b7d2a85d5
-  data.tar.gz: 6509d471a8f57e1108430e3d6e08a4308b5bca2e0eb386d1088534f0c0863856
+  metadata.gz: 0ea18a06a50c6c0dfaded6e6911e0f9603cf2f9b8d1c4e81a476da3d8b8aba29
+  data.tar.gz: b0991a42ac153666de1d4ce358226134e9804cfd93ba5a749c8030f364d5c2aa
 SHA512:
-  metadata.gz: 2500b6aa2b1cc75bc8476a4ed68576faf0156cc7f836b7fd3039606db135c05672f957fe4188d69f994b9fc54c952fb39974dcd398dee0376af32e78b5f9f0ab
-  data.tar.gz: f74c867864d8c77e8b73ec31b8ac0dd82d5b6d77d4c6152d32cbf3c010e909d24c844839153d4670f14bcfaa9db1e45de6f5d767176d70b262321eec8603b9f4
+  metadata.gz: c39da38186a7c15671704fb88981c4b8d76be7acddad44426b77c0b30ea88245ca4887d2cb79a787c04b4d7cf127498497be651c36ba25fe41b45490eeebff86
+  data.tar.gz: 8c9469a31a9c6f5b82e7985b628f288178e7aaf9d6f4e4f24de70182267e23fad71659c2afc3e5308b33ed41ad89c48e2ec5dd3fde1eda4b1277712754264c7a

data/app/jobs/lab/update_patient_orders_job.rb

@@ -6,7 +6,17 @@ module Lab
   class UpdatePatientOrdersJob < ApplicationJob
     queue_as :default
 
+    # Opening a patient's lab orders or tests queues this job, so a busy
+    # patient page would otherwise sync with NLIMS on every request.
+    MIN_INTERVAL_BETWEEN_RUNS = 5.minutes
+
+    # Only orders from this window are checked; older orders are left to the
+    # sync worker (bin/lab/sync_worker.rb uses the same window).
+    SYNC_WINDOW = 6.months
+
     def perform(patient_id)
+      return if ran_recently?(patient_id)
+
       Rails.logger.info('Initialising LIMS REST API...')
 
       User.current = Lab::Lims::Utils.lab_user
@@ -21,7 +31,7 @@ module Lab
           break false
         end
 
-        worker = Lab::Lims::PullWorker.new(Lab::Lims::ApiFactory.create_api)
+        worker = Lab::Lims::PullWorker.new(Lab::Lims::ApiFactory.create_api, start_date: SYNC_WINDOW.ago)
         worker.pull_orders(patient_id:)
 
         true
@@ -32,6 +42,20 @@ module Lab
 
     private
 
+    # Uses a file's mtime rather than Rails.cache so all Puma workers see it.
+    # The file is touched before the sync starts, so a burst of requests for
+    # the same patient results in a single sync.
+    def ran_recently?(patient_id)
+      stamp = Rails.root.join('tmp', "update-patient-orders-#{patient_id}.last_run")
+      if File.exist?(stamp) && File.mtime(stamp) > MIN_INTERVAL_BETWEEN_RUNS.ago
+        Rails.logger.info("Skipping LIMS update for patient #{patient_id}: last run at #{File.mtime(stamp)} and next run not due until #{File.mtime(stamp) + MIN_INTERVAL_BETWEEN_RUNS}")
+        return true
+      end
+
+      FileUtils.touch(stamp)
+      false
+    end
+
     def set_location_from_patient_encounter(patient_id)
       Rails.logger.info("Setting location context for patient #{patient_id}")
 

data/app/models/lab/lab_order.rb

@@ -49,10 +49,13 @@ module Lab
             class_name: '::Lab::LimsOrderMapping',
             foreign_key: :order_id
 
-    # Status trails are stored as observations with concept 'Lab Order Status'
+    # Status trails are stored as observations with concept 'Lab Order Status'.
+    # Ordered by when the status happened, not when it was saved: the pull
+    # worker can save an earlier NLIMS status after a later one was pushed.
     has_many :status_trail_observations,
              lambda {
-               unscoped.where(voided: 0, concept_id: Lab::LabOrder.order_status_concept_id).order(date_created: :asc)
+               unscoped.where(voided: 0, concept_id: Lab::LabOrder.order_status_concept_id)
+                       .order(obs_datetime: :asc, obs_id: :asc)
              },
              class_name: 'Observation',
              foreign_key: :order_id

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

@@ -11,6 +11,11 @@ module Lab
         class InvalidParameters < LimsApiError; end
 
         START_DATE = Time.parse('2024-09-03').freeze
+        
+        # How long to wait before asking NLIMS again about an order that still
+        # has no results. Orders that never get results (rejected or abandoned
+        # samples) would otherwise be fetched from NLIMS on every pull.
+        RESULTS_RECHECK_INTERVAL = 30.minutes
 
         def initialize(config)
           @config = config
@@ -632,12 +637,20 @@ module Lab
           # Lab::OrdersSearchService.find_orders_without_results(patient_id: patient_id)
           #                         .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id).where("pulled_at IS NULL"))
           orders = Lab::OrdersSearchService.find_orders_without_results(patient_id:)
-                                           .where(order_id: Lab::LimsOrderMapping.select(:order_id))
+                                           .where(order_id: mappings_due_for_results_check(accession_numbers).select(:order_id))
           orders = orders.where('orders.date_created >= ?', start_date) if start_date
           orders = orders.where(accession_number: accession_numbers) if accession_numbers.any?
           orders
         end
 
+        # Skips orders pulled within RESULTS_RECHECK_INTERVAL, unless specific
+        # accession numbers were asked for (a manual re-sync).
+        def mappings_due_for_results_check(accession_numbers)
+          return Lab::LimsOrderMapping.all if accession_numbers.any?
+
+          Lab::LimsOrderMapping.where('pulled_at IS NULL OR pulled_at < ?', RESULTS_RECHECK_INTERVAL.ago)
+        end
+
         def orders_without_reason(patient_id = nil, start_date: nil, accession_numbers: [])
           Rails.logger.debug('Looking for orders without a reason for test')
           orders = Lab::LabOrder.joins(:reason_for_test)

data/app/services/lab/order_location_resolver.rb

@@ -97,8 +97,11 @@ module Lab
       scope.order(Arel.sql("CASE WHEN concept_id IN (#{quoted_ids}) THEN 0 ELSE 1 END, date_created ASC, obs_id ASC"))
     end
 
+    # Cached like the concept IDs in Lab::LabTest; empty results are not cached
+    # so a missing concept is picked up once it is added.
     def order_location_concept_ids
-      ConceptName.where(name: ORDER_OBSERVATION_CONCEPT_NAMES).pluck(:concept_id)
+      @order_location_concept_ids ||= ConceptName.where(name: ORDER_OBSERVATION_CONCEPT_NAMES)
+                                                 .pluck(:concept_id).presence
     end
 
     def encounter_location_id_for_record(record)

data/app/services/lab/orders_service.rb

@@ -165,24 +165,12 @@ module Lab
       def update_order_status(order_params)
         # find the order
         order = find_order(order_params['tracking_number'])
-        concept = ConceptName.find_by_name Lab::Metadata::LAB_ORDER_STATUS_CONCEPT_NAME
-        location_id = Lab::OrderLocationResolver.location_id_for_order(order)
-        ActiveRecord::Base.transaction do
-          void_order_status(order, concept)
-          Observation.create!(
-            person_id: order.patient_id,
-            encounter_id: order.encounter_id,
-            concept_id: concept.concept_id,
-            order_id: order.id,
-            obs_datetime: order_params['status_time'] || Time.now,
-            value_text: order_params['status'],
-            creator: User.current.id,
-            location_id:
-          )
 
-          # Save order status trail if available
-          save_order_status_trail(order, order_params) if order_params['status']
-        end
+        # Statuses form the order's trail and the newest one is the current
+        # status, so earlier ones are kept. Voiding them here made the pull
+        # worker re-create the whole trail on its next run, and the two kept
+        # adding copies of the same statuses.
+        save_order_status_trail(order, order_params) if order_params['status']
         create_rejection_notification(order_params) if order_params['status'] == 'test-rejected'
 
         # Publish notification that order status has changed
@@ -499,12 +487,6 @@ module Lab
         add_reason_for_test(order, date: date, reason_for_test_id: concept_id)
       end
 
-      def void_order_status(order, concept)
-        Observation.unscoped.where(order_id: order.id, concept_id: concept.concept_id).each do |obs|
-          obs.void('New Status Received from LIMS')
-        end
-      end
-
       def location_id_from_order_params(order_params)
         order_params[:location_id] ||
           order_params[:order_location_id] ||

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.4.9'.freeze
+  VERSION = '2.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 2.5.0
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-13 00:00:00.000000000 Z
+date: 2026-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest