lib/hqmf-parser/2.0/document.rb in health-data-standards-3.7.0 vs lib/hqmf-parser/2.0/document.rb in health-data-standards-4.0.0

@@ -189,12 +189,12 @@
       end
 
       value_obj = nil
       value_obj = handle_attribute_value(attribute, value) if attribute.at_xpath('./cda:value', NAMESPACES)
 
-      # Handle the cms_id
-      @cms_id = "CMS#{value}v#{@hqmf_version_number.to_i}" if name.include? 'eMeasure Identifier'
+      # Handle the cms_id - changed to eCQM in MAT 5.4 (QDM 5.3)
+      @cms_id = "CMS#{value}v#{@hqmf_version_number.to_i}" if (name.include? 'eMeasure Identifier') || (name.include? 'eCQM Identifier')
 
       HQMF::Attribute.new(id, code, value, nil, name, id_obj, code_obj, value_obj)
     end
 
     # Extracts the code used by a particular attribute
@@ -281,11 +281,11 @@
         criteria.temporal_references.each do |tr|
           @reference_ids << tr.reference.id if tr.reference.id != HQMF::Document::MEASURE_PERIOD_ID
         end
       end
     end
-    
+
     # For specific occurrence data criteria, make sure the source data criteria reference points
     # to the correct source data criteria.
     def handle_specific_source_data_criteria_reference(criteria)
       original_sdc = find(@source_data_criteria, :id, criteria.source_data_criteria)
       updated_sdc = find(@source_data_criteria, :id, criteria.id)
@@ -297,8 +297,8 @@
         original_sdc.instance_variable_set(:@specific_occurrence, criteria.specific_occurrence)
         original_sdc.instance_variable_set(:@specific_occurrence_const, criteria.specific_occurrence_const)
         original_sdc.instance_variable_set(:@code_list_id, criteria.code_list_id)
       end
     end
-    
+
   end
 end