mahis_emr_api_lab 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce8f674cad939a3e92204eadfa4e97d299c41acbfbf0182efc0374544fcb846
-  data.tar.gz: f84dc3cbea226eed9d5f82d2a6e54169744d7e0a76f1a0e8e0c81d4e543db004
+  metadata.gz: 1564986977bbbb02dab3359307faa412965cecb2a0aaa3d0cc97b9e2ef068f92
+  data.tar.gz: 42fcee721977f3cbc1fd29f8f184b23e532cde82bf9846494c90bf1285f0d773
 SHA512:
-  metadata.gz: 0b7dea9b4174a922fb47d3e01ca88639a5f35d847d764265d19f597820af1c1358ca0879ec7d570281fca20359a8288cf68e415dba6aecc3b574e9710ea179ca
-  data.tar.gz: 3135f070f3b81e16d4f1c135dc07a347f6b74be84a04c1a1bacdfecc4b1353ecb48644e576c0364ebed3afb9c36f0ee5ec42a1c128f9f0f49c3eebb4ec7146c4
+  metadata.gz: 91179c762c1d91c33d6ca6c6c751ff73102b8a4e8ac9f191e3eb2aa00e0ccfa9a1e16f69accb3f19ec9d1a54f25b0066f17de4d47560c0c976d47859ad9240b9
+  data.tar.gz: f91bb3ab835a5ec653fdaa9666475b2d26f1e0acc2d43d8d753456c748137051d6ef364bf5709bc9569f774ecd0758022f798f1a5786b59c638d878c473b2fac

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'rest-client'
 
 class Lab::Lims::Api::RestApi
@@ -8,6 +9,8 @@ class Lab::Lims::Api::RestApi
 
   class InvalidParameters < LimsApiError; end
 
+  START_DATE = Time.parse('2024-09-03').freeze
+
   def initialize(config)
     @config = config
   end
@@ -240,7 +243,7 @@ class Lab::Lims::Api::RestApi
   def current_district
     health_centre = Location.current_health_center
     raise 'Current health centre not set' unless health_centre
-    
+
     district = health_centre.district || Lab::Lims::Config.application['district']
 
     unless district
@@ -406,7 +409,7 @@ class Lab::Lims::Api::RestApi
     Rails.logger.debug('Looking for orders without a specimen')
     unknown_specimen = ConceptName.where(name: Lab::Metadata::UNKNOWN_SPECIMEN)
                                   .select(:concept_id)
-    orders = Lab::LabOrder.where(concept_id: unknown_specimen)
+    orders = Lab::LabOrder.where(concept_id: unknown_specimen, date_created: START_DATE..(Date.today + 1.day))
                           .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id))
     orders = orders.where(patient_id: patient_id) if patient_id
 
@@ -418,16 +421,17 @@ class Lab::Lims::Api::RestApi
     # 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(order_id: Lab::LimsOrderMapping.select(:order_id))
+                            .where(order_id: Lab::LimsOrderMapping.select(:order_id), date_created: START_DATE..(Date.today + 1.day))
   end
 
   def orders_without_reason(patient_id = nil)
     Rails.logger.debug('Looking for orders without a reason for test')
     orders = Lab::LabOrder.joins(:reason_for_test)
                           .merge(Observation.where(value_coded: nil, value_text: nil))
+                          .where(date_created: START_DATE..(Date.today + 1.day))
                           .limit(1000)
                           .where.not(accession_number: Lab::LimsOrderMapping.select(:lims_id))
-    orders = orders.where(patient_id: patient_id) if patient_id
+    orders = orders.where(patient_id: patient_id, date_created: START_DATE..(Date.today + 1.day)) if patient_id
 
     orders
   end

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

@@ -10,6 +10,7 @@ module Lab
       include Utils # for logger
 
       SECONDS_TO_WAIT_FOR_ORDERS = 30
+      START_DATE = Time.parse('2024-09-03').freeze
 
       def initialize(lims_api)
         @lims_api = lims_api
@@ -23,7 +24,7 @@ module Lab
           logger.debug("Found #{orders.size} orders...")
           orders.each do |order|
             push_order(order)
-          rescue GatewayError => e
+          rescue StandardError => e
             logger.error("Failed to push order ##{order.accession_number}: #{e.class} - #{e.message}")
           rescue StandardError => e
             logger.error("Failed to push order ##{order.id}: #{order&.accession_number} : #{e.class} - #{e.message}")
@@ -60,9 +61,9 @@ module Lab
             Rails.logger.info("Updating order ##{order_dto[:accession_number]} in LIMS")
             lims_api.update_order(mapping.lims_id, order_dto)
             if order_dto['test_results'].nil? || order_dto['test_results'].empty?
-              mapping.update(pushed_at: Time.now)             
+              mapping.update(pushed_at: Time.now)
             else
-              mapping.update(pushed_at: Time.now, result_push_status: true)  
+              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
@@ -94,6 +95,7 @@ module Lab
         Rails.logger.debug('Looking for new orders that need to be created in LIMS...')
         Lab::LabOrder.where.not(order_id: Lab::LimsOrderMapping.all.select(:order_id))
                      .where("accession_number IS NOT NULL AND accession_number !=''")
+                     .where(date_created: START_DATE..(Date.today + 1.day))
                      .order(date_created: :desc)
       end
 

data/app/services/lab/orders_service.rb

@@ -148,8 +148,7 @@ module Lab
                  'arv_number': find_arv_number(order.patient_id),
                  'patient_id': result.person_id,
                  'ordered_by': order&.provider&.person&.name,
-                 'rejection_reason': order_params['comments']
-                }.as_json
+                 'rejection_reason': order_params['comments'] }.as_json
         NotificationService.new.create_notification('LIMS', data)
       end
 
@@ -197,7 +196,6 @@ module Lab
         return Encounter.find(encounter_id) if order_params[:encounter] || order_params[:encounter_id]
         raise StandardError, 'encounter_id|uuid or patient_id|uuid required' unless order_params[:patient]
 
-
         encounter = Encounter.new
         encounter.patient = Patient.find(patient_id)
         encounter.encounter_type = EncounterType.find_by_name!(Lab::Metadata::ENCOUNTER_TYPE_NAME)
@@ -263,7 +261,6 @@ module Lab
       #
       # Examples of reasons include: Routine, Targeted, Confirmatory, Repeat, or Stat.
       def add_reason_for_test(order, params)
-
         reason = params[:reason_for_test_id] || params[:reason_for_test]
 
         reason = Concept.find(reason)
@@ -289,6 +286,8 @@ module Lab
       end
 
       def create_order_observation(order, concept_name, date, **values)
+        creator = User.find_by(username: 'lab_daemon')
+        User.current ||= creator
         Observation.create!(
           order: order,
           encounter_id: order.encounter_id,

data/lib/lab/version.rb

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

data/lib/mahis_emr_api_lab.rb

@@ -0,0 +1,6 @@
+require 'lab/engine'
+require 'lab/version'
+
+module Lab
+  # Your code goes here...
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mahis_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -294,6 +294,7 @@ files:
 - lib/lab/engine.rb
 - lib/lab/version.rb
 - lib/logger_multiplexor.rb
+- lib/mahis_emr_api_lab.rb
 - lib/tasks/lab_tasks.rake
 - lib/tasks/loaders/data/reasons-for-test.csv
 - lib/tasks/loaders/data/test-measures.csv
@@ -308,7 +309,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
@@ -323,8 +324,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
-signing_key:
+rubygems_version: 3.4.17
+signing_key: 
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API
 test_files: []