his_emr_api_lab 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b33f866b86cd84bf4f88956e9358f00996f7f6ba7ac6c3878680f6db2281b493
-  data.tar.gz: e774a119159caf8c5a7f628606603f270b8746287afe5955fb4f722591239824
+  metadata.gz: 97dab2fa979ff86668bb9cd45bb506877f23be046b07acc43323d291f82c10be
+  data.tar.gz: eee6d5f74dc18f188ebd455687623c4e5d10a3cc80fdcee9fc46d9a7d63094bd
 SHA512:
-  metadata.gz: 7202aaaac5cc85be3d3f489e05f7d9aa537915b58e28f5961804a3cce07c3960a45373cabc8649d8b0fef7dd8333e27e4ed6434a7881022043b7f1c2a9ab058b
-  data.tar.gz: 787a155bfc9bf1af6dd202ba6ec18d07a5185f4dec661c2889968567f02d17529b536f30036c708cbaa316925e505818863596725b371219576a1082aae830c2
+  metadata.gz: 2a34a07e977a2fdaf46981ab30fd1cd2660065244cd9a9d1a75a6c71bb4ff8b32752b44adc779c7e4d4670af1861b63586bc2bbdaead93497a928bd9217c086a
+  data.tar.gz: 7a82940ac8ae6ed7454a1ad309bd3d3aee3ca0f459ab929c540d039c68ce8592e1d36211b06fa600450f9442141804e4dc30ef14ac8ebca2b80c1bcb6d326354

data/app/controllers/lab/labels_controller.rb

@@ -6,12 +6,7 @@ module Lab
 
     def print_order_label
       order_id = params.require(:order_id)
-
-      label = LabellingService::OrderLabel.new(order_id)
-      send_data(label.print, type: 'application/label; charset=utf-8',
-                             stream: false,
-                             filename: "#{SecureRandom.hex(24)}.lbl",
-                             disposition: 'inline')
+      render_zpl(LabellingService::OrderLabel.new(order_id).print(params[:use_small_specimen_label] == 'true'))
     end
   end
 end

data/app/services/lab/concepts_service.rb

@@ -66,7 +66,7 @@ module Lab
                            .select(:concept_id)
 
       ConceptSet.where(concept_set: measures, concept_id: test)
-                .joins('INNER JOIN concept_name AS measure ON measure.concept_id = concept_set.concept_set')
+                .joins("INNER JOIN concept_name AS measure ON measure.concept_id = concept_set.concept_set AND (measure.locale_preferred = 1 OR measure.concept_name_type = 'SHORT' OR measure.concept_name_type = 'FULLY_SPECIFIED')")
                 .select('measure.concept_id, measure.name')
                 .group('measure.concept_id')
                 .map { |concept| { name: concept.name, concept_id: concept.concept_id } }

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

@@ -13,24 +13,51 @@ module Lab
         @order = Lab::LabOrder.find(order_id)
       end
 
-      def print
+      def print(use_small_specimen = false)
         # 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`
         #       application of the NLIMS suite.
-        auto12epl.generate_epl(patient.given_name,
-                               patient.family_name,
-                               patient.nhid,
-                               patient.birthdate.strftime('%d/%^b/%Y'),
-                               '',
-                               patient.gender,
-                               '',
-                               drawer,
-                               '',
-                               tests,
-                               reason_for_test,
-                               order.accession_number,
-                               order.accession_number)
+        zpl = if use_small_specimen
+                auto12epl.generate_small_specimen_label(
+                  patient.family_name,
+                  patient.given_name,
+                  patient.gender,
+                  drawer_date,
+                  tests,
+                  order.accession_number
+                )
+              else
+                auto12epl.generate_epl(
+                  patient.given_name,
+                  patient.family_name,
+                  patient.nhid,
+                  patient.birthdate.strftime('%d/%^b/%Y'),
+                  '',
+                  patient.gender,
+                  '',
+                  drawer,
+                  '',
+                  tests,
+                  reason_for_test,
+                  order.accession_number,
+                  order.accession_number
+                )
+              end
+        {
+          zpl:,
+          data: {
+            accession_number: order.accession_number,
+            given_name: patient.given_name,
+            family_name: patient.family_name,
+            nhid: patient.nhid,
+            birthdate: patient.birthdate.strftime('%d/%^b/%Y'),
+            gender: patient.gender,
+            drawer:,
+            tests:,
+            reason_for_test:
+          }
+        }
       end
 
       def reason_for_test
@@ -70,6 +97,13 @@ module Lab
         user ? "#{user.username} #{draw_date}" : 'N/A'
       end
 
+      def drawer_date
+        return 'N/A' if order.concept_id == unknown_concept.concept_id
+
+        draw_date = (order.discontinued_date || order.start_date).strftime('%d/%^b/%Y %H:%M:%S')
+        "#{draw_date}" || 'N/A'
+      end
+
       def specimen
         return 'N/A' if order.concept_id == unknown_concept.concept_id
 

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

@@ -24,10 +24,6 @@ module Lab
         'indian ink' => 'India ink'
       }.freeze
 
-      TEST_INDICATOR_MAPPINGS = {
-        'HCT' => 10_532
-      }.freeze
-
       def self.translate_test_name(test_name)
         TEST_NAME_MAPPINGS.fetch(test_name.downcase, test_name)
       end
@@ -83,11 +79,9 @@ module Lab
       end
 
       def self.find_concept_by_name(name)
-        concept_id = TEST_INDICATOR_MAPPINGS[name.upcase]
-        query_condition = concept_id.nil? ? { name: CGI.unescapeHTML(name) } : { concept_id: }
         ConceptName.joins(:concept)
-                   .merge(Concept.all)
-                   .where(query_condition)
+                   .merge(Concept.all) # Filter out voided
+                   .where(name: CGI.unescapeHTML(name))
                    .first
       end
     end

data/lib/auto12epl.rb

@@ -96,6 +96,21 @@ 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)
+    <<~TEXT
+      N
+      R216,0
+      ZT
+      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,118,0,1,1,1,N,"#{col_date_time}"
+      A100,140,0,1,1,1,N,"#{tests}"
+      P#{print_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)

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-10-10 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.5.6
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API