his_emr_api_lab 2.3.2 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 621f287ea97c94b4c48cd73c0bcd44e38ec8232bad9c2e5a9c1bed97ffa40828
-  data.tar.gz: 41138387babca534befa95b3c2f07e794f2b8fe3b7812901dba45f18aa80b45d
+  metadata.gz: cf823a7706db9f2444ed694c9f58ea1c1851c9cf00de058bb6c980434e57b27a
+  data.tar.gz: 55ac7590a6cc36249ef8322b254844f3ada7ca891b45d00c3512ccfa2eee8ddc
 SHA512:
-  metadata.gz: 7712bd7f073b68e2b1ebc23f248902ac27b4ba08773fba780f12704b43b849f209eb75c7de421763e7bbe80dd960031abf68e2aa961514451c7d153afb62824b
-  data.tar.gz: b00db5c45c98f2c05a9ce6bc7f843d0a66b6db78528b2f1d8bf1c978e9d7b56848c32f8d6a98400ba1e554c72d8f34d281242151f6c23f92dadf4209fbe298b1
+  metadata.gz: 1b3efe1cf4d98acb7dd218866c331d384a7f4c0855fe2ad4475edc88e3c89799d74d479c4ca8159707eeb433a1cf985a8b98f847f2d3a6a66330af88b675343b
+  data.tar.gz: 51d757cdbaff73aa883332f8a0a17cc71cc117fd7812192b9c60b11506b16c8f4ba30c7a1850ee5bc49a56c531e93f912eca963519ee4251ad0edbb225ce716a

data/app/jobs/lab/process_lab_result_job.rb

@@ -8,10 +8,20 @@ module Lab
     def perform(results_obs_id, serializer, result_enter_by)
       Rails.logger.info("Lab::ProcessLabResultJob: Processing result completion for #{serializer}")
       # set location context for the job based on the order's encounter to ensure proper context for any operations performed in the job
-      results_obs = Lab::LabResult.unscoped.find(results_obs_id)
+      results_obs = Lab::LabResult.unscoped.includes(:test).find(results_obs_id)
       encounter = Encounter.unscoped.find_by(encounter_id: results_obs.encounter_id)
       Location.current = Location.find(encounter.location_id) if encounter&.location_id
       Lab::ResultsService.process_result_completion(results_obs, serializer, result_enter_by)
+
+      # Publish notification that results have been processed
+      ActiveSupport::Notifications.instrument(
+        'lab.results_saved',
+        patient_id: results_obs.person_id,
+        order_id: results_obs.order_id,
+        result_id: results_obs.obs_id,
+        encounter_id: results_obs.encounter_id,
+        timestamp: Time.current
+      )
     end
   end
 end

data/app/jobs/lab/void_order_job.rb

@@ -16,6 +16,14 @@ module Lab
 
       worker = Lab::Lims::PushWorker.new(Lab::Lims::ApiFactory.create_api)
       worker.push_order(order)
+
+      # Publish notification that order has been voided
+      ActiveSupport::Notifications.instrument(
+        'lab.order_voided',
+        patient_id: order.patient_id,
+        order_id: order.order_id,
+        timestamp: Time.current
+      )
     end
   end
 end

data/app/serializers/lab/lab_order_serializer.rb

@@ -18,7 +18,7 @@ module Lab
           order_type_id: order.order_type_id,
           order_id: order.order_id, # Deprecated: Link to :id
           encounter_id: order.encounter_id,
-          visit_id: encounter&.visit_id,
+          **(Encounter.column_names.include?('visit_id') ? { visit_id: encounter&.visit_id } : {}),
           order_date: order.start_date,
           location_id: encounter&.location_id,
           program_id: encounter&.program_id,

data/app/services/lab/notification_service.rb

@@ -31,7 +31,13 @@ class Lab::NotificationService
     return if alert_type != 'LIMS'
 
     # Use unscoped to find user regardless of location context
-    lab = User.unscoped.find_by(username: 'lab_daemon')
+    lab = Lab::Lims::Utils.lab_user
+
+    unless lab
+      Rails.logger.warn('NotificationService: lab_daemon user not found, skipping notification creation')
+      return
+    end
+
     ActiveRecord::Base.transaction do
       alert = NotificationAlert.create!(text: alert_message.to_json, date_to_expire: Time.now + not_period.days,
                                         creator: lab, changed_by: lab, date_created: Time.now)

