his_emr_api_lab 1.1.27 → 1.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72360d1d4609f72a118e05884e36b2f040a2d9eb7be8d5bed1ec3aa2fde4739b
-  data.tar.gz: 95065b63bbb52fcbbaca143e0cd6e62b62211bfc633a3da12a47149ae411bc48
+  metadata.gz: e8830688d3c9f3a5c1eaf915060e61c89110b7602f44233d9a6d6c87628d7bfa
+  data.tar.gz: 394f57a548c41b25303ea9cf6f7cd205094a18c2c1b471d847d7d02a7828487a
 SHA512:
-  metadata.gz: bfb51d340011b1d5e4dbc22d36b2b41519183e2e32250f81e205f4da5b58224ef9919781961e9ca12571a87fc9faac0d93b822f75b0e59716cda14fef9f4548b
-  data.tar.gz: e5547b239504482d6c0661cdf65d4603d94a1391a8932f5bfda12b60e3007f7ebdb0b6c0b904a6ffa41de63b5b1f285790dbc44270a3acf0bc45b2da43adebbd
+  metadata.gz: 8061088cf2210df529f524d410441f647386402ae0c706953d5dbf4b2a439b48c3d9377180b028ba5d456b5598f8b6c75c0a598f8550732785ce53853eafdb15
+  data.tar.gz: 06a06e00a9051548ee69387fa5c9078cb86d119968a5ef81a37fbddc3e60147fe57b743232aadc20fb7f9adbfa74caddd8f8eb1f6f05bb56219f96ca0762ccdd

data/app/controllers/lab/orders_controller.rb

@@ -28,6 +28,11 @@ module Lab
       render json: OrdersSearchService.find_orders(filters)
     end
 
+    def verify_tracking_number
+      tracking_number = params.require(:accession_number)
+      render json: { exists: OrdersService.check_tracking_number(tracking_number) }, status: :ok
+    end
+
     def destroy
       OrdersService.void_order(params[:id], params[:reason])
       Lab::VoidOrderJob.perform_later(params[:id])

data/app/services/lab/concepts_service.rb

@@ -8,7 +8,7 @@ module Lab
       test_types = test_types.filter_members(name: name) if name
 
       unless specimen_type
-        return test_types.joins('INNER JOIN concept_name ON concept_set.concept_id = concept_name.concept_id')
+        return test_types.joins('INNER JOIN concept_name ON concept_set.concept_id = concept_name.concept_id AND concept_name.voided = 0 AND concept_name.locale_preferred = 1')
                          .select('concept_name.name, concept_name.concept_id')
                          .group('concept_name.concept_id')
       end

data/app/services/lab/lims/api/rest_api.rb

@@ -87,6 +87,13 @@ class Lab::Lims::Api::RestApi
     end
   end
 
+  def verify_tracking_number(tracking_number)
+    find_lims_order(tracking_number)
+  rescue InvalidParameters => e
+    Rails.logger.error("Failed to verify tracking number #{tracking_number}: #{e.message}")
+    false
+  end
+
   private
 
   attr_reader :config

data/app/services/lab/orders_service.rb

@@ -52,6 +52,10 @@ module Lab
       def order_test(order_params)
         Order.transaction do
           encounter = find_encounter(order_params)
+          if order_params[:accession_number].present? && check_tracking_number(order_params[:accession_number])
+            raise 'Accession number already exists'
+          end
+
           order = create_order(encounter, order_params)
 
           Lab::TestsService.create_tests(order, order_params[:date], order_params[:tests])
@@ -104,6 +108,10 @@ module Lab
         voided
       end
 
+      def check_tracking_number(tracking_number)
+        accession_number_exists?(tracking_number) || nlims_accession_number_exists?(tracking_number)
+      end
+
       private
 
       ##
@@ -141,6 +149,19 @@ module Lab
         )
       end
 
+      def accession_number_exists?(accession_number)
+        Lab::LabOrder.where(accession_number: accession_number).exists?
+      end
+
+      def nlims_accession_number_exists?(accession_number)
+        config = YAML.load_file('config/application.yml')
+        return false unless config['lims_api']
+
+        # fetch from the rest api and check if it exists
+        lims_api = Lab::Lims::ApiFactory.create_api
+        lims_api.verify_tracking_number(accession_number).present?
+      end
+
       ##
       # Attach the requesting clinician to an order
       def add_requesting_clinician(order, params)

data/config/routes.rb

@@ -7,6 +7,7 @@ Lab::Engine.routes.draw do
   end
 
   get 'api/v1/lab/labels/order', to: 'labels#print_order_label'
+  get 'api/v1/lab/accession_number', to: 'orders#verify_tracking_number'
 
   # Metadata
   # TODO: Move the following to namespace /concepts

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.27
+  version: 1.1.29
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest