his_emr_api_lab 2.1.1 → 2.1.3

data/app/services/lab/results_service.rb

@@ -20,8 +20,10 @@ module Lab
         serializer = {}
         results_obs = {}
         ActiveRecord::Base.transaction do
-          test = Lab::LabTest.find(test_id)
+          test = Lab::LabTest.find(test_id) rescue nil
+          test = Lab::LabTest.find_by_uuid(test_id) if test.blank?
           encounter = find_encounter(test, encounter_id: params[:encounter_id],
+                                           encounter_uuid: params[:encounter],
                                            date: params[:date]&.to_date,
                                            provider_id: params[:provider_id])
 
@@ -33,7 +35,11 @@ module Lab
           serializer = Lab::ResultSerializer.serialize(results_obs)
         end
 
-        ProcessLabResultJob.perform_later(results_obs.id, serializer, result_enter_by)
+        # force commit all transactions
+        ActiveRecord::Base.connection.commit_db_transaction
+        
+        # delay job by a second
+        ProcessLabResultJob.set(wait: 1.second).perform_later(results_obs.id, serializer, result_enter_by)
 
         Rails.logger.info("Lab::ResultsService: Result created for test #{test_id} #{serializer}")
         serializer
@@ -52,10 +58,10 @@ module Lab
                  Specimen: ConceptName.find_by(concept_id: order.concept_id)&.name,
                  'Test type': ConceptName.find_by(concept_id: result.test.value_coded)&.name,
                  'Accession number': order&.accession_number,
-                 'Orde date': order&.start_date,
+                 'Orde date': Order.columns.include?('start_date') ? order.start_date : order.date_created,
                  'ARV-Number': find_arv_number(result.person_id),
                  PatientID: result.person_id,
-                 'Ordered By': order&.provider&.person&.name,
+                 'Ordered By': Order.columns.include?('provider_id') ? order&.provider&.person&.name : Person.find(order.creator)&.name,
                  Result: values }.as_json
         NotificationService.new.create_notification(result_enter_by, data)
       end
@@ -73,22 +79,28 @@ module Lab
                          .first&.identifier
       end
 
-      def find_encounter(test, encounter_id: nil, date: nil, provider_id: nil)
+      def find_encounter(test, encounter_id: nil, encounter_uuid: nil, date: nil, provider_id: nil)
         return Encounter.find(encounter_id) if encounter_id
+        return Encounter.find_by_uuid(encounter_uuid) if encounter_uuid
+        encounter_type = EncounterType.find_by_name!(Lab::Metadata::ENCOUNTER_TYPE_NAME)
 
-        Encounter.create!(
-          patient_id: test.person_id,
-          program_id: test.encounter.program_id,
-          type: EncounterType.find_by_name!(Lab::Metadata::ENCOUNTER_TYPE_NAME),
-          encounter_datetime: date || Date.today,
-          provider_id: provider_id || User.current.user_id
-        )
+        encounter = Encounter.new
+        encounter.patient_id = test.person_id
+        encounter.program_id = test.encounter.program_id if Encounter.column_names.include?('program_id')
+        encounter.visit_id = test.encounter.visit_id if Encounter.column_names.include?('visit_id')
+        encounter.type = encounter_type
+        encounter.encounter_type = encounter_type if (encounter&.encounter_type.nil? || encounter&.type.nil?)
+        encounter.encounter_datetime = date || Date.today
+        encounter.provider_id = provider_id || User.current.user_id if Encounter.column_names.include?('provider_id')
+
+        encounter.save!
+
+        encounter
       end
 
       # Creates the parent observation for results to which the different measures are attached
       def create_results_obs(encounter, test, date, comments = nil)
         void_existing_results_obs(encounter, test)
