SubstanceAdministered.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,
 ];
 
@@ -19,15 +21,22 @@
   relevantPeriod: Interval,
   dosage: Quantity,
   frequency: Code,
   route: Code,
   negationRationale: Code,
-  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.73' },
+  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.4' },
-  _type: { type: String, default: 'SubstanceAdministered' },
+  _type: { type: String, default: 'QDM::SubstanceAdministered' },
 
 });
 
 module.exports.SubstanceAdministeredSchema = SubstanceAdministeredSchema;
-module.exports.SubstanceAdministered = mongoose.model('SubstanceAdministered', SubstanceAdministeredSchema);
+class SubstanceAdministered extends mongoose.Document {
+  constructor(object) {
+    super(object, SubstanceAdministeredSchema);
+    this._type = 'QDM::SubstanceAdministered';
+  }
+}
+module.exports.SubstanceAdministered = SubstanceAdministered;