cqm-models 1.1.1.0 → 3.0.2

data/app/assets/javascripts/index.js

@@ -20,5 +20,9 @@ module.exports.ValueSet = require('./cqm/ValueSet.js').ValueSet;
 module.exports.ValueSetSchema = require('./cqm/ValueSet.js').ValueSetSchema;
 module.exports.Concept = require('./cqm/Concept.js').Concept;
 module.exports.ConceptSchema = require('./cqm/Concept.js').ConceptSchema;
-module.exports.IndividualResult = require('./IndividualResult').IndividualResult;
-module.exports.IndividualResultSchema = require('./IndividualResult').IndividualResultSchema;
+module.exports.IndividualResult = require('./cqm/IndividualResult.js').IndividualResult;
+module.exports.IndividualResultSchema = require('./cqm/IndividualResult.js').IndividualResultSchema;
+module.exports.ClauseResult = require('./cqm/ClauseResult.js').ClauseResult;
+module.exports.ClauseResultSchema = require('./cqm/ClauseResult.js').ClauseResultSchema;
+module.exports.StatementResult = require('./cqm/StatementResult.js').StatementResult;
+module.exports.StatementResultSchema = require('./cqm/StatementResult.js').StatementResultchema;

data/app/models/cqm/clause_result.rb

@@ -0,0 +1,21 @@
+module CQM
+  # ClauseResult is used to store clause result information in IndividualResult
+  class ClauseResult
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    # Library the clause this result is for is in
+    field :library_name, type: String
+    # Statment the clause this result is for is in
+    field :statement_name, type: String
+    # LocalId of the clause this result is for
+    field :localId, type: String
+    # Final, processed result of raw calculation
+    field :final, type: String
+    # Raw result of clause calculation
+    field :raw
+
+    # Relations to other model classes
+    embedded_in :individual_result
+  end
+end

data/app/models/{qdm/tacoma → cqm}/individual_result.rb

@@ -1,4 +1,4 @@
-module QDM
+module CQM
   # IndividualResult stores the patient-level (population/clause) results for a patient/measure combination
   class IndividualResult
     include Mongoid::Document
@@ -20,9 +20,11 @@ module QDM
     field :MSRPOPLEX, type: Integer
 
     # Result Attributes
-    field :clause_results, type: Hash
+    embeds_many :clause_results
+    embeds_many :statement_results
     field :episode_results, type: Hash
-    field :statement_results, type: Hash
+    field :observation_values, type: Array, default: []
+    field :population_relevance, type: Hash
 
     # 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,
@@ -35,5 +37,24 @@ module QDM
     # Relations to other model classes
     belongs_to :measure
     belongs_to :patient
+
+    # Convert the stored array into a hash between clause and result
+    def clause_results_by_clause
+      clause_results_hash = {}
+      clause_results.each do |result|
+        clause_results_hash[result['library_name']] = {} unless clause_results_hash[result['library_name']]
+        clause_results_hash[result['library_name']][result['localId']] = result
+      end
+      return clause_results_hash
+    end
+
+    def statement_results_by_statement
+      statement_results_hash = {}
+      statement_results.each do |result|
+        statement_results_hash[result['library_name']] = {} unless statement_results_hash[result['library_name']]
+        statement_results_hash[result['library_name']][result['statement_name']] = result
+      end
+      return statement_results_hash
+    end
   end
 end

data/app/models/cqm/measure.rb

@@ -73,6 +73,8 @@ module CQM
     # hence the 'inverse_of: nil')
     has_and_belongs_to_many :value_sets, inverse_of: nil
 
+    has_many :calculation_results, class_name: 'CQM::IndividualResult'
+
     def all_stratifications
       population_sets.flat_map(&:stratifications)
     end

data/app/models/cqm/patient.rb

@@ -11,6 +11,7 @@ module CQM
 
     has_and_belongs_to_many :providers, class_name: 'CQM::Provider'
     embeds_one :qdmPatient, class_name: 'QDM::Patient', autobuild: true