-
         Lab::LabResult.create!(
           person_id: encounter.patient_id,
           encounter_id: encounter.encounter_id,
@@ -118,11 +130,13 @@ module Lab
       def add_measure_to_results(results_obs, params, date)
         validate_measure_params(params)
 
+        concept_id = params[:indicator][:concept_id] || Concept.find_concept_by_uuid(params.dig(:indicator, :concept))&.id
+
         Observation.create!(
           person_id: results_obs.person_id,
           encounter_id: results_obs.encounter_id,
           order_id: results_obs.order_id,
-          concept_id: params[:indicator][:concept_id],
+          concept_id: concept_id,
           obs_group_id: results_obs.obs_id,
           obs_datetime: date&.to_datetime || DateTime.now,
           **make_measure_value(params)
@@ -132,8 +146,8 @@ module Lab
       def validate_measure_params(params)
         raise InvalidParameterError, 'measures.value is required' if params[:value].blank?
 
-        if params[:indicator]&.[](:concept_id).blank?
-          raise InvalidParameterError, 'measures.indicator.concept_id is required'
+        if params[:indicator]&.[](:concept_id).blank? && params[:indicator]&.[](:concept).blank?
+          raise InvalidParameterError, 'measures.indicator.concept_id or concept is required'
         end
 
         params

data/app/services/lab/tests_service.rb

@@ -7,9 +7,15 @@ module Lab
     class << self
       def find_tests(filters)
         tests = Lab::LabTest.all
+        patient_id = filters.delete(:patient_id)
+        patient_id ||= ::Patient.find(filters.delete(:patient))&.id if filters[:patient]
+
+        Lab::UpdatePatientOrdersJob.perform_later(patient_id) if patient_id
 
         tests = filter_tests(tests, test_type_id: filters.delete(:test_type_id),
-                                    patient_id: filters.delete(:patient_id))
+                                    patient_id: filters.delete(:patient_id),
+                                    patient: filters.delete(:patient)
+                                    )
 
         tests = filter_tests_by_results(tests) if %w[1 true].include?(filters[:pending_results]&.downcase)
 
@@ -23,8 +29,12 @@ module Lab
       def create_tests(order, date, tests_params)
         raise InvalidParameterError, 'tests are required' if tests_params.nil? || tests_params.empty?
 
+        
         Lab::LabTest.transaction do
           tests_params.map do |params|
+            concept_id = params[:concept_id]
+            concept_id = Concept.find_concept_by_uuid(params[:concept]).id if concept_id.nil?
+            
             test = Lab::LabTest.create!(
               concept_id: ConceptName.find_by_name!(Lab::Metadata::TEST_TYPE_CONCEPT_NAME)
                                      .concept_id,
@@ -32,7 +42,7 @@ module Lab
               order_id: order.order_id,
               person_id: order.patient_id,
               obs_datetime: date&.to_time || Time.now,
-              value_coded: params[:concept_id]
+              value_coded: concept_id
             )
 
             Lab::TestSerializer.serialize(test, order:)
@@ -44,9 +54,11 @@ module Lab
 
       ##
       # Filter a LabTests Relation.
-      def filter_tests(tests, test_type_id: nil, patient_id: nil)
+      def filter_tests(tests, test_type_id: nil, patient_id: nil, patient: nil)
         tests = tests.where(value_coded: test_type_id) if test_type_id
         tests = tests.where(person_id: patient_id) if patient_id
+        person = ::Person.find_by_uuid(patient) if patient
+        tests = tests.where(person_id: person&.patient&.id) if patient
 
         tests
       end

data/config/routes.rb

@@ -14,6 +14,7 @@ Lab::Engine.routes.draw do
 
   get 'api/v1/lab/labels/order', to: 'labels#print_order_label'
   get 'api/v1/lab/accession_number', to: 'orders#verify_tracking_number'
+  get 'api/v1/lab/test_methods', to: 'test_methods#index'
 
   # Metadata
   # TODO: Move the following to namespace /concepts

data/db/migrate/20260119104240_add_fulfiller_fields_to_orders.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This migration adds fields to the orders table to support the comment to fulfiller feature.
+class AddFulfillerFieldsToOrders < ActiveRecord::Migration[5.2]
+  def change
+    add_column :orders, :comment_to_fulfiller, :string, limit: 1024 unless column_exists?(:orders,
+                                                                                          :comment_to_fulfiller)
+    add_column :orders, :fulfiller_comment, :string, limit: 1024 unless column_exists?(:orders, :fulfiller_comment)
+    add_column :orders, :fulfiller_status, :string, limit: 50 unless column_exists?(:orders, :fulfiller_status)
+  end
+end

data/db/migrate/20260119104241_create_comment_to_fulfiller_concept.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# This migration creates the concept for the comment to fulfiller feature.
+class CreateCommentToFulfillerConcept < ActiveRecord::Migration[5.2]
+  def up
+    # Return if the concept already exists
+    return if ConceptName.exists?(name: 'Comment to fulfiller')
+
+    ActiveRecord::Base.transaction do
+      # Find or create the concept class for Misc
+      concept_class = ConceptClass.find_by(name: 'Finding')
+
+      # Find or create the concept datatype for Text
+      concept_datatype = ConceptDatatype.find_by(name: 'Text')
+
+      # Create the concept
+      concept = Concept.create!(
+        class_id: concept_class.id,
+        datatype_id: concept_datatype.id,
+        short_name: 'Comment to fulfiller',
+        retired: 0,
+        is_set: 0,
+        creator: 1,
+        date_created: Time.current,
+        uuid: SecureRandom.uuid
+      )
+
+      # Create the concept name
+      ConceptName.create!(
+        concept: concept,
+        name: 'Comment to fulfiller',
+        locale: 'en',
+        locale_preferred: 1,
+        concept_name_type: 'FULLY_SPECIFIED',
+        creator: 1,
+        date_created: Time.current,
+        uuid: SecureRandom.uuid
+      )
+      puts "Created 'Comment to fulfiller' concept with ID: #{concept.concept_id}"
+    end
+  end
+
+  def down
+    concept = ConceptName.find_by(name: 'Comment to fulfiller')&.concept
+    return unless concept
+
+    ConceptName.where(concept: concept).destroy_all
+    concept.destroy
+  end
+end

data/lib/lab/version.rb

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

data/lib/mahis_emr_api_lab.rb

@@ -0,0 +1,6 @@
+require 'lab/engine'
+require 'lab/version'
+
+module Lab
+  # Your code goes here...
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-12 00:00:00.000000000 Z
+date: 2026-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -42,14 +42,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.6
 - !ruby/object:Gem::Dependency
@@ -238,6 +238,7 @@ files:
 - app/controllers/lab/reasons_for_test_controller.rb
 - app/controllers/lab/results_controller.rb
 - app/controllers/lab/specimen_types_controller.rb
+- app/controllers/lab/test_methods_controller.rb
 - app/controllers/lab/test_result_indicators_controller.rb
 - app/controllers/lab/test_types_controller.rb
 - app/controllers/lab/tests_controller.rb
@@ -257,6 +258,7 @@ files:
 - app/models/lab/lab_test.rb
 - app/models/lab/lims_failed_import.rb
 - app/models/lab/lims_order_mapping.rb
+- app/models/lab/order_extension.rb
 - app/serializers/lab/lab_order_serializer.rb
 - app/serializers/lab/result_serializer.rb
 - app/serializers/lab/test_serializer.rb
@@ -268,7 +270,7 @@ files:
 - app/services/lab/lims/acknowledgement_serializer.rb
 - app/services/lab/lims/acknowledgement_worker.rb
 - app/services/lab/lims/api/blackhole_api.rb
-- app/services/lab/lims/api/couchdb_api.rb
+- app/services/lab/lims/api/couch_db_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
@@ -283,6 +285,7 @@ files:
 - app/services/lab/lims/utils.rb
 - app/services/lab/lims/worker.rb
 - app/services/lab/metadata.rb
+- app/services/lab/notification_service.rb
 - app/services/lab/orders_search_service.rb
 - app/services/lab/orders_service.rb
 - app/services/lab/results_service.rb
@@ -296,6 +299,8 @@ files:
 - db/migrate/20210407071728_create_lab_lims_failed_imports.rb
 - db/migrate/20210610095024_fix_numeric_results_value_type.rb
 - db/migrate/20210807111531_add_default_to_lims_order_mapping.rb
+- db/migrate/20260119104240_add_fulfiller_fields_to_orders.rb
+- db/migrate/20260119104241_create_comment_to_fulfiller_concept.rb
 - lib/auto12epl.rb
 - lib/couch_bum/couch_bum.rb
 - lib/generators/lab/install/USAGE
@@ -307,6 +312,7 @@ files:
 - lib/lab/engine.rb
 - lib/lab/version.rb
 - lib/logger_multiplexor.rb
+- lib/mahis_emr_api_lab.rb
 - lib/tasks/lab_tasks.rake
 - lib/tasks/loaders/data/reasons-for-test.csv
 - lib/tasks/loaders/data/test-measures.csv