his_emr_api_lab 1.1.31 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88d310815f8d7efad226f84e50963754893da11220df2af7aedf173361452091
-  data.tar.gz: d01062b0a5ec36c1a1710d795a128ca810c265451f46c95b663cd47158667263
+  metadata.gz: 9b30e492def430c355c0ac0a80c1c0af05d5fede383fa50f5664e3b9340b2180
+  data.tar.gz: 948693f89c85c6a2111c8b10c1accd91fdbb2d9bea3ad8ef41157d7421af7fd1
 SHA512:
-  metadata.gz: 881a7f78e83513207822d69980a884d19dd4b328b89192caa96b8d536e79a637e6c21bf1a07231e7e03a19464ec3693d03233dfbda1b0974cf41a7195a5882ff
-  data.tar.gz: 186e472eeb17f75bf7be3cac3478701f6b9b34d092da3368b96e9410f7522e0bdfaaec26099d919ed2a88366de8e57e755f492d52a16b50a584e2193e82f4887
+  metadata.gz: 69ec800aefa4f198dc16f392500723c47a6b1e24dd1b600b6646bf552c7c9a63533a7257810d7605128eab5f54c0c8ab76fe06ff60621f010209109675b7ba3e
+  data.tar.gz: ae17044c979b38e3f6182d23b29d36aeb90845e9238d9c85f63c7d7971cc2ae99bb87a64d4684b33b2dbc16a871ebf0615e3ec92b589ea9040dcd3d6eefedd91

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

@@ -25,6 +25,8 @@ module Lab
             push_order(order)
           rescue GatewayError => e
             logger.error("Failed to push order ##{order.accession_number}: #{e.class} - #{e.message}")
+          rescue StandardError => e
+            logger.error("Failed to push order ##{order.id}: #{order&.accession_number} : #{e.class} - #{e.message}")
           end
 
           break unless wait
@@ -91,6 +93,7 @@ module Lab
       def new_orders
         Rails.logger.debug('Looking for new orders that need to be created in LIMS...')
         Lab::LabOrder.where.not(order_id: Lab::LimsOrderMapping.all.select(:order_id))
+                     .where("accession_number IS NOT NULL AND accession_number !=''")
                      .order(date_created: :desc)
       end
 

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

@@ -13,7 +13,7 @@ module Lab
         User.current = Utils.lab_user
 
         fork(&method(:start_push_worker))
-        fork(&method(:start_pull_worker))
+        # fork(&method(:start_pull_worker))
         fork(&method(:start_acknowledgement_worker))
         fork(&method(:start_realtime_pull_worker)) if realtime_updates_enabled?
 

data/app/services/lab/orders_service.rb

@@ -204,6 +204,9 @@ module Lab
       end
 
       def create_order(encounter, params)
+        access_number = params[:accession_number] || next_accession_number(params[:date]&.to_date || Date.today)
+        raise 'Accession Number cannot be blank' unless access_number.present?
+        raise 'Accession cannot be this short' unless access_number.length > 6
         Lab::LabOrder.create!(
           order_type: OrderType.find_by_name!(Lab::Metadata::ORDER_TYPE_NAME),
           concept_id: params.dig(:specimen, :concept_id) || unknown_concept_id,
@@ -211,7 +214,7 @@ module Lab
           patient_id: encounter.patient_id,
           start_date: params[:date]&.to_date || Date.today,
           auto_expire_date: params[:end_date],
-          accession_number: params[:accession_number] || next_accession_number(params[:date]&.to_date || Date.today),
+          accession_number: access_number,
           orderer: User.current&.user_id
         )
       end

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.31
+  version: 1.2.0
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API