cqm-models 3.1.2 → 4.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (149) hide show
  1. checksums.yaml +4 -4
  2. data/.eslintrc.json +0 -7
  3. data/.github/workflows/ci.yml +2 -2
  4. data/README.md +3 -2
  5. data/app/assets/javascripts/AdverseEvent.js +2 -2
  6. data/app/assets/javascripts/AllDataElements.js +2 -2
  7. data/app/assets/javascripts/AllergyIntolerance.js +2 -2
  8. data/app/assets/javascripts/AssessmentOrder.js +2 -2
  9. data/app/assets/javascripts/AssessmentPerformed.js +3 -2
  10. data/app/assets/javascripts/AssessmentRecommended.js +2 -2
  11. data/app/assets/javascripts/CareGoal.js +2 -2
  12. data/app/assets/javascripts/CommunicationPerformed.js +3 -3
  13. data/app/assets/javascripts/DeviceOrder.js +2 -2
  14. data/app/assets/javascripts/DeviceRecommended.js +2 -2
  15. data/app/assets/javascripts/Diagnosis.js +2 -2
  16. data/app/assets/javascripts/DiagnosticStudyOrder.js +2 -2
  17. data/app/assets/javascripts/DiagnosticStudyPerformed.js +4 -2
  18. data/app/assets/javascripts/DiagnosticStudyRecommended.js +2 -2
  19. data/app/assets/javascripts/EncounterOrder.js +2 -2
  20. data/app/assets/javascripts/EncounterPerformed.js +7 -3
  21. data/app/assets/javascripts/EncounterRecommended.js +2 -2
  22. data/app/assets/javascripts/FamilyHistory.js +2 -2
  23. data/app/assets/javascripts/ImmunizationAdministered.js +2 -2
  24. data/app/assets/javascripts/ImmunizationOrder.js +2 -2
  25. data/app/assets/javascripts/InterventionOrder.js +2 -2
  26. data/app/assets/javascripts/InterventionPerformed.js +3 -2
  27. data/app/assets/javascripts/InterventionRecommended.js +2 -2
  28. data/app/assets/javascripts/LaboratoryTestOrder.js +2 -2
  29. data/app/assets/javascripts/LaboratoryTestPerformed.js +4 -2
  30. data/app/assets/javascripts/LaboratoryTestRecommended.js +2 -2
  31. data/app/assets/javascripts/MedicationActive.js +2 -2
  32. data/app/assets/javascripts/MedicationAdministered.js +2 -2
  33. data/app/assets/javascripts/MedicationDischarge.js +3 -3
  34. data/app/assets/javascripts/MedicationDispensed.js +4 -3
  35. data/app/assets/javascripts/MedicationOrder.js +3 -2
  36. data/app/assets/javascripts/Participation.js +1 -2
  37. data/app/assets/javascripts/PatientCareExperience.js +2 -2
  38. data/app/assets/javascripts/PatientCharacteristic.js +1 -1
  39. data/app/assets/javascripts/PatientCharacteristicBirthdate.js +1 -1
  40. data/app/assets/javascripts/PatientCharacteristicClinicalTrialParticipant.js +1 -1
  41. data/app/assets/javascripts/PatientCharacteristicEthnicity.js +1 -1
  42. data/app/assets/javascripts/PatientCharacteristicExpired.js +1 -1
  43. data/app/assets/javascripts/PatientCharacteristicPayer.js +1 -1
  44. data/app/assets/javascripts/PatientCharacteristicRace.js +1 -1
  45. data/app/assets/javascripts/PatientCharacteristicSex.js +1 -1
  46. data/app/assets/javascripts/PhysicalExamOrder.js +2 -2
  47. data/app/assets/javascripts/PhysicalExamPerformed.js +3 -2
  48. data/app/assets/javascripts/PhysicalExamRecommended.js +2 -2
  49. data/app/assets/javascripts/ProcedureOrder.js +2 -2
  50. data/app/assets/javascripts/ProcedurePerformed.js +3 -3
  51. data/app/assets/javascripts/ProcedureRecommended.js +2 -2
  52. data/app/assets/javascripts/ProviderCareExperience.js +2 -2
  53. data/app/assets/javascripts/QDMPatient.js +1 -1
  54. data/app/assets/javascripts/RelatedPerson.js +1 -1
  55. data/app/assets/javascripts/SubstanceAdministered.js +2 -2
  56. data/app/assets/javascripts/SubstanceOrder.js +2 -2
  57. data/app/assets/javascripts/SubstanceRecommended.js +2 -2
  58. data/app/assets/javascripts/Symptom.js +2 -2
  59. data/app/assets/javascripts/attributes/Component.js +2 -2
  60. data/app/assets/javascripts/attributes/DiagnosisComponent.js +1 -1
  61. data/app/assets/javascripts/attributes/Entity.js +2 -2
  62. data/app/assets/javascripts/attributes/FacilityLocation.js +1 -1
  63. data/app/assets/javascripts/attributes/Identifier.js +1 -1
  64. data/app/assets/javascripts/attributes/Location.js +32 -0
  65. data/app/assets/javascripts/attributes/Organization.js +1 -1
  66. data/app/assets/javascripts/basetypes/Any.js +1 -1
  67. data/app/assets/javascripts/basetypes/AnyEntity.js +3 -0
  68. data/app/models/cqm/individual_result.rb +2 -2
  69. data/app/models/cqm/measure.rb +1 -1
  70. data/app/models/cqm/patient.rb +1 -1
  71. data/app/models/hqmfOid_to_datatype_map.json +1 -1
  72. data/app/models/models.rb +2 -2
  73. data/app/models/qdm/adverse_event.rb +2 -2
  74. data/app/models/qdm/allergy_intolerance.rb +2 -2
  75. data/app/models/qdm/assessment_order.rb +2 -2
  76. data/app/models/qdm/assessment_performed.rb +3 -2
  77. data/app/models/qdm/assessment_recommended.rb +2 -2
  78. data/app/models/qdm/attributes/component.rb +1 -1
  79. data/app/models/qdm/attributes/diagnosis_component.rb +1 -1
  80. data/app/models/qdm/attributes/entity.rb +1 -1
  81. data/app/models/qdm/attributes/facility_location.rb +1 -1
  82. data/app/models/qdm/attributes/identifier.rb +1 -1
  83. data/app/models/qdm/attributes/location.rb +9 -0
  84. data/app/models/qdm/attributes/organization.rb +1 -1
  85. data/app/models/qdm/basetypes/data_element.rb +5 -0
  86. data/app/models/qdm/care_goal.rb +2 -2
  87. data/app/models/qdm/communication_performed.rb +3 -3
  88. data/app/models/qdm/device_order.rb +2 -2
  89. data/app/models/qdm/device_recommended.rb +2 -2
  90. data/app/models/qdm/diagnosis.rb +2 -2
  91. data/app/models/qdm/diagnostic_study_order.rb +2 -2
  92. data/app/models/qdm/diagnostic_study_performed.rb +4 -2
  93. data/app/models/qdm/diagnostic_study_recommended.rb +2 -2
  94. data/app/models/qdm/encounter_order.rb +2 -2
  95. data/app/models/qdm/encounter_performed.rb +4 -3
  96. data/app/models/qdm/encounter_recommended.rb +2 -2
  97. data/app/models/qdm/family_history.rb +2 -2
  98. data/app/models/qdm/immunization_administered.rb +2 -2
  99. data/app/models/qdm/immunization_order.rb +2 -2
  100. data/app/models/qdm/intervention_order.rb +2 -2
  101. data/app/models/qdm/intervention_performed.rb +3 -2
  102. data/app/models/qdm/intervention_recommended.rb +2 -2
  103. data/app/models/qdm/laboratory_test_order.rb +2 -2
  104. data/app/models/qdm/laboratory_test_performed.rb +4 -2
  105. data/app/models/qdm/laboratory_test_recommended.rb +2 -2
  106. data/app/models/qdm/medication_active.rb +2 -2
  107. data/app/models/qdm/medication_administered.rb +2 -2
  108. data/app/models/qdm/medication_discharge.rb +3 -3
  109. data/app/models/qdm/medication_dispensed.rb +4 -3
  110. data/app/models/qdm/medication_order.rb +3 -2
  111. data/app/models/qdm/participation.rb +1 -2
  112. data/app/models/qdm/patient.rb +1 -1
  113. data/app/models/qdm/patient_care_experience.rb +2 -2
  114. data/app/models/qdm/patient_characteristic.rb +1 -1
  115. data/app/models/qdm/patient_characteristic_birthdate.rb +1 -1
  116. data/app/models/qdm/patient_characteristic_clinical_trial_participant.rb +1 -1
  117. data/app/models/qdm/patient_characteristic_ethnicity.rb +1 -1
  118. data/app/models/qdm/patient_characteristic_expired.rb +1 -1
  119. data/app/models/qdm/patient_characteristic_payer.rb +1 -1
  120. data/app/models/qdm/patient_characteristic_race.rb +1 -1
  121. data/app/models/qdm/patient_characteristic_sex.rb +1 -1
  122. data/app/models/qdm/physical_exam_order.rb +2 -2
  123. data/app/models/qdm/physical_exam_performed.rb +3 -2
  124. data/app/models/qdm/physical_exam_recommended.rb +2 -2
  125. data/app/models/qdm/procedure_order.rb +2 -2
  126. data/app/models/qdm/procedure_performed.rb +3 -3
  127. data/app/models/qdm/procedure_recommended.rb +2 -2
  128. data/app/models/qdm/provider_care_experience.rb +2 -2
  129. data/app/models/qdm/related_person.rb +1 -1
  130. data/app/models/qdm/substance_administered.rb +2 -2
  131. data/app/models/qdm/substance_order.rb +2 -2
  132. data/app/models/qdm/substance_recommended.rb +2 -2
  133. data/app/models/qdm/symptom.rb +2 -2
  134. data/bin/validate_generator.sh +1 -1
  135. data/cqm-models.gemspec +1 -1
  136. data/data/oids_qdm_5.6.json +335 -0
  137. data/dist/browser.js +887 -1340
  138. data/dist/index.js +887 -1340
  139. data/lib/generate_entities.rb +18 -10
  140. data/lib/generate_models.rb +27 -19
  141. data/lib/generate_patients.rb +1 -1
  142. data/modelinfo/qdm-modelinfo-5.6.xml +1102 -0
  143. data/package.json +3 -3
  144. data/templates/models_template.rb.erb +3 -1
  145. data/templates/mongoose_template.js.erb +9 -2
  146. data/yarn.lock +999 -899
  147. metadata +11 -9
  148. data/app/assets/javascripts/DeviceApplied.js +0 -48
  149. data/app/models/qdm/device_applied.rb +0 -19
