cqm-models 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adce07d4828edeec55d0a07a98a55f7cd4ca0e6f
-  data.tar.gz: fd48e3958c11556440fa984040a426437fb65823
+  metadata.gz: f69ba79193a6df18a4a86fc508237fac9b1e9078
+  data.tar.gz: 6ddf65c325e26a91823a84ff3a1fdb2b75323110
 SHA512:
-  metadata.gz: 34e5edecfca3aebe628265178824100649c0abadce2b6c730acf7ed368f1d6c958606d12e31fa9a1e9a8c1bc0a80bd3a46daa68ab52123604eafea31e8f81010
-  data.tar.gz: 219d45b6e063aaa360eb8800b6f84fe496fb70625589f5417f0203dc1ad98a64d9253fe1d7592a41502b646ef08e6040dc3de410fa961aba42ba60cdd62f641b
+  metadata.gz: b2563e216ff73afed6947a86e68f7467c3091df0a8eb4846df375675e75e63923d353abe79b8304d588e164694e0c21cd53fee4efd6b97f3e174dbdea3622587
+  data.tar.gz: 7791447027060f7e426a71214b818877c44b15962f656789f64cffaea55a8a9ecf12be3cbb2975280cd78c3a1e483aceb4e15346ee8a65f296c073ad6fc4ff97

data/.eslintrc.json

@@ -2,10 +2,10 @@
   "extends": "airbnb-base",
   "rules": {
     "max-len": ["error", {"code": 200, "ignoreComments": true}],
-    "no-unused-vars": ["error", { "varsIgnorePattern": "Code|Quantity|Interval|Integer|Array|Float|Time|Number|Date|Mixed|Any" }],
+    "no-unused-vars": ["error", { "varsIgnorePattern": "DataElementSchema|ComponentSchema|FacilityLocationSchema|Code|Quantity|Interval|Integer|Array|Float|Time|Number|Date|Mixed|Any" }],
     "camelcase": "off",
     "comma-dangle": ["error", {
-      "arrays": "always-multiline", 
+      "arrays": "always-multiline",
       "objects": "always-multiline",
       "imports": "always-multiline",
       "exports": "always-multiline",

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,7 @@ Pull requests into cqm-models require the following. Submitter and reviewer shou
 - [ ] Tests have been run locally and pass
 - [ ] If there were any JavaScript changes, this PR has updated the `dist` directory using `npm run dist`
 - [ ] If applicable, the library version number in `package.json` and `cqm-models.gemspec` has been updated
+- [ ] All changes can be reproduced by running the generator script
 
 **Bonnie Reviewer:**
 
@@ -16,6 +17,7 @@ Name:
 - [ ] Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
 - [ ] The tests appropriately test the new code, including edge cases
 - [ ] You have tried to break the code
+- [ ] You have executed the generator script, and made sure no changes were made that the generator did not reproduce itself
 
 **Cypress Reviewer:**
 
@@ -23,3 +25,4 @@ Name:
 - [ ] Code is maintainable and reusable, reuses existing code and infrastructure where appropriate, and accomplishes the task’s purpose
 - [ ] The tests appropriately test the new code, including edge cases
 - [ ] You have tried to break the code
+- [ ] You have executed the generator script, and made sure no changes were made that the generator did not reproduce itself

data/app/assets/javascripts/AdverseEvent.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -15,7 +17,7 @@ const AdverseEventSchema = DataElementSchema({
   authorDatetime: DateTime,
   relevantPeriod: Interval,
   severity: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   type: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.120' },
   category: { type: String, default: 'adverse_event' },

data/app/assets/javascripts/AllergyIntolerance.js

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

data/app/assets/javascripts/AssessmentPerformed.js

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

data/app/assets/javascripts/AssessmentRecommended.js

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

data/app/assets/javascripts/CareGoal.js

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

data/app/assets/javascripts/CommunicationFromPatientToProvider.js

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

data/app/assets/javascripts/CommunicationFromProviderToPatient.js

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

data/app/assets/javascripts/CommunicationFromProviderToProvider.js

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

data/app/assets/javascripts/Component.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -11,7 +13,7 @@ const [Number, String] = [
   mongoose.Schema.Types.String,
 ];
 
-const ComponentSchema = DataElementSchema({
+const ComponentSchema = new mongoose.Schema({
   code: Code,
   result: Any,
   qdmVersion: { type: String, default: '5.3' },

data/app/assets/javascripts/DeviceApplied.js

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

data/app/assets/javascripts/DeviceOrder.js

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

data/app/assets/javascripts/DeviceRecommended.js

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

data/app/assets/javascripts/Diagnosis.js

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

data/app/assets/javascripts/DiagnosticStudyOrder.js

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

data/app/assets/javascripts/DiagnosticStudyPerformed.js

@@ -5,6 +5,7 @@ const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -20,7 +21,7 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
   resultDatetime: DateTime,
   status: Code,
   method: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
   components: [ComponentSchema],
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.23' },

data/app/assets/javascripts/DiagnosticStudyRecommended.js

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

data/app/assets/javascripts/EncounterOrder.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -14,7 +16,7 @@ const [Number, String] = [
 const EncounterOrderSchema = DataElementSchema({
   authorDatetime: DateTime,
   reason: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.27' },
   category: { type: String, default: 'encounter' },

data/app/assets/javascripts/EncounterPerformed.js

@@ -4,6 +4,7 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
 const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 

data/app/assets/javascripts/EncounterRecommended.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+const { FacilityLocationSchema } = require('./FacilityLocation');
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -14,7 +16,7 @@ const [Number, String] = [
 const EncounterRecommendedSchema = DataElementSchema({
   authorDatetime: DateTime,
   reason: Code,
-  facilityLocation: Code,
+  facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.28' },
   category: { type: String, default: 'encounter' },

data/app/assets/javascripts/FacilityLocation.js

@@ -4,6 +4,8 @@ const Code = require('./basetypes/Code');
 const Interval = require('./basetypes/Interval');
 const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
+const { ComponentSchema } = require('./Component');
+
 const Any = require('./basetypes/Any');
 
 const [Number, String] = [
@@ -11,7 +13,7 @@ const [Number, String] = [
   mongoose.Schema.Types.String,
 ];
 
-const FacilityLocationSchema = DataElementSchema({
+const FacilityLocationSchema = new mongoose.Schema({
   code: Code,
   locationPeriod: Interval,
   qdmVersion: { type: String, default: '5.3' },

data/app/assets/javascripts/FamilyHistory.js

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

data/app/assets/javascripts/Id.js

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

data/app/assets/javascripts/ImmunizationAdministered.js

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

data/app/assets/javascripts/ImmunizationOrder.js

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

data/app/assets/javascripts/IndividualResult.js

@@ -29,7 +29,10 @@ const IndividualResultSchema = mongoose.Schema(
     // This field is for application specific information only. If both Bonnie and
     // Cypress use a common field, it should be made a field on this model,
     // and not put into extendedData.
-    extendedData: {},
+    extendedData: {
+      type: Mixed,
+      default: {},
+    },
 
     // Calculation State attributes
     state: {

data/app/assets/javascripts/InterventionOrder.js

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

data/app/assets/javascripts/InterventionPerformed.js

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

data/app/assets/javascripts/InterventionRecommended.js

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

data/app/assets/javascripts/LaboratoryTestOrder.js

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

data/app/assets/javascripts/LaboratoryTestPerformed.js

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

data/app/assets/javascripts/LaboratoryTestRecommended.js

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

data/app/assets/javascripts/MedicationActive.js

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

data/app/assets/javascripts/MedicationAdministered.js

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

data/app/assets/javascripts/MedicationDischarge.js

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

data/app/assets/javascripts/MedicationDispensed.js

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

data/app/assets/javascripts/MedicationOrder.js

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

data/app/assets/javascripts/Participation.js

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

data/app/assets/javascripts/Patient.js

@@ -5,10 +5,11 @@ const Quantity = require('./basetypes/Quantity');
 const DateTime = require('./basetypes/DateTime');
 const AllDataElements = require('./AllDataElements');
 
-const [Schema, Number, String] = [
+const [Schema, Number, String, Mixed] = [
   mongoose.Schema,
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
+  mongoose.Schema.Types.Mixed,
 ];
 
 const PatientSchema = new Schema({
@@ -25,7 +26,10 @@ const PatientSchema = new Schema({
   // This field is for application specific information only. If both Bonnie
   // Cypress use a common field, it should be made a field on this model,
   // and not put into extendedData.
-  extendedData: {},
+  extendedData: {
+    type: Mixed,
+    default: {},
+  },
 }, { id: false });
 
 // After initialization of a Patient model, initialize every individual data element
@@ -78,19 +82,27 @@ PatientSchema.methods.getDataElements = function getDataElements(params) {
 // Returns an array of dataElements that exist on the patient, queried by
 // QDM profile
 PatientSchema.methods.getByProfile = function getByProfile(profile, isNegated = null) {
-  if (isNegated === true) {
-    return this.dataElements.filter(element => element._type === `QDM::${profile}` && (typeof element.negationRationale !== 'undefined' && element.negationRationale != null));
-  } else if (isNegated === false) {
-    return this.dataElements.filter(element => element._type === `QDM::${profile}` && (typeof element.negationRationale === 'undefined' || element.negationRationale == null));
-  }
-  return this.dataElements.filter(element => element._type === `QDM::${profile}`);
+  // 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));
+  return results.map((result) => {
+    const getCodeFunction = Object.getPrototypeOf(result).getCode;
+    const codeFunction = Object.getPrototypeOf(result).code;
+    const removedMongooseItems = AllDataElements[profile](result).toObject();
+    // toObject() will remove all mongoose functions but also removed the getCode and code functions
+    // the execution engine requires the code and getCode functions so we have to add them back
+    removedMongooseItems.getCode = getCodeFunction;
+    removedMongooseItems.code = codeFunction;
+    return removedMongooseItems;
+  });
 };
 
 // This method is called by the CQL execution engine on a CQLPatient when
 // the execution engine wants information on a record. A record could be patient
 // characteristic information about the patient, or it could be data criteria
 // that currently exist on this patient (data criteria you drag on a patient
-// in Bonnie's patient builder).
+// in Bonnie patient builder).
 // @param {String} profile - the data criteria requested by the execution engine
 // @returns {Object}
 PatientSchema.methods.findRecords = function findRecords(profile) {
@@ -107,7 +119,7 @@ PatientSchema.methods.findRecords = function findRecords(profile) {
     // Requested something else (probably a QDM data type).
 
     // Strip model details from request. The requested profile string contains
-    // a lot of things we don't need or care about. Example, we might see
+    // a lot of things we do not need or care about. Example, we might see
     // something like:
     // "{urn:healthit-gov:qdm:v5_0_draft}PatientCharacteristicEthnicity"
     // Where we only care about: "PatientCharacteristicEthnicity".

data/app/assets/javascripts/PatientCareExperience.js

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

data/app/assets/javascripts/PatientCharacteristic.js

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

data/app/assets/javascripts/PatientCharacteristicBirthdate.js

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

data/app/assets/javascripts/PatientCharacteristicClinicalTrialParticipant.js

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

data/app/assets/javascripts/PatientCharacteristicEthnicity.js

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

data/app/assets/javascripts/PatientCharacteristicExpired.js

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

data/app/assets/javascripts/PatientCharacteristicPayer.js

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