cqm-models 2.0.1 → 3.0.4

data/app/models/qdm/adverse_event.rb

@@ -4,13 +4,14 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
-    field :relevantPeriod, type: QDM::Interval
+    field :relevantDatetime, type: DateTime
     field :severity, type: QDM::Code
     field :facilityLocation, type: QDM::FacilityLocation
     field :type, type: QDM::Code
+    embeds_one :recorder, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Adverse Event'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.120'
     field :qdmCategory, type: String, default: 'adverse_event'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/allergy_intolerance.rb

@@ -7,10 +7,11 @@ module QDM
     field :prevalencePeriod, type: QDM::Interval
     field :type, type: QDM::Code
     field :severity, type: QDM::Code
+    embeds_one :recorder, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Allergy/Intolerance'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.119'
     field :qdmCategory, type: String, default: 'allergy'
     field :qdmStatus, type: String, default: 'intolerance'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/assessment_order.rb

@@ -6,10 +6,11 @@ module QDM
     field :authorDatetime, type: DateTime
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
+    embeds_one :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Assessment, Order'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.131'
     field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'order'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/assessment_performed.rb

@@ -4,16 +4,19 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
+    field :relevantDatetime, type: DateTime
+    field :relevantPeriod, type: QDM::Interval
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
     field :method, type: QDM::Code
     field :result
     field :components, type: Array
-    embeds_many :relatedTo, class_name: 'QDM::Id'
+    field :relatedTo, type: Array
+    embeds_one :performer, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Assessment, Performed'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.117'
     field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'performed'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/assessment_recommended.rb

@@ -6,10 +6,11 @@ module QDM
     field :authorDatetime, type: DateTime
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
+    embeds_one :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Assessment, Recommended'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.118'
     field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'recommended'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/attributes/attribute.rb

@@ -30,6 +30,7 @@ module QDM
       # this custom class from it.
       def demongoize(object)
         return nil unless object
+
         object = object.symbolize_keys
         if object.is_a?(Hash)
           # This will turn the object into the concrete type eg: facilityLocation

data/app/models/qdm/attributes/care_partner.rb

@@ -0,0 +1,10 @@
+module QDM
+  # app/models/qdm/care_partner.rb
+  class CarePartner < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :relationship, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.134'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.160'
+  end
+end

data/app/models/qdm/attributes/component.rb

@@ -4,6 +4,6 @@ module QDM
     include Mongoid::Document
     field :code, type: QDM::Code
     field :result
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/attributes/diagnosis_component.rb

@@ -0,0 +1,10 @@
+module QDM
+  # app/models/qdm/diagnosis_component.rb
+  class DiagnosisComponent < Attribute
+    include Mongoid::Document
+    field :code, type: QDM::Code
+    field :presentOnAdmissionIndicator, type: QDM::Code
+    field :rank, type: Integer
+    field :qdmVersion, type: String, default: '5.5'
+  end
+end

data/app/models/qdm/attributes/entity.rb

@@ -0,0 +1,15 @@
+module QDM
+  # app/models/qdm/entity.rb
+  class Entity < Attribute
+    include Mongoid::Document
+    embedded_in :data_element
+    field :id, type: String
+    embeds_one :identifier, class_name: 'QDM::Identifier'
+    field :qdmVersion, type: String, default: '5.5'
+    def initialize(options = {})
+      super(options)
+      # default id to the mongo ObjectId for this DataElement if it isnt already defined
+      self.id = _id.to_s unless id?
+    end
+  end
+end

data/app/models/qdm/attributes/facility_location.rb

@@ -4,6 +4,6 @@ module QDM
     include Mongoid::Document
     field :code, type: QDM::Code
     field :locationPeriod, type: QDM::Interval
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/{id.rb → attributes/identifier.rb}

@@ -1,10 +1,9 @@
 module QDM
-  # app/models/qdm/id.rb
-  class Id
+  # app/models/qdm/identifier.rb
+  class Identifier < Attribute
     include Mongoid::Document
-    embedded_in :data_element
     field :namingSystem, type: String
     field :value, type: String
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/attributes/organization.rb

@@ -0,0 +1,10 @@
+module QDM
+  # app/models/qdm/organization.rb
+  class Organization < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :type, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.135'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.163'
+  end
+end

data/app/models/qdm/attributes/patient_entity.rb

@@ -0,0 +1,9 @@
+module QDM
+  # app/models/qdm/patient_entity.rb
+  class PatientEntity < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.136'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.161'
+  end
+end

data/app/models/qdm/attributes/practitioner.rb

@@ -0,0 +1,12 @@
+module QDM
+  # app/models/qdm/practitioner.rb
+  class Practitioner < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :role, type: QDM::Code
+    field :specialty, type: QDM::Code
+    field :qualification, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.137'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.162'
+  end
+end

data/app/models/qdm/{result_component.rb → attributes/result_component.rb}

@@ -1,9 +1,7 @@
 module QDM
   # app/models/qdm/result_component.rb
-  class ResultComponent < DataElement
+  class ResultComponent < Component
     include Mongoid::Document
-    embedded_in :patient
     field :referenceRange, type: QDM::Interval
