app/assets/javascripts/PatientCharacteristicExpired.js in cqm-models-1.0.3 vs app/assets/javascripts/PatientCharacteristicExpired.js in cqm-models-1.1.1.0

@@ -1,29 +1,38 @@
-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,
 ];
 
 const PatientCharacteristicExpiredSchema = DataElementSchema({
   expiredDatetime: DateTime,
   cause: Code,
-  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.57' },
+  qdmTitle: { type: String, default: 'Patient Characteristic Expired' },
+  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.4' },
-  _type: { type: String, default: 'PatientCharacteristicExpired' },
+  _type: { type: String, default: 'QDM::PatientCharacteristicExpired' },
 
 });
 
 module.exports.PatientCharacteristicExpiredSchema = PatientCharacteristicExpiredSchema;
-module.exports.PatientCharacteristicExpired = mongoose.model('PatientCharacteristicExpired', PatientCharacteristicExpiredSchema);
+class PatientCharacteristicExpired extends mongoose.Document {
+  constructor(object) {
+    super(object, PatientCharacteristicExpiredSchema);
+    this._type = 'QDM::PatientCharacteristicExpired';
+  }
+}
+module.exports.PatientCharacteristicExpired = PatientCharacteristicExpired;