his_emr_api_lab 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306fe47c9b027c61e15e1bd6fe2cee372f08e084acc06375f3a1dcbdf79be1bd
-  data.tar.gz: 8ac31940e00893ffcc554e721c12aa957017c7ab8fc7db69c231830eb063595e
+  metadata.gz: fa0a902d0f6f1159525e92598deb3ee77684c17c12a52078fa20d44cf2cafec1
+  data.tar.gz: a0b8c8d773c498dc77b4beaeb460b491695785cca91245bf62149d434e1e4841
 SHA512:
-  metadata.gz: 28b4c75bed9b3da3c47e0c19e717b51606e3ff1212b5c07d9c9e78cd29496d3b18299e0ce394b8491847faf6dc4c3e9eaf7f51e6f3836a7d957dd4f260292aea
-  data.tar.gz: d9e847ea4fd3c2725ac69222d4e0e1ef8398d06baba9112c2988c0894faeff778eb866ac10a44af3f9a7b9ba9a966c0f90d5f0c704bc0c7a1ff3ce345d238a01
+  metadata.gz: f24e327db48725b4ddffb24e12dcd09e02c1a0965ecdeb6aae08ab547305de6053a2d93d07154ed7750639b376b51bbedaeee54ec6cd44eeeb992f6d46dd5e8e
+  data.tar.gz: beca813e59561a368b4ad8252f82364b19c801adcead63d8c4b3f1562ebe1066b94f4d09a3abb6c1f734728836de5b719bb3deb685598127220741fcb4f42541

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/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.0'
 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.0
 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-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest