cqm-models 3.1.1 → 4.0.0

data/app/assets/javascripts/attributes/Component.js

@@ -17,7 +17,7 @@ const [Number, String] = [
 const ComponentSchema = new mongoose.Schema({
   code: Code,
   result: Any,
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::Component' },
 
 });
@@ -34,7 +34,7 @@ function ComponentSchemaFunction(add, options) {
   const extended = new Schema({
     code: Code,
     result: Any,
-    qdmVersion: { type: String, default: '5.5' },
+    qdmVersion: { type: String, default: '5.6' },
     _type: { type: String, default: 'QDM::Component' },
 
 

data/app/assets/javascripts/attributes/DiagnosisComponent.js

@@ -17,7 +17,7 @@ const DiagnosisComponentSchema = new mongoose.Schema({
   code: Code,
   presentOnAdmissionIndicator: Code,
   rank: Number,
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::DiagnosisComponent' },
 
 });

data/app/assets/javascripts/attributes/Entity.js

@@ -18,7 +18,7 @@ const [Number, String] = [
 const EntitySchema = new mongoose.Schema({
   id: String,
   identifier: IdentifierSchema,
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::Entity' },
 
 });
@@ -34,7 +34,7 @@ class Entity extends mongoose.Document {
 function EntitySchemaFunction(add, options) {
   const extended = new Schema({
     identifier: IdentifierSchema,
-    qdmVersion: { type: String, default: '5.5' },
+    qdmVersion: { type: String, default: '5.6' },
     _type: { type: String, default: 'QDM::Entity' },
 
 

data/app/assets/javascripts/attributes/FacilityLocation.js

@@ -16,7 +16,7 @@ const [Number, String] = [
 const FacilityLocationSchema = new mongoose.Schema({
   code: Code,
   locationPeriod: Interval,
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::FacilityLocation' },
 
 });

data/app/assets/javascripts/attributes/Identifier.js

@@ -8,7 +8,7 @@ const [Number, String] = [
 const IdentifierSchema = mongoose.Schema({
   namingSystem: String,
   value: String,
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::Identifier' },
 
 }, { _id: false, id: false });

data/app/assets/javascripts/attributes/Location.js

@@ -0,0 +1,32 @@
+const mongoose = require('mongoose/browser');
+
+const { EntitySchemaFunction } = require('./Entity');
+const Code = require('../basetypes/Code');
+const Interval = require('../basetypes/Interval');
+const Quantity = require('../basetypes/Quantity');
+const DateTime = require('../basetypes/DateTime');
+const QDMDate = require('../basetypes/QDMDate');
+const Any = require('../basetypes/Any');
+
+const [Number, String] = [
+  mongoose.Schema.Types.Number,
+  mongoose.Schema.Types.String,
+];
+
+const LocationSchema = EntitySchemaFunction({
+  locationType: Code,
+  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.142' },
+  _type: { type: String, default: 'QDM::Location' },
+
+});
+
+module.exports.LocationSchema = LocationSchema;
+class Location extends mongoose.Document {
+  constructor(object) {
+    super(object, LocationSchema);
+    this._type = 'QDM::Location';
+  }
+}
+
+module.exports.Location = Location;
+

data/app/assets/javascripts/attributes/Organization.js

@@ -14,7 +14,7 @@ const [Number, String] = [
 ];
 
 const OrganizationSchema = EntitySchemaFunction({
-  type: Code,
+  organizationType: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.135' },
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.163' },
   _type: { type: String, default: 'QDM::Organization' },

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

@@ -3,6 +3,7 @@ const { PatientEntity } = require('../attributes/PatientEntity');
 const { Practitioner } = require('../attributes/Practitioner');
 const { CarePartner } = require('../attributes/CarePartner');
 const { Organization } = require('../attributes/Organization');
+const { Location } = require('../attributes/Location');
 
 function AnyEntity(key, options) {
   mongoose.SchemaType.call(this, key, options, 'AnyEntity');
@@ -32,6 +33,8 @@ AnyEntity.prototype.cast = (entity) => {
         return new CarePartner(entity);
       case 'QDM::Organization':
         return new Organization(entity);
+      case 'QDM::Location':
+        return new Location(entity);
       default:
         throw new Error(`Could not find entity type "${entity._type}".`);
     }

data/app/models/cqm/individual_result.rb

@@ -35,8 +35,8 @@ module CQM
     field :state, type: String, default: 'queued'
 
     # Relations to other model classes
-    belongs_to :measure, class_name: 'CQM::Measure', inverse_of: :calculation_result
-    belongs_to :patient, class_name: 'CQM::Patient', inverse_of: :calculation_result
+    belongs_to :measure
+    belongs_to :patient
 
     # Convert the stored array into a hash between clause and result
     def clause_results_by_clause

data/app/models/cqm/measure.rb

@@ -73,7 +73,7 @@ module CQM
     # hence the 'inverse_of: nil')
     has_and_belongs_to_many :value_sets, inverse_of: nil
 
-    has_many :calculation_results, class_name: 'CQM::IndividualResult', inverse_of: :measure
+    has_many :calculation_results, class_name: 'CQM::IndividualResult'
 
     def all_stratifications
       population_sets.flat_map(&:stratifications)

data/app/models/cqm/patient.rb

@@ -11,7 +11,7 @@ module CQM
 
     has_and_belongs_to_many :providers, class_name: 'CQM::Provider'
     embeds_one :qdmPatient, class_name: 'QDM::Patient', autobuild: true
-    has_many :calculation_results, class_name: 'CQM::IndividualResult', inverse_of: :patient
+    has_many :calculation_results, class_name: 'CQM::IndividualResult'
 
     # Include '_type' in any JSON output. This is necessary for deserialization.
     def to_json(options = nil)

data/app/models/hqmfOid_to_datatype_map.json

@@ -4,6 +4,7 @@
   "2.16.840.1.113883.10.20.28.4.141": "RelatedPerson",
   "2.16.840.1.113883.10.20.28.4.137": "Practitioner",
   "2.16.840.1.113883.10.20.28.4.135": "Organization",
+  "2.16.840.1.113883.10.20.28.4.142": "Location",
   "2.16.840.1.113883.10.20.28.4.61": "PhysicalExamOrder",
   "2.16.840.1.113883.10.20.28.4.130": "Participation",
   "2.16.840.1.113883.10.20.28.4.55": "PatientCharacteristicSex",
@@ -42,7 +43,6 @@
   "2.16.840.1.113883.10.20.28.4.54": "PatientCharacteristicBirthdate",
   "2.16.840.1.113883.10.20.28.4.120": "AdverseEvent",
   "2.16.840.1.113883.10.20.28.4.16": "DeviceRecommended",
-  "2.16.840.1.113883.10.20.28.4.13": "DeviceApplied",
   "2.16.840.1.113883.10.20.28.4.48": "MedicationDischarge",
   "2.16.840.1.113883.10.20.28.4.36": "InterventionPerformed",
   "2.16.840.1.113883.10.20.28.4.43": "LaboratoryTestRecommended",

data/app/models/models.rb

@@ -1,4 +1,4 @@
-# Base QDM module (generated from lib/generate_models.rb) for QDM 5.5
+# Base QDM module (generated from lib/generate_models.rb) for QDM 5.6
 module QDM
 end
 require 'mongoid'
@@ -25,6 +25,7 @@ require_relative 'qdm/attributes/diagnosis_component'
 require_relative 'qdm/attributes/organization'
 require_relative 'qdm/attributes/patient_entity'
 require_relative 'qdm/attributes/practitioner'
+require_relative 'qdm/attributes/location'
 require_relative 'qdm/attributes/result_component'
 
 # Tacoma-specific models
@@ -85,7 +86,6 @@ require_relative 'qdm/physical_exam_recommended'
 require_relative 'qdm/patient_characteristic_birthdate'
 require_relative 'qdm/adverse_event'
 require_relative 'qdm/device_recommended'
-require_relative 'qdm/device_applied'
 require_relative 'qdm/medication_discharge'
 require_relative 'qdm/intervention_performed'
 require_relative 'qdm/laboratory_test_recommended'

data/app/models/qdm/adverse_event.rb

@@ -8,10 +8,10 @@ module QDM
     field :severity, type: QDM::Code
     field :facilityLocation, type: QDM::FacilityLocation
     field :type, type: QDM::Code
-    embeds_one :recorder, class_name: 'QDM::Entity'
+    embeds_many :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.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/allergy_intolerance.rb

@@ -7,11 +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'
+    embeds_many :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.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/assessment_order.rb

@@ -6,11 +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'
+    embeds_many :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.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/assessment_performed.rb

@@ -10,13 +10,14 @@ module QDM
     field :reason, type: QDM::Code
     field :method, type: QDM::Code
     field :result
+    field :interpretation, type: QDM::Code
     field :components, type: Array
     field :relatedTo, type: Array
-    embeds_one :performer, class_name: 'QDM::Entity'
+    embeds_many :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.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/assessment_recommended.rb

@@ -6,11 +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'
+    embeds_many :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.5'
+    field :qdmVersion, type: String, default: '5.6'
   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.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

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

@@ -5,6 +5,6 @@ module QDM
     field :code, type: QDM::Code
     field :presentOnAdmissionIndicator, type: QDM::Code
     field :rank, type: Integer
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

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

@@ -5,7 +5,7 @@ module QDM
     embedded_in :data_element
     field :id, type: String
     embeds_one :identifier, class_name: 'QDM::Identifier'
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
     def initialize(options = {})
       super(options)
       # default id to the mongo ObjectId for this DataElement if it isnt already defined

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.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

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

@@ -4,6 +4,6 @@ module QDM
     include Mongoid::Document
     field :namingSystem, type: String
     field :value, type: String
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

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

@@ -0,0 +1,9 @@
+module QDM
+  # app/models/qdm/location.rb
+  class Location < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :locationType, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.142'
+  end
+end

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

@@ -3,7 +3,7 @@ module QDM
   class Organization < Entity
     include Mongoid::Document
     embedded_in :data_element
-    field :type, type: QDM::Code
+    field :organizationType, 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

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

@@ -17,6 +17,11 @@ module QDM
     field :id, type: String
 
     def initialize(options = {})
+      # class is reserved word. changed to clazz
+      if options['class']
+        options['clazz'] = options['class']
+        options.delete('class')
+      end
       super(options)
       # default id to the mongo ObjectId for this DataElement if it isnt already defined
       self.id = _id.to_s unless id?

data/app/models/qdm/care_goal.rb

@@ -7,10 +7,10 @@ module QDM
     field :relevantPeriod, type: QDM::Interval
     field :relatedTo, type: Array
     field :targetOutcome
-    embeds_one :performer, class_name: 'QDM::Entity'
+    embeds_many :performer, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Care Goal'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.7'
     field :qdmCategory, type: String, default: 'care_goal'
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/communication_performed.rb

@@ -6,8 +6,8 @@ module QDM
     field :authorDatetime, type: DateTime
     field :category, type: QDM::Code
     field :medium, type: QDM::Code
-    embeds_one :sender, class_name: 'QDM::Entity'
-    embeds_one :recipient, class_name: 'QDM::Entity'
+    embeds_many :sender, class_name: 'QDM::Entity'
+    embeds_many :recipient, class_name: 'QDM::Entity'
     field :relatedTo, type: Array
     field :sentDatetime, type: DateTime
     field :receivedDatetime, type: DateTime
@@ -16,6 +16,6 @@ module QDM
     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.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/device_order.rb

@@ -6,11 +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'
+    embeds_many :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Device, Order'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.15'
     field :qdmCategory, type: String, default: 'device'
     field :qdmStatus, type: String, default: 'order'
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/device_recommended.rb

@@ -6,11 +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'
+    embeds_many :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Device, Recommended'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.16'
     field :qdmCategory, type: String, default: 'device'
     field :qdmStatus, type: String, default: 'recommended'
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/diagnosis.rb

@@ -7,11 +7,11 @@ module QDM
     field :prevalencePeriod, type: QDM::Interval
     field :anatomicalLocationSite, type: QDM::Code
     field :severity, type: QDM::Code
-    embeds_one :recorder, class_name: 'QDM::Entity'
+    embeds_many :recorder, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Diagnosis'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.110'
     field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.135'
     field :qdmCategory, type: String, default: 'condition'
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end

data/app/models/qdm/diagnostic_study_order.rb

@@ -6,11 +6,11 @@ module QDM
     field :authorDatetime, type: DateTime
     field :reason, type: QDM::Code
     field :negationRationale, type: QDM::Code
-    embeds_one :requester, class_name: 'QDM::Entity'
+    embeds_many :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Diagnostic Study, Order'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.22'
     field :qdmCategory, type: String, default: 'diagnostic_study'
     field :qdmStatus, type: String, default: 'order'
-    field :qdmVersion, type: String, default: '5.5'
+    field :qdmVersion, type: String, default: '5.6'
   end
 end