data/app/models/qdm/attributes/identifier.rb CHANGED
@@ -4,6 +4,6 @@ module QDM
4
4
  include Mongoid::Document
5
5
  field :namingSystem, type: String
6
6
  field :value, type: String
7
- field :qdmVersion, type: String, default: '5.5'
7
+ field :qdmVersion, type: String, default: '5.6'
8
8
  end
9
9
  end
data/app/models/qdm/attributes/location.rb ADDED
@@ -0,0 +1,9 @@
1
+ module QDM
2
+ # app/models/qdm/location.rb
3
+ class Location < Entity
4
+ include Mongoid::Document
5
+ embedded_in :data_element
6
+ field :locationType, type: QDM::Code
7
+ field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.142'
8
+ end
9
+ end
data/app/models/qdm/attributes/organization.rb CHANGED
@@ -3,7 +3,7 @@ module QDM
3
3
  class Organization < Entity
4
4
  include Mongoid::Document
5
5
  embedded_in :data_element
6
- field :type, type: QDM::Code
6
+ field :organizationType, type: QDM::Code
7
7
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.135'
8
8
  field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.163'
9
9
  end
data/app/models/qdm/basetypes/data_element.rb CHANGED
@@ -17,6 +17,11 @@ module QDM
17
17
  field :id, type: String
