his_emr_api_lab 1.1.23 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629116134d63ff0d2d3da97b80b0b9f4a3249483e5d57f43d4f332a645ce35e5
-  data.tar.gz: 414d3a1a4647e666599f71fca7e9026a034f210fbf6080da5cc501bb47c2e24f
+  metadata.gz: 93d57cd7dd12e53d88dbb8dda693c6472d52312e5115453d739cdeeab0a28eee
+  data.tar.gz: ee71326f52f9ad6a36ee153658987943746ab3bdbe15e58543f1041bd568b319
 SHA512:
-  metadata.gz: b5bf3f01293464ab6f0be71a8707ab6b57801a371375f1bd6a2fae9812da72d4cba323a5b783e68f9b770db0f6e21c9a39162d89d3004add6b6a8327f7033cf1
-  data.tar.gz: 6c09429e8520fc49459c40737214e1c538079cdacf2b715a9dc856d32bf2b562a8e68a4d5ad9f97bfbe3ead532484f510cc944986475978090755787d118c6f2
+  metadata.gz: 3386853e1bb7b9092e464ad608b901fa0ca78b2981e34b80269c9e2af98242b8215a87ababd824e9dc2774f87fd77d4df8f927d06d50383257fcb02510a4070b
+  data.tar.gz: 97c06feb45b3766e37b5c07c4e5f98818f484d07d9bd68e74f5f891c5e07acc0de7cc35ae0c2f60a8f0ef98186865df38dabfee017c959566e4c6099c9255802

data/app/models/lab/lab_acknowledgement.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Lab
+  class LabAcknowledgement < ::LimsAcknowledgementStatus
+  end
+end

data/app/services/lab/acknowledgement_service.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Lab
+  # acknoledgement service for creating lab acknowledgements
+  module AcknowledgementService
+    class << self
+      def create_acknowledgement(params)
+        order = Order.find(params[:order_id])
+        Lab::LabAcknowledgement.create!(order_id: order.id, test: params[:test], pushed: false,
+                                        acknowledgement_type: params[:entered_by] == 'LIMS' ? 'test_results_delivered_to_site_electronically' : 'test_results_delivered_to_site_manually',
+                                        date_received: params[:date_received])
+      end
+
+      def acknowledgements_pending_sync(batch_size)
+        Lab::LabAcknowledgement.where(pushed: false)
+                               .limit(batch_size)
+      end
+
+      def push_acknowledgement(acknowledgement, lims_api)
+        Rails.logger.info("Pushing acknowledgement ##{acknowledgement.order_id}")
+
+        acknowledgement_dto = Lab::Lims::AcknowledgementSerializer.serialize_acknowledgement(acknowledgement)
+        mapping = Lab::LimsOrderMapping.find_by(order_id: acknowledgement.order_id)
+
+        ActiveRecord::Base.transaction do
+          if mapping
+            Rails.logger.info("Updating acknowledgement ##{acknowledgement_dto[:tracking_number]} in LIMS")
+            response = lims_api.acknowledge(acknowledgement_dto)
+            Rails.logger.info("Info #{response}")
+            if response['status'] == 200 || response['message'] == 'results already delivered for test name given'
+              acknowledgement.pushed = true
+              acknowledgement.date_pushed = Time.now
+              acknowledgement.save!
+            else
+              Rails.logger.error("Failed to process acknowledgement for tracking number ##{acknowledgement_dto[:tracking_number]} in LIMS")
+            end
+          else
+            Rails.logger.info("No mapping found for acknowledgement ##{acknowledgement_dto[:tracking_number]}")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Lab
+  module Lims
+    ##
+    # Serialize a Lab::LabResult to LIMS' acknowledgement format
+    module AcknowledgementSerializer
+      class << self
+        include Utils
+
+        def serialize_acknowledgement(acknowledgement)
+          serialized_acknowledgement = Lims::Utils.structify(acknowledgement)
+          {
+            tracking_number: Lab::LabOrder.find(serialized_acknowledgement.order_id).accession_number,
+            test: ::ConceptName.where(concept_id: serialized_acknowledgement.test, concept_name_type: nil).first.name,
+            date_acknowledged: format_date(serialized_acknowledgement.date_received),
+            recipient_type: serialized_acknowledgement.acknowledgement_type
+          }
+        end
+
+        private
+
+        def format_date(date)
+          date.strftime('%Y%m%d %H:%M:%S')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Lab
+  module Lims
+    # This class is responsible for handling the acknowledgement of lab orders
+    class AcknowledgementWorker
+      attr_reader :lims_api
+
+      include Utils # for logger
+
+      SECONDS_TO_WAIT_FOR_ORDERS = 30
+
+      def initialize(lims_api)
+        @lims_api = lims_api
+      end
+
+      def push_acknowledgement(batch_size: 1000, wait: false)
+        loop do
+          logger.info('Looking for new acknowledgements to push to LIMS...')
+          acknowledgements = Lab::AcknowledgementService.acknowledgements_pending_sync(batch_size).all
+
+          logger.debug("Found #{acknowledgements.size} acknowledgements...")
+          acknowledgements.each do |acknowledgement|
+            Lab::AcknowledgementService.push_acknowledgement(acknowledgement, @lims_api)
+          rescue GatewayError => e
+            logger.error("Failed to push acknowledgement ##{acknowledgement.order_id}: #{e.class} - #{e.message}")
+          end
+
+          break unless wait
+
+          logger.info('Waiting for acknowledgements...')
+          sleep(Lab::Lims::Config.updates_poll_frequency)
+        end
+      end
+    end
+  end
+end

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

@@ -32,6 +32,15 @@ class Lab::Lims::Api::RestApi
     )
   end
 