+    has_many :calculation_results, class_name: 'CQM::IndividualResult'
 
     # Include '_type' in any JSON output. This is necessary for deserialization.
     def to_json(options = nil)

data/app/models/cqm/provider.rb

@@ -16,7 +16,7 @@ module CQM
 
     embeds_many :addresses
     embeds_many :telecoms
-    embeds_many :ids, class_name: 'QDM::Id'
+    embeds_many :ids, class_name: 'QDM::Identifier'
 
     def npi=(an_npi)
       cda_id_npi = ids.where(namingSystem: NPI_OID).first
@@ -24,7 +24,7 @@ module CQM
         cda_id_npi.value = an_npi
         cda_id_npi.save!
       else
-        ids << QDM::Id.new(namingSystem: NPI_OID, value: an_npi)
+        ids << QDM::Identifier.new(namingSystem: NPI_OID, value: an_npi)
       end
     end
 
@@ -34,7 +34,7 @@ module CQM
     end
 
     def tin=(a_tin)
-      ids << QDM::Id.new(namingSystem: TAX_ID_OID, value: a_tin)
+      ids << QDM::Identifier.new(namingSystem: TAX_ID_OID, value: a_tin)
     end
 
     def tin
@@ -48,7 +48,7 @@ module CQM
         cda_id_ccn.value = a_ccn
         cda_id_ccn.save!
       else
-        ids << QDM::Id.new(namingSystem: CCN_OID, value: a_ccn)
+        ids << QDM::Identifier.new(namingSystem: CCN_OID, value: a_ccn)
       end
     end
 

data/app/models/cqm/statement_result.rb

@@ -0,0 +1,27 @@
+module CQM
+  # StatementResult is used to store statement result information in IndividualResult
+  class StatementResult
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    # These are the Mongoid equivalent of the Mongoose "enum" attribute for the respective fields.
+    # They throw an error if you try to assign a value that's not in the array.
+    validates_inclusion_of :relevance, in: %w[NA TRUE FALSE]
+
+    # Library the clause this result is for is in
+    field :library_name, type: String
+    # Statment the clause this result is for is in
+    field :statement_name, type: String
+    # LocalId of the clause this result is for
+    field :pretty, type: String
+    # Final, processed result of raw calculation
+    field :final, type: String
+    # Raw result of clause calculation
+    field :raw
+
+    field :relevance, type: String
+
+    # Relations to other model classes
+    embedded_in :individual_result
+  end
+end

data/app/models/hqmfOid_to_datatype_map.json