18
18
 
19
19
  def initialize(options = {})
20
+ # class is reserved word. changed to clazz
21
+ if options['class']
22
+ options['clazz'] = options['class']
23
+ options.delete('class')
24
+ end
20
25
  super(options)
21
26
  # default id to the mongo ObjectId for this DataElement if it isnt already defined
22
27
  self.id = _id.to_s unless id?
data/app/models/qdm/care_goal.rb CHANGED
@@ -7,10 +7,10 @@ module QDM
7
7
  field :relevantPeriod, type: QDM::Interval
8
8
  field :relatedTo, type: Array
9
9
  field :targetOutcome
10
- embeds_one :performer, class_name: 'QDM::Entity'
10
+ embeds_many :performer, class_name: 'QDM::Entity'
11
11
  field :qdmTitle, type: String, default: 'Care Goal'
12
12
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.7'
13
13
  field :qdmCategory, type: String, default: 'care_goal'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/communication_performed.rb CHANGED
@@ -6,8 +6,8 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :category, type: QDM::Code
8
8
  field :medium, type: QDM::Code
9
- embeds_one :sender, class_name: 'QDM::Entity'
10
- embeds_one :recipient, class_name: 'QDM::Entity'
9
+ embeds_many :sender, class_name: 'QDM::Entity'
10
+ embeds_many :recipient, class_name: 'QDM::Entity'
11
11
  field :relatedTo, type: Array
12
12
  field :sentDatetime, type: DateTime
13
13
  field :receivedDatetime, type: DateTime
@@ -16,6 +16,6 @@ module QDM
16
16
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.132'
17
17
  field :qdmCategory, type: String, default: 'communication'
18
18
  field :qdmStatus, type: String, default: 'performed'
19
- field :qdmVersion, type: String, default: '5.5'
19
+ field :qdmVersion, type: String, default: '5.6'
20
20
  end
21
21
  end
data/app/models/qdm/device_order.rb CHANGED
@@ -6,11 +6,11 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :negationRationale, type: QDM::Code
8
8
  field :reason, type: QDM::Code
9
- embeds_one :requester, class_name: 'QDM::Entity'
9
+ embeds_many :requester, class_name: 'QDM::Entity'
10
10
  field :qdmTitle, type: String, default: 'Device, Order'
11
11
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.15'
12
12
  field :qdmCategory, type: String, default: 'device'
13
13
  field :qdmStatus, type: String, default: 'order'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/device_recommended.rb CHANGED
@@ -6,11 +6,11 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :negationRationale, type: QDM::Code
8
8
  field :reason, type: QDM::Code
9
- embeds_one :requester, class_name: 'QDM::Entity'
9
+ embeds_many :requester, class_name: 'QDM::Entity'
10
10
  field :qdmTitle, type: String, default: 'Device, Recommended'
11
11
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.16'
12
12
  field :qdmCategory, type: String, default: 'device'
13
13
  field :qdmStatus, type: String, default: 'recommended'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/diagnosis.rb CHANGED
@@ -7,11 +7,11 @@ module QDM
7
7
  field :prevalencePeriod, type: QDM::Interval
8
8
  field :anatomicalLocationSite, type: QDM::Code
9
9
  field :severity, type: QDM::Code
