his_emr_api_lab 1.1.26 → 1.1.28

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 775a892a4617d90d67a28f1bf22a88b24a2c41a9fc288b8ec06e485bf6437269
4
- data.tar.gz: e626bd34e7b4baa2eb9979caef87a819e7f87466ec28c70113fa9aba12efead7
3
+ metadata.gz: '09cfdf606b1084b4bda331d27fa85e69b831e3c3329be923692011d403c4ab4d'
4
+ data.tar.gz: 6aa364d1c6e1965df73aa05cc1a6a3dc31b160171cf9443c974aa333fbcfd9d4
5
5
  SHA512:
6
- metadata.gz: 5c248c75193b97da5c79f71f47aafb8ab7abdd8d069a4b4b9e61842e3f1529e20c56edb3adcef6411e4a9a8839bb185e01ddb2f0e0f02eac85bc14a1e99fa025
7
- data.tar.gz: 2f5b12505060dfcc8d1b6f1e0e1256d78d9853e6e8a1cee56859bac2868431c56755d29ac41cf5d14055c5848b2df184a9add39254e67998f438b9670d6fc364
6
+ metadata.gz: 27809c7ad5e07ba4502665b4d289f007562fb159d81ba7b847d344fed25585fa8b3fe73e89def79cccd9d95a01adfdf6c82fa260e664f5cb51ad71ad27efc29f
7
+ data.tar.gz: 4326993c19083cbffa2521eddb16a04e719b7406940bdbd0fead6acedb408568c94628060fb5c359c99dbb6f22edbe504fbf64a533a2d0f861d1e627e8bc162f
@@ -8,7 +8,7 @@ module Lab
8
8
  test_types = test_types.filter_members(name: name) if name
9
9
 
10
10
  unless specimen_type
11
- return test_types.joins('INNER JOIN concept_name ON concept_set.concept_id = concept_name.concept_id')
11
+ return test_types.joins('INNER JOIN concept_name ON concept_set.concept_id = concept_name.concept_id AND concept_name.voided = 0 AND concept_name.locale_preferred = 1')
12
12
  .select('concept_name.name, concept_name.concept_id')
13
13
  .group('concept_name.concept_id')
14
14
  end
@@ -12,7 +12,7 @@ module Lab
12
12
  serialized_acknowledgement = Lims::Utils.structify(acknowledgement)
13
13
  {
14
14
  tracking_number: Lab::LabOrder.find(serialized_acknowledgement.order_id).accession_number,
15
- test: ::ConceptName.where(concept_id: serialized_acknowledgement.test, concept_name_type: nil).first.name,
15
+ test: ::ConceptName.where(concept_id: serialized_acknowledgement.test).first.name,
16
16
  date_acknowledged: format_date(serialized_acknowledgement.date_received),
17
17
  recipient_type: serialized_acknowledgement.acknowledgement_type
18
18
  }
data/lib/lab/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Lab
4
- VERSION = '1.1.26'
4
+ VERSION = '1.1.28'
5
5
  end
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: 1.1.26
4
+ version: 1.1.28
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: 2023-03-09 00:00:00.000000000 Z
11
+ date: 2023-03-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: couchrest