his_emr_api_lab 1.1.16 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31eb65eeca1c291f733da313a36a6477143ed6119afa9858cd7afb6979ef75bd
-  data.tar.gz: 3f753f4313b69f613388c2517a8efe7936871baad6adb43dfc8475ecfe303688
+  metadata.gz: ef07023388b9d06939b9e9b0d09531aaecf58471eb2e62b2f883bc8112121cf8
+  data.tar.gz: b4aa93d96700812eed8cd0c04e37130b56f30fec563c168679b420ccd229ddb7
 SHA512:
-  metadata.gz: 94ba7f43627d0def3edb609439535f9a715b695afda5ba43a494b673f421b1878cda6386b2b58c9960990f58c5156f308d85a5909668aad7c1dba97ab4aae2a9
-  data.tar.gz: 2f2d3552dcbe2608623066a65bb4fff59932aea55b3ab4b8a24478cc773161b6b1149c4bba08175233e4c6a43d3ed247abd889fcf258528c31bb4c4e8c89c35e
+  metadata.gz: 97cb016a11e134600fb11f1017df49f819ca43efdc973f2e526a9493c02e126a7af9af19ce58caa4f4e67b2d13e18fb99b1abd45136cf2dabb54f613c92402a6
+  data.tar.gz: cdf3a623a0e5b25e9436aa108cafce799ca1e5fdd7a22688062fcff7a07dcda5f9a5aaab7127952e4ec5569e09c827513b6cf07b446f16b8a29921f28d2016ae

data/app/models/lab/lab_order.rb

@@ -35,6 +35,10 @@ module Lab
             class_name: 'Observation',
             foreign_key: :order_id
 
+    has_one :mapping,
+            class_name: '::Lab::LimsOrderMapping',
+            foreign_key: :order_id
+
     default_scope do
       joins(:order_type)
         .merge(OrderType.where(name: Lab::Metadata::ORDER_TYPE_NAME))

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(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/app/services/lab/lims/push_worker.rb

@@ -57,7 +57,11 @@ module Lab
           elsif mapping
             Rails.logger.info("Updating order ##{order_dto[:accession_number]} in LIMS")
             lims_api.update_order(mapping.lims_id, order_dto)
-            mapping.update(pushed_at: Time.now)
+            if order_dto['test_results'].nil? || order_dto['test_results'].empty?
+              mapping.update(pushed_at: Time.now)             
+            else
+              mapping.update(pushed_at: Time.now, result_push_status: true)  
+           end
           elsif order_dto[:_id] && Lab::LimsOrderMapping.where(lims_id: order_dto[:_id]).exists?
             # HACK: v1.1.7 had a bug where duplicates of recently created orders where being created by
             # the pull worker. This here detects those duplicates and voids them.
@@ -67,7 +71,7 @@ module Lab
             Rails.logger.info("Creating order ##{order_dto[:accession_number]} in LIMS")
             update = lims_api.create_order(order_dto)
             Lab::LimsOrderMapping.create!(order: order, lims_id: update['id'], revision: update['rev'],
-                                          pushed_at: Time.now)
+                                          pushed_at: Time.now, result_push_status: false)
           end
         end
 
@@ -97,8 +101,9 @@ module Lab
                                             .last_updated
 
         Lab::LabOrder.left_joins(:results)
+                     .joins(:mapping)
                      .where('orders.discontinued_date > :last_updated
-                             OR obs.date_created > :last_updated',
+                             OR obs.date_created > orders.date_created AND lab_lims_order_mappings.result_push_status = 0',
                             last_updated: last_updated)
                      .group('orders.order_id')
                      .order(discontinued_date: :desc, date_created: :desc)

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.20
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2022-01-05 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.1.4
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API
 test_files: []