mahis_emr_api_lab 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b93353e9b867677abd45317e32291dcbd53d68e328cb2ac7cc2e294d719b71f
-  data.tar.gz: 22fcdf2407609885b81df63de7be75ff20156f6b0b6d8de6a6eb8974d54915ae
+  metadata.gz: 114c56e62980ef6a721d63240bb14fe640076d26cafb7d4c3fe41483786c9466
+  data.tar.gz: 4cdd59a7566f7128e0b6bfa6589d3525559a981891879c42b37e208489e7ca35
 SHA512:
-  metadata.gz: e95ee315519fcf1d77d9b337b449921c05489cf7842bf2f74e730f61fd298233aba7b87c0a819b6bcac9f39c58c87703c5ed76a9b7b1f31b60573d3fcceb8b14
-  data.tar.gz: 3326b887701a0fdf285bb37f2a2daa56500f4b81875080cb711bc25b046370e94c6e198c837e7521415b69ccc0cbfe01cb0c18096e09196f2b79468eaf15fbba
+  metadata.gz: 1a73a0cd671d283d5cda912c1ee324eaa6fe5ba15ea25e2864fb50c40e7bf474b2bd517b243a664dca1a15a8850f6a4cef503b114f0db333a3aaa6b807739366
+  data.tar.gz: 20e8eb0cda6e7840b38015ee6c25fb1833e07da1fce05e27e30111e29e5efc94b633902068cc2c2dbc3479574cc8291cc863b122c9e547d5e6b45c6f84a470a2

data/app/serializers/lab/lab_order_serializer.rb

@@ -2,9 +2,10 @@
 
 module Lab
   module LabOrderSerializer
-    def self.serialize_order(order, tests: nil, requesting_clinician: nil, reason_for_test: nil, target_lab: nil)
+    def self.serialize_order(order, tests: nil, requesting_clinician: nil, reason_for_test: nil, target_lab: nil, comment_to_fulfiller: nil)
       tests ||= order.voided == 1 ? voided_tests(order) : order.tests
       requesting_clinician ||= order.requesting_clinician
+      comment_to_fulfiller ||= order.comment_to_fulfiller
       reason_for_test ||= order.reason_for_test
       target_lab = target_lab&.value_text || order.target_lab&.value_text || Location.current_health_center&.name
       ActiveSupport::HashWithIndifferentAccess.new(
@@ -21,6 +22,7 @@ module Lab
           },
           requesting_clinician: requesting_clinician&.value_text,
           target_lab: target_lab,
+          comment_to_fulfiller: comment_to_fulfiller&.value_text,
           reason_for_test: {
             concept_id: reason_for_test&.value_coded,
             name: concept_name(reason_for_test&.value_coded)

data/app/services/lab/metadata.rb

@@ -5,6 +5,7 @@ module Lab
     # Concepts
     REASON_FOR_TEST_CONCEPT_NAME = 'Reason for test'
     REQUESTING_CLINICIAN_CONCEPT_NAME = 'Person making request'
+    COMMENT_TO_FULFILLER_CONCEPT_NAME = 'Comment to fulfiller'
     SPECIMEN_TYPE_CONCEPT_NAME = 'Specimen type'
     TARGET_LAB_CONCEPT_NAME = 'Lab'
     TEST_RESULT_CONCEPT_NAME = 'Lab test result'

data/app/services/lab/orders_service.rb

@@ -63,7 +63,8 @@ module Lab
           Lab::LabOrderSerializer.serialize_order(
             order, requesting_clinician: add_requesting_clinician(order, order_params),
                    reason_for_test: add_reason_for_test(order, order_params),
-                   target_lab: add_target_lab(order, order_params)
+                   target_lab: add_target_lab(order, order_params),
+                   comment_to_fulfiller: add_comment_to_fulfiller(order, order_params)
           )
         end
       end
@@ -97,11 +98,12 @@ module Lab
       end
 
       def void_order(order_id, reason)
-        order = Lab::LabOrder.includes(%i[requesting_clinician reason_for_test target_lab], 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)
         order.reason_for_test&.void(reason)
+        order.comment_to_fulfiller&.void(reason)
         order.target_lab&.void(reason)
 
         order.tests.each { |test| test.void(reason) }
@@ -224,6 +226,7 @@ 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]
         order.accession_number = access_number
         order.orderer = User.current&.user_id
 
@@ -256,6 +259,15 @@ module Lab
         )
       end
 
+      def add_comment_to_fulfiller(order, params)
+        create_order_observation(
+          order,
+          Lab::Metadata::COMMENT_TO_FULFILLER_CONCEPT_NAME,
+          params[:date],
+          value_text: params['comment_to_fulfiller']
+        )
+      end
+
       ##
       # Attach a reason for the order/test
       #

data/lib/lab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mahis_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-18 00:00:00.000000000 Z
+date: 2025-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.7'
 description: |
   This adds a lab interface to the OpenMRS compatible core API provided by
   [HIS-EMR-API](https://github.com/EGPAFMalawiHIS/HIS-EMR-API).