health-data-standards 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e9e7e37d4f361d8ebce2aafaa93d7fa32aaccc28d85381ff3cf325f4ba8934
-  data.tar.gz: 664647467b139621ce860648beaccb907ed716885f8e6e713c93228347fecf8a
+  metadata.gz: d83eb6d500f3b7d034ff83d68338f1e3500c0bad94cc43213cd1b1912016faf3
+  data.tar.gz: 87be123a0f1426e4ec12f68f0f1c475722e884a5bbcba64fe976ca1fa17443b2
 SHA512:
-  metadata.gz: 1a8bc171be92e16d543ae408c64e29d17478c232ad8c8cbda42dec47a33ba9a6b6d669240f05f8623f6046b7e31ccf4b0efa6fbe15c8332b74acbfc5756abffb
-  data.tar.gz: 6c64d3251eca602cc91e86964ec7e15d5a5e926d00c88e43dee33a92fb265ecc16abc20d280c111383aa90e729c29f139a5bd506400b50c04246f347b497fb6c
+  metadata.gz: 2ef01e4118e7abab76e13a10b0d0377751aef2ab55daf1f0d681c7f4fee8f964e85ecfaec876b3b0a9dc9481e34a393f28f0445a8b293b30d3640134a465988e
+  data.tar.gz: bcc4fcf3624b882837bcbb29b51c7a60f6132eae1880d4ac7d14e8b6cef947c74d76f97a1871445fff9a19447edfbb4e8e62949054ca7609d0212e0cb9d92645

data/lib/hqmf-parser/cql/document_helpers/doc_population_helper.rb

@@ -40,7 +40,11 @@ module HQMF2CQL
           # The at_xpath(...).values returns an array of a single element.
           # The match returns an array and since we don't want the double quotes we take the second element
           cql_define_function[:function_name] = entry.at_xpath("*/cda:measureObservationDefinition/cda:value/cda:expression").values.first.match('\\"([A-Za-z0-9 ]+)\\"')[1]
-          cql_define_function[:parameter] = entry.at_xpath("*/cda:measureObservationDefinition/cda:component/cda:criteriaReference/cda:id").attributes['extension'].value.match('\\"([A-Za-z0-9 ]+)\\"')[1]
+          # The criteria_reference_id is the id of the measurePopulationCriteria that should be used for this observation function
+          measure_population_id = entry.at_xpath("*/cda:measureObservationDefinition/cda:component/cda:criteriaReference/cda:id").attributes['root'].value
+          # Get the name of the parameter to the  observation function within the measurePopulationCriteria section
+          cql_define_function[:parameter] = @doc.at_xpath("cda:QualityMeasureDocument/cda:component/cda:populationCriteriaSection/cda:component/cda:measurePopulationCriteria/cda:id[@root = \"#{measure_population_id}\"]/../cda:precondition/cda:criteriaReference/cda:id").attributes['extension'].value.match('\\"([A-Za-z0-9 ]+)\\"')[1]
+
           @observations << cql_define_function
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: health-data-standards
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - The MITRE Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client