@@ -1,4 +1,9 @@
 {
+  "2.16.840.1.113883.10.20.28.4.136": "PatientEntity",
+  "2.16.840.1.113883.10.20.28.4.134": "CarePartner",
+  "2.16.840.1.113883.10.20.28.4.141": "RelatedPerson",
+  "2.16.840.1.113883.10.20.28.4.137": "Practitioner",
+  "2.16.840.1.113883.10.20.28.4.135": "Organization",
   "2.16.840.1.113883.10.20.28.4.61": "PhysicalExamOrder",
   "2.16.840.1.113883.10.20.28.4.130": "Participation",
   "2.16.840.1.113883.10.20.28.4.55": "PatientCharacteristicSex",
@@ -33,7 +38,6 @@
   "2.16.840.1.113883.10.20.28.4.28": "EncounterRecommended",
   "2.16.840.1.113883.10.20.28.4.67": "ProcedurePerformed",
   "2.16.840.1.113883.10.20.28.4.119": "AllergyIntolerance",
-  "2.16.840.1.113883.10.20.28.4.71": "ProviderCharacteristic",
   "22.16.840.1.113883.10.20.28.4.63": "PhysicalExamRecommended",
   "2.16.840.1.113883.10.20.28.4.54": "PatientCharacteristicBirthdate",
   "2.16.840.1.113883.10.20.28.4.120": "AdverseEvent",

data/app/models/model_finder.rb

@@ -6,6 +6,7 @@ module QDM
     def self.by_hqmf_oid(hqmfOid)
       datatype = @hqmfOidToDatatypeMap[hqmfOid]
       return nil if datatype.nil?
+
       return QDM.const_get(datatype)
     end
   end

data/app/models/models.rb

@@ -1,4 +1,4 @@
-# Base QDM module (generated from lib/generate_models.rb) for QDM 5.3
+# Base QDM module (generated from lib/generate_models.rb) for QDM 5.5
 module QDM
 end
 require 'mongoid'
@@ -7,17 +7,25 @@ require 'mongoid'
 require_relative 'model_finder'
 
 # Generated models that are dependencies for base types
-require_relative 'qdm/id'
+require_relative 'qdm/attributes/attribute'
+require_relative 'qdm/attributes/identifier'
 
 # base types
 require_relative 'qdm/basetypes/code'
 require_relative 'qdm/basetypes/data_element'
+require_relative 'qdm/basetypes/date'
 require_relative 'qdm/basetypes/interval'
 require_relative 'qdm/basetypes/quantity'
 require_relative 'qdm/basetypes/ratio'
-require_relative 'qdm/attributes/attribute'
 require_relative 'qdm/attributes/facility_location'
 require_relative 'qdm/attributes/component'
+require_relative 'qdm/attributes/entity'
+require_relative 'qdm/attributes/care_partner'
+require_relative 'qdm/attributes/diagnosis_component'
+require_relative 'qdm/attributes/organization'
+require_relative 'qdm/attributes/patient_entity'
+require_relative 'qdm/attributes/practitioner'
+require_relative 'qdm/attributes/result_component'
 
 # Tacoma-specific models
 require_relative 'cqm/measure'
@@ -29,13 +37,16 @@ require_relative 'cqm/cql_library'
 require_relative 'cqm/population_set'
 require_relative 'cqm/patient'
 require_relative 'cqm/provider'
-require_relative 'qdm/tacoma/individual_result'
+require_relative 'cqm/individual_result'
+require_relative 'cqm/statement_result'
+require_relative 'cqm/clause_result'
 
 # Make Patient Generation Available
 require_relative '../../lib/generate_patients'
 
 # Generated models
 require_relative 'qdm/patient'
+require_relative 'qdm/related_person'
 require_relative 'qdm/physical_exam_order'
 require_relative 'qdm/participation'
 require_relative 'qdm/patient_characteristic_sex'
@@ -56,7 +67,6 @@ require_relative 'qdm/device_order'
 require_relative 'qdm/diagnostic_study_performed'
 require_relative 'qdm/intervention_order'
 require_relative 'qdm/family_history'
-require_relative 'qdm/result_component'
 require_relative 'qdm/medication_active'
 require_relative 'qdm/laboratory_test_order'
 require_relative 'qdm/diagnostic_study_order'
@@ -71,7 +81,6 @@ require_relative 'qdm/encounter_order'
 require_relative 'qdm/encounter_recommended'
 require_relative 'qdm/procedure_performed'
 require_relative 'qdm/allergy_intolerance'
-require_relative 'qdm/provider_characteristic'
 require_relative 'qdm/physical_exam_recommended'
 require_relative 'qdm/patient_characteristic_birthdate'
 require_relative 'qdm/adverse_event'

data/app/models/qdm/adverse_event.rb

@@ -4,13 +4,14 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
-    field :relevantPeriod, type: QDM::Interval
+    field :relevantDatetime, type: DateTime
     field :severity, type: QDM::Code
     field :facilityLocation, type: QDM::FacilityLocation
     field :type, type: QDM::Code
+    embeds_one :recorder, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Adverse Event'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.120'
     field :qdmCategory, type: String, default: 'adverse_event'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/allergy_intolerance.rb

@@ -7,10 +7,11 @@ module QDM
     field :prevalencePeriod, type: QDM::Interval
     field :type, type: QDM::Code
     field :severity, type: QDM::Code
+    embeds_one :recorder, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Allergy/Intolerance'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.119'
     field :qdmCategory, type: String, default: 'allergy'
     field :qdmStatus, type: String, default: 'intolerance'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/assessment_order.rb

@@ -6,10 +6,11 @@ module QDM
     field :authorDatetime, type: DateTime
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
+    embeds_one :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Assessment, Order'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.131'
     field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'order'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/assessment_performed.rb

@@ -4,16 +4,19 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
+    field :relevantDatetime, type: DateTime
+    field :relevantPeriod, type: QDM::Interval
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
     field :method, type: QDM::Code
     field :result
     field :components, type: Array
-    embeds_many :relatedTo, class_name: 'QDM::Id'
+    field :relatedTo, type: Array
+    embeds_one :performer, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Assessment, Performed'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.117'
     field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'performed'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/assessment_recommended.rb

@@ -6,10 +6,11 @@ module QDM
     field :authorDatetime, type: DateTime
     field :negationRationale, type: QDM::Code
     field :reason, type: QDM::Code
+    embeds_one :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Assessment, Recommended'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.118'
     field :qdmCategory, type: String, default: 'assessment'
     field :qdmStatus, type: String, default: 'recommended'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/attributes/attribute.rb

@@ -30,6 +30,7 @@ module QDM
       # this custom class from it.
       def demongoize(object)
         return nil unless object
+
         object = object.symbolize_keys
         if object.is_a?(Hash)
           # This will turn the object into the concrete type eg: facilityLocation

data/app/models/qdm/attributes/care_partner.rb

@@ -0,0 +1,10 @@
+module QDM
+  # app/models/qdm/care_partner.rb
+  class CarePartner < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :relationship, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.134'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.160'
+  end
+end

data/app/models/qdm/attributes/component.rb

@@ -4,6 +4,6 @@ module QDM
     include Mongoid::Document
     field :code, type: QDM::Code
     field :result
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/attributes/diagnosis_component.rb

@@ -0,0 +1,10 @@
+module QDM
+  # app/models/qdm/diagnosis_component.rb
+  class DiagnosisComponent < Attribute
+    include Mongoid::Document
+    field :code, type: QDM::Code
+    field :presentOnAdmissionIndicator, type: QDM::Code
+    field :rank, type: Integer
+    field :qdmVersion, type: String, default: '5.5'
+  end
+end

data/app/models/qdm/attributes/entity.rb

@@ -0,0 +1,15 @@
+module QDM
+  # app/models/qdm/entity.rb
+  class Entity < Attribute
+    include Mongoid::Document
+    embedded_in :data_element
+    field :id, type: String
+    embeds_one :identifier, class_name: 'QDM::Identifier'
+    field :qdmVersion, type: String, default: '5.5'
+    def initialize(options = {})
+      super(options)
+      # default id to the mongo ObjectId for this DataElement if it isnt already defined
+      self.id = _id.to_s unless id?
+    end
+  end
+end

data/app/models/qdm/attributes/facility_location.rb

@@ -4,6 +4,6 @@ module QDM
     include Mongoid::Document
     field :code, type: QDM::Code
     field :locationPeriod, type: QDM::Interval
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/{id.rb → attributes/identifier.rb}

@@ -1,10 +1,9 @@
 module QDM
-  # app/models/qdm/id.rb
-  class Id
+  # app/models/qdm/identifier.rb
+  class Identifier < Attribute
     include Mongoid::Document
-    embedded_in :data_element
     field :namingSystem, type: String
     field :value, type: String
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/attributes/organization.rb

@@ -0,0 +1,10 @@
+module QDM
+  # app/models/qdm/organization.rb
+  class Organization < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :type, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.135'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.163'
+  end
+end

data/app/models/qdm/attributes/patient_entity.rb

@@ -0,0 +1,9 @@
+module QDM
+  # app/models/qdm/patient_entity.rb
+  class PatientEntity < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.136'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.161'
+  end
+end

data/app/models/qdm/attributes/practitioner.rb

@@ -0,0 +1,12 @@
+module QDM
+  # app/models/qdm/practitioner.rb
+  class Practitioner < Entity
+    include Mongoid::Document
+    embedded_in :data_element
+    field :role, type: QDM::Code
+    field :specialty, type: QDM::Code
+    field :qualification, type: QDM::Code
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.137'
+    field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.162'
+  end
+end