his_emr_api_lab 2.3.4 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf823a7706db9f2444ed694c9f58ea1c1851c9cf00de058bb6c980434e57b27a
-  data.tar.gz: 55ac7590a6cc36249ef8322b254844f3ada7ca891b45d00c3512ccfa2eee8ddc
+  metadata.gz: 0a4ea1a6183fe75cd7d56a11e934391903cab098f8892b91380d6f6e67b3b752
+  data.tar.gz: 4b9f2c6e7f8beabf94c5c474cd11a2cbafe833a4111d975786b9b65b85a093fd
 SHA512:
-  metadata.gz: 1b3efe1cf4d98acb7dd218866c331d384a7f4c0855fe2ad4475edc88e3c89799d74d479c4ca8159707eeb433a1cf985a8b98f847f2d3a6a66330af88b675343b
-  data.tar.gz: 51d757cdbaff73aa883332f8a0a17cc71cc117fd7812192b9c60b11506b16c8f4ba30c7a1850ee5bc49a56c531e93f912eca963519ee4251ad0edbb225ce716a
+  metadata.gz: b5562e97cd505fed7dc56e3529e7b5b38510cf3ec5d0a94dbd2fbff91a8286e7715a96bb77c6ff339cf7edf60d0eda539e57ec758109c32de26cd11892e387e7
+  data.tar.gz: '097f26ec972cd4f79e57f5719142c6224a975dad0b4c31de4e6063df96470f01885c000544b743f4d0470b09c2d63ab1180f97dad6eb585ab0d7ff6d01350e1b'

data/app/services/lab/acknowledgement_service.rb

@@ -14,12 +14,11 @@ module Lab
                                         date_received: params[:date_received])
       end
 
-      def acknowledgements_pending_sync(batch_size, start_date: nil)
+      def acknowledgements_pending_sync(batch_size, start_date: nil, last_order_id: 0)
         query = Lab::LabAcknowledgement.joins(:order).where(pushed: false)
-
+                                       .where('lims_acknowledgement_statuses.order_id > ?', last_order_id)
         query = query.where('orders.date_created >= ?', start_date) if start_date
-
-        query.limit(batch_size)
+        query.order('lims_acknowledgement_statuses.order_id ASC').limit(batch_size)
       end
 
       def push_acknowledgement(acknowledgement, lims_api)

data/app/services/lab/concepts_service.rb

@@ -117,8 +117,13 @@ module Lab
       # From the members above, filter out only those concepts that are result indicators
       measures = ConceptSet.find_members_by_name(Lab::Metadata::TEST_RESULT_INDICATOR_CONCEPT_NAME)
                            .select(:concept_id)
+            # Get specimen types to exclude from results
+      specimen_types = ConceptSet.find_members_by_name(Lab::Metadata::SPECIMEN_TYPE_CONCEPT_NAME)
+                                 .select(:concept_id)
 
+      # Find concepts that are linked to the test type AND are measures (but NOT specimens)
       sets = ConceptSet.where(concept_set: test, concept_id: measures)
+                       .where.not(concept_id: specimen_types)
 
       return ActiveRecord::Base.connection.select_all <<~SQL
         SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid

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

@@ -16,19 +16,33 @@ module Lab
       end
 
       def push_acknowledgement(batch_size: 1000, wait: false)
+        last_order_id = 0
         loop do
           logger.info('Looking for new acknowledgements to push to LIMS...')
           acknowledgements = Lab::AcknowledgementService.acknowledgements_pending_sync(batch_size,
-                                                                                       start_date: start_date).all
+                                                                                       start_date: start_date,
+                                                                                       last_order_id: last_order_id).all
 
           logger.debug("Found #{acknowledgements.size} acknowledgements...")
           acknowledgements.each do |acknowledgement|
             Lab::AcknowledgementService.push_acknowledgement(acknowledgement, @lims_api)
+            last_order_id = acknowledgement.order_id
           rescue StandardError => e
             logger.error("Failed to push acknowledgement ##{acknowledgement.order_id}: #{e.class} - #{e.message}")
           end
 
-          break unless wait
+          # If no records found or not waiting, check if we should continue
+          if acknowledgements.empty?
+            break unless wait
+          elsif !wait && acknowledgements.size < batch_size
+            # Processed final partial batch in one-shot mode
+            logger.info("Processed final batch of #{acknowledgements.size} acknowledgements")
+            break
+          elsif !wait
+            # More records likely exist, continue processing
+            logger.info('Batch complete, checking for more acknowledgements...')
+            next
+          end
 
           logger.info('Waiting for acknowledgements...')
           sleep(Lab::Lims::Config.updates_poll_frequency)

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

@@ -82,6 +82,9 @@ module Lab
         unescaped_name = CGI.unescapeHTML(name)
         attribute_type_id = ConceptAttributeType.test_catalogue_name.concept_attribute_type_id
 
+        attribute = ConceptAttribute.where('attribute_type_id = ? AND value_reference = ?', attribute_type_id, unescaped_name).first
+        return attribute.concept if attribute
+
         ConceptName.joins('INNER JOIN concept_attribute ON concept_attribute.concept_id = concept_name.concept_id')
                    .where('concept_attribute.attribute_type_id = ? AND concept_attribute.value_reference = ? AND concept_name.name = ?',
                           attribute_type_id, unescaped_name, unescaped_name)

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.6
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-29 00:00:00.000000000 Z
+date: 2026-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest