his_emr_api_lab 1.1.17 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9180f5367d311361a972c4ec15d72bbd6296731adf1bd71b4ae25a1ff58dc4b5
-  data.tar.gz: d6b399321648924e31cecda13c4348b53370796a89344947b0932f0720ed0b11
+  metadata.gz: ecb22c6981cf4627f8b862fc958949e9d8bce3258533fc7369f5ecbb51f7e35f
+  data.tar.gz: f361eade238cfceb9fa6d8ac390166c8747d017755e6ce543bb8d2b1222277ba
 SHA512:
-  metadata.gz: 284aab03e785c885b3e1a88f8fef8826c73c89b9f7436e17aa730d14c2f3fc5fe14cb65e2f29ce6171675a363c5945b73d547094f11a4187d67dbdfc9636c4dd
-  data.tar.gz: 0c849e47f58c86fd221f9c97111c0028f3fafdad3cf07393baf64928ebd462008895550fd4ab754e2708654cde5867fb81abb07dcbdd289454e4da14bbafd4d2
+  metadata.gz: b5ac8fff26842cdec49086800174748e8fdc36c76c8843d03cc7da2f14dd068843854775c795682739dbcc6923c3afa6bcefa9a6d73f1dc590441cb971aed7e5
+  data.tar.gz: f4aa9129aa56bbc4aa6dff749511a6b15556adc91383bb0dfdc040f065817974e3e21ec8d0f6d8cc0716b5e4e1341c94024665a87a9bf33c9a1081e041180bea

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

@@ -377,7 +377,7 @@ class Lab::Lims::Api::RestApi
     orders_without_specimen(patient_id).each { |order| orders[order.order_id] = order }
     orders_without_results(patient_id).each { |order| orders[order.order_id] = order }
     orders_without_reason(patient_id).each { |order| orders[order.order_id] = order }
-
+    
     orders.values
   end
 
@@ -394,8 +394,10 @@ class Lab::Lims::Api::RestApi
 
   def orders_without_results(patient_id = nil)
     Rails.logger.debug('Looking for orders without a result')
+    # Lab::OrdersSearchService.find_orders_without_results(patient_id: patient_id)
+    #                         .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id).where("pulled_at IS NULL"))
     Lab::OrdersSearchService.find_orders_without_results(patient_id: patient_id)
-                            .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id).where("pulled_at IS NULL"))
+                             .where(order_id: Lab::LimsOrderMapping.select(:order_id))
   end
 
   def orders_without_reason(patient_id = nil)

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

@@ -45,7 +45,7 @@ module Lab
           end
 
           update_last_seq(context.current_seq)
-        rescue DuplicateNHID
+        rescue Lab::Lims::DuplicateNHID
           logger.warn("Failed to import order due to duplicate patient NHID: #{order_dto[:patient][:id]}")
           save_failed_import(order_dto, "Duplicate local patient NHID: #{order_dto[:patient][:id]}")
         rescue MissingAccessionNumber
@@ -102,7 +102,7 @@ module Lab
                           .distinct(:patient_id)
                           .all
 
-        raise DuplicateNHID, "Duplicate National Health ID: #{nhid}" if patients.size > 1
+        raise Lab::Lims::DuplicateNHID, "Duplicate National Health ID: #{nhid}" if patients.size > 1
 
         patients.first
       end
@@ -182,14 +182,14 @@ module Lab
 
       def update_results(order, lims_results)
         logger.debug("Updating results for order ##{order[:accession_number]}: #{lims_results}")
-
+        
         lims_results.each do |test_name, test_results|
           test = find_test(order['id'], test_name)
           unless test
             logger.warn("Couldn't find test, #{test_name}, in order ##{order[:id]}")
             next
           end
-
+          
           next if test.result || test_results['results'].blank?
 
           measures = test_results['results'].map do |indicator, value|
@@ -198,7 +198,7 @@ module Lab
 
             measure
           end
-
+          
           measures = measures.compact
           next if measures.empty?
 

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.18
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -319,7 +319,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/EGPAFMalawiHIS/his_emr_api_lab
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -334,8 +334,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API
 test_files: []