cqm-models 3.1.0 → 4.0.2

data/app/assets/javascripts/PatientCareExperience.js

@@ -21,11 +21,11 @@ const [Number, String] = [
 
 const PatientCareExperienceSchema = DataElementSchema({
   authorDatetime: DateTime,
-  recorder: AnyEntity,
+  recorder: [AnyEntity],
   qdmTitle: { type: String, default: 'Patient Care Experience' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.52' },
   qdmCategory: { type: String, default: 'care_experience' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCareExperience' },
 
 });

data/app/assets/javascripts/PatientCharacteristic.js

@@ -24,7 +24,7 @@ const PatientCharacteristicSchema = DataElementSchema({
   qdmTitle: { type: String, default: 'Patient Characteristic' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.53' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristic' },
 
 });

data/app/assets/javascripts/PatientCharacteristicBirthdate.js

@@ -25,7 +25,7 @@ const PatientCharacteristicBirthdateSchema = DataElementSchema({
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.54' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
   qdmStatus: { type: String, default: 'birthdate' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristicBirthdate' },
 
 });

data/app/assets/javascripts/PatientCharacteristicClinicalTrialParticipant.js

@@ -27,7 +27,7 @@ const PatientCharacteristicClinicalTrialParticipantSchema = DataElementSchema({
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.51' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
   qdmStatus: { type: String, default: 'clinical_trial_participant' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristicClinicalTrialParticipant' },
 
 });

data/app/assets/javascripts/PatientCharacteristicEthnicity.js

@@ -24,7 +24,7 @@ const PatientCharacteristicEthnicitySchema = DataElementSchema({
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.56' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
   qdmStatus: { type: String, default: 'ethnicity' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristicEthnicity' },
 
 });

data/app/assets/javascripts/PatientCharacteristicExpired.js

@@ -26,7 +26,7 @@ const PatientCharacteristicExpiredSchema = DataElementSchema({
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.57' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
   qdmStatus: { type: String, default: 'expired' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristicExpired' },
 
 });

data/app/assets/javascripts/PatientCharacteristicPayer.js

@@ -25,7 +25,7 @@ const PatientCharacteristicPayerSchema = DataElementSchema({
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.58' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
   qdmStatus: { type: String, default: 'payer' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristicPayer' },
 
 });

data/app/assets/javascripts/PatientCharacteristicRace.js

@@ -24,7 +24,7 @@ const PatientCharacteristicRaceSchema = DataElementSchema({
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.59' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
   qdmStatus: { type: String, default: 'race' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristicRace' },
 
 });

data/app/assets/javascripts/PatientCharacteristicSex.js

@@ -24,7 +24,7 @@ const PatientCharacteristicSexSchema = DataElementSchema({
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.55' },
   qdmCategory: { type: String, default: 'patient_characteristic' },
   qdmStatus: { type: String, default: 'gender' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PatientCharacteristicSex' },
 
 });

data/app/assets/javascripts/PhysicalExamOrder.js

@@ -24,12 +24,12 @@ const PhysicalExamOrderSchema = DataElementSchema({
   reason: Code,
   anatomicalLocationSite: Code,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Physical Exam, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.61' },
   qdmCategory: { type: String, default: 'physical_exam' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PhysicalExamOrder' },
 
 });

data/app/assets/javascripts/PhysicalExamPerformed.js

@@ -29,12 +29,13 @@ const PhysicalExamPerformedSchema = DataElementSchema({
   anatomicalLocationSite: Code,
   negationRationale: Code,
   components: [ComponentSchema],
-  performer: AnyEntity,
+  performer: [AnyEntity],
+  relatedTo: [String],
   qdmTitle: { type: String, default: 'Physical Exam, Performed' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.62' },
   qdmCategory: { type: String, default: 'physical_exam' },
   qdmStatus: { type: String, default: 'performed' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PhysicalExamPerformed' },
 
 });

data/app/assets/javascripts/PhysicalExamRecommended.js

@@ -24,12 +24,12 @@ const PhysicalExamRecommendedSchema = DataElementSchema({
   reason: Code,
   anatomicalLocationSite: Code,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Physical Exam, Recommended' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.63' },
   qdmCategory: { type: String, default: 'physical_exam' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::PhysicalExamRecommended' },
 
 });

data/app/assets/javascripts/ProcedureOrder.js

@@ -26,12 +26,12 @@ const ProcedureOrderSchema = DataElementSchema({
   rank: Number,
   priority: Code,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Procedure, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.66' },
   qdmCategory: { type: String, default: 'procedure' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::ProcedureOrder' },
 
 });

data/app/assets/javascripts/ProcedurePerformed.js

@@ -29,16 +29,16 @@ const ProcedurePerformedSchema = DataElementSchema({
   status: Code,
   anatomicalLocationSite: Code,
   rank: Number,
-  priority: Code,
   incisionDatetime: DateTime,
   negationRationale: Code,
   components: [ComponentSchema],
-  performer: AnyEntity,
+  performer: [AnyEntity],
+  relatedTo: [String],
   qdmTitle: { type: String, default: 'Procedure, Performed' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.67' },
   qdmCategory: { type: String, default: 'procedure' },
   qdmStatus: { type: String, default: 'performed' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::ProcedurePerformed' },
 
 });

data/app/assets/javascripts/ProcedureRecommended.js

@@ -24,13 +24,13 @@ const ProcedureRecommendedSchema = DataElementSchema({
   reason: Code,
   anatomicalLocationSite: Code,
   rank: Number,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   negationRationale: Code,
   qdmTitle: { type: String, default: 'Procedure, Recommended' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.68' },
   qdmCategory: { type: String, default: 'procedure' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::ProcedureRecommended' },
 
 });

data/app/assets/javascripts/ProviderCareExperience.js

@@ -21,11 +21,11 @@ const [Number, String] = [
 
 const ProviderCareExperienceSchema = DataElementSchema({
   authorDatetime: DateTime,
-  recorder: AnyEntity,
+  recorder: [AnyEntity],
   qdmTitle: { type: String, default: 'Provider Care Experience' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.70' },
   qdmCategory: { type: String, default: 'care_experience' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::ProviderCareExperience' },
 
 });

data/app/assets/javascripts/QDMPatient.js

@@ -14,7 +14,7 @@ const [Schema, Number, String, Mixed] = [
 
 const QDMPatientSchema = new Schema({
   birthDatetime: DateTime,
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
 
   // These are the "data criteria", or QDM datatype elements that exist on a
   // patient.
@@ -56,6 +56,31 @@ QDMPatientSchema.methods.getByQrdaOid = function getByQrdaOid(qrdaOid) {
   return this.dataElements.filter(element => element.qrdaOid === qrdaOid);
 };
 
+// cql-execution prefers getId() over id() because some data models may have an id property
+QDMPatientSchema.methods.getId = function getId() {
+  return this._id;
+};
+
+/* eslint no-underscore-dangle: 0 */
+QDMPatientSchema.methods._is = function _is(typeSpecifier) {
+  return this._typeHierarchy().some(
+    t => t.type === typeSpecifier.type && t.name === typeSpecifier.name
+  );
+};
+
+/* eslint no-underscore-dangle: 0 */
+QDMPatientSchema.methods._typeHierarchy = function _typeHierarchy() {
+  const ver = this.qdmVersion.replace('.', '_');
+  return [
+    {
+      name: `{urn:healthit-gov:qdm:v${ver}}Patient`,
+      type: 'NamedTypeSpecifier',
+    },
+    { name: '{urn:hl7-org:elm-types:r1}Tuple', type: 'NamedTypeSpecifier' },
+    { name: '{urn:hl7-org:elm-types:r1}Any', type: 'NamedTypeSpecifier' },
+  ];
+};
+
 // Returns an array of elements that exist on this patient. Optionally
 // takes a qdmCategory, which returns all elements of that QDM qdmCategory.
 // Example: patient.getDataElements({qdmCategory: 'encounters'}) will return

data/app/assets/javascripts/RelatedPerson.js

@@ -25,7 +25,7 @@ const RelatedPersonSchema = DataElementSchema({
   qdmTitle: { type: String, default: 'Related Person' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.141' },
   qdmCategory: { type: String, default: 'related_person' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::RelatedPerson' },
 
 });

data/app/assets/javascripts/SubstanceAdministered.js

@@ -27,12 +27,12 @@ const SubstanceAdministeredSchema = DataElementSchema({
   frequency: Code,
   route: Code,
   negationRationale: Code,
-  performer: AnyEntity,
+  performer: [AnyEntity],
   qdmTitle: { type: String, default: 'Substance, Administered' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.73' },
   qdmCategory: { type: String, default: 'substance' },
   qdmStatus: { type: String, default: 'administered' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::SubstanceAdministered' },
 
 });

data/app/assets/javascripts/SubstanceOrder.js

@@ -29,12 +29,12 @@ const SubstanceOrderSchema = DataElementSchema({
   refills: Number,
   route: Code,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Substance, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.77' },
   qdmCategory: { type: String, default: 'substance' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::SubstanceOrder' },
 
 });

data/app/assets/javascripts/SubstanceRecommended.js

@@ -27,12 +27,12 @@ const SubstanceRecommendedSchema = DataElementSchema({
   refills: Number,
   route: Code,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Substance, Recommended' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.78' },
   qdmCategory: { type: String, default: 'substance' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::SubstanceRecommended' },
 
 });

data/app/assets/javascripts/Symptom.js

@@ -22,12 +22,12 @@ const [Number, String] = [
 const SymptomSchema = DataElementSchema({
   prevalencePeriod: Interval,
   severity: Code,
-  recorder: AnyEntity,
+  recorder: [AnyEntity],
   qdmTitle: { type: String, default: 'Symptom' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.116' },
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.136' },
   qdmCategory: { type: String, default: 'symptom' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::Symptom' },
 
 });

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/assets/javascripts/basetypes/DataElement.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose/browser');
-const Code = require('./Code.js');
 const cql = require('cql-execution');
+const Code = require('./Code.js');
 const Identifier = require('../attributes/Identifier');
 
 const [Schema] = [mongoose.Schema];
@@ -49,6 +49,31 @@ function DataElementSchema(add, options) {
     return null;
   };
 
+  /* eslint no-underscore-dangle: 0 */
+  extended.methods._is = function _is(typeSpecifier) {
+    return this._typeHierarchy().some(
+      t => t.type === typeSpecifier.type && t.name === typeSpecifier.name
+    );
+  };
+
+  /* eslint no-underscore-dangle: 0 */
+  extended.methods._typeHierarchy = function _typeHierarchy() {
+    const typeName = this._type.replace(/QDM::/, '');
+    const prefix = this.negationRationale ? 'Negative' : 'Positive';
+    const ver = this.qdmVersion.replace('.', '_');
+    return [
+      {
+        name: `{urn:healthit-gov:qdm:v${ver}}${prefix}${typeName}`,
+        type: 'NamedTypeSpecifier',
+      },
+      {
+        name: `{urn:healthit-gov:qdm:v${ver}}${typeName}`,
+        type: 'NamedTypeSpecifier',
+      },
+      { name: '{urn:hl7-org:elm-types:r1}Tuple', type: 'NamedTypeSpecifier' },
+      { name: '{urn:hl7-org:elm-types:r1}Any', type: 'NamedTypeSpecifier' },
+    ];
+  };
   return extended;
 }
 

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