10
- embeds_one :recorder, class_name: 'QDM::Entity'
10
+ embeds_many :recorder, class_name: 'QDM::Entity'
11
11
  field :qdmTitle, type: String, default: 'Diagnosis'
12
12
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.110'
13
13
  field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.135'
14
14
  field :qdmCategory, type: String, default: 'condition'
15
- field :qdmVersion, type: String, default: '5.5'
15
+ field :qdmVersion, type: String, default: '5.6'
16
16
  end
17
17
  end
data/app/models/qdm/diagnostic_study_order.rb CHANGED
@@ -6,11 +6,11 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :reason, type: QDM::Code
8
8
  field :negationRationale, type: QDM::Code
9
- embeds_one :requester, class_name: 'QDM::Entity'
9
+ embeds_many :requester, class_name: 'QDM::Entity'
10
10
  field :qdmTitle, type: String, default: 'Diagnostic Study, Order'
11
11
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.22'
12
12
  field :qdmCategory, type: String, default: 'diagnostic_study'
13
13
  field :qdmStatus, type: String, default: 'order'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/diagnostic_study_performed.rb CHANGED
@@ -9,16 +9,18 @@ module QDM
9
9
  field :reason, type: QDM::Code
10
10
  field :result
11
11
  field :resultDatetime, type: DateTime
12
+ field :interpretation, type: QDM::Code
12
13
  field :status, type: QDM::Code
13
14
  field :method, type: QDM::Code
14
15
  field :facilityLocation, type: QDM::FacilityLocation
15
16
  field :negationRationale, type: QDM::Code
16
17
  field :components, type: Array
17
- embeds_one :performer, class_name: 'QDM::Entity'
18
+ embeds_many :performer, class_name: 'QDM::Entity'
19
+ field :relatedTo, type: Array
18
20
  field :qdmTitle, type: String, default: 'Diagnostic Study, Performed'
19
21
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.23'
20
22
  field :qdmCategory, type: String, default: 'diagnostic_study'
21
23
  field :qdmStatus, type: String, default: 'performed'
22
- field :qdmVersion, type: String, default: '5.5'
24
+ field :qdmVersion, type: String, default: '5.6'
23
25
  end
24
26
  end
data/app/models/qdm/diagnostic_study_recommended.rb CHANGED
@@ -5,12 +5,12 @@ module QDM
5
5
  embedded_in :patient
6
6
  field :authorDatetime, type: DateTime
7
7
  field :negationRationale, type: QDM::Code
8
- embeds_one :requester, class_name: 'QDM::Entity'
8
+ embeds_many :requester, class_name: 'QDM::Entity'
9
9
  field :qdmTitle, type: String, default: 'Diagnostic Study, Recommended'
10
10
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.24'
11
11
  field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.19'
12
12
  field :qdmCategory, type: String, default: 'diagnostic_study'
13
13
  field :qdmStatus, type: String, default: 'recommended'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/encounter_order.rb CHANGED
@@ -7,12 +7,12 @@ module QDM
7
7
  field :reason, type: QDM::Code
8
8
  field :facilityLocation, type: QDM::FacilityLocation
9
9
  field :negationRationale, type: QDM::Code
10
- embeds_one :requester, class_name: 'QDM::Entity'
10
+ embeds_many :requester, class_name: 'QDM::Entity'
11
11
  field :priority, type: QDM::Code
12
12
  field :qdmTitle, type: String, default: 'Encounter, Order'
13
13
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.27'
14
14
  field :qdmCategory, type: String, default: 'encounter'
15
15
  field :qdmStatus, type: String, default: 'order'
16
- field :qdmVersion, type: String, default: '5.5'
16
+ field :qdmVersion, type: String, default: '5.6'
17
17
  end
18
18
  end
data/app/models/qdm/encounter_performed.rb CHANGED
@@ -5,18 +5,19 @@ module QDM
5
5
  embedded_in :patient
6
6
  field :authorDatetime, type: DateTime
7
7
  field :admissionSource, type: QDM::Code
8
+ field :clazz, type: QDM::Code
8
9
  field :relevantPeriod, type: QDM::Interval
9
10
  field :dischargeDisposition, type: QDM::Code
10
11
  field :facilityLocations, type: Array, default: []
11
12
  field :diagnoses, type: Array
12
- field :negationRationale, type: QDM::Code
13
13
  field :lengthOfStay, type: QDM::Quantity
14
14
  field :priority, type: QDM::Code
15
- embeds_one :participant, class_name: 'QDM::Entity'
15
+ embeds_many :participant, class_name: 'QDM::Entity'
16
+ field :relatedTo, type: Array
16
17
  field :qdmTitle, type: String, default: 'Encounter, Performed'
17
18
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.5'
18
19
  field :qdmCategory, type: String, default: 'encounter'
19
20
  field :qdmStatus, type: String, default: 'performed'
20
- field :qdmVersion, type: String, default: '5.5'
21
+ field :qdmVersion, type: String, default: '5.6'
21
22
  end
22
23
  end
data/app/models/qdm/encounter_recommended.rb CHANGED
@@ -7,11 +7,11 @@ module QDM
7
7
  field :reason, type: QDM::Code
8
8
  field :facilityLocation, type: QDM::FacilityLocation
9
9
  field :negationRationale, type: QDM::Code
10
- embeds_one :requester, class_name: 'QDM::Entity'
10
+ embeds_many :requester, class_name: 'QDM::Entity'
11
11
  field :qdmTitle, type: String, default: 'Encounter, Recommended'
12
12
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.28'
13
13
  field :qdmCategory, type: String, default: 'encounter'
14
14
  field :qdmStatus, type: String, default: 'recommended'
15
- field :qdmVersion, type: String, default: '5.5'
15
+ field :qdmVersion, type: String, default: '5.6'
16
16
  end
17
17
  end
data/app/models/qdm/family_history.rb CHANGED
@@ -5,11 +5,11 @@ module QDM
5
5
  embedded_in :patient
6
6
  field :authorDatetime, type: DateTime
7
7
  field :relationship, type: QDM::Code
8
- embeds_one :recorder, class_name: 'QDM::Entity'
8
+ embeds_many :recorder, class_name: 'QDM::Entity'
9
9
  field :qdmTitle, type: String, default: 'Family History'
10
10
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.111'
11
11
  field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.12'
12
12
  field :qdmCategory, type: String, default: 'family_history'
13
- field :qdmVersion, type: String, default: '5.5'
13
+ field :qdmVersion, type: String, default: '5.6'
14
14
  end
15
15
  end
data/app/models/qdm/immunization_administered.rb CHANGED
@@ -9,12 +9,12 @@ module QDM
9
9
  field :dosage, type: QDM::Quantity
10
10
  field :route, type: QDM::Code
11
11
  field :negationRationale, type: QDM::Code
12
- embeds_one :performer, class_name: 'QDM::Entity'
12
+ embeds_many :performer, class_name: 'QDM::Entity'
13
13
  field :qdmTitle, type: String, default: 'Immunization, Administered'
14
14
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.112'
15
15
  field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.140'
16
16
  field :qdmCategory, type: String, default: 'immunization'
17
17
  field :qdmStatus, type: String, default: 'administered'
18
- field :qdmVersion, type: String, default: '5.5'
18
+ field :qdmVersion, type: String, default: '5.6'
19
19
  end
20
20
  end
data/app/models/qdm/immunization_order.rb CHANGED
@@ -10,11 +10,11 @@ module QDM
10
10
  field :reason, type: QDM::Code
11
11
  field :route, type: QDM::Code
12
12
  field :negationRationale, type: QDM::Code
13
- embeds_one :requester, class_name: 'QDM::Entity'
13
+ embeds_many :requester, class_name: 'QDM::Entity'
14
14
  field :qdmTitle, type: String, default: 'Immunization, Order'
15
15
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.113'
16
16
  field :qdmCategory, type: String, default: 'immunization'
17
17
  field :qdmStatus, type: String, default: 'order'
18
- field :qdmVersion, type: String, default: '5.5'
18
+ field :qdmVersion, type: String, default: '5.6'
19
19
  end
20
20
  end
data/app/models/qdm/intervention_order.rb CHANGED
@@ -6,11 +6,11 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :reason, type: QDM::Code
8
8
  field :negationRationale, type: QDM::Code
9
- embeds_one :requester, class_name: 'QDM::Entity'
9
+ embeds_many :requester, class_name: 'QDM::Entity'
10
10
  field :qdmTitle, type: String, default: 'Intervention, Order'
11
11
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.35'
12
12
  field :qdmCategory, type: String, default: 'intervention'
13
13
  field :qdmStatus, type: String, default: 'order'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/intervention_performed.rb CHANGED
@@ -10,11 +10,12 @@ module QDM
10
10
  field :result
11
11
  field :status, type: QDM::Code
12
12
  field :negationRationale, type: QDM::Code
13
- embeds_one :performer, class_name: 'QDM::Entity'
13
+ embeds_many :performer, class_name: 'QDM::Entity'
14
+ field :relatedTo, type: Array
14
15
  field :qdmTitle, type: String, default: 'Intervention, Performed'
15
16
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.36'
16
17
  field :qdmCategory, type: String, default: 'intervention'
17
18
  field :qdmStatus, type: String, default: 'performed'
18
- field :qdmVersion, type: String, default: '5.5'
19
+ field :qdmVersion, type: String, default: '5.6'
19
20
  end
20
21
  end
data/app/models/qdm/intervention_recommended.rb CHANGED
@@ -6,11 +6,11 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :reason, type: QDM::Code
8
8
  field :negationRationale, type: QDM::Code
9
- embeds_one :requester, class_name: 'QDM::Entity'
9
+ embeds_many :requester, class_name: 'QDM::Entity'
10
10
  field :qdmTitle, type: String, default: 'Intervention, Recommended'
11
11
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.37'
12
12
  field :qdmCategory, type: String, default: 'intervention'
13
13
  field :qdmStatus, type: String, default: 'recommended'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/laboratory_test_order.rb CHANGED
@@ -6,11 +6,11 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :reason, type: QDM::Code
8
8
  field :negationRationale, type: QDM::Code
9
- embeds_one :requester, class_name: 'QDM::Entity'
9
+ embeds_many :requester, class_name: 'QDM::Entity'
10
10
  field :qdmTitle, type: String, default: 'Laboratory Test, Order'
11
11
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.41'
12
12
  field :qdmCategory, type: String, default: 'laboratory_test'
13
13
  field :qdmStatus, type: String, default: 'order'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/laboratory_test_performed.rb CHANGED
@@ -12,13 +12,15 @@ module QDM
12
12
  field :resultDatetime, type: DateTime
13
13
  field :reason, type: QDM::Code
14
14
  field :referenceRange, type: QDM::Interval
15
+ field :interpretation, type: QDM::Code
15
16
  field :negationRationale, type: QDM::Code
16
17
  field :components, type: Array
17
- embeds_one :performer, class_name: 'QDM::Entity'
18
+ embeds_many :performer, class_name: 'QDM::Entity'
19
+ field :relatedTo, type: Array
18
20
  field :qdmTitle, type: String, default: 'Laboratory Test, Performed'
19
21
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.42'
20
22
  field :qdmCategory, type: String, default: 'laboratory_test'
21
23
  field :qdmStatus, type: String, default: 'performed'
22
- field :qdmVersion, type: String, default: '5.5'
24
+ field :qdmVersion, type: String, default: '5.6'
23
25
  end
24
26
  end
data/app/models/qdm/laboratory_test_recommended.rb CHANGED
@@ -6,11 +6,11 @@ module QDM
6
6
  field :authorDatetime, type: DateTime
7
7
  field :reason, type: QDM::Code
8
8
  field :negationRationale, type: QDM::Code
9
- embeds_one :requester, class_name: 'QDM::Entity'
9
+ embeds_many :requester, class_name: 'QDM::Entity'
10
10
  field :qdmTitle, type: String, default: 'Laboratory Test, Recommended'
11
11
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.43'
12
12
  field :qdmCategory, type: String, default: 'laboratory_test'
13
13
  field :qdmStatus, type: String, default: 'recommended'
14
- field :qdmVersion, type: String, default: '5.5'
14
+ field :qdmVersion, type: String, default: '5.6'
15
15
  end
16
16
  end
data/app/models/qdm/medication_active.rb CHANGED
@@ -8,11 +8,11 @@ module QDM
8
8
  field :dosage, type: QDM::Quantity
9
9
  field :frequency, type: QDM::Code
10
10
  field :route, type: QDM::Code
11
- embeds_one :recorder, class_name: 'QDM::Entity'
11
+ embeds_many :recorder, class_name: 'QDM::Entity'
12
12
  field :qdmTitle, type: String, default: 'Medication, Active'
13
13
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.44'
14
14
  field :qdmCategory, type: String, default: 'medication'
15
15
  field :qdmStatus, type: String, default: 'active'
16
- field :qdmVersion, type: String, default: '5.5'
16
+ field :qdmVersion, type: String, default: '5.6'
17
17
  end
18
18
  end
data/app/models/qdm/medication_administered.rb CHANGED
@@ -11,11 +11,11 @@ module QDM
11
11
  field :route, type: QDM::Code
12
12
  field :reason, type: QDM::Code
13
13
  field :negationRationale, type: QDM::Code
14
- embeds_one :performer, class_name: 'QDM::Entity'
14
+ embeds_many :performer, class_name: 'QDM::Entity'
15
15
  field :qdmTitle, type: String, default: 'Medication, Administered'
16
16
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.45'
17
17
  field :qdmCategory, type: String, default: 'medication'
18
18
  field :qdmStatus, type: String, default: 'administered'
19
- field :qdmVersion, type: String, default: '5.5'
19
+ field :qdmVersion, type: String, default: '5.6'
20
20
  end
21
21
  end
data/app/models/qdm/medication_discharge.rb CHANGED
@@ -11,12 +11,12 @@ module QDM
11
11
  field :daysSupplied, type: Integer
12
12
  field :route, type: QDM::Code
13
13
  field :negationRationale, type: QDM::Code
14
- embeds_one :prescriber, class_name: 'QDM::Entity'
15
- embeds_one :recorder, class_name: 'QDM::Entity'
14
+ embeds_many :prescriber, class_name: 'QDM::Entity'
15
+ embeds_many :recorder, class_name: 'QDM::Entity'
16
16
  field :qdmTitle, type: String, default: 'Medication, Discharge'
17
17
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.48'
18
18
  field :qdmCategory, type: String, default: 'medication'
19
19
  field :qdmStatus, type: String, default: 'discharge'
20
- field :qdmVersion, type: String, default: '5.5'
20
+ field :qdmVersion, type: String, default: '5.6'
21
21
  end
22
22
  end
data/app/models/qdm/medication_dispensed.rb CHANGED
@@ -12,13 +12,14 @@ module QDM
12
12
  field :frequency, type: QDM::Code
13
13
  field :daysSupplied, type: Integer
14
14
  field :route, type: QDM::Code
15
- embeds_one :prescriber, class_name: 'QDM::Entity'
16
- embeds_one :dispenser, class_name: 'QDM::Entity'
15
+ embeds_many :prescriber, class_name: 'QDM::Entity'
16
+ embeds_many :dispenser, class_name: 'QDM::Entity'
17
17
  field :negationRationale, type: QDM::Code
