cqm-models 0.8.3 → 0.8.4

data/app/assets/javascripts/SubstanceAdministered.js

@@ -6,6 +6,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/SubstanceOrder.js

@@ -6,6 +6,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/SubstanceRecommended.js

@@ -6,6 +6,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

data/app/assets/javascripts/Symptom.js

@@ -6,6 +6,7 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
+const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [

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

@@ -53,7 +53,7 @@ function RecursiveCast(any) {
     });
     return casted;
   }
-  if (Number.isInteger(any)) {
+  if (Number.isFinite(any)) {
     return any;
   }
   if (Date.parse(any)) {

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

@@ -1,6 +1,7 @@
 const mongoose = require('mongoose');
 const Code = require('./Code.js');
 const cql = require('cql-execution');
+const Id = require('../Id');
 
 const [Schema] = [mongoose.Schema];
 
@@ -8,6 +9,12 @@ function DataElementSchema(add, options) {
   const extended = new Schema({
     dataElementCodes: { type: [] },
     description: { type: String },
+    id: {
+      type: Id.IdSchema,
+      default() {
+        return new Id.Id({ value: (this._id ? this._id.toString() : mongoose.Types.ObjectId().toString()), namingSystem: null });
+      },
+    },
   }, options);
 
   if (add) {

data/app/models/models.rb

@@ -3,6 +3,9 @@ module QDM
 end
 require 'mongoid'
 
+# Generated models that are dependencies for base types
+require_relative 'qdm/id'
+
 # base types
 require_relative 'qdm/basetypes/code'
 require_relative 'qdm/basetypes/interval'
@@ -18,7 +21,6 @@ require_relative 'qdm/tacoma/individual_result'
 
 # Generated models
 require_relative 'qdm/patient'
-require_relative 'qdm/id'
 require_relative 'qdm/ratio'
 require_relative 'qdm/physical_exam_order'
 require_relative 'qdm/participation'

data/app/models/qdm/assessment_performed.rb

@@ -9,7 +9,7 @@ module QDM
     field :method, type: QDM::Code
     field :result
     field :components, type: Array
-    field :relatedTo, 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 :qdmStatus, type: String, default: 'performed'

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

@@ -10,6 +10,14 @@ module QDM
     # Optional description.
     field :description, type: String
 
+    embeds_one :id, class_name: 'QDM::Id'
+
+    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?
+    end
+
     # Returns the attribute requested on the datatype.
     def get(attribute)
       send(attribute) if has_attribute?(attribute)
@@ -29,11 +37,6 @@ module QDM
       dataElementCodes.collect { |code| QDM::Code.demongoize(code) }
     end
 
-    # Return the Mongo id for this datatype.
-    def id
-      _id
-    end
-
     def mongoize
       json_representation = {}
       attribute_names.each do |field|

data/app/models/qdm/care_goal.rb

@@ -4,7 +4,7 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :relevantPeriod, type: QDM::Interval
-    field :relatedTo, type: Array
+    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'

data/app/models/qdm/communication_from_patient_to_provider.rb

@@ -4,7 +4,7 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
-    field :relatedTo, type: Array
+    embeds_many :relatedTo, class_name: 'QDM::Id'
     field :negationRationale, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.8'
     field :category, type: String, default: 'communication'

data/app/models/qdm/communication_from_provider_to_patient.rb

@@ -4,7 +4,7 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
-    field :relatedTo, type: Array
+    embeds_many :relatedTo, class_name: 'QDM::Id'
     field :negationRationale, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.9'
     field :category, type: String, default: 'communication'

data/app/models/qdm/communication_from_provider_to_provider.rb

@@ -4,7 +4,7 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
-    field :relatedTo, type: Array
+    embeds_many :relatedTo, class_name: 'QDM::Id'
     field :negationRationale, type: QDM::Code
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.10'
     field :category, type: String, default: 'communication'

data/app/models/qdm/component.rb

@@ -2,7 +2,6 @@ module QDM
   # app/models/qdm/component.rb
   class Component < DataElement
     include Mongoid::Document
-    embedded_in :patient
     field :code, type: QDM::Code
     field :result
     field :qdmVersion, type: String, default: '5.3'

data/app/models/qdm/facility_location.rb

@@ -2,7 +2,6 @@ module QDM
   # app/models/qdm/facility_location.rb
   class FacilityLocation < DataElement
     include Mongoid::Document
-    embedded_in :patient
     field :code, type: QDM::Code
     field :locationPeriod, type: QDM::Interval
     field :qdmVersion, type: String, default: '5.3'

data/app/models/qdm/id.rb

@@ -1,8 +1,8 @@
 module QDM
   # app/models/qdm/id.rb
-  class Id < DataElement
+  class Id
     include Mongoid::Document
-    embedded_in :patient
+    embedded_in :data_element
     field :namingSystem, type: String
     field :value, type: String
     field :qdmVersion, type: String, default: '5.3'

data/cqm-models.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-models'
-  spec.version       = '0.8.3'
+  spec.version       = '0.8.4'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'