lib/ext/data_element.rb in cqm-parsers-0.2.4 vs lib/ext/data_element.rb in cqm-parsers-2.0.0
- old
+ new
@@ -1,9 +1,9 @@
module QDM
class DataElement
def merge!(other)
# ensure they're the same category (e.g. 'encounter')
- return unless category == other.category
+ return unless qdmCategory == other.qdmCategory
# ensure they're the same status (e.g. 'performed'), and that they both have a status set (or that they both don't)
return if respond_to?(:qdmStatus) && !other.respond_to?(:qdmStatus)
return if !respond_to?(:qdmStatus) && other.respond_to?(:qdmStatus)
return if respond_to?(:qdmStatus) && other.respond_to?(:qdmStatus) && qdmStatus != other.qdmStatus