cqm-models 1.1.1.0 → 3.0.2

data/app/models/qdm/procedure_performed.rb

@@ -4,20 +4,23 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
+    field :relevantDatetime, type: DateTime
     field :relevantPeriod, type: QDM::Interval
     field :reason, type: QDM::Code
     field :method, type: QDM::Code
     field :result
     field :status, type: QDM::Code
     field :anatomicalLocationSite, type: QDM::Code
-    field :ordinality, type: QDM::Code
+    field :rank, type: Integer
+    field :priority, type: QDM::Code
     field :incisionDatetime, type: DateTime
     field :negationRationale, type: QDM::Code
     field :components, type: Array
+    embeds_one :performer, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Procedure, Performed'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.67'
     field :qdmCategory, type: String, default: 'procedure'
     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/procedure_recommended.rb

@@ -6,12 +6,13 @@ module QDM
     field :authorDatetime, type: DateTime
     field :reason, type: QDM::Code
     field :anatomicalLocationSite, type: QDM::Code
-    field :ordinality, type: QDM::Code
+    field :rank, type: Integer
+    embeds_one :requester, class_name: 'QDM::Entity'
     field :negationRationale, type: QDM::Code
     field :qdmTitle, type: String, default: 'Procedure, Recommended'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.68'
     field :qdmCategory, type: String, default: 'procedure'
     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/provider_care_experience.rb

@@ -4,9 +4,10 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
+    embeds_one :recorder, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Provider Care Experience'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.70'
     field :qdmCategory, type: String, default: 'care_experience'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/related_person.rb

@@ -0,0 +1,13 @@
+module QDM
+  # app/models/qdm/related_person.rb
+  class RelatedPerson < DataElement
+    include Mongoid::Document
+    embedded_in :patient
+    embeds_one :identifier, class_name: 'QDM::Identifier'
+    field :linkedPatientId, type: String
+    field :qdmTitle, type: String, default: 'Related Person'
+    field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.141'
+    field :qdmCategory, type: String, default: 'related_person'
+    field :qdmVersion, type: String, default: '5.5'
+  end
+end

data/app/models/qdm/substance_administered.rb

@@ -4,15 +4,17 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
+    field :relevantDatetime, type: DateTime
     field :relevantPeriod, type: QDM::Interval
     field :dosage, type: QDM::Quantity
     field :frequency, type: QDM::Code
     field :route, type: QDM::Code
     field :negationRationale, type: QDM::Code
+    embeds_one :performer, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Substance, Administered'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.73'
     field :qdmCategory, type: String, default: 'substance'
     field :qdmStatus, type: String, default: 'administered'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/app/models/qdm/substance_order.rb

@@ -4,6 +4,7 @@ module QDM
     include Mongoid::Document
     embedded_in :patient
     field :authorDatetime, type: DateTime
+    field :relevantPeriod, type: QDM::Interval
     field :reason, type: QDM::Code
     field :dosage, type: QDM::Quantity
     field :supply, type: QDM::Quantity
@@ -11,10 +12,11 @@ module QDM
     field :refills, type: Integer
     field :route, type: QDM::Code
     field :negationRationale, type: QDM::Code
+    embeds_one :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Substance, Order'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.77'
     field :qdmCategory, type: String, default: 'substance'
     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/substance_recommended.rb

@@ -10,10 +10,11 @@ module QDM
     field :refills, type: Integer
     field :route, type: QDM::Code
     field :negationRationale, type: QDM::Code
+    embeds_one :requester, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Substance, Recommended'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.78'
     field :qdmCategory, type: String, default: 'substance'
     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/symptom.rb

@@ -5,10 +5,11 @@ module QDM
     embedded_in :patient
     field :prevalencePeriod, type: QDM::Interval
     field :severity, type: QDM::Code
+    embeds_one :recorder, class_name: 'QDM::Entity'
     field :qdmTitle, type: String, default: 'Symptom'
     field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.116'
     field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.136'
     field :qdmCategory, type: String, default: 'symptom'
-    field :qdmVersion, type: String, default: '5.4'
+    field :qdmVersion, type: String, default: '5.5'
   end
 end

data/bin/validate_generator.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-yes | ruby lib/generate_models.rb modelinfo/qdm-modelinfo-5.4.xml data/oids_qdm_5.4.json
+yes | ruby lib/generate_models.rb modelinfo/qdm-modelinfo-5.5.xml data/oids_qdm_5.5.json
 
 if git diff-index --quiet HEAD --; then
   echo "Generator script produces no differences."

data/cqm-models.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cqm-models'
-  spec.version       = '1.1.1.0'
+  spec.version       = '3.0.2'
   spec.authors       = ['aholmes@mitre.org', 'mokeefe@mitre.org', 'lades@mitre.org']
 
   spec.summary       = 'Mongo models that correspond to the QDM specification.'
@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundle-audit'
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'byebug', '~> 10.0.0'
+  spec.add_development_dependency 'bundler', '~> 2.1.4'
+  spec.add_development_dependency 'byebug', '~> 11.0.1'
   spec.add_development_dependency 'codecov'
-  spec.add_development_dependency 'mongoid', '~> 6.3.0'
+  spec.add_development_dependency 'mongoid', '~> 6.4'
   spec.add_development_dependency 'rails', '~> 5.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.54.0'
   spec.add_development_dependency 'simplecov'

data/data/oids_qdm_5.5.json

@@ -0,0 +1,337 @@
+{
+  "adverse_event": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.120",
+    "qrda_oid": "",
+    "qdm_category": "adverse_event",
+    "qdm_status": ""
+  },
+  "allergy_intolerance": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.119",
+    "qrda_oid": "",
+    "qdm_category": "allergy",
+    "qdm_status": "intolerance"
+  },
+  "assessment_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.131",
+    "qrda_oid": "",
+    "qdm_category": "assessment",
+    "qdm_status": "order"
+  },
+  "assessment_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.117",
+    "qrda_oid": "",
+    "qdm_category": "assessment",
+    "qdm_status": "performed"
+  },
+  "assessment_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.118",
+    "qrda_oid": "",
+    "qdm_category": "assessment",
+    "qdm_status": "recommended"
+  },
+  "care_goal": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.7",
+    "qrda_oid": "",
+    "qdm_category": "care_goal",
+    "qdm_status": ""
+  },
+  "care_partner": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.134",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.160"
+  },
+  "communication_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.132",
+    "qrda_oid": "",
+    "qdm_category": "communication",
+    "qdm_status": "performed"
+  },
+  "device_applied": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.13",
+    "qrda_oid": "",
+    "qdm_category": "device",
+    "qdm_status": "applied"
+  },
+  "device_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.15",
+    "qrda_oid": "",
+    "qdm_category": "device",
+    "qdm_status": "order"
+  },
+  "device_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.16",
+    "qrda_oid": "",
+    "qdm_category": "device",
+    "qdm_status": "recommended"
+  },
+  "diagnosis": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.110",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.135",
+    "qdm_category": "condition",
+    "qdm_status": ""
+  },
+  "diagnostic_study_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.22",
+    "qrda_oid": "",
+    "qdm_category": "diagnostic_study",
+    "qdm_status": "order"
+  },
+  "diagnostic_study_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.23",
+    "qrda_oid": "",
+    "qdm_category": "diagnostic_study",
+    "qdm_status": "performed"
+  },
+  "diagnostic_study_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.24",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.19",
+    "qdm_category": "diagnostic_study",
+    "qdm_status": "recommended"
+  },
+  "encounter_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.27",
+    "qrda_oid": "",
+    "qdm_category": "encounter",
+    "qdm_status": "order"
+  },
+  "encounter_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.5",
+    "qrda_oid": "",
+    "qdm_category": "encounter",
+    "qdm_status": "performed"
+  },
+  "encounter_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.28",
+    "qrda_oid": "",
+    "qdm_category": "encounter",
+    "qdm_status": "recommended"
+  },
+  "family_history": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.111",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.12",
+    "qdm_category": "family_history",
+    "qdm_status": ""
+  },
+  "immunization_administered": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.112",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.140",
+    "qdm_category": "immunization",
+    "qdm_status": "administered"
+  },
+  "immunization_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.113",
+    "qrda_oid": "",
+    "qdm_category": "immunization",
+    "qdm_status": "order"
+  },
+  "intervention_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.35",
+    "qrda_oid": "",
+    "qdm_category": "intervention",
+    "qdm_status": "order"
+  },
+  "intervention_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.36",
+    "qrda_oid": "",
+    "qdm_category": "intervention",
+    "qdm_status": "performed"
+  },
+  "intervention_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.37",
+    "qrda_oid": "",
+    "qdm_category": "intervention",
+    "qdm_status": "recommended"
+  },
+  "laboratory_test_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.41",
+    "qrda_oid": "",
+    "qdm_category": "laboratory_test",
+    "qdm_status": "order"
+  },
+  "laboratory_test_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.42",
+    "qrda_oid": "",
+    "qdm_category": "laboratory_test",
+    "qdm_status": "performed"
+  },
+  "laboratory_test_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.43",
+    "qrda_oid": "",
+    "qdm_category": "laboratory_test",
+    "qdm_status": "recommended"
+  },
+  "medication_active": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.44",
+    "qrda_oid": "",
+    "qdm_category": "medication",
+    "qdm_status": "active"
+  },
+  "medication_administered": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.45",
+    "qrda_oid": "",
+    "qdm_category": "medication",
+    "qdm_status": "administered"
+  },
+  "medication_discharge": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.48",
+    "qrda_oid": "",
+    "qdm_category": "medication",
+    "qdm_status": "discharge"
+  },
+  "medication_dispensed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.49",
+    "qrda_oid": "",
+    "qdm_category": "medication",
+    "qdm_status": "dispensed"
+  },
+  "medication_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.51",
+    "qrda_oid": "",
+    "qdm_category": "medication",
+    "qdm_status": "order"
+  },
+  "organization": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.135",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.163"
+  },
+  "participation": {
+    "hqmf_title": "Program Participation",
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.130",
+    "qrda_oid": "",
+    "qdm_category": "participation",
+    "qdm_status": ""
+  },
+  "patient_care_experience": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.52",
+    "qrda_oid": "",
+    "qdm_category": "care_experience",
+    "qdm_status": ""
+  },
+  "patient_characteristic": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.53",
+    "qrda_oid": "",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": ""
+  },
+  "patient_characteristic_birthdate": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.54",
+    "qrda_oid": "",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": "birthdate"
+  },
+  "patient_characteristic_clinical_trial_participant": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.6",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.51",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": "clinical_trial_participant"
+  },
+  "patient_characteristic_ethnicity": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.56",
+    "qrda_oid": "",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": "ethnicity"
+  },
+  "patient_characteristic_expired": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.57",
+    "qrda_oid": "",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": "expired"
+  },
+  "patient_characteristic_payer": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.58",
+    "qrda_oid": "",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": "payer"
+  },
+  "patient_characteristic_race": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.59",
+    "qrda_oid": "",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": "race"
+  },
+  "patient_characteristic_sex": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.55",
+    "qrda_oid": "",
+    "qdm_category": "patient_characteristic",
+    "qdm_status": "gender"
+  },
+  "patient_entity": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.136",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.161"
+  },
+  "physical_exam_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.61",
+    "qrda_oid": "",
+    "qdm_category": "physical_exam",
+    "qdm_status": "order"
+  },
+  "physical_exam_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.62",
+    "qrda_oid": "",
+    "qdm_category": "physical_exam",
+    "qdm_status": "performed"
+  },
+  "physical_exam_recommended": {
+    "hqmf_oid": "22.16.840.1.113883.10.20.28.4.63",
+    "qrda_oid": "",
+    "qdm_category": "physical_exam",
+    "qdm_status": "recommended"
+  },
+  "practitioner": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.137",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.162"
+  },
+  "procedure_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.66",
+    "qrda_oid": "",
+    "qdm_category": "procedure",
+    "qdm_status": "order"
+  },
+  "procedure_performed": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.67",
+    "qrda_oid": "",
+    "qdm_category": "procedure",
+    "qdm_status": "performed"
+  },
+  "procedure_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.68",
+    "qrda_oid": "",
+    "qdm_category": "procedure",
+    "qdm_status": "recommended"
+  },
+  "provider_care_experience": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.70",
+    "qrda_oid": "",
+    "qdm_category": "care_experience",
+    "qdm_status": ""
+  },
+  "related_person": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.141",
+    "qrda_oid": "",
+    "qdm_category": "related_person",
+    "qdm_status": ""
+  },
+  "substance_administered": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.73",
+    "qrda_oid": "",
+    "qdm_category": "substance",
+    "qdm_status": "administered"
+  },
+  "substance_order": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.77",
+    "qrda_oid": "",
+    "qdm_category": "substance",
+    "qdm_status": "order"
+  },
+  "substance_recommended": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.78",
+    "qrda_oid": "",
+    "qdm_category": "substance",
+    "qdm_status": "recommended"
+  },
+  "symptom": {
+    "hqmf_oid": "2.16.840.1.113883.10.20.28.4.116",
+    "qrda_oid": "2.16.840.1.113883.10.20.24.3.136",
+    "qdm_category": "symptom",
+    "qdm_status": ""
+  }
+}