his_emr_api_lab 2.1.7.pre.alpha → 2.1.7.pre.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9b24a7f0fab2de0e47f886cd6debbdfa4b8e8ee07abd2e2d9403c45ff9343b
-  data.tar.gz: e57bc3a15d6ae8ff85bff447c0e7e95a3d6ce35c1d9b99d1a237dc22e2c717aa
+  metadata.gz: b15bb82b3ff39714e8f48a1a8102bc9c0347d5498f2e8fae7d8e5c446d0d15f5
+  data.tar.gz: 159e9321795329ae186bf7d4a88aa492f63634ed5b5a236fb6a634da0dbd8342
 SHA512:
-  metadata.gz: 41a0a57a88d0d6b2a4826ada390a62f244118f024a5d49b9e9dfa17940165cb4a450076fa209c413d6f06d209050b89a3ee25ec513e4706400380f10d1bcbd8b
-  data.tar.gz: b0894a58a2fdd2467d5f1ffe9f36d041cc9b00680369453d6dd2f0f2016743336d9466eea954fbab15c4f74b9f0e208031772bd84854a1e5780b634f433bee9f
+  metadata.gz: e2632b305212c9f09bc2347f6d2a14d873b781e02311c1f52309f52db418ea194124fcc2065f7258865204bd918a56888e29c4d40656f08cf99b8d6184b75b0a
+  data.tar.gz: 6e4f055b0412a7300c11abcb955c732302b5429db0aec611a888df507c5f547328715a7831f9411a181695549f698cb04430b5a4f564f3f9e42d23b25af2034e

data/app/services/lab/orders_service.rb

@@ -102,14 +102,16 @@ module Lab
 
         if reason_for_test
           Rails.logger.debug("Updating reason for test on order ##{order.order_id}")
-          update_reason_for_test(order, Concept.find(reason_for_test)&.id, force_update: params.fetch('force_update', false))
+          update_reason_for_test(order, Concept.find(reason_for_test)&.id,
+                                 force_update: params.fetch('force_update', false))
         end
 
         Lab::LabOrderSerializer.serialize_order(order)
       end
 
       def void_order(order_id, reason)
-        order = Lab::LabOrder.includes(%i[requesting_clinician reason_for_test target_lab comment_to_fulfiller], tests: [:result])
+        order = Lab::LabOrder.includes(%i[requesting_clinician reason_for_test target_lab comment_to_fulfiller],
+                                       tests: [:result])
                              .find(order_id)
 
         order.requesting_clinician&.void(reason)
@@ -160,13 +162,15 @@ module Lab
           last_order_date: Lab::LabOrder.last&.start_date&.to_date,
           lab_orders: []
         }
-        data[:lab_orders] = orders.map do |order|
-          Lab::LabOrderSerializer.serialize_order(
-            order, requesting_clinician: order.requesting_clinician,
-                   reason_for_test: order.reason_for_test,
-                   target_lab: order.target_lab
-          )
-        end if include_data
+        if include_data
+          data[:lab_orders] = orders.map do |order|
+            Lab::LabOrderSerializer.serialize_order(
+              order, requesting_clinician: order.requesting_clinician,
+                     reason_for_test: order.reason_for_test,
+                     target_lab: order.target_lab
+            )
+          end
+        end
         data
       end
 
@@ -174,14 +178,14 @@ module Lab
 
       def create_rejection_notification(order_params)
         order = find_order order_params['tracking_number']
-        data = { 'type': 'LIMS',
-                 'specimen': ConceptName.find_by(concept_id: order.concept_id)&.name,
-                 'accession_number': order&.accession_number,
-                 'order_date': order&.start_date,
-                 '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
+        data = { type: 'LIMS',
+                 specimen: ConceptName.find_by(concept_id: order.concept_id)&.name,
+                 accession_number: order&.accession_number,
+                 order_date: order&.start_date,
+                 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
         NotificationService.new.create_notification('LIMS', data)
       end
 
@@ -235,7 +239,9 @@ module Lab
         encounter.encounter_datetime = order_params[:date] || Date.today
         encounter.visit = Visit.find_by_uuid(visit) if Encounter.column_names.include?('visit_id')
         encounter.provider_id = User.current&.person&.id if Encounter.column_names.include?('provider_id')
-        encounter.program_id = order_params[:program_id] if Encounter.column_names.include?('program_id') && order_params[:program_id].present?
+        if Encounter.column_names.include?('program_id') && order_params[:program_id].present?
+          encounter.program_id = order_params[:program_id]
+        end
         encounter.save!
         encounter.reload
       end
@@ -259,7 +265,8 @@ module Lab
         order.date_created = params[:date]&.to_date || Date.today if order.respond_to?(:date_created)
         order.start_date = params[:date]&.to_date || Date.today if order.respond_to?(:start_date)
         order.auto_expire_date = params[:end_date]
-        order.comment_to_fulfiller = params[:comment_to_fulfiller] if params[:comment_to_fulfiller]
+        # NOTE: comment_to_fulfiller is a has_one association, not a field
+        # It will be created via add_comment_to_fulfiller method
         order.accession_number = access_number
         order.orderer = User.current&.user_id
 
@@ -355,7 +362,10 @@ module Lab
 
         return if order.reason_for_test&.value_coded == concept_id
 
-        raise InvalidParameterError, "Can't change reason for test once set" if order.reason_for_test&.value_coded && !force_update
+        if order.reason_for_test&.value_coded && !force_update
+          raise InvalidParameterError,
+                "Can't change reason for test once set"
+        end
 
         order.reason_for_test&.delete
         date = order.start_date if order.respond_to?(:start_date)

data/lib/lab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lab
-  VERSION = '2.1.7-alpha'
+  VERSION = '2.1.7-beta.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.1.7.pre.alpha
+  version: 2.1.7.pre.beta.0
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi