his_emr_api_lab 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314873736cb992217b9c0bab3446d7aa62f94f4b08e7f10b749894573d74811f
-  data.tar.gz: 163f43124d1952514ab77b7ef70b5d86b54c36d5daa8d41f4da0cdb7cf07ff38
+  metadata.gz: b33f866b86cd84bf4f88956e9358f00996f7f6ba7ac6c3878680f6db2281b493
+  data.tar.gz: e774a119159caf8c5a7f628606603f270b8746287afe5955fb4f722591239824
 SHA512:
-  metadata.gz: dc26c5a5edecdadd4a108adc213c65d184d25bf114c6096f353accfcd00fcce16289695a7320f5119172c31857cbbc173140915be0a10619582a1db819015616
-  data.tar.gz: 131d6ee486442f33d5b0c87de7ecd2c190897aa9f423f5ad0bb98e73711d77b93a9464d0309313fb2945f452d6ce006c0f6b8d62124931a2a200f4b966ba3bf6
+  metadata.gz: 7202aaaac5cc85be3d3f489e05f7d9aa537915b58e28f5961804a3cce07c3960a45373cabc8649d8b0fef7dd8333e27e4ed6434a7881022043b7f1c2a9ab058b
+  data.tar.gz: 787a155bfc9bf1af6dd202ba6ec18d07a5185f4dec661c2889968567f02d17529b536f30036c708cbaa316925e505818863596725b371219576a1082aae830c2

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

@@ -82,7 +82,9 @@ module Lab
 
       protected
 
-      def order_saved(order_dto); end
+      def order_saved(order_dto)
+        order_dto
+      end
 
       def order_rejected(order_dto, message); end
 
@@ -230,7 +232,7 @@ module Lab
           creator = format_result_entered_by(test_results['result_entered_by'])
 
           ResultsService.create_results(test.id, { provider_id: User.current.person_id,
-                                                   date: Utils.parse_date(test_results['date_result_entered'],
+                                                   date: Utils.parse_date(test_results['result_date'] || result_date,
                                                                           order[:order_date].to_s),
                                                    comments: "LIMS import: Entered by: #{creator}",
                                                    measures: })

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

@@ -80,6 +80,15 @@ module Lab
         order_dto
       end
 
+      def void_order_in_lims(order_id)
+        order = Lab::LabOrder.joins(order_type: { name: 'Lab' })
+        .unscoped
+        .find(order_id)
+        order_dto = Lab::Lims::OrderSerializer.serialize_order(order)
+        Rails.logger.info("Deleting order ##{order_dto[:accession_number]} from LIMS")
+        lims_api.delete_order('', order_dto)
+      end
+
       private
 
       def orders_pending_sync(batch_size)

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

@@ -24,6 +24,10 @@ 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
@@ -79,9 +83,11 @@ 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) # Filter out voided
-                   .where(name: CGI.unescapeHTML(name))
+                   .merge(Concept.all)
+                   .where(query_condition)
                    .first
       end
     end

data/lib/auto12epl.rb

@@ -133,9 +133,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}\nP3\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#{print_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}\nP3\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#{print_copies}\n"
     end
   end
 
@@ -176,6 +176,12 @@ class Auto12Epl
     schema_track = schema_track.gsub('-', '').strip
     "B#{x},#{y},#{BARCODE_ROTATION},#{BARCODE_TYPE},#{BARCODE_NARROW_WIDTH},#{BARCODE_WIDE_WIDTH},#{height},#{BARCODE_IS_HUMAN_READABLE},\"#{schema_track}\""
   end
+
+  def print_copies
+    property = ::GlobalProperty.find_by(property: 'max.lab.order.print.copies')
+    value = property&.property_value&.strip
+    value || 3
+  end
 end
 
 if __FILE__ == $PROGRAM_NAME

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -321,7 +321,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/EGPAFMalawiHIS/his_emr_api_lab
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -336,8 +336,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.15
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API
 test_files: []