cqm-models 0.8.4 → 1.0.0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cqm-models",
-  "version": "0.8.4",
+  "version": "1.0.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": {
@@ -15,7 +15,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "cql-execution": "1.2.3",
+    "cql-execution": "1.3.0",
     "mongoose": "^5.0.7"
   },
   "devDependencies": {

data/templates/models_template.rb.erb

@@ -8,9 +8,10 @@ require_relative 'qdm/id'
 
 # base types
 require_relative 'qdm/basetypes/code'
+require_relative 'qdm/basetypes/data_element'
 require_relative 'qdm/basetypes/interval'
 require_relative 'qdm/basetypes/quantity'
-require_relative 'qdm/basetypes/data_element'
+require_relative 'qdm/basetypes/ratio'
 
 # Tacoma-specific models
 require_relative 'qdm/tacoma/measure'

data/templates/patient_extension.rb.erb

@@ -40,9 +40,9 @@
   # will return all Encounter QDM data types active on the patient.
   def get_data_elements(category = nil, status = nil)
     if category && status
-      dataElements.where(category: category, qdmStatus: status) || []
+      dataElements.where(qdmCategory: category, qdmStatus: status) || []
     elsif category
-      dataElements.where(category: category) || []
+      dataElements.where(qdmCategory: category) || []
     else
       dataElements || []
     end

data/templates/patient_template.js.erb

@@ -70,10 +70,10 @@ PatientSchema.methods.getByQrdaOid = function getByQrdaOid(qrdaOid) {
 // Example: patient.getDataElements(category = 'encounters') will return
 // all Encounter QDM data types active on the patient.
 PatientSchema.methods.getDataElements = function getDataElements(params) {
-  if (params.category && params.qdmStatus) {
-    return this.dataElements.filter(element => (element.category === params.category) && (element.qdmStatus === params.qdmStatus));
+  if (params.qdmCategory && params.qdmStatus) {
+    return this.dataElements.filter(element => (element.qdmCategory === params.qdmCategory) && (element.qdmStatus === params.qdmStatus));
   } else if (params.category) {
-    return this.dataElements.filter(element => element.category === params.category);
+    return this.dataElements.filter(element => element.qdmCategory === params.qdmCategory);
   }
   return this.dataElements;
 };

data/yarn.lock

@@ -442,9 +442,9 @@ core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cql-execution@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.2.3.tgz#2c51825da605148f4433f665b3cb6d9fcc9293ee"
+cql-execution@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.3.0.tgz#8f02c29477807d080f423e979e1fffac10e21ef5"
   dependencies:
     moment "^2.20.1"
     ucum "0.0.7"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cqm-models
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 1.0.0
 platform: ruby
 authors:
 - aholmes@mitre.org
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,12 +131,11 @@ files:
 - app/assets/javascripts/AdverseEvent.js
 - app/assets/javascripts/AllDataElements.js
 - app/assets/javascripts/AllergyIntolerance.js
+- app/assets/javascripts/AssessmentOrder.js
 - app/assets/javascripts/AssessmentPerformed.js
 - app/assets/javascripts/AssessmentRecommended.js
 - app/assets/javascripts/CareGoal.js
-- app/assets/javascripts/CommunicationFromPatientToProvider.js
-- app/assets/javascripts/CommunicationFromProviderToPatient.js
-- app/assets/javascripts/CommunicationFromProviderToProvider.js
+- app/assets/javascripts/CommunicationPerformed.js
 - app/assets/javascripts/Component.js
 - app/assets/javascripts/Concept.js
 - app/assets/javascripts/DeviceApplied.js
@@ -187,7 +186,6 @@ files:
 - app/assets/javascripts/ProcedureRecommended.js
 - app/assets/javascripts/ProviderCareExperience.js
 - app/assets/javascripts/ProviderCharacteristic.js
-- app/assets/javascripts/Ratio.js
 - app/assets/javascripts/Result.js
 - app/assets/javascripts/ResultComponent.js
 - app/assets/javascripts/SubstanceAdministered.js
@@ -201,20 +199,21 @@ files:
 - app/assets/javascripts/basetypes/DateTime.js
 - app/assets/javascripts/basetypes/Interval.js
 - app/assets/javascripts/basetypes/Quantity.js
+- app/assets/javascripts/basetypes/Ratio.js
 - app/assets/javascripts/index.js
 - app/models/models.rb
 - app/models/qdm/adverse_event.rb
 - app/models/qdm/allergy_intolerance.rb
+- app/models/qdm/assessment_order.rb
 - app/models/qdm/assessment_performed.rb
 - app/models/qdm/assessment_recommended.rb
 - app/models/qdm/basetypes/code.rb
 - app/models/qdm/basetypes/data_element.rb
 - app/models/qdm/basetypes/interval.rb
 - app/models/qdm/basetypes/quantity.rb
+- app/models/qdm/basetypes/ratio.rb
 - app/models/qdm/care_goal.rb
-- app/models/qdm/communication_from_patient_to_provider.rb
-- app/models/qdm/communication_from_provider_to_patient.rb
-- app/models/qdm/communication_from_provider_to_provider.rb
+- app/models/qdm/communication_performed.rb
 - app/models/qdm/component.rb
 - app/models/qdm/device_applied.rb
 - app/models/qdm/device_order.rb
@@ -261,7 +260,6 @@ files:
 - app/models/qdm/procedure_recommended.rb
 - app/models/qdm/provider_care_experience.rb
 - app/models/qdm/provider_characteristic.rb
-- app/models/qdm/ratio.rb
 - app/models/qdm/result_component.rb
 - app/models/qdm/substance_administered.rb
 - app/models/qdm/substance_order.rb
@@ -287,6 +285,7 @@ files:
 - modelinfo/qdm-modelinfo-5.0.2.xml
 - modelinfo/qdm-modelinfo-5.0.xml
 - modelinfo/qdm-modelinfo-5.3.xml
+- modelinfo/qdm-modelinfo-5.4.xml
 - package.json
 - templates/all_data_elements_template.js.erb
 - templates/id_template.js.erb
@@ -317,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Mongo models that correspond to the QDM specification.

data/app/assets/javascripts/CommunicationFromProviderToProvider.js

@@ -1,30 +0,0 @@
-const mongoose = require('mongoose');
-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 [Number, String] = [
-  mongoose.Schema.Types.Number,
-  mongoose.Schema.Types.String,
-];
-
-const CommunicationFromProviderToProviderSchema = DataElementSchema({
-  authorDatetime: DateTime,
-  relatedTo: [IdSchema],
-  negationRationale: Code,
-  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.10' },
-  category: { type: String, default: 'communication' },
-  qdmStatus: { type: String, default: 'from_provider_to_provider' },
-  qdmVersion: { type: String, default: '5.3' },
-  _type: { type: String, default: 'CommunicationFromProviderToProvider' },
-
-});
-
-module.exports.CommunicationFromProviderToProviderSchema = CommunicationFromProviderToProviderSchema;
-module.exports.CommunicationFromProviderToProvider = mongoose.model('CommunicationFromProviderToProvider', CommunicationFromProviderToProviderSchema);

data/app/assets/javascripts/Ratio.js

@@ -1,26 +0,0 @@
-const mongoose = require('mongoose');
-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 [Number, String] = [
-  mongoose.Schema.Types.Number,
-  mongoose.Schema.Types.String,
-];
-
-const RatioSchema = DataElementSchema({
-  numerator: Quantity,
-  denominator: Quantity,
-  qdmVersion: { type: String, default: '5.3' },
-  _type: { type: String, default: 'Ratio' },
-
-});
-
-module.exports.RatioSchema = RatioSchema;
-module.exports.Ratio = mongoose.model('Ratio', RatioSchema);

data/app/models/qdm/communication_from_patient_to_provider.rb

@@ -1,14 +0,0 @@
-module QDM
-  # app/models/qdm/communication_from_patient_to_provider.rb
-  class CommunicationFromPatientToProvider < DataElement
-    include Mongoid::Document
-    embedded_in :patient
-    field :authorDatetime, type: DateTime
-    embeds_many :relatedTo, class_name: 'QDM::Id'
-    field :negationRationale, type: QDM::Code
-    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.8'
-    field :category, type: String, default: 'communication'
-    field :qdmStatus, type: String, default: 'from_patient_to_provider'
-    field :qdmVersion, type: String, default: '5.3'
-  end
-end

data/app/models/qdm/communication_from_provider_to_patient.rb

@@ -1,14 +0,0 @@
-module QDM
-  # app/models/qdm/communication_from_provider_to_patient.rb
-  class CommunicationFromProviderToPatient < DataElement
-    include Mongoid::Document
-    embedded_in :patient
-    field :authorDatetime, type: DateTime
-    embeds_many :relatedTo, class_name: 'QDM::Id'
-    field :negationRationale, type: QDM::Code
-    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.9'
-    field :category, type: String, default: 'communication'
-    field :qdmStatus, type: String, default: 'from_provider_to_patient'
-    field :qdmVersion, type: String, default: '5.3'
-  end
-end

data/app/models/qdm/communication_from_provider_to_provider.rb

@@ -1,14 +0,0 @@
-module QDM
-  # app/models/qdm/communication_from_provider_to_provider.rb
-  class CommunicationFromProviderToProvider < DataElement
-    include Mongoid::Document
-    embedded_in :patient
-    field :authorDatetime, type: DateTime
-    embeds_many :relatedTo, class_name: 'QDM::Id'
-    field :negationRationale, type: QDM::Code
-    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.3.10'
-    field :category, type: String, default: 'communication'
-    field :qdmStatus, type: String, default: 'from_provider_to_provider'
-    field :qdmVersion, type: String, default: '5.3'
-  end
-end

data/app/models/qdm/ratio.rb

@@ -1,10 +0,0 @@
-module QDM
-  # app/models/qdm/ratio.rb
-  class Ratio < DataElement
-    include Mongoid::Document
-    embedded_in :patient
-    field :numerator, type: QDM::Quantity
-    field :denominator, type: QDM::Quantity
-    field :qdmVersion, type: String, default: '5.3'
-  end
-end