+  def acknowledge(acknowledgement_dto)
+    Rails.logger.info("Acknowledging order ##{acknowledgement_dto} in LIMS")
+    response = in_authenticated_session do |headers|
+      RestClient.post(expand_uri('/acknowledge/test/results/recipient'), acknowledgement_dto, headers)
+    end
+    Rails.logger.info("Acknowledged order ##{acknowledgement_dto} in LIMS. Response: #{response}")
+    JSON.parse(response)
+  end
+
   def update_order(_id, order_dto)
     in_authenticated_session do |headers|
       RestClient.post(expand_uri('update_order'), make_update_params(order_dto), headers)
@@ -191,6 +200,7 @@ class Lab::Lims::Api::RestApi
       arv_number: order_dto.fetch(:patient).fetch(:arv_number),
       art_regimen: order_dto.fetch(:patient).fetch(:art_regimen),
       art_start_date: order_dto.fetch(:patient).fetch(:art_start_date),
+      date_of_birth: order_dto.fetch(:patient).fetch(:dob),
       national_patient_id: order_dto.fetch(:patient).fetch(:id),
       requesting_clinician: requesting_clinician(order_dto),
       sample_type: order_dto.fetch(:sample_type),
@@ -380,7 +390,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
 

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

@@ -67,6 +67,7 @@ module Lab
             arv_number: find_arv_number(patient_id),
             art_regimen: find_current_regimen(patient_id),
             art_start_date: find_art_start_date(patient_id),
+            dob: person.birthdate,
             phone_number: phone_number&.value || 'Unknown',
             gender: person.gender,
             email: nil

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

@@ -14,6 +14,7 @@ module Lab
 
         fork(&method(:start_push_worker))
         fork(&method(:start_pull_worker))
+        fork(&method(:start_acknowledgement_worker))
         fork(&method(:start_realtime_pull_worker)) if realtime_updates_enabled?
 
         Process.waitall
@@ -27,6 +28,13 @@ module Lab
         end
       end
 
+      def self.start_acknowledgement_worker
+        start_worker('acknowledgement_worker') do
+          worker = AcknowledgementWorker.new(lims_api)
+          worker.push_acknowledgement
+        end
+      end
+
       def self.start_pull_worker
         start_worker('pull_worker') do
           worker = PullWorker.new(lims_api)

data/app/services/lab/orders_service.rb

@@ -136,7 +136,7 @@ module Lab
           patient_id: encounter.patient_id,
           start_date: params[:date]&.to_date || Date.today,
           auto_expire_date: params[:end_date],
-          accession_number: params[:accession_number] || next_accession_number,
+          accession_number: params[:accession_number] || next_accession_number(params[:date]&.to_date || Date.today),
           orderer: User.current&.user_id
         )
       end

data/app/services/lab/results_service.rb

@@ -32,22 +32,30 @@ module Lab
 
           serializer = Lab::ResultSerializer.serialize(results_obs)
         end
-        NotificationService.new.create_notification(result_enter_by, prepare_notification_message(results_obs, serializer, result_enter_by))
+        process_acknowledgement(results_obs, result_enter_by)
+        precess_notification_message(results_obs, serializer, result_enter_by)
         Rails.logger.info("Lab::ResultsService: Result created for test #{test_id} #{serializer}")
         serializer
       end
 
       private
 
-      def prepare_notification_message(result, values, result_enter_by)
+      def precess_notification_message(result, values, result_enter_by)
         order = Order.find(result.order_id)
-        { Type: result_enter_by,
-          'Test type': ConceptName.find_by(concept_id: result.test.value_coded)&.name,
-          'Accession number': order&.accession_number,
-          'ARV-Number': find_arv_number(result.person_id),
-          PatientID: result.person_id,
-          'Ordered By': order&.provider&.person&.name,
-          Result: values }.as_json
+        data = { Type: result_enter_by,
+                 'Test type': ConceptName.find_by(concept_id: result.test.value_coded)&.name,
+                 'Accession number': order&.accession_number,
+                 'ARV-Number': find_arv_number(result.person_id),
+                 PatientID: result.person_id,
+                 'Ordered By': order&.provider&.person&.name,
+                 Result: values }.as_json
+        NotificationService.new.create_notification(result_enter_by, data) 
+      end
+
+      def process_acknowledgement(results, results_enter_by)
+        Lab::AcknowledgementService.create_acknowledgement({ order_id: results.order_id, test: results.test.value_coded,
+                                                             date_received: Time.now,
+                                                             entered_by: results_enter_by })
       end
 
       def find_arv_number(patient_id)

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.1.23
+  version: 1.1.25
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -254,6 +254,7 @@ files:
 - app/mailers/lab/application_mailer.rb
 - app/models/lab/application_record.rb
 - app/models/lab/lab_accession_number_counter.rb
+- app/models/lab/lab_acknowledgement.rb
 - app/models/lab/lab_encounter.rb
 - app/models/lab/lab_order.rb
 - app/models/lab/lab_result.rb
@@ -264,8 +265,11 @@ files:
 - app/serializers/lab/result_serializer.rb
 - app/serializers/lab/test_serializer.rb
 - app/services/lab/accession_number_service.rb
+- app/services/lab/acknowledgement_service.rb
 - app/services/lab/concepts_service.rb
 - app/services/lab/labelling_service/order_label.rb
+- app/services/lab/lims/acknowledgement_serializer.rb
+- app/services/lab/lims/acknowledgement_worker.rb
 - app/services/lab/lims/api/blackhole_api.rb
 - app/services/lab/lims/api/couchdb_api.rb
 - app/services/lab/lims/api/mysql_api.rb