18
+ field :relatedTo, type: Array
18
19
  field :qdmTitle, type: String, default: 'Medication, Dispensed'
19
20
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.49'
20
21
  field :qdmCategory, type: String, default: 'medication'
21
22
  field :qdmStatus, type: String, default: 'dispensed'
22
- field :qdmVersion, type: String, default: '5.5'
23
+ field :qdmVersion, type: String, default: '5.6'
23
24
  end
24
25
  end
data/app/models/qdm/medication_order.rb CHANGED
@@ -14,11 +14,12 @@ module QDM
14
14
  field :setting, type: QDM::Code
15
15
  field :reason, type: QDM::Code
16
16
  field :negationRationale, type: QDM::Code
17
- embeds_one :prescriber, class_name: 'QDM::Entity'
17
+ embeds_many :prescriber, class_name: 'QDM::Entity'
18
+ field :relatedTo, type: Array
18
19
  field :qdmTitle, type: String, default: 'Medication, Order'
19
20
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.51'
20
21
  field :qdmCategory, type: String, default: 'medication'
21
22
  field :qdmStatus, type: String, default: 'order'
22
- field :qdmVersion, type: String, default: '5.5'
23
+ field :qdmVersion, type: String, default: '5.6'
23
24
  end
24
25
  end
data/app/models/qdm/participation.rb CHANGED
@@ -4,10 +4,9 @@ module QDM
4
4
  include Mongoid::Document
5
5
  embedded_in :patient
6
6
  field :participationPeriod, type: QDM::Interval
7
- embeds_one :recorder, class_name: 'QDM::Entity'
8
7
  field :qdmTitle, type: String, default: 'Participation'
9
8
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.130'
10
9
  field :qdmCategory, type: String, default: 'participation'
11
- field :qdmVersion, type: String, default: '5.5'
10
+ field :qdmVersion, type: String, default: '5.6'
12
11
  end
13
12
  end
data/app/models/qdm/patient.rb CHANGED
@@ -3,7 +3,7 @@ module QDM
3
3
  class Patient
4
4
  include Mongoid::Document
5
5
  field :birthDatetime, type: DateTime
6
- field :qdmVersion, type: String, default: '5.5'
6
+ field :qdmVersion, type: String, default: '5.6'
7
7
  embedded_in :cqmPatient, class_name: 'CQM::Patient'
8
8
 
9
9
  # These are the "data criteria", or QDM datatype elements that exist on a
data/app/models/qdm/patient_care_experience.rb CHANGED
@@ -4,10 +4,10 @@ module QDM
4
4
  include Mongoid::Document
5
5
  embedded_in :patient
6
6
  field :authorDatetime, type: DateTime
7
- embeds_one :recorder, class_name: 'QDM::Entity'
7
+ embeds_many :recorder, class_name: 'QDM::Entity'
8
8
  field :qdmTitle, type: String, default: 'Patient Care Experience'
9
9
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.52'
10
10
  field :qdmCategory, type: String, default: 'care_experience'
11
- field :qdmVersion, type: String, default: '5.5'
11
+ field :qdmVersion, type: String, default: '5.6'
12
12
  end
13
13
  end
data/app/models/qdm/patient_characteristic.rb CHANGED
@@ -7,6 +7,6 @@ module QDM
7
7
  field :qdmTitle, type: String, default: 'Patient Characteristic'
8
8
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.53'
9
9
  field :qdmCategory, type: String, default: 'patient_characteristic'
10
- field :qdmVersion, type: String, default: '5.5'
10
+ field :qdmVersion, type: String, default: '5.6'
11
11
  end
12
12
  end
data/app/models/qdm/patient_characteristic_birthdate.rb CHANGED
@@ -8,6 +8,6 @@ module QDM
8
8
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.54'
9
9
  field :qdmCategory, type: String, default: 'patient_characteristic'
10
10
  field :qdmStatus, type: String, default: 'birthdate'
11
- field :qdmVersion, type: String, default: '5.5'
11
+ field :qdmVersion, type: String, default: '5.6'
12
12
  end
13
13
  end
data/app/models/qdm/patient_characteristic_clinical_trial_participant.rb CHANGED
@@ -10,6 +10,6 @@ module QDM
10
10
  field :qrdaOid, type: String, default: '2.16.840.1.113883.10.20.24.3.51'
11
11
  field :qdmCategory, type: String, default: 'patient_characteristic'
12
12
  field :qdmStatus, type: String, default: 'clinical_trial_participant'
13
- field :qdmVersion, type: String, default: '5.5'
13
+ field :qdmVersion, type: String, default: '5.6'
14
14
  end
15
15
  end
data/app/models/qdm/patient_characteristic_ethnicity.rb CHANGED
@@ -7,6 +7,6 @@ module QDM
7
7
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.56'
8
8
  field :qdmCategory, type: String, default: 'patient_characteristic'
9
9
  field :qdmStatus, type: String, default: 'ethnicity'
10
- field :qdmVersion, type: String, default: '5.5'
10
+ field :qdmVersion, type: String, default: '5.6'
11
11
  end
12
12
  end
