his_emr_api_lab 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97dab2fa979ff86668bb9cd45bb506877f23be046b07acc43323d291f82c10be
-  data.tar.gz: eee6d5f74dc18f188ebd455687623c4e5d10a3cc80fdcee9fc46d9a7d63094bd
+  metadata.gz: fa48f103211974b33e9655ff076610ed6947acf378c96cc30937e38cfa65245b
+  data.tar.gz: ca3905ec865b706d8242e7040d3ef52dd5775497960a0016b38ff1a093d7e0f0
 SHA512:
-  metadata.gz: 2a34a07e977a2fdaf46981ab30fd1cd2660065244cd9a9d1a75a6c71bb4ff8b32752b44adc779c7e4d4670af1861b63586bc2bbdaead93497a928bd9217c086a
-  data.tar.gz: 7a82940ac8ae6ed7454a1ad309bd3d3aee3ca0f459ab929c540d039c68ce8592e1d36211b06fa600450f9442141804e4dc30ef14ac8ebca2b80c1bcb6d326354
+  metadata.gz: 378fbfc8631c09be95111fa94c557b87749cacc9bb6bb3b9d6f72929f7b41c9bc36b4aa7c5e09a228a409e57d3ca900b2123bdd381c14b244be5bc052fe05f7c
+  data.tar.gz: 94ea4c075d6a2f0cbb746a238a371ef6c41d40b96cab80458414068888bee87f17d8d98ede12b9a31a85e5968561afb5ed4aa69985a4adaa749f03ece34f035d

data/app/controllers/lab/labels_controller.rb

@@ -6,7 +6,12 @@ module Lab
 
     def print_order_label
       order_id = params.require(:order_id)
-      render_zpl(LabellingService::OrderLabel.new(order_id).print(params[:use_small_specimen_label] == 'true'))
+      print_copies = params[:number_of_copies].to_i if params[:number_of_copies].present?
+      render_zpl(LabellingService::OrderLabel.new(order_id).print(
+          params[:use_small_specimen_label] == 'true', 
+          print_copies        
+        )
+      )
     end
   end
 end

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

@@ -13,7 +13,7 @@ module Lab
         @order = Lab::LabOrder.find(order_id)
       end
 
-      def print(use_small_specimen = false)
+      def print(use_small_specimen = false, number_of_copies = nil)
         # NOTE: The arguments are passed into the method below not in the order
         #       the method expects (eg patient_id is passed to middle_name field)
         #       to retain compatibility with labels generated by the `lab test controller`
@@ -25,7 +25,8 @@ module Lab
                   patient.gender,
                   drawer_date,
                   tests,
-                  order.accession_number
+                  order.accession_number,
+                  number_of_copies
                 )
               else
                 auto12epl.generate_epl(
@@ -41,7 +42,8 @@ module Lab
                   tests,
                   reason_for_test,
                   order.accession_number,
-                  order.accession_number
+                  order.accession_number,
+                  number_of_copies
                 )
               end
         {

data/lib/auto12epl.rb

@@ -96,7 +96,7 @@ 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)
+  def generate_small_specimen_label(last_name, first_name, gender, col_date_time, tests, acc_num, number_of_copies = print_copies)
     <<~TEXT
       N
       R216,0
@@ -107,13 +107,13 @@ class Auto12Epl
       A100,100,0,1,1,1,N,"#{acc_num}"
       A100,118,0,1,1,1,N,"#{col_date_time}"
       A100,140,0,1,1,1,N,"#{tests}"
-      P#{print_copies}
+      P#{number_of_copies}
     TEXT
   end
 
   # 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)
+                   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)
@@ -148,9 +148,9 @@ class Auto12Epl
 
     # 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#{print_copies}\n"
+      "\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#{print_copies}\n"
+      "\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
   end
 

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -336,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API