his_emr_api_lab 2.0.9 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306fe47c9b027c61e15e1bd6fe2cee372f08e084acc06375f3a1dcbdf79be1bd
-  data.tar.gz: 8ac31940e00893ffcc554e721c12aa957017c7ab8fc7db69c231830eb063595e
+  metadata.gz: 1c80aacd232547335da6ecc016e3dd846f4f10f5490653db6ad877c21fc4eb3e
+  data.tar.gz: 4ddb8bf35b0c011f9e85c7167c1b3f6e551933d0f697123771ce007ea728a74e
 SHA512:
-  metadata.gz: 28b4c75bed9b3da3c47e0c19e717b51606e3ff1212b5c07d9c9e78cd29496d3b18299e0ce394b8491847faf6dc4c3e9eaf7f51e6f3836a7d957dd4f260292aea
-  data.tar.gz: d9e847ea4fd3c2725ac69222d4e0e1ef8398d06baba9112c2988c0894faeff778eb866ac10a44af3f9a7b9ba9a966c0f90d5f0c704bc0c7a1ff3ce345d238a01
+  metadata.gz: 414b6d9dbe2f808869ce6a2bc17818b8c8da6de35514dbc418aec03bdee86e934367569e15139ddc1d38a432a32a47c55955b276384203449e90ba99c2f84acc
+  data.tar.gz: bdbda16a58d3a67cf89aeeee958eb9975bf4d06af53b0cfda460f8b5fb31c09354695c7a26e8ee4c71dfcfa6c7910d2c864c56e35be6db0cfa74736b864933b8

data/app/jobs/lab/process_lab_result_job.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Lab
+  ##
+  # Push an order to LIMS.
+  class ProcessLabResultJob < ApplicationJob
+    queue_as :default
+    def perform(results_obs_id, serializer, result_enter_by)
+      results_obs = Lab::LabResult.find(results_obs_id)
+      Lab::ResultsService.process_result_completion(results_obs, serializer, result_enter_by)
+    end
+  end
+end

data/app/models/lab/lab_order.rb

@@ -41,7 +41,10 @@ module Lab
 
     default_scope do
       joins(:order_type)
-        .merge(OrderType.where(name: Lab::Metadata::ORDER_TYPE_NAME))
+        .merge(OrderType.where(name: [
+          Lab::Metadata::ORDER_TYPE_NAME, 
+          Lab::Metadata::HTS_ORDER_TYPE_NAME
+        ]))
         .where.not(concept_id: ConceptName.where(name: 'Tests ordered').select(:concept_id))
     end
 

data/app/serializers/lab/lab_order_serializer.rb

@@ -8,11 +8,18 @@ module Lab
       reason_for_test ||= order.reason_for_test
       target_lab = target_lab&.value_text || order.target_lab&.value_text || Location.current_health_center&.name
 
+      encounter = Encounter.find_by_encounter_id(order.encounter_id)
+      program = Program.find_by_program_id(encounter.program_id)
+
       ActiveSupport::HashWithIndifferentAccess.new(
         {
           id: order.order_id,
+          order_type_id: order.order_type_id,
           order_id: order.order_id, # Deprecated: Link to :id
           encounter_id: order.encounter_id,
+          location_id: encounter.location_id,
+          program_id: encounter.program_id,
+          program_name: program.name,
           order_date: order.start_date,
           patient_id: order.patient_id,
           accession_number: order.accession_number,

data/app/serializers/lab/result_serializer.rb

@@ -8,6 +8,13 @@ module Lab
       result.children.map do |measure|
         value, value_type = read_value(measure)
         concept_name = ConceptName.find_by_concept_id(measure.concept_id)
+        
+        program_id = ""
+        if measure.obs_id.present?
+          obs = Observation.find(measure.obs_id)
+          encounter = Encounter.find(obs.encounter_id)
+          program_id = encounter.program_id
+        end
 
         {
           id: measure.obs_id,
@@ -18,7 +25,8 @@ module Lab
           date: measure.obs_datetime,
           value:,
           value_type:,
-          value_modifier: measure.value_modifier
+          value_modifier: measure.value_modifier,
+          program_id: program_id
         }
       end
     end

data/app/services/lab/accession_number_service.rb

@@ -41,8 +41,8 @@ module Lab
         year = format_year(date.year)
         month = format_month(date.month)
         day = format_day(date.day)
-
-        "X#{site_code}#{year}#{month}#{day}#{counter}"
+        time_acc_generated = Time.now.strftime('%H%M')
+        "X#{site_code}#{year}#{month}#{day}#{counter}#{time_acc_generated}"
       end
 
       def format_year(year)

data/app/services/lab/labelling_service/order_label.rb

@@ -23,9 +23,10 @@ module Lab
                   patient.family_name,
                   patient.given_name,
                   patient.gender,
-                  drawer_date,
+                  drawer,
                   tests,
                   order.accession_number,
+                  patient.arv,
                   number_of_copies
                 )
               else
@@ -43,6 +44,7 @@ module Lab
                   reason_for_test,
                   order.accession_number,
                   order.accession_number,
+                  patient.arv,
                   number_of_copies
                 )
               end
@@ -76,27 +78,22 @@ module Lab
         patient_identifier = PatientIdentifier.where(type: PatientIdentifierType.where(name: 'National id'),
                                                      patient_id: order.patient_id)
                                               .first
-
+        arv_identifier = PatientIdentifier.where(type: PatientIdentifierType.where(name: 'ARV Number'),
+                                                     patient_id: order.patient_id)
+                                              .first
         @patient = OpenStruct.new(
           given_name: person_name.given_name,
           family_name: person_name.family_name,
           birthdate: person.birthdate,
           gender: person.gender,
-          nhid: patient_identifier&.identifier || 'Unknown'
+          nhid: patient_identifier&.identifier || 'Unknown',
+          arv: arv_identifier&.identifier || ''
         )
       end
 
       def drawer
         return 'N/A' if order.concept_id == unknown_concept.concept_id
-
-        drawer_id = User.find(order.discontinued_by || order.creator).person_id
-        draw_date = (order.discontinued_date || order.start_date).strftime('%d/%^b/%Y %H:%M:%S')
-
-        name = PersonName.find_by_person_id(drawer_id)
-        return "#{name.given_name} #{name.family_name} #{draw_date}" if name
-
-        user = User.find_by_user_id(drawer_id)
-        user ? "#{user.username} #{draw_date}" : 'N/A'
+        (order.discontinued_date || order.start_date).strftime('%d/%^b/%Y')
       end
 
       def drawer_date

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

@@ -23,7 +23,7 @@ module Lab
         lims_api.consume_orders(from: last_seq, limit: batch_size, **) do |order_dto, context|
           logger.debug("Retrieved order ##{order_dto[:tracking_number]}: #{order_dto}")
 
-          patient = find_patient_by_nhid(order_dto[:patient][:id])
+          patient = find_patient_by_nhid(order_dto[:patient][:id], order_dto[:tracking_number])
           unless patient
             logger.debug("Discarding order: Non local patient ##{order_dto[:patient][:id]} on order ##{order_dto[:tracking_number]}")
             order_rejected(order_dto, "Patient NPID, '#{order_dto[:patient][:id]}', didn't match any local NPIDs")
@@ -58,7 +58,7 @@ module Lab
       end
 
       def process_order(order_dto)
-        patient = find_patient_by_nhid(order_dto[:patient][:id])
+        patient = find_patient_by_nhid(order_dto[:patient][:id], order_dto[:tracking_number])
         unless patient
           logger.debug("Discarding order: Non local patient ##{order_dto[:patient][:id]} on order ##{order_dto[:tracking_number]}")
           order_rejected(order_dto, "Patient NPID, '#{order_dto[:patient][:id]}', didn't match any local NPIDs")
@@ -107,7 +107,7 @@ module Lab
 
       private
 
-      def find_patient_by_nhid(nhid)
+      def find_patient_by_nhid(nhid, accession_number)
         national_id_type = PatientIdentifierType.where(name: ['National id', 'Old Identification Number'])
         identifiers = PatientIdentifier.where(type: national_id_type, identifier: nhid)
                                        .joins('INNER JOIN person ON person.person_id = patient_identifier.patient_id AND person.voided  = 0')
@@ -126,10 +126,10 @@ module Lab
         patients = Patient.where(patient_id: identifiers.select(:patient_id))
                           .distinct(:patient_id)
                           .all
+        order = Order.find_by(patient_id: patients.select(:patient_id), accession_number: accession_number)
+        raise Lab::Lims::LimsException, "Order #{accession_number} does not exists for patient #{nhid}" if order.nil?
 
-        raise Lab::Lims::DuplicateNHID, "Duplicate National Health ID: #{nhid}" if patients.size > 1
-
-        patients.first
+        order.patient
       end
 
       ##

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

