his_emr_api_lab 2.1.6 → 2.1.7.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48598b7d2b93b3982c4a54761943f715383ee5a99a9416364890eddafe8e49d4
-  data.tar.gz: da0908670af042eabb120bd72cbfa0eda0cfdbd1c824e2e4fd262ef0aa82b8bd
+  metadata.gz: 8f9b24a7f0fab2de0e47f886cd6debbdfa4b8e8ee07abd2e2d9403c45ff9343b
+  data.tar.gz: e57bc3a15d6ae8ff85bff447c0e7e95a3d6ce35c1d9b99d1a237dc22e2c717aa
 SHA512:
-  metadata.gz: 04af0a0acc805f447d316cd2d38bca66a6c1f1a88e12b8fae474b62e60e46b1fe9e655f19ba1ecd026a057f78332ce408f38ca048612a395c7e5300c67d80822
-  data.tar.gz: 54f8bb2b761df7a2da6bac7b85fb4b241c8284edcd9219acd969ac182cb5cc7e48fe23326c28a64421731bdaceadb19243b8fef085fa8b271e2343c60a901393
+  metadata.gz: 41a0a57a88d0d6b2a4826ada390a62f244118f024a5d49b9e9dfa17940165cb4a450076fa209c413d6f06d209050b89a3ee25ec513e4706400380f10d1bcbd8b
+  data.tar.gz: b0894a58a2fdd2467d5f1ffe9f36d041cc9b00680369453d6dd2f0f2016743336d9466eea954fbab15c4f74b9f0e208031772bd84854a1e5780b634f433bee9f

data/app/services/lab/concepts_service.rb

@@ -34,10 +34,11 @@ module Lab
 
       unless specimen_type
         return ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
+          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
             FROM concept_attribute ca
           INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
             AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
+          INNER JOIN concept c ON c.concept_id = ca.concept_id
           WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
           AND ca.concept_id IN (#{test_types.select(:concept_id).to_sql})
           GROUP BY ca.concept_id
@@ -56,10 +57,11 @@ module Lab
       )
 
       return ActiveRecord::Base.connection.select_all <<~SQL
-        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
+        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
           FROM concept_attribute ca
         INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
           AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
+        INNER JOIN concept c ON c.concept_id = ca.concept_id
         WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
         AND ca.concept_id IN (#{concept_set.select(:concept_set).to_sql})
         GROUP BY ca.concept_id
@@ -72,10 +74,11 @@ module Lab
 
       unless test_type
         return ActiveRecord::Base.connection.select_all <<~SQL
-          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
+          SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
             FROM concept_attribute ca
           INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
             AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
+          INNER JOIN concept c ON c.concept_id = ca.concept_id
           WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
           AND ca.concept_id IN (#{specimen_types.select(:concept_id).to_sql})
           GROUP BY ca.concept_id
@@ -94,10 +97,11 @@ module Lab
       )
 
       return ActiveRecord::Base.connection.select_all <<~SQL
-        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
+        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
           FROM concept_attribute ca
         INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
           AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
+        INNER JOIN concept c ON c.concept_id = ca.concept_id
         WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
         AND ca.concept_id IN (#{concept_set.pluck(:concept_id).push(0).join(',')})
         GROUP BY ca.concept_id
@@ -114,15 +118,16 @@ module Lab
       measures = ConceptSet.find_members_by_name(Lab::Metadata::TEST_RESULT_INDICATOR_CONCEPT_NAME)
                            .select(:concept_id)
 
-      sets = ConceptSet.where(concept_set: measures, concept_id: test)
+      sets = ConceptSet.where(concept_set: test, concept_id: measures)
 
       return ActiveRecord::Base.connection.select_all <<~SQL
-        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code
+        SELECT ca.concept_id, ca.value_reference as name, ca2.value_reference as nlims_code, c.uuid
           FROM concept_attribute ca
           INNER JOIN concept_attribute ca2 ON ca.concept_id = ca2.concept_id
             AND ca2.attribute_type_id = #{ConceptAttributeType.nlims_code.concept_attribute_type_id}
+          INNER JOIN concept c ON c.concept_id = ca.concept_id
           WHERE ca.attribute_type_id = #{ConceptAttributeType.test_catalogue_name.concept_attribute_type_id}
-          AND ca.concept_id IN (#{sets.pluck(:concept_set).push(0).join(',')})
+          AND ca.concept_id IN (#{sets.pluck(:concept_id).push(0).join(',')})
           GROUP BY ca.concept_id
       SQL
     end

data/lib/lab/version.rb

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

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: his_emr_api_lab
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7.pre.alpha
 platform: ruby
 authors:
 - Elizabeth Glaser Pediatric Foundation Malawi
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-10 00:00:00.000000000 Z
+date: 2026-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -328,6 +329,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/EGPAFMalawiHIS/his_emr_api_lab
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -338,11 +340,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Lab extension for the HIS-EMR-API
 test_files: []