data/app/services/lab/orders_service.rb

@@ -50,6 +50,10 @@ module Lab
       # reason_for_test_id: is a concept_id for a (standard) reason of why the test is being carried out
       # requesting_clinician: Name of the clinician requesting the test (defaults to current user)
       def order_test(order_params)
+        serialized_order = nil
+        order_id = nil
+        patient_id = nil
+
         Order.transaction do
           encounter = find_encounter(order_params)
           if order_params[:accession_number].present? && check_tracking_number(order_params[:accession_number])
@@ -68,13 +72,29 @@ module Lab
           # Reload order to include status trails and tests
           order = Lab::LabOrder.prefetch_relationships.find(order.order_id)
 
-          Lab::LabOrderSerializer.serialize_order(
+          serialized_order = Lab::LabOrderSerializer.serialize_order(
             order, requesting_clinician: add_requesting_clinician(order, order_params),
                    reason_for_test: add_reason_for_test(order, order_params),
                    target_lab: add_target_lab(order, order_params),
                    comment_to_fulfiller: add_comment_to_fulfiller(order, order_params)
           )
+
+          # Store IDs for notification after transaction commits
+          order_id = order.order_id
+          patient_id = order.patient_id
         end
+
+        # Publish notification AFTER transaction commits
+        # This ensures the order is visible in the database before rebuilding
+        ActiveSupport::Notifications.instrument(
+          'lab.order_created',
+          patient_id: patient_id,
+          order_id: order_id,
+          accession_number: serialized_order[:accession_number],
+          timestamp: Time.current
+        )
+
+        serialized_order
       end
 
       def attach_test_method(order, order_params)
@@ -153,6 +173,16 @@ module Lab
           save_order_status_trail(order, order_params) if order_params['status']
         end
         create_rejection_notification(order_params) if order_params['status'] == 'test-rejected'
+
+        # Publish notification that order status has changed
+        ActiveSupport::Notifications.instrument(
+          'lab.order_status_changed',
+          patient_id: order.patient_id,
+          order_id: order.order_id,
+          new_status: order_params['status'],
+          tracking_number: order_params['tracking_number'],
+          timestamp: Time.current
+        )
       end
 
       def update_order_result(order_params)

data/app/services/lab/results_service.rb

@@ -46,21 +46,38 @@ module Lab
         ProcessLabResultJob.perform_now(results_obs.id, serializer, result_enter_by)
 
         Rails.logger.info("Lab::ResultsService: Result created for test #{test_id} #{serializer}")
+
+        # Publish notification that results have been created
+        ActiveSupport::Notifications.instrument(
+          'lab.results_created',
+          patient_id: results_obs.person_id,
+          order_id: results_obs.order_id,
+          result_id: results_obs.obs_id,
+          test_id: test_id,
+          timestamp: Time.current
+        )
+
         serializer
       end
 
       def process_result_completion(results_obs, serializer, result_enter_by)
         process_acknowledgement(results_obs, result_enter_by)
         precess_notification_message(results_obs, serializer, result_enter_by)
+      rescue StandardError => e
+        Rails.logger.error("Lab::ResultsService: Error in post-result processing: #{e.message}")
+        Rails.logger.error(e.backtrace.join("\n"))
+        # Don't re-raise - result is already saved
       end
 
       private
 
       def precess_notification_message(result, values, result_enter_by)
         order = Order.find(result.order_id)
+        test_concept_id = result.test&.value_coded
+
         data = { Type: result_enter_by,
                  Specimen: get_test_catalog_name(order.concept_id) || ConceptName.find_by(concept_id: order.concept_id)&.name,
-                 'Test type': get_test_catalog_name(result.test.value_coded) || ConceptName.find_by(concept_id: result.test.value_coded)&.name,
+                 'Test type': test_concept_id ? (get_test_catalog_name(test_concept_id) || ConceptName.find_by(concept_id: test_concept_id)&.name) : nil,
                  'Accession number': order&.accession_number,
                  order_date: Order.columns.include?('start_date') ? order.start_date : order.date_created,
                  'ARV-Number': find_arv_number(result.person_id),

data/lib/lab/version.rb

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

metadata

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