-    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/basetypes/code.rb

@@ -1,20 +1,19 @@
 module QDM
   # Represents a Code
   class Code
-    attr_accessor :code, :codeSystem, :descriptor, :codeSystemOid, :version
+    attr_accessor :code, :display, :system, :version
 
     # Code and code system are required (at minimum).
-    def initialize(code, codeSystemOid, descriptor = nil, codeSystem = nil, version = nil)
+    def initialize(code, sys, display = nil, version = nil)
       @code = code
-      @codeSystem = codeSystem
-      @descriptor = descriptor
-      @codeSystemOid = codeSystemOid
+      @system = sys
+      @display = display
       @version = version
     end
 
     # Converts an object of this instance into a database friendly value.
     def mongoize
-      { code: @code, codeSystemOid: @codeSystemOid, descriptor: @descriptor, codeSystem: @codeSystem, version: @version, _type: 'QDM::Code' }
+      { code: @code, system: @system, display: @display, version: @version, _type: 'QDM::Code' }
     end
 
     class << self
@@ -22,11 +21,12 @@ module QDM
       # this custom class from it.
       #
       # The array elements in demongoize are the same 5 elements used in mongoize, i.e.
-      # [ code, codeSystem, descriptor, codeSystemOid, version ].
+      # [ code, system, display, version ].
       def demongoize(object)
         return nil unless object
+
         object = object.symbolize_keys
-        QDM::Code.new(object[:code], object[:codeSystemOid], object[:descriptor], object[:codeSystem], object[:version])
+        QDM::Code.new(object[:code], object[:system], object[:display], object[:version])
       end
 
       # Takes any possible object and converts it to how it would be
@@ -37,8 +37,7 @@ module QDM
         when QDM::Code then object.mongoize
         when Hash
           object = object.symbolize_keys
-          codeSystemOid = object[:system] ? object[:system] : object[:codeSystemOid]
-          QDM::Code.new(object[:code], codeSystemOid, object[:descriptor], object[:codeSystem], object[:version]).mongoize
+          QDM::Code.new(object[:code], object[:system], object[:display], object[:version]).mongoize
         else object
         end
       end

data/app/models/qdm/basetypes/data_element.rb

@@ -14,12 +14,12 @@ module QDM
     # Valueset oid of the specific type.
     field :codeListId, type: String
 
-    embeds_one :id, class_name: 'QDM::Id'
+    field :id, type: String
 
     def initialize(options = {})
       super(options)
       # default id to the mongo ObjectId for this DataElement if it isnt already defined
-      self.id = QDM::Id.new(value: _id.to_s) unless id?
+      self.id = _id.to_s unless id?
     end
 
     # Returns the attribute requested on the datatype.
@@ -31,7 +31,7 @@ module QDM
     # to the CQL execution engine.
     def code_system_pairs
       codes.collect do |code|
-        { code: code.code, system: code.codeSystemOid }
+        { code: code.code, system: code.system }
       end
     end
 
@@ -59,12 +59,8 @@ module QDM
     # values shift backwards.
     def shift_dates(seconds)
       fields.keys.each do |field|
-        if send(field).is_a? DateTime
-          send(field + '=', (send(field).to_time + seconds.seconds).to_datetime)
-        end
-        if (send(field).is_a? Interval) || (send(field).is_a? DataElement)
-          send(field + '=', send(field).shift_dates(seconds))
-        end
+        send(field + '=', (send(field).to_time + seconds.seconds).to_datetime) if send(field).is_a? DateTime
+        send(field + '=', send(field).shift_dates(seconds)) if (send(field).is_a? Interval) || (send(field).is_a? DataElement)
 
         # Special case for facility locations
         if field == 'facilityLocations'
@@ -91,12 +87,24 @@ module QDM
     # back to the 28th in non leap years
     def shift_years(year_shift)
       fields.keys.each do |field|
-        if send(field).is_a? DateTime
-          if send(field).year + year_shift > 9999 || send(field).year + year_shift < 1
-            raise RangeError, 'Year was shifted after 9999 or before 0001'
-          end
-          if send(field).month == 2 && send(field).day == 29 && !Date.leap?(year_shift + send(field).year)
-            send(field + '=', send(field).change(year: year_shift + send(field).year, day: 28))
+        if send(field).is_a?(QDM::Date) || send(field).is_a?(DateTime)
+          # Do not shift Time values. They are stored as DateTimes with year 0.
+          next if send(field).year.zero?
+          raise RangeError, 'Year was shifted after 9999 or before 0001' if send(field).year + year_shift > 9999 || send(field).year + year_shift < 1
+
+          if send(field).month == 2 && send(field).day == 29 && !::Date.leap?(year_shift + send(field).year)
+            if send(field).is_a?(QDM::Date)
+              shifted_date = send(field)
+              shifted_date.year = shifted_date.year + year_shift
+              shifted_date.day = 28
+              send(field + '=', shifted_date)
+            else
+              send(field + '=', send(field).change(year: year_shift + send(field).year, day: 28))
+            end
+          elsif send(field).is_a?(QDM::Date)
+            shifted_date = send(field)
+            shifted_date.year = shifted_date.year + year_shift
+            send(field + '=', shifted_date)
           else
             send(field + '=', send(field).change(year: year_shift + send(field).year))
           end
@@ -124,9 +132,7 @@ module QDM
           end
         end
 
-        if (send(field).is_a? Interval) || (send(field).is_a? DataElement)
-          send(field + '=', send(field).shift_years(year_shift))
-        end
+        send(field + '=', send(field).shift_years(year_shift)) if (send(field).is_a? Interval) || (send(field).is_a? DataElement)
       end
     end
 
@@ -140,6 +146,7 @@ module QDM
       #
       def demongoize(object)
         return nil unless object
+
         object = object.symbolize_keys
         if object.is_a?(Hash)
           data_element = QDM.const_get(object[:_type])

data/app/models/qdm/basetypes/date.rb

@@ -0,0 +1,39 @@
+module QDM
+  # Represents a QDM/CQL Date
+  class Date
+    attr_accessor :year, :month, :day
+
+    def initialize(year = nil, month = nil, day = nil)
+      @year = year
+      @month = month
+      @day = day
+    end
+
+    # Converts an object of this instance into a database friendly value.
+    def mongoize
+      "#{format('%04d', year)}-#{format('%02d', month)}-#{format('%02d', day)}"
+    end
+
+    class << self
+      # Get the string as it was stored in the database, and instantiate
+      # this custom class from it.
+      def demongoize(date_str)
+        return nil unless date_str
+
+        year = date_str[0..3].to_i
+        month = date_str[5..6].to_i
+        day = date_str[8..10].to_i
+        QDM::Date.new(year, month, day)
+      end
+
+      # Converts the object that was supplied to a criteria and converts it
+      # into a database friendly form.
+      def evolve(object)
+        case object
+        when QDM::Date then object.mongoize
+        else object
+        end
+      end
+    end
+  end
+end

data/app/models/qdm/basetypes/interval.rb

@@ -22,9 +22,7 @@ module QDM
     #
     # NOTE: This will only shift if @high and @low are DateTimes.
     def shift_dates(seconds)
-      if (@low.is_a? DateTime) || (@low.is_a? Time)
-        @low = (@low.utc.to_time + seconds.seconds).to_datetime.new_offset(0)
-      end
+      @low = (@low.utc.to_time + seconds.seconds).to_datetime.new_offset(0) if (@low.is_a? DateTime) || (@low.is_a? Time)
       if (@high.is_a? DateTime) || (@high.is_a? Time)
         @high = (@high.utc.to_time + seconds.seconds).to_datetime.new_offset(0)
         @high = @high.year > 9999 ? @high.change(year: 9999) : @high
@@ -34,22 +32,20 @@ module QDM
 
     def shift_years(year_shift)
       if (@low.is_a? DateTime) || (@low.is_a? Time)
-        if @low.year + year_shift < 1 || @low.year + year_shift > 9999
-          raise RangeError, 'Year was shifted after 9999 or before 0001'
-        end
+        raise RangeError, 'Year was shifted after 9999 or before 0001' if @low.year + year_shift < 1 || @low.year + year_shift > 9999
+
         low_shift = @low.year + year_shift
-        @low = if @low.month == 2 && @low.day == 29 && !Date.leap?(low_shift)
+        @low = if @low.month == 2 && @low.day == 29 && !::Date.leap?(low_shift)
                  @low.change(year: low_shift, day: 28)
                else
                  @low.change(year: low_shift)
                end
       end
       if (@high.is_a? DateTime) || (@high.is_a? Time)
-        if @high.year + year_shift < 1 || @high.year + year_shift > 9999
-          raise RangeError, 'Year was shifted after 9999 or before 0001'
-        end
+        raise RangeError, 'Year was shifted after 9999 or before 0001' if @high.year + year_shift < 1 || @high.year + year_shift > 9999
+
         high_shift = @high.year + year_shift
-        @high = if @high.month == 2 && @high.day == 29 && !Date.leap?(high_shift)
+        @high = if @high.month == 2 && @high.day == 29 && !::Date.leap?(high_shift)
                   @high.change(year: high_shift, day: 28)
                 else
                   @high.change(year: high_shift)
@@ -66,6 +62,7 @@ module QDM
       # [ low, high ].
       def demongoize(object)
         return nil unless object
+
         object = object.symbolize_keys
         fix_datetime(object)
         QDM::Interval.new(object[:low], object[:high], object[:lowClosed], object[:highClosed]) if object.is_a?(Hash)

data/app/models/qdm/basetypes/quantity.rb

@@ -22,6 +22,7 @@ module QDM
       # [ value, unit ].
       def demongoize(object)
         return nil unless object
+
         object = object.symbolize_keys
         QDM::Quantity.new(object[:value], object[:unit]) if object.is_a?(Hash)
       end

data/app/models/qdm/basetypes/ratio.rb

@@ -22,6 +22,7 @@ module QDM
       # [ numerator, denominator ].
       def demongoize(object)
         return nil unless object
+
         object = object.symbolize_keys
         QDM::Ratio.new(object[:numerator], object[:denominator]) if object.is_a?(Hash)
       end