his_emr_api_lab 1.1.19 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1417f8496820741d5eb37f1d2ae95da6ffdb27cc3b434242d079f6780d7eaeec
-  data.tar.gz: 17bf60bd54605de176c26f87f7da8653789d1df101920814b354512d8cca3c68
+  metadata.gz: ef07023388b9d06939b9e9b0d09531aaecf58471eb2e62b2f883bc8112121cf8
+  data.tar.gz: b4aa93d96700812eed8cd0c04e37130b56f30fec563c168679b420ccd229ddb7
 SHA512:
-  metadata.gz: 6c5722a094de688a6803de102553bdc928e29b28b208bf12f999a98e5d631cbc5b817c5982e5a1bc349a366263dcd3bd66ab2a1618a70b8d4ecbd8f2c86c0644
-  data.tar.gz: 8ed510173d514efcdf307cbb38d70fb4e25b19752bb95f1f20a0f4a0cdc6efd5b2d3cf5761648b8a5ac92d17072fb4a35bdbca0de929937ecccbe6525e30cfaf
+  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/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 > orders.date_created',
+                             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.19'
+  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.19
+  version: 1.1.20
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest