EncounterPerformed.js in cqm-models-1.1.1.0

- old
+ new

@@ -1,16 +1,18 @@
-const mongoose = require('mongoose');
+const mongoose = require('mongoose/browser');
+
+const { IdSchema } = require('./Id');
 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');
-const { ComponentSchema } = require('./Component');
-const { FacilityLocationSchema } = require('./FacilityLocation');
-const { IdSchema } = require('./Id');
 const Any = require('./basetypes/Any');
+const { ComponentSchema } = require('./attributes/Component');
+const { FacilityLocationSchema } = require('./attributes/FacilityLocation');
 
+
 const [Number, String] = [
   mongoose.Schema.Types.Number,
   mongoose.Schema.Types.String,
 ];
 
@@ -22,15 +24,22 @@
   facilityLocations: [FacilityLocationSchema],
   diagnoses: [Code],
   principalDiagnosis: Code,
   negationRationale: Code,
   lengthOfStay: Quantity,
-  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.5' },
+  qdmTitle: { type: String, default: 'Encounter, Performed' },
+  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.5' },
   qdmCategory: { type: String, default: 'encounter' },
   qdmStatus: { type: String, default: 'performed' },
   qdmVersion: { type: String, default: '5.4' },
-  _type: { type: String, default: 'EncounterPerformed' },
+  _type: { type: String, default: 'QDM::EncounterPerformed' },
 
 });
 
 module.exports.EncounterPerformedSchema = EncounterPerformedSchema;
-module.exports.EncounterPerformed = mongoose.model('EncounterPerformed', EncounterPerformedSchema);
+class EncounterPerformed extends mongoose.Document {
+  constructor(object) {
+    super(object, EncounterPerformedSchema);
+    this._type = 'QDM::EncounterPerformed';
+  }
+}
+module.exports.EncounterPerformed = EncounterPerformed;