@@ -13,7 +13,7 @@ module Lab
         User.current = Utils.lab_user
 
         fork(&method(:start_push_worker))
-        # fork(&method(:start_pull_worker))
+        fork(&method(:start_pull_worker))
         fork(&method(:start_acknowledgement_worker))
         fork(&method(:start_realtime_pull_worker)) if realtime_updates_enabled?
 

data/app/services/lab/metadata.rb

@@ -18,6 +18,7 @@ module Lab
 
     # Order types
     ORDER_TYPE_NAME = 'Lab'
+    HTS_ORDER_TYPE_NAME = 'HTS Lab'
 
     # Programs
     LAB_PROGRAM_NAME = 'Laboratory Program'

data/app/services/lab/orders_service.rb

@@ -160,6 +160,7 @@ module Lab
       def create_rejection_notification(order_params)
         order = find_order order_params['tracking_number']
         data = { 'type': 'LIMS',
+                 'specimen': ConceptName.find_by(concept_id: order.concept_id)&.name,
                  'accession_number': order&.accession_number,
                  'order_date': order&.start_date,
                  'arv_number': find_arv_number(order.patient_id),
@@ -226,8 +227,12 @@ module Lab
         access_number = params[:accession_number] || next_accession_number(params[:date]&.to_date || Date.today)
         raise 'Accession Number cannot be blank' unless access_number.present?
         raise 'Accession cannot be this short' unless access_number.length > 6
+
+        order_type = nil
+        order_type = OrderType.find_by_order_type_id!(params[:order_type_id]) if params[:order_type_id].present?
+        
         Lab::LabOrder.create!(
-          order_type: OrderType.find_by_name!(Lab::Metadata::ORDER_TYPE_NAME),
+          order_type: order_type || OrderType.find_by_name!(Lab::Metadata::ORDER_TYPE_NAME),
           concept_id: params.dig(:specimen, :concept_id) || unknown_concept_id,
           encounter_id: encounter.encounter_id,
           patient_id: encounter.patient_id,

data/app/services/lab/results_service.rb

@@ -32,17 +32,24 @@ module Lab
 
           serializer = Lab::ResultSerializer.serialize(results_obs)
         end
-        process_acknowledgement(results_obs, result_enter_by)
-        precess_notification_message(results_obs, serializer, result_enter_by)
+
+        ProcessLabResultJob.perform_later(results_obs.id, serializer, result_enter_by)
+
         Rails.logger.info("Lab::ResultsService: Result created for test #{test_id} #{serializer}")
         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)
+      end
+
       private
 
       def precess_notification_message(result, values, result_enter_by)
         order = Order.find(result.order_id)
         data = { Type: result_enter_by,
+                 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,

data/lib/auto12epl.rb

@@ -96,7 +96,8 @@ class Auto12Epl
     "#{last_name}, #{first_name}#{middle_initial.nil? ? '' : " #{middle_initial}"}"
   end
 
-  def generate_small_specimen_label(last_name, first_name, gender, col_date_time, tests, acc_num, number_of_copies = print_copies)
+  def generate_small_specimen_label(last_name, first_name, gender, col_date_time, tests, acc_num, arv_number, number_of_copies = print_copies)
+    arv_display = tests.match?(/vl/i) ? arv_number : ''
     <<~TEXT
       N
       R216,0
@@ -104,7 +105,7 @@ class Auto12Epl
       S1
       A100,6,0,1,1,1,N,"#{first_name}, #{last_name} - #{gender}"
       B120,40,0,1A,1,2,48,N,"#{acc_num}"
-      A100,100,0,1,1,1,N,"#{acc_num}"
+      A100,100,0,1,1,1,N,"#{acc_num}    #{arv_display}"
       A100,118,0,1,1,1,N,"#{col_date_time}"
       A100,140,0,1,1,1,N,"#{tests}"
       P#{number_of_copies}
@@ -113,45 +114,22 @@ class Auto12Epl
 
   # The main function to generate the EPL
   def generate_epl(last_name, first_name, middle_initial, pid, dob, age, gender, col_date_time, col_name, tests, stat,
-                   acc_num, schema_track, number_of_copies = print_copies)
-    # format text and set margin
-    if stat.nil?
-      name_text = truncate_name(last_name, first_name, middle_initial, false)
-      pid_dob_age_gender_text = full_justify(pid, "#{dob} #{age} #{gender}", @element_font, WIDTH_ELEMENT)
-      l_margin = L_MARGIN
-      l_margin_barcode = L_MARGIN_BARCODE
-    else
-      name_text = truncate_name(last_name, first_name, middle_initial, true)
-      pid_dob_age_gender_text = full_justify(pid, "#{dob} #{age} #{gender}", @element_font, STAT_WIDTH_ELEMENT)
-      stat_element_text = pad_stat_w_space(stat)
-      l_margin = L_MARGIN_W_STAT
-      l_margin_barcode = L_MARGIN_BARCODE_W_STAT
-    end
-    barcode_human_text = "#{acc_num} * #{schema_track.gsub(/-/i, '')}"
-    collector_element_text = "Col: #{col_date_time} #{col_name}"
-    tests_element_text = tests
-
-    # generate EPL statements
-    name_element = generate_ascii_element(to_dots(l_margin), to_dots(HEIGHT_MARGIN), 0, @element_font, false, name_text)
-    pid_dob_age_gender_element = generate_ascii_element(to_dots(l_margin),
-                                                        to_dots(HEIGHT_MARGIN + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE), 0, @element_font, false, pid_dob_age_gender_text)
-    barcode_human_element = generate_ascii_element(to_dots(l_margin_barcode),
-                                                   to_dots(HEIGHT_MARGIN + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE + HEIGHT_BARCODE), 0, @barcode_human_font, false, barcode_human_text)
-    collector_element = generate_ascii_element(to_dots(l_margin),
-                                               to_dots(HEIGHT_MARGIN + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE + HEIGHT_BARCODE + HEIGHT_BARCODE_HUMAN + HEIGHT_ELEMENT_SPACE), 0, @element_font, false, collector_element_text)
-    tests_element = generate_ascii_element(to_dots(l_margin),
-                                           to_dots(HEIGHT_MARGIN + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE + HEIGHT_BARCODE + HEIGHT_BARCODE_HUMAN + HEIGHT_ELEMENT_SPACE + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE), 0, @element_font, false, tests_element_text)
-    barcode_element = generate_barcode_element(to_dots(l_margin_barcode),
-                                               to_dots(HEIGHT_MARGIN + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE + HEIGHT_ELEMENT + HEIGHT_ELEMENT_SPACE), to_dots(HEIGHT_BARCODE) - 4, schema_track)
-    stat_element = generate_ascii_element(to_dots(L_MARGIN) + FONT_Y_DOTS.at(@element_font - 1) + FONT_PAD_DOTS,
-                                          to_dots(HEIGHT_MARGIN), 1, @element_font, true, stat_element_text)
-
-    # combine EPL statements
-    if stat.nil?
-      "\nN\nR216,0\nZT\nS1\n#{name_element}\n#{pid_dob_age_gender_element}\n#{barcode_element}\n#{barcode_human_element}\n#{collector_element}\n#{tests_element}\nP#{number_of_copies}\n"
-    else
-      "\nN\nR216,0\nZT\nS1\n#{name_element}\n#{pid_dob_age_gender_element}\n#{barcode_element}\n#{barcode_human_element}\n#{collector_element}\n#{tests_element}\n#{stat_element}\nP#{number_of_copies}\n"
-    end
+                   acc_num, schema_track, arv_number, number_of_copies = print_copies)
+    # Show ARV number only if test contains 'vl' (case insensitive)
+    arv_display = tests.match?(/vl/i) ? arv_number : ''
+    
+    <<~TEXT
+      N
+      R130,0
+      ZT
+      S1
+      A100,6,0,1,1,1,N,"#{last_name} #{first_name} (#{age})"
+      B100,30,0,1A,2,2,37,N,"#{acc_num}"
+      A100,80,0,1,1,1,N,"#{acc_num}   #{arv_display}"
+      A100,100,0,1,1,1,N,"#{col_date_time}	#{tests}"
+      A80,6,1,1,1,1,R," #{stat} "
+      P#{number_of_copies}
+    TEXT
   end
 
   # Add spaces before and after the stat text so that black bars appear across the left edge of label

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.1
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-02 00:00:00.000000000 Z
+date: 2026-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -243,6 +243,7 @@ files:
 - app/controllers/lab/tests_controller.rb
 - app/controllers/lab/users_controller.rb
 - app/jobs/lab/application_job.rb
+- app/jobs/lab/process_lab_result_job.rb
 - app/jobs/lab/push_order_job.rb
 - app/jobs/lab/update_patient_orders_job.rb
 - app/jobs/lab/void_order_job.rb