his_emr_api_lab 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ac3fb7e82f896ac9c5f0545aa1c7e97290e7aaf11cc149fd6e8f385938397dc
-  data.tar.gz: 707411853618c5b391c99ecdc043bdbc71ef5df5a1b801567869d279b068c6d7
+  metadata.gz: e025ec511241c94de0fe3a31ccc589159953af60258181036094f3be7d44c409
+  data.tar.gz: 4061c96e3e6ce5017a2324ed93211a28b2b3b7bc374e1c3e78bd40ccd57e5b95
 SHA512:
-  metadata.gz: e0ae79db2d3cb66121a3daf92c1fb0e141a09309dc148f604da49cb167203fe22c77e50c843a9a10e6531fe505cb8241c5212668a643bff38ef5f851d8232a72
-  data.tar.gz: 32ec983d0e45aa6af8b280ae1850544ad42bb250465cdfa45a597818e589c3ff9238d7ebea7ba7cdc7c613ae4f2368fc05c2c854809fa2f1d2d8b76ed82c1bcf
+  metadata.gz: 3b3d09afe97f56a907b6f71f1d1de58b7a9329de5cbcc19ab8fc1a67bb56d057193cf82cd663f25a1061b18937d2930020b682f8bf63b6908952b88b3c9b436f
+  data.tar.gz: fbd1ab31395c8f1cca74f76bc075029f88da367cdc09fe7d295332524018d937f017dc78d75e0bd29d58ebbf0d9575027de3a68e5a771362a2582852804cf4af

data/app/controllers/lab/orders_controller.rb

@@ -95,7 +95,8 @@ module Lab
       end_date = params[:end_date].present? ? params[:end_date].to_date.end_of_day : 24.hours.ago.end_of_day
       concept_id = params[:concept_id]
       include_data = params[:include_data]
-      orders = OrdersService.lab_orders(start_date, end_date, concept_id, include_data: include_data)
+      location_id = params[:location_id]
+      orders = OrdersService.lab_orders(start_date, end_date, concept_id, include_data: include_data, location_id: location_id)
       render json: orders, status: :ok
     end
 

data/app/controllers/lab/users_controller.rb

@@ -8,6 +8,12 @@ module Lab
     # create a LIMS User that will be responsible for sending lab results
     def create
       user_params = params.permit(:username, :password)
+      begin
+        User.current = Lab::Lims::Utils.lab_user
+        Location.current = User.current.location
+      rescue StandardError => e
+        Rails.logger.error("Failed to set current location: #{e.message}")
+      end
       service.create_lims_user(username: user_params['username'], password: user_params['password'])
       render json: { message: 'User successfully created' }, status: 200
     end

data/app/services/lab/orders_service.rb

@@ -240,16 +240,18 @@ module Lab
         Lab::Lims::PullWorker.new(nil).process_order(order_dto)
       end
 
-      def lab_orders(start_date, end_date, concept_id = nil, include_data: false)
-        tests = Lab::LabTest.where('date_created >= ? AND date_created <= ?', start_date, end_date)
+      def lab_orders(start_date, end_date, concept_id = nil, include_data: false, location_id: nil)
+        tests = Lab::LabTest.unscoped.where('date_created >= ? AND date_created <= ?', start_date, end_date)
+        tests = tests.where(voided: false, concept: ConceptName.where(name: Lab::Metadata::TEST_TYPE_CONCEPT_NAME))
         tests = tests.where(value_coded: concept_id) if concept_id
+        tests = tests.where(location_id: location_id) if location_id
         orders = Lab::LabOrder.where(order_id: tests.pluck(:order_id))
         data = {
           count: orders.count,
           last_order_date: Lab::LabOrder.last&.start_date&.to_date,
           lab_orders: []
         }
-        if include_data
+        if (include_data.present? && include_data == 'true')
           data[:lab_orders] = orders.map do |order|
             Lab::LabOrderSerializer.serialize_order(
               order, requesting_clinician: order.requesting_clinician,

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.4.6'.freeze
+  VERSION = '2.4.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-19 00:00:00.000000000 Z
+date: 2026-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest