his_emr_api_lab 2.1.4.pre.beta → 2.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/serializers/lab/lab_order_serializer.rb +1 -1
- data/app/services/lab/lims/migrator.rb +1 -1
- data/app/services/lab/lims/order_serializer.rb +2 -2
- data/app/services/lab/lims/push_worker.rb +1 -1
- data/app/services/lab/orders_service.rb +1 -1
- data/lib/lab/version.rb +1 -1
- metadata +5 -6
- data/db/migrate/20260128111557_add_program_id_to_encounter.rb +0 -13
- /data/app/services/lab/lims/api/{couchdb_api.rb → couch_db_api.rb} +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2086e2372ae3182efa9a1eb56d5dfe0845f770800f25891dec98af02530d7953
|
|
4
|
+
data.tar.gz: cebae46dd81f29f128b6904ccaa7dbefc780b0dfcc57d9f2e1f3087f86cfc830
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6381879cefbb24c3226d2a68f458e26cea19bcf3db7f4b50fb97a14afc7b94958f2e76178d8f1fa0f4abd6ff976ddaa0ca5ce3f26fb309414117f0b82c872389
|
|
7
|
+
data.tar.gz: b6bede3239bb94db739c4ea1f7cf817a4eb217b9c5ba77bb9b3678dcb1b3edba44f41f71c8e0db00d9f1d333458a49376d8bb57a631473ed35ef4d3641293399
|
|
@@ -21,7 +21,7 @@ module Lab
|
|
|
21
21
|
order_date: order.date_created,
|
|
22
22
|
location_id: encounter.location_id,
|
|
23
23
|
program_id: encounter.program_id,
|
|
24
|
-
program_name: program
|
|
24
|
+
program_name: program.name,
|
|
25
25
|
# order_date: order.start_date,
|
|
26
26
|
patient_id: order.patient_id,
|
|
27
27
|
accession_number: order.accession_number,
|
|
@@ -29,7 +29,7 @@ require 'lab/lab_test'
|
|
|
29
29
|
require 'lab/lims_order_mapping'
|
|
30
30
|
require 'lab/lims_failed_import'
|
|
31
31
|
|
|
32
|
-
require_relative 'api/
|
|
32
|
+
require_relative 'api/couch_db_api'
|
|
33
33
|
require_relative 'config'
|
|
34
34
|
require_relative 'pull_worker'
|
|
35
35
|
require_relative 'utils'
|
|
@@ -144,7 +144,7 @@ module Lab
|
|
|
144
144
|
end
|
|
145
145
|
|
|
146
146
|
def format_test_status_trail(order)
|
|
147
|
-
tests =
|
|
147
|
+
tests = order.voided.zero? ? order.tests : Lab::LabOrderSerializer.voided_tests(order)
|
|
148
148
|
tests.each_with_object({}) do |test, trail|
|
|
149
149
|
test_name = format_test_name(::Concept.find(test.value_coded).test_catalogue_name)
|
|
150
150
|
|
|
@@ -155,7 +155,7 @@ module Lab
|
|
|
155
155
|
updated_by: find_user(test.creator)
|
|
156
156
|
}
|
|
157
157
|
|
|
158
|
-
unless
|
|
158
|
+
unless test.voided.zero?
|
|
159
159
|
current_test_trail[test.date_voided.strftime('%Y%m%d%H%M%S')] = {
|
|
160
160
|
status: 'Voided',
|
|
161
161
|
updated_by: find_user(test.voided_by)
|
|
@@ -51,7 +51,7 @@ module Lab
|
|
|
51
51
|
mapping = Lab::LimsOrderMapping.find_by(order_id: order.order_id)
|
|
52
52
|
|
|
53
53
|
ActiveRecord::Base.transaction do
|
|
54
|
-
if mapping && !
|
|
54
|
+
if mapping && !order.voided.zero?
|
|
55
55
|
Rails.logger.info("Deleting order ##{order_dto['accession_number']} from LIMS")
|
|
56
56
|
lims_api.delete_order(mapping.lims_id, order_dto)
|
|
57
57
|
mapping.destroy
|
|
@@ -234,7 +234,7 @@ module Lab
|
|
|
234
234
|
encounter.encounter_type = EncounterType.find_by_name!(Lab::Metadata::ENCOUNTER_TYPE_NAME)
|
|
235
235
|
encounter.encounter_datetime = order_params[:date] || Date.today
|
|
236
236
|
encounter.visit = Visit.find_by_uuid(visit) if Encounter.column_names.include?('visit_id')
|
|
237
|
-
encounter.provider_id = User.current&.person
|
|
237
|
+
encounter.provider_id = User.current&.person.id if Encounter.column_names.include?('provider_id')
|
|
238
238
|
encounter.program_id = order_params[:program_id] if Encounter.column_names.include?('program_id') && order_params[:program_id].present?
|
|
239
239
|
encounter.save!
|
|
240
240
|
encounter.reload
|
data/lib/lab/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: his_emr_api_lab
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.4
|
|
4
|
+
version: 2.1.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Elizabeth Glaser Pediatric Foundation Malawi
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2026-01-
|
|
11
|
+
date: 2026-01-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: couchrest
|
|
@@ -270,7 +270,7 @@ files:
|
|
|
270
270
|
- app/services/lab/lims/acknowledgement_serializer.rb
|
|
271
271
|
- app/services/lab/lims/acknowledgement_worker.rb
|
|
272
272
|
- app/services/lab/lims/api/blackhole_api.rb
|
|
273
|
-
- app/services/lab/lims/api/
|
|
273
|
+
- app/services/lab/lims/api/couch_db_api.rb
|
|
274
274
|
- app/services/lab/lims/api/mysql_api.rb
|
|
275
275
|
- app/services/lab/lims/api/rest_api.rb
|
|
276
276
|
- app/services/lab/lims/api/ws_api.rb
|
|
@@ -301,7 +301,6 @@ files:
|
|
|
301
301
|
- db/migrate/20210807111531_add_default_to_lims_order_mapping.rb
|
|
302
302
|
- db/migrate/20260119104240_add_fulfiller_fields_to_orders.rb
|
|
303
303
|
- db/migrate/20260119104241_create_comment_to_fulfiller_concept.rb
|
|
304
|
-
- db/migrate/20260128111557_add_program_id_to_encounter.rb
|
|
305
304
|
- lib/auto12epl.rb
|
|
306
305
|
- lib/couch_bum/couch_bum.rb
|
|
307
306
|
- lib/generators/lab/install/USAGE
|
|
@@ -340,9 +339,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
340
339
|
version: '0'
|
|
341
340
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
342
341
|
requirements:
|
|
343
|
-
- - "
|
|
342
|
+
- - ">="
|
|
344
343
|
- !ruby/object:Gem::Version
|
|
345
|
-
version:
|
|
344
|
+
version: '0'
|
|
346
345
|
requirements: []
|
|
347
346
|
rubygems_version: 3.4.1
|
|
348
347
|
signing_key:
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
# This migration adds the program_id column to the encounter table if it doesn't already exist.
|
|
4
|
-
# The program_id column is used to associate encounters with specific programs (e.g., HIV Program, TB Program).
|
|
5
|
-
class AddProgramIdToEncounter < ActiveRecord::Migration[5.2]
|
|
6
|
-
def change
|
|
7
|
-
return if column_exists?(:encounter, :program_id)
|
|
8
|
-
|
|
9
|
-
add_column :encounter, :program_id, :integer, after: :encounter_type
|
|
10
|
-
add_index :encounter, :program_id
|
|
11
|
-
add_foreign_key :encounter, :program, column: :program_id, primary_key: :program_id
|
|
12
|
-
end
|
|
13
|
-
end
|
|
File without changes
|