data/app/models/qdm/patient_characteristic_expired.rb CHANGED
@@ -9,6 +9,6 @@ module QDM
9
9
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.57'
10
10
  field :qdmCategory, type: String, default: 'patient_characteristic'
11
11
  field :qdmStatus, type: String, default: 'expired'
12
- field :qdmVersion, type: String, default: '5.5'
12
+ field :qdmVersion, type: String, default: '5.6'
13
13
  end
14
14
  end
data/app/models/qdm/patient_characteristic_payer.rb CHANGED
@@ -8,6 +8,6 @@ module QDM
8
8
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.58'
9
9
  field :qdmCategory, type: String, default: 'patient_characteristic'
10
10
  field :qdmStatus, type: String, default: 'payer'
11
- field :qdmVersion, type: String, default: '5.5'
11
+ field :qdmVersion, type: String, default: '5.6'
12
12
  end
13
13
  end
data/app/models/qdm/patient_characteristic_race.rb CHANGED
@@ -7,6 +7,6 @@ module QDM
7
7
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.59'
8
8
  field :qdmCategory, type: String, default: 'patient_characteristic'
9
9
  field :qdmStatus, type: String, default: 'race'
10
- field :qdmVersion, type: String, default: '5.5'
10
+ field :qdmVersion, type: String, default: '5.6'
11
11
  end
12
12
  end
data/app/models/qdm/patient_characteristic_sex.rb CHANGED
@@ -7,6 +7,6 @@ module QDM
7
7
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.55'
8
8
  field :qdmCategory, type: String, default: 'patient_characteristic'
9
9
  field :qdmStatus, type: String, default: 'gender'
10
- field :qdmVersion, type: String, default: '5.5'
10
+ field :qdmVersion, type: String, default: '5.6'
11
11
  end
12
12
  end
data/app/models/qdm/physical_exam_order.rb CHANGED
@@ -7,11 +7,11 @@ module QDM
7
7
  field :reason, type: QDM::Code
8
8
  field :anatomicalLocationSite, type: QDM::Code
9
9
  field :negationRationale, type: QDM::Code
10
- embeds_one :requester, class_name: 'QDM::Entity'
10
+ embeds_many :requester, class_name: 'QDM::Entity'
11
11
  field :qdmTitle, type: String, default: 'Physical Exam, Order'
12
12
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.61'
13
13
  field :qdmCategory, type: String, default: 'physical_exam'
14
14
  field :qdmStatus, type: String, default: 'order'
15
- field :qdmVersion, type: String, default: '5.5'
15
+ field :qdmVersion, type: String, default: '5.6'
16
16
  end
17
17
  end
data/app/models/qdm/physical_exam_performed.rb CHANGED
@@ -12,11 +12,12 @@ module QDM
12
12
  field :anatomicalLocationSite, type: QDM::Code
13
13
  field :negationRationale, type: QDM::Code
14
14
  field :components, type: Array
15
- embeds_one :performer, class_name: 'QDM::Entity'
15
+ embeds_many :performer, class_name: 'QDM::Entity'
16
+ field :relatedTo, type: Array
16
17
  field :qdmTitle, type: String, default: 'Physical Exam, Performed'
17
18
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.62'
18
19
  field :qdmCategory, type: String, default: 'physical_exam'
19
20
  field :qdmStatus, type: String, default: 'performed'
20
- field :qdmVersion, type: String, default: '5.5'
21
+ field :qdmVersion, type: String, default: '5.6'
21
22
  end
22
23
  end
data/app/models/qdm/physical_exam_recommended.rb CHANGED
@@ -7,11 +7,11 @@ module QDM
7
7
  field :reason, type: QDM::Code
8
8
  field :anatomicalLocationSite, type: QDM::Code
9
9
  field :negationRationale, type: QDM::Code
10
- embeds_one :requester, class_name: 'QDM::Entity'
10
+ embeds_many :requester, class_name: 'QDM::Entity'
11
11
  field :qdmTitle, type: String, default: 'Physical Exam, Recommended'
12
12
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.63'
13
13
  field :qdmCategory, type: String, default: 'physical_exam'
14
14
  field :qdmStatus, type: String, default: 'recommended'
15
- field :qdmVersion, type: String, default: '5.5'
15
+ field :qdmVersion, type: String, default: '5.6'
16
16
  end
17
17
  end
data/app/models/qdm/procedure_order.rb CHANGED
@@ -9,11 +9,11 @@ module QDM
9
9
  field :rank, type: Integer
10
10
  field :priority, type: QDM::Code
11
11
  field :negationRationale, type: QDM::Code
12
- embeds_one :requester, class_name: 'QDM::Entity'
12
+ embeds_many :requester, class_name: 'QDM::Entity'
13
13
  field :qdmTitle, type: String, default: 'Procedure, Order'
14
14
  field :hqmfOid, type: String, default: '2.16.840.1.113883.10.20.28.4.66'
15
15
  field :qdmCategory, type: String, default: 'procedure'
16
16
  field :qdmStatus, type: String, default: 'order'
17
- field :qdmVersion, type: String, default: '5.5'
17
+ field :qdmVersion, type: String, default: '5.6'
18
18
  end
19
19
  end