cqm-models 1.0.3 → 1.1.1.0

data/lib/generators/custom_mongo/model.rb.tt

@@ -0,0 +1,20 @@
+<% module_namespacing do -%>
+class <%= class_name %><%= " < #{options[:parent].classify}" if options[:parent] %>
+<% unless options[:parent] -%>
+  include Mongoid::Document
+<% end -%>
+<% if options[:timestamps] -%>
+  include Mongoid::Timestamps
+<% end -%>
+<% if options[:collection] -%>
+  store_in collection: "<%= options[:collection] %>"
+<% end -%>
+<% attributes.reject{|attr| attr.reference?}.each do |attribute| -%>
+  field :<%= attribute.name %>, type: <%= attribute.type_class %><% if attribute.default -%>, default: '<%= attribute.default %>'<% end -%>
+
+<% end -%>
+<% attributes.select{|attr| attr.reference? }.each do |attribute| -%>
+  embedded_in :<%= attribute.name%>
+<% end -%>
+end
+<% end -%>

data/lib/generators/custom_mongo/model_generator.rb

@@ -0,0 +1,34 @@
+require 'rails/generators/named_base'
+require 'rails/generators/active_model'
+require File.join(Gem::Specification.find_by_name('mongoid').gem_dir, 'lib/rails/generators/mongoid/model/model_generator.rb')
+
+module Rails
+  module Generators
+    # Extend this class to add the "default" field used in the generator.
+    class GeneratedAttribute
+      attr_accessor :default
+    end
+  end
+end
+
+module CustomMongo
+  module Generators
+    # Extend this class to add the "default" field.
+    class ModelGenerator < ::Mongoid::Generators::ModelGenerator
+      def initialize(args, *options)
+        custom_attributes = args[1]
+        args = [args[0]] # "super" expects the name as arg[0], then we custom parse the attributes
+        super
+        self.attributes = custom_attributes.map do |attribute|
+          att = Rails::Generators::GeneratedAttribute.new(attribute[:name], attribute[:type].to_sym)
+          att.default = attribute[:default]
+          att
+        end
+      end
+
+      def create_model_file
+        template File.join(File.dirname(__FILE__), 'model.rb.tt'), File.join('app/models', class_path, "#{file_name}.rb")
+      end
+    end
+  end
+end

data/notice.md

@@ -0,0 +1,9 @@
+NOTICE
+======
+This (software/technical data) was produced for the U. S. Government under Contract Number HHSM-500-2012-00008I, and is subject to Federal Acquisition Regulation Clause 52.227-14, Rights in Data-General.  
+
+No other use other than that granted to the U. S. Government, or to those acting on behalf of the U. S. Government under that Clause is authorized without the express written permission of The MITRE Corporation.
+
+To the extent necessary MITRE hereby grants express written permission to use, reproduce, distribute, modify, and otherwise leverage this software to the extent permitted by the Apache 2.0 license.
+
+For further information, please contact The MITRE Corporation, Contracts Management Office, 7515 Colshire Drive, McLean, VA  22102-7539, (703) 983-6000.

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "1.0.2",
+  "version": "1.1.1.0",
   "description": "This library contains auto generated Mongo (Mongoose.js) models that correspond to the QDM (Quality Data Model) specification.",
   "main": "app/assets/javascripts/index.js",
   "browser": {
@@ -11,24 +11,30 @@
   "contributors": [
     "Louis Ades <lades@mitre.org>",
     "Michael O'Keefe <mokeefe@mitre.org>",
-    "Adam Holmes <aholmes@mitre.org>"
+    "Adam Holmes <aholmes@mitre.org>",
+    "Chris Hossenlopp <hossenlopp@mitre.org>"
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "cql-execution": "1.3.3",
-    "mongoose": "^5.0.7"
+    "cql-execution": "https://github.com/cqframework/cql-execution.git",
+    "mongoose": "^5.4.14"
   },
   "devDependencies": {
     "browserify": "^16.1.0",
     "eslint": "^4.17.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-import": "^2.8.0",
+    "istanbul": "^0.4.5",
     "jasmine": "^2.9.0"
   },
   "scripts": {
-    "test": "jasmine",
+    "prepublish": "./bin/build_cql_execution.sh",
+    "test": "istanbul cover jasmine -x 'spec/**/*'",
     "lint": "eslint 'app/assets/javascripts/**/*.js'",
     "dist": "yarn && browserify app/assets/javascripts/index.js > dist/index.js",
-    "dist_test": "browserify app/assets/javascripts/index.js > tmp/dist/index.js"
+    "browser": "browserify app/assets/javascripts/browser.js > dist/browser.js",
+    "browser_test": "browserify app/assets/javascripts/browser.js > tmp/dist/browser.js",
+    "dist_test": "browserify app/assets/javascripts/index.js > tmp/dist/index.js",
+    "build-cql": "cd ./node_modules/cql-execution && yarn install && cd ../../"
   }
 }

data/templates/id_template.js.erb

@@ -1,4 +1,4 @@
-const mongoose = require('mongoose');
+const mongoose = require('mongoose/browser');
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,
@@ -7,9 +7,14 @@ const [Number, String] = [
 
 const IdSchema = mongoose.Schema({
   <%- for attribute in attrs_with_extras -%>
-  <%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,
+  <% if attribute[:default] %><%= attribute[:name] %>: { type: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>, default: '<%= attribute[:default] %>' },<% else %><%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,<%- end %>
   <%- end %>
 }, { _id: false, id: false });
 
 module.exports.IdSchema = IdSchema;
-module.exports.Id = mongoose.model('Id', IdSchema);
+class Id extends mongoose.Document {
+  constructor(object) {
+    super(object, IdSchema);
+  }
+}
+module.exports.Id = Id;

data/templates/index_template.js.erb

@@ -2,13 +2,23 @@ module.exports = require('./AllDataElements.js');
 module.exports.CQL = require('cql-execution');
 module.exports.Result = require('./Result.js').Result;
 module.exports.ResultSchema = require('./Result.js').ResultSchema;
-module.exports.Measure = require('./Measure.js').Measure;
-module.exports.MeasureSchema = require('./Measure.js').MeasureSchema;
-module.exports.MeasurePackage = require('./MeasurePackage.js').MeasurePackage;
-module.exports.MeasurePackageSchema = require('./MeasurePackage.js').MeasurePackageSchema;
-module.exports.ValueSet = require('./ValueSet.js').ValueSet;
-module.exports.ValueSetSchema = require('./ValueSet.js').ValueSetSchema;
-module.exports.Concept = require('./Concept.js').Concept;
-module.exports.ConceptSchema = require('./Concept.js').ConceptSchema;
+module.exports.Measure = require('./cqm/Measure.js').Measure;
+module.exports.MeasureSchema = require('./cqm/Measure.js').MeasureSchema;
+module.exports.MeasurePackage = require('./cqm/MeasurePackage.js').MeasurePackage;
+module.exports.MeasurePackageSchema = require('./cqm/MeasurePackage.js').MeasurePackageSchema;
+module.exports.Patient = require('./cqm/Patient.js').Patient;
+module.exports.PatientSchema = require('./cqm/Patient.js').PatientSchema;
+module.exports.Provider = require('./cqm/Provider.js').Provider;
+module.exports.ProviderSchema = require('./cqm/Provider.js').ProviderSchema;
+module.exports.StatementDependency = require('./cqm/CQLStatementDependency.js').StatementDependency;
+module.exports.StatementDependencySchema = require('./cqm/CQLStatementDependency.js').StatementDependencySchema;
+module.exports.PopulationSet = require('./cqm/PopulationSet.js').PopulationSet;
+module.exports.PopulationSetSchema = require('./cqm/PopulationSet.js').PopulationSetSchema;
+module.exports.CQLLibrary = require('./cqm/CQLLibrary.js').CQLLibrary;
+module.exports.CQLLibrarySchema = require('./cqm/CQLLibrary.js').CQLLibrarySchema;
+module.exports.ValueSet = require('./cqm/ValueSet.js').ValueSet;
+module.exports.ValueSetSchema = require('./cqm/ValueSet.js').ValueSetSchema;
+module.exports.Concept = require('./cqm/Concept.js').Concept;
+module.exports.ConceptSchema = require('./cqm/Concept.js').ConceptSchema;
 module.exports.IndividualResult = require('./IndividualResult').IndividualResult;
 module.exports.IndividualResultSchema = require('./IndividualResult').IndividualResultSchema;

data/templates/models_template.rb.erb

@@ -3,6 +3,9 @@ module QDM
 end
 require 'mongoid'
 
+# ModelFinder
+require_relative 'model_finder'
+
 # Generated models that are dependencies for base types
 require_relative 'qdm/id'
 
@@ -12,16 +15,29 @@ require_relative 'qdm/basetypes/data_element'
 require_relative 'qdm/basetypes/interval'
 require_relative 'qdm/basetypes/quantity'
 require_relative 'qdm/basetypes/ratio'
+require_relative 'qdm/attributes/attribute'
+require_relative 'qdm/attributes/facility_location'
+require_relative 'qdm/attributes/component'
 
 # Tacoma-specific models
-require_relative 'qdm/tacoma/measure'
-require_relative 'qdm/tacoma/measure_package'
-require_relative 'qdm/tacoma/valueset'
-require_relative 'qdm/tacoma/concept'
+require_relative 'cqm/measure'
+require_relative 'cqm/measure_package'
+require_relative 'cqm/valueset'
+require_relative 'cqm/concept'
+require_relative 'cqm/cql_statement_dependency'
+require_relative 'cqm/cql_library'
+require_relative 'cqm/population_set'
+require_relative 'cqm/patient'
+require_relative 'cqm/provider'
 require_relative 'qdm/tacoma/individual_result'
 
+# Make Patient Generation Available
+require_relative '../../lib/generate_patients'
+
 # Generated models
 <%- datatypes.each_key do |datatype| -%>
 <%- next if datatype.underscore == 'id' -%>
+<%- next if datatype.underscore == 'facility_location' -%>
+<%- next if datatype.underscore == 'component' -%>
 require_relative 'qdm/<%= datatype.underscore %>'
 <%- end -%>

data/templates/mongoose_template.js.erb

@@ -1,30 +1,38 @@
-const mongoose = require('mongoose');
+const mongoose = require('mongoose/browser');
+<% unless datatype.downcase == 'component' || datatype.downcase == 'facilitylocation' %>
+<% unless datatype.downcase == 'id' %>const { IdSchema } = require('./Id');<% end %>
 const { DataElementSchema } = require('./basetypes/DataElement');
 const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
-<% unless datatype.downcase.include? 'component' %>const { ComponentSchema } = require('./Component');<% end %>
-<% unless datatype.downcase.include? 'facilitylocation' %>const { FacilityLocationSchema } = require('./FacilityLocation');<% end %>
-<% unless datatype.downcase == 'id' %>const { IdSchema } = require('./Id');<% end %>
 const Any = require('./basetypes/Any');
+const { ComponentSchema } = require('./attributes/Component');
+const { FacilityLocationSchema } = require('./attributes/FacilityLocation');
+<% else %>
+const Code = require('../basetypes/Code');
+const Interval = require('../basetypes/Interval');
+const Quantity = require('../basetypes/Quantity');
+const DateTime = require('../basetypes/DateTime');
+const Any = require('../basetypes/Any');
+<% end %>
 
 const [Number, String] = [
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
 ];
-<% unless datatype == 'Component' || datatype == 'FacilityLocation' %>
-const <%= datatype -%>Schema = DataElementSchema({
-  <%- for attribute in attrs_with_extras -%>
-  <%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,
-  <%- end %>
-});
-<% else %>
-const <%= datatype -%>Schema = new mongoose.Schema({
+
+const <%= datatype -%>Schema = <% unless datatype == 'Component' || datatype == 'FacilityLocation' %>DataElementSchema<% else %>new mongoose.Schema<%- end %>({
   <%- for attribute in attrs_with_extras -%>
-  <%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,
+  <% if attribute[:default] %><%= attribute[:name] %>: { type: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>, default: '<%= attribute[:default] %>' },<% else %><%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,<%- end %>
   <%- end %>
 });
-<% end %>
+
 module.exports.<%= datatype %>Schema = <%= datatype %>Schema;
-module.exports.<%= datatype %> = mongoose.model('<%= datatype %>', <%= datatype %>Schema);
+class <%= datatype %> extends mongoose.Document {
+  constructor(object) {
+    super(object, <%= datatype %>Schema);
+    this._type = 'QDM::<%= datatype %>';
+  }
+}
+module.exports.<%= datatype %> = <%= datatype %>;

data/templates/patient_extension.rb.erb

@@ -1,6 +1,4 @@
-  field :givenNames, type: Array
-  field :familyName, type: String
-  field :bundleId, type: String
+  embedded_in :tacomaPatient, class_name: 'CQM::Patient'
 
   # These are the "data criteria", or QDM datatype elements that exist on a
   # patient.
@@ -133,6 +131,11 @@
     get_data_elements('medication')
   end
 
+  # Helper method; returns patient_characteristic data element types on this patient.
+  def patient_characteristics
+    get_data_elements('patient_characteristic')
+  end
+
   # Helper method; returns physical_exam data element types on this patient.
   def physical_exams
     get_data_elements('physical_exam')
@@ -200,6 +203,6 @@
 
   # Include '_type' in any JSON output. This is necessary for deserialization.
   def to_json(options = nil)
-    serializable_hash(methods: :_type).to_json(options)
+    serializable_hash(methods: :_type, include: :_type).to_json(options)
   end
 end

data/templates/patient_template.js.erb

@@ -1,4 +1,4 @@
-const mongoose = require('mongoose');
+const mongoose = require('mongoose/browser');
 const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
@@ -12,13 +12,10 @@ const [Schema, Number, String, Mixed] = [
   mongoose.Schema.Types.Mixed,
 ];
 
-const PatientSchema = new Schema({
+const QDMPatientSchema = new Schema({
   <%- for attribute in attrs_with_extras -%>
-  <%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,
+  <% if attribute[:default] %><%= attribute[:name] %>: { type: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>, default: '<%= attribute[:default] %>' },<% else %><%= attribute[:name] %>: <%= TYPE_LOOKUP_JS[attribute[:type]] -%>,<%- end %>
   <%- end %>
-  givenNames: [String],
-  familyName: String,
-  bundleId: String,
   // These are the "data criteria", or QDM datatype elements that exist on a
   // patient.
   dataElements: [],
@@ -33,46 +30,40 @@ const PatientSchema = new Schema({
 
 // After initialization of a Patient model, initialize every individual data element
 // to its respective Mongoose Model
-PatientSchema.methods.initializeDataElements = function initializeDataElements() {
+QDMPatientSchema.methods.initializeDataElements = function initializeDataElements() {
   let typeStripped;
   const dataElementsInit = [];
   this.dataElements.forEach((element) => {
     typeStripped = element._type.replace(/QDM::/, '');
-    if (typeStripped in AllDataElements) {
-      dataElementsInit.push(AllDataElements[typeStripped](element));
-    } else {
-      dataElementsInit.push(element);
-    }
+    dataElementsInit.push(new AllDataElements[typeStripped](element));
   });
   this.set({ dataElements: dataElementsInit });
 };
 
-PatientSchema.queue('initializeDataElements');
-
-PatientSchema.methods.id = function id() {
+QDMPatientSchema.methods.id = function id() {
   return this._id;
 };
 
 // Returns an array of elements that exist on this patient, that
 // match the given HQMF data criteria OID.
-PatientSchema.methods.getByHqmfOid = function getByHqmfOid(hqmfOid) {
+QDMPatientSchema.methods.getByHqmfOid = function getByHqmfOid(hqmfOid) {
   return this.dataElements.filter(element => element.hqmfOid === hqmfOid);
 };
 
 // Returns an array of elements that exist on this patient, that
 // match the given QRDA data criteria OID.
-PatientSchema.methods.getByQrdaOid = function getByQrdaOid(qrdaOid) {
+QDMPatientSchema.methods.getByQrdaOid = function getByQrdaOid(qrdaOid) {
   return this.dataElements.filter(element => element.qrdaOid === qrdaOid);
 };
 
 // Returns an array of elements that exist on this patient. Optionally
-// takes a category, which returns all elements of that QDM category.
-// Example: patient.getDataElements(category = 'encounters') will return
+// takes a qdmCategory, which returns all elements of that QDM qdmCategory.
+// Example: patient.getDataElements({qdmCategory: 'encounters'}) will return
 // all Encounter QDM data types active on the patient.
-PatientSchema.methods.getDataElements = function getDataElements(params) {
-  if (params.qdmCategory && params.qdmStatus) {
+QDMPatientSchema.methods.getDataElements = function getDataElements(params) {
+  if (params !== undefined && params.qdmCategory !== undefined && params.qdmStatus !== undefined) {
     return this.dataElements.filter(element => (element.qdmCategory === params.qdmCategory) && (element.qdmStatus === params.qdmStatus));
-  } else if (params.category) {
+  } else if (params !== undefined && params.qdmCategory !== undefined) {
     return this.dataElements.filter(element => element.qdmCategory === params.qdmCategory);
   }
   return this.dataElements;
@@ -83,15 +74,15 @@ PatientSchema.methods.getDataElements = function getDataElements(params) {
 // @param {string} profile - the data criteria requested by the execution engine
 // @param {boolean} isNegated - whether dataElements should be returned based on their negation status
 // @returns {DataElement[]}
-PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated = null) {
+QDMPatientSchema.methods.getByProfile = function getByProfile(profile, isNegated = null) {
   // If isNegated == true, only return data elements with a negationRationale that is not null.
   // If isNegated == false, only return data elements with a null negationRationale.
   // If isNegated == null, return all matching data elements by type, regardless of negationRationale.
-  const results = this.dataElements.filter(element => element._type === `QDM::${profile}` && (isNegated === null || !!element.negationRationale === isNegated));
+  const results = this.dataElements.filter(element => (element._type === `QDM::${profile}` || element._type === profile) && (isNegated === null || !!element.negationRationale === isNegated));
   return results.map((result) => {
-    const removedMongooseItems = AllDataElements[profile](result).toObject();
+    const removedMongooseItems = new AllDataElements[profile](result).toObject({ virtuals: true });
     // toObject() will remove all mongoose functions but also remove the schema methods, so we add them back
-    Object.entries(Object.getPrototypeOf(result).schema.methods).forEach(([method_name, method]) => {
+    Object.entries(result.schema.methods).forEach(([method_name, method]) => {
       removedMongooseItems[method_name] = method;
     });
     return removedMongooseItems;
@@ -105,7 +96,7 @@ PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated =
 // in Bonnie patient builder).
 // @param {String} profile - the data criteria requested by the execution engine
 // @returns {Object}
-PatientSchema.methods.findRecords = function findRecords(profile) {
+QDMPatientSchema.methods.findRecords = function findRecords(profile) {
   let profileStripped;
   if (profile === 'Patient') {
     // Requested generic patient info
@@ -141,121 +132,131 @@ PatientSchema.methods.findRecords = function findRecords(profile) {
   return [];
 };
 
-PatientSchema.methods.adverse_events = function adverse_events() {
-  return this.getDataElements({ category: 'adverse_event' });
+QDMPatientSchema.methods.adverse_events = function adverse_events() {
+  return this.getDataElements({ qdmCategory: 'adverse_event' });
 };
 
-PatientSchema.methods.allergies = function allergies() {
-  return this.getDataElements({ category: 'allergy' });
+QDMPatientSchema.methods.allergies = function allergies() {
+  return this.getDataElements({ qdmCategory: 'allergy' });
 };
 
-PatientSchema.methods.assessments = function assessments() {
-  return this.getDataElements({ category: 'assessment' });
+QDMPatientSchema.methods.assessments = function assessments() {
+  return this.getDataElements({ qdmCategory: 'assessment' });
 };
 
-PatientSchema.methods.care_experiences = function care_experiences() {
-  return this.getDataElements({ category: 'care_experience' });
+QDMPatientSchema.methods.care_experiences = function care_experiences() {
+  return this.getDataElements({ qdmCategory: 'care_experience' });
 };
 
-PatientSchema.methods.care_goals = function care_goals() {
-  return this.getDataElements({ category: 'care_goal' });
+QDMPatientSchema.methods.care_goals = function care_goals() {
+  return this.getDataElements({ qdmCategory: 'care_goal' });
 };
 
-PatientSchema.methods.communications = function communications() {
-  return this.getDataElements({ category: 'communication' });
+QDMPatientSchema.methods.communications = function communications() {
+  return this.getDataElements({ qdmCategory: 'communication' });
 };
 
-PatientSchema.methods.conditions = function conditions() {
-  return this.getDataElements({ category: 'condition' });
+QDMPatientSchema.methods.conditions = function conditions() {
+  return this.getDataElements({ qdmCategory: 'condition' });
 };
 
-PatientSchema.methods.devices = function devices() {
-  return this.getDataElements({ category: 'device' });
+QDMPatientSchema.methods.devices = function devices() {
+  return this.getDataElements({ qdmCategory: 'device' });
 };
 
-PatientSchema.methods.diagnostic_studies = function diagnostic_studies() {
-  return this.getDataElements({ category: 'diagnostic_study' });
+QDMPatientSchema.methods.diagnostic_studies = function diagnostic_studies() {
+  return this.getDataElements({ qdmCategory: 'diagnostic_study' });
 };
 
-PatientSchema.methods.encounters = function encounters() {
-  return this.getDataElements({ category: 'encounter' });
+QDMPatientSchema.methods.encounters = function encounters() {
+  return this.getDataElements({ qdmCategory: 'encounter' });
 };
 
-PatientSchema.methods.family_history = function family_history() {
-  return this.getDataElements({ category: 'family_history' });
+QDMPatientSchema.methods.family_history = function family_history() {
+  return this.getDataElements({ qdmCategory: 'family_history' });
 };
 
-PatientSchema.methods.functional_statuses = function functional_statuses() {
-  return this.getDataElements({ category: 'functional_status' });
+QDMPatientSchema.methods.functional_statuses = function functional_statuses() {
+  return this.getDataElements({ qdmCategory: 'functional_status' });
 };
 
-PatientSchema.methods.immunizations = function immunizations() {
-  return this.getDataElements({ category: 'immunization' });
+QDMPatientSchema.methods.immunizations = function immunizations() {
+  return this.getDataElements({ qdmCategory: 'immunization' });
 };
 
-PatientSchema.methods.interventions = function interventions() {
-  return this.getDataElements({ category: 'intervention' });
+QDMPatientSchema.methods.interventions = function interventions() {
+  return this.getDataElements({ qdmCategory: 'intervention' });
 };
 
-PatientSchema.methods.laboratory_tests = function laboratory_tests() {
-  return this.getDataElements({ category: 'laboratory_test' });
+QDMPatientSchema.methods.laboratory_tests = function laboratory_tests() {
+  return this.getDataElements({ qdmCategory: 'laboratory_test' });
 };
 
-PatientSchema.methods.medical_equipment = function medical_equipment() {
-  return this.getDataElements({ category: 'medical_equipment' });
+QDMPatientSchema.methods.medical_equipment = function medical_equipment() {
+  return this.getDataElements({ qdmCategory: 'medical_equipment' });
 };
 
-PatientSchema.methods.medications = function medications() {
-  return this.getDataElements({ category: 'medication' });
+QDMPatientSchema.methods.medications = function medications() {
+  return this.getDataElements({ qdmCategory: 'medication' });
 };
 
-PatientSchema.methods.physical_exams = function physical_exams() {
-  return this.getDataElements({ category: 'physical_exam' });
+QDMPatientSchema.methods.patient_characteristics = function patient_characteristics() {
+  return this.getDataElements({ qdmCategory: 'patient_characteristic' });
 };
 
-PatientSchema.methods.preferences = function preferences() {
-  return this.getDataElements({ category: 'preference' });
+QDMPatientSchema.methods.physical_exams = function physical_exams() {
+  return this.getDataElements({ qdmCategory: 'physical_exam' });
 };
 
-PatientSchema.methods.provider_characteristics = function provider_characteristics() {
-  return this.getDataElements({ category: 'provider_characteristic' });
+QDMPatientSchema.methods.preferences = function preferences() {
+  return this.getDataElements({ qdmCategory: 'preference' });
 };
 
-PatientSchema.methods.procedures = function procedures() {
-  return this.getDataElements({ category: 'procedure' });
+QDMPatientSchema.methods.provider_characteristics = function provider_characteristics() {
+  return this.getDataElements({ qdmCategory: 'provider_characteristic' });
 };
 
-PatientSchema.methods.results = function results() {
-  return this.getDataElements({ category: 'result' });
+QDMPatientSchema.methods.procedures = function procedures() {
+  return this.getDataElements({ qdmCategory: 'procedure' });
 };
 
-PatientSchema.methods.risk_category_assessments = function risk_category_assessments() {
-  return this.getDataElements({ category: 'risk_category_assessment' });
+QDMPatientSchema.methods.results = function results() {
+  return this.getDataElements({ qdmCategory: 'result' });
 };
 
-PatientSchema.methods.social_history = function social_history() {
-  return this.getDataElements({ category: 'social_history' });
+QDMPatientSchema.methods.risk_category_assessments = function risk_category_assessments() {
+  return this.getDataElements({ qdmCategory: 'risk_category_assessment' });
 };
 
-PatientSchema.methods.substances = function substances() {
-  return this.getDataElements({ category: 'substance' });
+QDMPatientSchema.methods.social_history = function social_history() {
+  return this.getDataElements({ qdmCategory: 'social_history' });
 };
 
-PatientSchema.methods.symptoms = function symptoms() {
-  return this.getDataElements({ category: 'symptom' });
+QDMPatientSchema.methods.substances = function substances() {
+  return this.getDataElements({ qdmCategory: 'substance' });
 };
 
-PatientSchema.methods.system_characteristics = function system_characteristics() {
-  return this.getDataElements({ category: 'system_characteristic' });
+QDMPatientSchema.methods.symptoms = function symptoms() {
+  return this.getDataElements({ qdmCategory: 'symptom' });
 };
 
-PatientSchema.methods.transfers = function transfers() {
-  return this.getDataElements({ category: 'transfer' });
+QDMPatientSchema.methods.system_characteristics = function system_characteristics() {
+  return this.getDataElements({ qdmCategory: 'system_characteristic' });
 };
 
-PatientSchema.methods.vital_signs = function vital_signs() {
-  return this.getDataElements({ category: 'vital_sign' });
+QDMPatientSchema.methods.transfers = function transfers() {
+  return this.getDataElements({ qdmCategory: 'transfer' });
 };
 
-module.exports.PatientSchema = PatientSchema;
-module.exports.Patient = mongoose.model('Patient', PatientSchema);
+QDMPatientSchema.methods.vital_signs = function vital_signs() {
+  return this.getDataElements({ qdmCategory: 'vital_sign' });
+};
+
+module.exports.QDMPatientSchema = QDMPatientSchema;
+class QDMPatient extends mongoose.Document {
+  constructor(object) {
+    super(object, QDMPatientSchema);
+    this.initializeDataElements();
+  }
+}
+module.exports.QDMPatient = QDMPatient;