his_emr_api_lab 2.3.3 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3873475c6cfd03e575f78f41fbf683f18c7dc7c9805727b7fe95c68bda0c9ad0
-  data.tar.gz: 1ac84309c0eb67cc136b7e51c2254d45b64514c7a2cc605f7366cc73d33fcc59
+  metadata.gz: dc965d603f0266ab7897325bdf7342208fb136527c39b2b6d267269b79c2670c
+  data.tar.gz: 67b239f498c628d805d336df0b1ce1aa906969638046453640b57278dbdc3d1a
 SHA512:
-  metadata.gz: d4a4106f2ace136bede102affbf76ba7d6d9d740711f401b53727349ff47f3bc781ad5b3f709e56b17c75dcb1f194a7e6fa4e2abaa3895ac6685f262afa62c53
-  data.tar.gz: 04ac7da59794e253c10bab14a5002633c1b9f30e48e0a70338153af8020443bd75914400ef274edc469a5852862bfe03623f5be4664c564af29ada6782a9b1e0
+  metadata.gz: 1944e524aab65fa92c218339dd61e1edfd741b38c0525b8c89092d493dd77bfc1f450f5bbe51dca6b9896db402f32f7d38a2e0c90ba59eac04e257a82bbb5375
+  data.tar.gz: 33b215daa16a744b72ff9999ec71fcfbc211c21fad7cad8f73d540ec8eb9cf16183bdd1a4f90ee6a901847a89f0cba0f4d4326bb28383515105f2662805f232a

data/app/jobs/lab/process_lab_result_job.rb

@@ -8,7 +8,7 @@ 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)

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/concepts_service.rb

@@ -117,8 +117,13 @@ module Lab
       # From the members above, filter out only those concepts that are result indicators
       measures = ConceptSet.find_members_by_name(Lab::Metadata::TEST_RESULT_INDICATOR_CONCEPT_NAME)
                            .select(:concept_id)
+            # Get specimen types to exclude from results
+      specimen_types = ConceptSet.find_members_by_name(Lab::Metadata::SPECIMEN_TYPE_CONCEPT_NAME)
+                                 .select(:concept_id)
 
+      # Find concepts that are linked to the test type AND are measures (but NOT specimens)
       sets = ConceptSet.where(concept_set: test, concept_id: measures)
+                       .where.not(concept_id: specimen_types)
 
       return ActiveRecord::Base.connection.select_all <<~SQL
         SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid

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

@@ -82,6 +82,9 @@ module Lab
         unescaped_name = CGI.unescapeHTML(name)
         attribute_type_id = ConceptAttributeType.test_catalogue_name.concept_attribute_type_id
 
+        attribute = ConceptAttribute.where('attribute_type_id = ? AND value_reference = ?', attribute_type_id, unescaped_name).first
+        return attribute.concept if attribute
+
         ConceptName.joins('INNER JOIN concept_attribute ON concept_attribute.concept_id = concept_name.concept_id')
                    .where('concept_attribute.attribute_type_id = ? AND concept_attribute.value_reference = ? AND concept_name.name = ?',
                           attribute_type_id, unescaped_name, unescaped_name)

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/results_service.rb

@@ -63,15 +63,21 @@ module Lab
       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.3'
+  VERSION = '2.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.5
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-07 00:00:00.000000000 Z
+date: 2026-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest