cqm-models 0.8.4 → 1.0.0

data/app/assets/javascripts/SubstanceOrder.js

@@ -20,14 +20,13 @@ const SubstanceOrderSchema = DataElementSchema({
   dosage: Quantity,
   supply: Quantity,
   frequency: Code,
-  method: Code,
   refills: Number,
   route: Code,
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.77' },
-  category: { type: String, default: 'substance' },
+  qdmCategory: { type: String, default: 'substance' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.3' },
+  qdmVersion: { type: String, default: '5.4' },
   _type: { type: String, default: 'SubstanceOrder' },
 
 });

data/app/assets/javascripts/SubstanceRecommended.js

@@ -18,16 +18,14 @@ const SubstanceRecommendedSchema = DataElementSchema({
   authorDatetime: DateTime,
   reason: Code,
   dosage: Quantity,
-  supply: Quantity,
   frequency: Code,
-  method: Code,
   refills: Number,
   route: Code,
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.78' },
-  category: { type: String, default: 'substance' },
+  qdmCategory: { type: String, default: 'substance' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.3' },
+  qdmVersion: { type: String, default: '5.4' },
   _type: { type: String, default: 'SubstanceRecommended' },
 
 });

data/app/assets/javascripts/Symptom.js

@@ -19,8 +19,8 @@ const SymptomSchema = DataElementSchema({
   severity: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.116' },
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.136' },
-  category: { type: String, default: 'symptom' },
-  qdmVersion: { type: String, default: '5.3' },
+  qdmCategory: { type: String, default: 'symptom' },
+  qdmVersion: { type: String, default: '5.4' },
   _type: { type: String, default: 'Symptom' },
 
 });

data/app/assets/javascripts/basetypes/Any.js

@@ -39,10 +39,10 @@ function RecursiveCast(any) {
 
     // Cast to DateTime if it is a string representing a DateTime
     if (casted.low && Date.parse(casted.low)) {
-      casted.low = cql.DateTime.fromDate(new Date(casted.low), 0);
+      casted.low = cql.DateTime.fromJSDate(new Date(casted.low), 0);
     }
     if (casted.high && Date.parse(casted.high)) {
-      casted.high = cql.DateTime.fromDate(new Date(casted.high), 0);
+      casted.high = cql.DateTime.fromJSDate(new Date(casted.high), 0);
     }
     return casted;
   }
@@ -57,7 +57,7 @@ function RecursiveCast(any) {
     return any;
   }
   if (Date.parse(any)) {
-    return cql.DateTime.fromDate(new Date(any), 0);
+    return cql.DateTime.fromJSDate(new Date(any), 0);
   }
   return any;
 }

data/app/assets/javascripts/basetypes/DateTime.js

@@ -11,7 +11,7 @@ DateTime.prototype.cast = (dateTime) => {
     throw new Error(`DateTime: ${dateTime} is not a valid DateTime`);
   }
 
-  return cql.DateTime.fromDate(new Date(dateTime), 0);
+  return cql.DateTime.fromJSDate(new Date(dateTime), 0);
 };
 
 mongoose.Schema.Types.DateTime = DateTime;

data/app/assets/javascripts/basetypes/Interval.js

@@ -23,10 +23,10 @@ Interval.prototype.cast = (interval) => {
 
   // Cast to DateTime if it is a string representing a DateTime
   if (casted.low && Date.parse(casted.low)) {
-    casted.low = cql.DateTime.fromDate(new Date(casted.low), 0);
+    casted.low = cql.DateTime.fromJSDate(new Date(casted.low), 0);
   }
   if (casted.high && Date.parse(casted.high)) {
-    casted.high = cql.DateTime.fromDate(new Date(casted.high), 0);
+    casted.high = cql.DateTime.fromJSDate(new Date(casted.high), 0);
   }
   return casted;
 };

data/app/assets/javascripts/basetypes/Ratio.js

@@ -0,0 +1,20 @@
+const mongoose = require('mongoose');
+const cql = require('cql-execution');
+
+function Ratio(key, options) {
+  mongoose.SchemaType.call(this, key, options, 'Ratio');
+}
+Ratio.prototype = Object.create(mongoose.SchemaType.prototype);
+
+Ratio.prototype.cast = (ratio) => {
+  if (typeof ratio.numerator === 'undefined') {
+    throw new Error(`Ratio: ${ratio} does not have a numerator`);
+  } else if (typeof ratio.denominator === 'undefined') {
+    throw new Error(`Ratio: ${ratio} does not have a denominator`);
+  }
+
+  return new cql.Ratio(ratio);
+};
+
+mongoose.Schema.Types.Ratio = Ratio;
+module.exports = Ratio;

data/app/models/models.rb

@@ -8,9 +8,10 @@ require_relative 'qdm/id'
 
 # base types
 require_relative 'qdm/basetypes/code'
+require_relative 'qdm/basetypes/data_element'
 require_relative 'qdm/basetypes/interval'
 require_relative 'qdm/basetypes/quantity'
-require_relative 'qdm/basetypes/data_element'
+require_relative 'qdm/basetypes/ratio'
 
 # Tacoma-specific models
 require_relative 'qdm/tacoma/measure'
@@ -21,7 +22,6 @@ require_relative 'qdm/tacoma/individual_result'
 
 # Generated models
 require_relative 'qdm/patient'
-require_relative 'qdm/ratio'
 require_relative 'qdm/physical_exam_order'
 require_relative 'qdm/participation'
 require_relative 'qdm/patient_characteristic_sex'
@@ -35,7 +35,7 @@ require_relative 'qdm/medication_administered'
 require_relative 'qdm/procedure_recommended'
 require_relative 'qdm/encounter_performed'
 require_relative 'qdm/diagnosis'
-require_relative 'qdm/communication_from_provider_to_patient'
+require_relative 'qdm/communication_performed'
 require_relative 'qdm/assessment_performed'
 require_relative 'qdm/patient_characteristic_clinical_trial_participant'
 require_relative 'qdm/device_order'
@@ -45,13 +45,13 @@ require_relative 'qdm/family_history'
 require_relative 'qdm/component'
 require_relative 'qdm/result_component'
 require_relative 'qdm/facility_location'
-require_relative 'qdm/communication_from_provider_to_provider'
 require_relative 'qdm/medication_active'
 require_relative 'qdm/laboratory_test_order'
 require_relative 'qdm/diagnostic_study_order'
 require_relative 'qdm/substance_order'
 require_relative 'qdm/patient_characteristic_payer'
 require_relative 'qdm/patient_characteristic_expired'
+require_relative 'qdm/assessment_order'
 require_relative 'qdm/assessment_recommended'
 require_relative 'qdm/immunization_administered'
 require_relative 'qdm/substance_administered'
@@ -63,7 +63,6 @@ require_relative 'qdm/provider_characteristic'
 require_relative 'qdm/physical_exam_recommended'
 require_relative 'qdm/patient_characteristic_birthdate'
 require_relative 'qdm/adverse_event'
-require_relative 'qdm/communication_from_patient_to_provider'
 require_relative 'qdm/device_recommended'
 require_relative 'qdm/device_applied'
 require_relative 'qdm/medication_discharge'

data/app/models/qdm/adverse_event.rb

@@ -9,7 +9,7 @@ module QDM
     field :facilityLocation, type: QDM::Code
     field :type, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.120'
-    field :category, type: String, default: 'adverse_event'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmCategory, type: String, default: 'adverse_event'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/allergy_intolerance.rb

@@ -8,8 +8,8 @@ module QDM
     field :type, type: QDM::Code
     field :severity, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.119'
-    field :category, type: String, default: 'allergy'
+    field :qdmCategory, type: String, default: 'allergy'
     field :qdmStatus, type: String, default: 'intolerance'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/assessment_order.rb

@@ -0,0 +1,14 @@
+module QDM
+  # app/models/qdm/assessment_order.rb
+  class AssessmentOrder < DataElement
+    include Mongoid::Document
+    embedded_in :patient
+    field :authorDatetime, type: DateTime
+    field :negationRationale, type: QDM::Code
+    field :reason, type: QDM::Code
+    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'
+  end
+end

data/app/models/qdm/assessment_performed.rb

@@ -11,8 +11,8 @@ module QDM
     field :components, type: Array
     embeds_many :relatedTo, class_name: 'QDM::Id'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.117'
-    field :category, type: String, default: 'assessment'
+    field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'performed'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/assessment_recommended.rb

@@ -6,10 +6,9 @@ module QDM
     field :authorDatetime, type: DateTime
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
-    field :method, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.118'
-    field :category, type: String, default: 'assessment'
+    field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'recommended'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

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

@@ -0,0 +1,52 @@
+module QDM
+  # Represents a Ratio
+  class Ratio
+    attr_accessor :numerator, :denominator
+
+    # Numerator and denominator are required
+    def initialize(numerator, denominator)
+      @numerator = numerator
+      @denominator = denominator
+    end
+
+    # Converts an object of this instance into a database friendly value.
+    def mongoize
+      { numerator: @numerator, denominator: @denominator, _type: 'QDM::Ratio' }
+    end
+
+    class << self
+      # Get the object as it was stored in the database, and instantiate
+      # this custom class from it.
+      #
+      # The array elements in demongoize are the same 2 elements used in mongoize, i.e.
+      # [ 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
+
+      # Takes any possible object and converts it to how it would be
+      # stored in the database.
+      def mongoize(object)
+        case object
+        when nil then nil
+        when QDM::Ratio then object.mongoize
+        when Hash
+          object = object.symbolize_keys
+          QDM::Ratio.new(object[:numerator], object[:denominator]).mongoize
+        else object
+        end
+      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::Ratio then object.mongoize
+        else object
+        end
+      end
+    end
+  end
+end

data/app/models/qdm/care_goal.rb

@@ -7,7 +7,7 @@ module QDM
     embeds_many :relatedTo, class_name: 'QDM::Id'
     field :targetOutcome
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.7'
-    field :category, type: String, default: 'care_goal'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmCategory, type: String, default: 'care_goal'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/communication_performed.rb

@@ -0,0 +1,19 @@
+module QDM
+  # app/models/qdm/communication_performed.rb
+  class CommunicationPerformed < DataElement
+    include Mongoid::Document
+    embedded_in :patient
+    field :authorDatetime, type: DateTime
+    field :category, type: QDM::Code
+    field :medium, type: QDM::Code
+    field :sender, type: QDM::Code
+    field :recipient, type: QDM::Code
+    embeds_many :relatedTo, class_name: 'QDM::Id'
+    field :relevantPeriod, type: QDM::Interval
+    field :negationRationale, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.132'
+    field :qdmCategory, type: String, default: 'communication'
+    field :qdmStatus, type: String, default: 'performed'
+    field :qdmVersion, type: String, default: '5.4'
+  end
+end

data/app/models/qdm/component.rb

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

data/app/models/qdm/device_applied.rb

@@ -8,10 +8,9 @@ module QDM
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
     field :anatomicalLocationSite, type: QDM::Code
-    field :anatomicalApproachSite, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.13'
-    field :category, type: String, default: 'device'
+    field :qdmCategory, type: String, default: 'device'
     field :qdmStatus, type: String, default: 'applied'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/device_order.rb

@@ -7,8 +7,8 @@ module QDM
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.15'
-    field :category, type: String, default: 'device'
+    field :qdmCategory, type: String, default: 'device'
     field :qdmStatus, type: String, default: 'order'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/device_recommended.rb

@@ -7,8 +7,8 @@ module QDM
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.16'
-    field :category, type: String, default: 'device'
+    field :qdmCategory, type: String, default: 'device'
     field :qdmStatus, type: String, default: 'recommended'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/diagnosis.rb

@@ -9,7 +9,7 @@ module QDM
     field :severity, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.110'
     field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.135'
-    field :category, type: String, default: 'condition'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmCategory, type: String, default: 'condition'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/diagnostic_study_order.rb

@@ -5,11 +5,10 @@ module QDM
     embedded_in :patient
     field :authorDatetime, type: DateTime
     field :reason, type: QDM::Code
-    field :method, type: QDM::Code
     field :negationRationale, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.22'
-    field :category, type: String, default: 'diagnostic_study'
+    field :qdmCategory, type: String, default: 'diagnostic_study'
     field :qdmStatus, type: String, default: 'order'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/diagnostic_study_performed.rb

@@ -14,8 +14,8 @@ module QDM
     field :negationRationale, type: QDM::Code
     field :components, type: Array
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.23'
-    field :category, type: String, default: 'diagnostic_study'
+    field :qdmCategory, type: String, default: 'diagnostic_study'
     field :qdmStatus, type: String, default: 'performed'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/diagnostic_study_recommended.rb

@@ -4,12 +4,11 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
-    field :method, type: QDM::Code
     field :negationRationale, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.24'
     field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.19'
-    field :category, type: String, default: 'diagnostic_study'
+    field :qdmCategory, type: String, default: 'diagnostic_study'
     field :qdmStatus, type: String, default: 'recommended'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/encounter_order.rb

@@ -8,8 +8,8 @@ module QDM
     field :facilityLocation, type: QDM::Code
     field :negationRationale, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.27'
-    field :category, type: String, default: 'encounter'
+    field :qdmCategory, type: String, default: 'encounter'
     field :qdmStatus, type: String, default: 'order'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end

data/app/models/qdm/encounter_performed.rb

@@ -13,8 +13,8 @@ module QDM
     field :negationRationale, type: QDM::Code
     field :lengthOfStay, type: QDM::Quantity
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.5'
-    field :category, type: String, default: 'encounter'
+    field :qdmCategory, type: String, default: 'encounter'
     field :qdmStatus, type: String, default: 'performed'
-    field :qdmVersion, type: String, default: '5.3'
+    field :qdmVersion, type: String, default: '5.4'
   end
 end