his_emr_api_lab 2.1.8.5 → 2.1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2884ca0a71414204057ec642d6de6e9ff68a9c4d91922436be5eb12f59b45a20
-  data.tar.gz: 13912255b483ca92fa2253f8a7fc80f333d22afb1d8981eb4866881d34044f3b
+  metadata.gz: 666ee2ba3fbc370e272c06156d5f90fa2b8a8bedba647dcc1bbfbfbec347a42b
+  data.tar.gz: ceedca5090c613d217af7f85b3d52cb5a519cb8dfea24a5452e321d50efa2a3d
 SHA512:
-  metadata.gz: 915108d4a41f716e00b885d00caae453ee877963cc27ed5e386626a48945bd7b95a605516bd454b7c027d0bd44e4bbe2682c147b425c88884d33d7d490a0e539
-  data.tar.gz: f993658f07978b549cac77acd6e3021d6c5855ca4dd2fa1da35ee649bfe263357af60a61e1181abc2947cea33692c11c7aa3086abf60706b7cd8e8f19758dbf6
+  metadata.gz: f10ed2e39e3fabcdb6219a13b553dd4a1acc29318256f6977ffa05230917265afd90ba4487bb350508ffb5d323cb0783ffc04cc0a3dcdb591692e18cdd78ed4b
+  data.tar.gz: 46a28575116934b1a8bdce291dd5661b965f5d8ec428a00edbe2530626a7be5bc22b2e96c4e7a09989ba000048d5c252d4aa1303f4d943c044f4415ead92ca54

data/app/serializers/lab/lab_order_serializer.rb

@@ -66,7 +66,8 @@ module Lab
     def self.concept_name(concept_id)
       return concept_id unless concept_id
 
-      ::ConceptAttribute.find_by(concept_id:, attribute_type: ConceptAttributeType.test_catalogue_name)&.value_reference
+      c_name = ::ConceptAttribute.find_by(concept_id:, attribute_type: ConceptAttributeType.test_catalogue_name)&.value_reference
+      c_name || ConceptName.find_by_concept_id(concept_id)&.name
     end
 
     def self.voided_tests(order)

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

@@ -524,9 +524,10 @@ module Lab
         def orders_without_specimen(patient_id = nil, start_date: nil)
           Rails.logger.debug('Looking for orders without a specimen')
           unknown_specimen = ConceptName.where(name: Lab::Metadata::UNKNOWN_SPECIMEN)
-                                        .select(:concept_id)
+                                        .pluck(:concept_id)
           orders = Lab::LabOrder.where(concept_id: unknown_specimen)
-                                .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id))
+                                .joins('LEFT JOIN lab_lims_order_mappings ON lab_lims_order_mappings.lims_id = orders.accession_number')
+                                .where('lab_lims_order_mappings.lims_id IS NULL')
           orders = orders.where(patient_id:) if patient_id
           orders = orders.where('orders.date_created >= ?', start_date) if start_date
 
@@ -538,7 +539,7 @@ module Lab
           # Lab::OrdersSearchService.find_orders_without_results(patient_id: patient_id)
           #                         .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id).where("pulled_at IS NULL"))
           orders = Lab::OrdersSearchService.find_orders_without_results(patient_id:)
-                                           .where(order_id: Lab::LimsOrderMapping.select(:order_id))
+                                           .joins('INNER JOIN lab_lims_order_mappings ON lab_lims_order_mappings.order_id = orders.order_id')
           orders = orders.where('orders.date_created >= ?', start_date) if start_date
           orders
         end
@@ -548,7 +549,8 @@ module Lab
           orders = Lab::LabOrder.joins(:reason_for_test)
                                 .merge(Observation.where(value_coded: nil, value_text: nil))
                                 .limit(1000)
-                                .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id))
+                                .joins('LEFT JOIN lab_lims_order_mappings ON lab_lims_order_mappings.lims_id = orders.accession_number')
+                                .where('lab_lims_order_mappings.lims_id IS NULL')
           orders = orders.where(patient_id:) if patient_id
           orders = orders.where('orders.date_created >= ?', start_date) if start_date
 

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

@@ -109,6 +109,7 @@ module Lab
         end
 
         def format_sample_type(name)
+          return 'not_specified' if name.nil?
           return 'not_specified' if name.casecmp?('Unknown')
 
           return 'CSF' if name.casecmp?('Cerebrospinal Fluid')

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

@@ -101,7 +101,8 @@ module Lab
 
       def new_orders
         Rails.logger.debug('Looking for new orders that need to be created in LIMS...')
-        query = Lab::LabOrder.where.not(order_id: Lab::LimsOrderMapping.all.select(:order_id))
+        query = Lab::LabOrder.joins('LEFT JOIN lab_lims_order_mappings ON lab_lims_order_mappings.order_id = orders.order_id')
+                             .where('lab_lims_order_mappings.order_id IS NULL')
                              .where("accession_number IS NOT NULL AND accession_number !=''")
 
         query = if start_date
@@ -133,9 +134,9 @@ module Lab
         # add date filter to avoid pushing voided orders that were created a long time ago
         Rails.logger.debug('Looking for voided orders that are being tracked by LIMS...')
         orders = Lab::LabOrder.unscoped
-                     .where(order_type: OrderType.where(name: Lab::Metadata::ORDER_TYPE_NAME),
-                            order_id: Lab::LimsOrderMapping.all.select(:order_id),
-                            voided: 1)
+                              .joins('INNER JOIN lab_lims_order_mappings ON lab_lims_order_mappings.order_id = orders.order_id')
+                              .where(order_type: OrderType.where(name: Lab::Metadata::ORDER_TYPE_NAME),
+                                     voided: 1)
         orders = orders.where('orders.date_created >= ?', start_date) if start_date
         orders.order(date_voided: :desc)
       end

data/lib/lab/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.1.8.5
+  version: 2.1.8.7
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi