cqm-models 0.8.4 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (142) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/assets/javascripts/AdverseEvent.js +2 -2
  4. data/app/assets/javascripts/AllDataElements.js +4 -8
  5. data/app/assets/javascripts/AllergyIntolerance.js +2 -2
  6. data/app/assets/javascripts/{CommunicationFromProviderToPatient.js → AssessmentOrder.js} +9 -9
  7. data/app/assets/javascripts/AssessmentPerformed.js +2 -2
  8. data/app/assets/javascripts/AssessmentRecommended.js +2 -3
  9. data/app/assets/javascripts/CareGoal.js +2 -2
  10. data/app/assets/javascripts/{CommunicationFromPatientToProvider.js → CommunicationPerformed.js} +13 -8
  11. data/app/assets/javascripts/Component.js +1 -1
  12. data/app/assets/javascripts/DeviceApplied.js +2 -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 -3
  17. data/app/assets/javascripts/DiagnosticStudyPerformed.js +2 -2
  18. data/app/assets/javascripts/DiagnosticStudyRecommended.js +2 -3
  19. data/app/assets/javascripts/EncounterOrder.js +2 -2
  20. data/app/assets/javascripts/EncounterPerformed.js +2 -2
  21. data/app/assets/javascripts/EncounterRecommended.js +2 -2
  22. data/app/assets/javascripts/FacilityLocation.js +1 -1
  23. data/app/assets/javascripts/FamilyHistory.js +2 -2
  24. data/app/assets/javascripts/Id.js +1 -1
  25. data/app/assets/javascripts/ImmunizationAdministered.js +2 -3
  26. data/app/assets/javascripts/ImmunizationOrder.js +2 -2
  27. data/app/assets/javascripts/InterventionOrder.js +2 -2
  28. data/app/assets/javascripts/InterventionPerformed.js +2 -2
  29. data/app/assets/javascripts/InterventionRecommended.js +2 -2
  30. data/app/assets/javascripts/LaboratoryTestOrder.js +2 -3
  31. data/app/assets/javascripts/LaboratoryTestPerformed.js +2 -2
  32. data/app/assets/javascripts/LaboratoryTestRecommended.js +2 -3
  33. data/app/assets/javascripts/MedicationActive.js +2 -3
  34. data/app/assets/javascripts/MedicationAdministered.js +2 -3
  35. data/app/assets/javascripts/MedicationDischarge.js +3 -2
  36. data/app/assets/javascripts/MedicationDispensed.js +5 -2
  37. data/app/assets/javascripts/MedicationOrder.js +5 -4
  38. data/app/assets/javascripts/Participation.js +2 -2
  39. data/app/assets/javascripts/Patient.js +4 -4
  40. data/app/assets/javascripts/PatientCareExperience.js +2 -2
  41. data/app/assets/javascripts/PatientCharacteristic.js +2 -2
  42. data/app/assets/javascripts/PatientCharacteristicBirthdate.js +2 -2
  43. data/app/assets/javascripts/PatientCharacteristicClinicalTrialParticipant.js +2 -2
  44. data/app/assets/javascripts/PatientCharacteristicEthnicity.js +2 -2
  45. data/app/assets/javascripts/PatientCharacteristicExpired.js +2 -2
  46. data/app/assets/javascripts/PatientCharacteristicPayer.js +2 -2
  47. data/app/assets/javascripts/PatientCharacteristicRace.js +2 -2
  48. data/app/assets/javascripts/PatientCharacteristicSex.js +2 -2
  49. data/app/assets/javascripts/PhysicalExamOrder.js +2 -3
  50. data/app/assets/javascripts/PhysicalExamPerformed.js +2 -2
  51. data/app/assets/javascripts/PhysicalExamRecommended.js +2 -3
  52. data/app/assets/javascripts/ProcedureOrder.js +2 -4
  53. data/app/assets/javascripts/ProcedurePerformed.js +2 -3
  54. data/app/assets/javascripts/ProcedureRecommended.js +2 -4
  55. data/app/assets/javascripts/ProviderCareExperience.js +2 -2
  56. data/app/assets/javascripts/ProviderCharacteristic.js +2 -2
  57. data/app/assets/javascripts/ResultComponent.js +1 -1
  58. data/app/assets/javascripts/SubstanceAdministered.js +2 -3
  59. data/app/assets/javascripts/SubstanceOrder.js +2 -3
  60. data/app/assets/javascripts/SubstanceRecommended.js +2 -4
  61. data/app/assets/javascripts/Symptom.js +2 -2
  62. data/app/assets/javascripts/basetypes/Any.js +3 -3
  63. data/app/assets/javascripts/basetypes/DateTime.js +1 -1
  64. data/app/assets/javascripts/basetypes/Interval.js +2 -2
  65. data/app/assets/javascripts/basetypes/Ratio.js +20 -0
  66. data/app/models/models.rb +4 -5
  67. data/app/models/qdm/adverse_event.rb +2 -2
  68. data/app/models/qdm/allergy_intolerance.rb +2 -2
  69. data/app/models/qdm/assessment_order.rb +14 -0
  70. data/app/models/qdm/assessment_performed.rb +2 -2
  71. data/app/models/qdm/assessment_recommended.rb +2 -3
  72. data/app/models/qdm/basetypes/ratio.rb +52 -0
  73. data/app/models/qdm/care_goal.rb +2 -2
  74. data/app/models/qdm/communication_performed.rb +19 -0
  75. data/app/models/qdm/component.rb +1 -1
  76. data/app/models/qdm/device_applied.rb +2 -3
  77. data/app/models/qdm/device_order.rb +2 -2
  78. data/app/models/qdm/device_recommended.rb +2 -2
  79. data/app/models/qdm/diagnosis.rb +2 -2
  80. data/app/models/qdm/diagnostic_study_order.rb +2 -3
  81. data/app/models/qdm/diagnostic_study_performed.rb +2 -2
  82. data/app/models/qdm/diagnostic_study_recommended.rb +2 -3
  83. data/app/models/qdm/encounter_order.rb +2 -2
  84. data/app/models/qdm/encounter_performed.rb +2 -2
  85. data/app/models/qdm/encounter_recommended.rb +2 -2
  86. data/app/models/qdm/facility_location.rb +1 -1
  87. data/app/models/qdm/family_history.rb +2 -2
  88. data/app/models/qdm/id.rb +1 -1
  89. data/app/models/qdm/immunization_administered.rb +2 -3
  90. data/app/models/qdm/immunization_order.rb +2 -2
  91. data/app/models/qdm/intervention_order.rb +2 -2
  92. data/app/models/qdm/intervention_performed.rb +2 -2
  93. data/app/models/qdm/intervention_recommended.rb +2 -2
  94. data/app/models/qdm/laboratory_test_order.rb +2 -3
  95. data/app/models/qdm/laboratory_test_performed.rb +2 -2
  96. data/app/models/qdm/laboratory_test_recommended.rb +2 -3
  97. data/app/models/qdm/medication_active.rb +2 -3
  98. data/app/models/qdm/medication_administered.rb +2 -3
  99. data/app/models/qdm/medication_discharge.rb +3 -2
  100. data/app/models/qdm/medication_dispensed.rb +5 -2
  101. data/app/models/qdm/medication_order.rb +5 -4
  102. data/app/models/qdm/participation.rb +2 -2
  103. data/app/models/qdm/patient.rb +3 -3
  104. data/app/models/qdm/patient_care_experience.rb +2 -2
  105. data/app/models/qdm/patient_characteristic.rb +2 -2
  106. data/app/models/qdm/patient_characteristic_birthdate.rb +2 -2
  107. data/app/models/qdm/patient_characteristic_clinical_trial_participant.rb +2 -2
  108. data/app/models/qdm/patient_characteristic_ethnicity.rb +2 -2
  109. data/app/models/qdm/patient_characteristic_expired.rb +2 -2
  110. data/app/models/qdm/patient_characteristic_payer.rb +2 -2
  111. data/app/models/qdm/patient_characteristic_race.rb +2 -2
  112. data/app/models/qdm/patient_characteristic_sex.rb +2 -2
  113. data/app/models/qdm/physical_exam_order.rb +2 -3
  114. data/app/models/qdm/physical_exam_performed.rb +2 -2
  115. data/app/models/qdm/physical_exam_recommended.rb +2 -3
  116. data/app/models/qdm/procedure_order.rb +2 -4
  117. data/app/models/qdm/procedure_performed.rb +2 -3
  118. data/app/models/qdm/procedure_recommended.rb +2 -4
  119. data/app/models/qdm/provider_care_experience.rb +2 -2
  120. data/app/models/qdm/provider_characteristic.rb +2 -2
  121. data/app/models/qdm/result_component.rb +1 -1
  122. data/app/models/qdm/substance_administered.rb +2 -3
  123. data/app/models/qdm/substance_order.rb +2 -3
  124. data/app/models/qdm/substance_recommended.rb +2 -4
  125. data/app/models/qdm/symptom.rb +2 -2
  126. data/cqm-models.gemspec +1 -1
  127. data/data/oids.json +209 -197
  128. data/dist/index.js +2114 -1230
  129. data/lib/generate_models.rb +14 -12
  130. data/modelinfo/qdm-modelinfo-5.4.xml +503 -0
  131. data/package.json +2 -2
  132. data/templates/models_template.rb.erb +2 -1
  133. data/templates/patient_extension.rb.erb +2 -2
  134. data/templates/patient_template.js.erb +3 -3
  135. data/yarn.lock +3 -3
  136. metadata +10 -11
  137. data/app/assets/javascripts/CommunicationFromProviderToProvider.js +0 -30
  138. data/app/assets/javascripts/Ratio.js +0 -26
  139. data/app/models/qdm/communication_from_patient_to_provider.rb +0 -14
  140. data/app/models/qdm/communication_from_provider_to_patient.rb +0 -14
  141. data/app/models/qdm/communication_from_provider_to_provider.rb +0 -14
  142. data/app/models/qdm/ratio.rb +0 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 363b774ed856747c2e2072c19509c6b07cbc9f32
4
- data.tar.gz: 6023d0d51527e7d983e654d07be048787b708e74
3
+ metadata.gz: dd559058bde27e44c663cdceb7f5c8f4c4716f4e
4
+ data.tar.gz: 8cf7b92222d773f79050bde4c788b7b57ac0a72e
5
5
  SHA512:
6
- metadata.gz: e9cfd973933d81ab07bf72a680c81059dbcffa3db16dd42920d94f5886b141404199aebfcc885c9fcaeb9c2cefb0ea2b0c418d288174dc4db1f55db90980fdde
7
- data.tar.gz: '08fcc6ffbb2d6c0f3998fb07c3d4238b5c334af360ecbf00acb01f624cfd0648cf522b5831c589ad2292d7d0a9916af33c804c601cdadbe853ba46e61972e85e'
6
+ metadata.gz: 637a263b364d02f76ca01bf5823ede9ac27983d221e7bcd3cbaa56294410b45140a2203f3806a6eba9af6f7bcfcebc56842c69e1289bb9458e8a1e1b9836c765
7
+ data.tar.gz: b8434dbda67a944f40f54cf4b14c12cc3d88a705af36380251633ab8c466778be49e555544d351d472e68751bb4d2d8a9f08c19e631e266ae8ea53a7ebb64c2e
data/README.md CHANGED
@@ -16,7 +16,7 @@ See the top of the `lib/generate_models.rb` script for RubyGem requirements.
16
16
 
17
17
  To use, execute the following:
18
18
  ```
19
- ruby lib/generate_models.rb modelinfo/qdm-modelinfo-5.3.xml data/oids.json
19
+ ruby lib/generate_models.rb modelinfo/qdm-modelinfo-5.4.xml data/oids.json
20
20
  ```
21
21
 
22
22
  The first parameter is the file path to the modelinfo file you wish to generate from. The second parameter is the OID map file. You must include both.
@@ -21,8 +21,8 @@ const AdverseEventSchema = DataElementSchema({
21
21
  facilityLocation: FacilityLocationSchema,
22
22
  type: Code,
23
23
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.120' },
24
- category: { type: String, default: 'adverse_event' },
25
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmCategory: { type: String, default: 'adverse_event' },
25
+ qdmVersion: { type: String, default: '5.4' },
26
26
  _type: { type: String, default: 'AdverseEvent' },
27
27
 
28
28
  });
@@ -2,8 +2,6 @@ module.exports.Patient = require('./Patient.js').Patient;
2
2
  module.exports.PatientSchema = require('./Patient.js').PatientSchema;
3
3
  module.exports.Id = require('./Id.js').Id;
4
4
  module.exports.IdSchema = require('./Id.js').IdSchema;
5
- module.exports.Ratio = require('./Ratio.js').Ratio;
6
- module.exports.RatioSchema = require('./Ratio.js').RatioSchema;
7
5
  module.exports.PhysicalExamOrder = require('./PhysicalExamOrder.js').PhysicalExamOrder;
8
6
  module.exports.PhysicalExamOrderSchema = require('./PhysicalExamOrder.js').PhysicalExamOrderSchema;
9
7
  module.exports.Participation = require('./Participation.js').Participation;
@@ -30,8 +28,8 @@ module.exports.EncounterPerformed = require('./EncounterPerformed.js').Encounter
30
28
  module.exports.EncounterPerformedSchema = require('./EncounterPerformed.js').EncounterPerformedSchema;
31
29
  module.exports.Diagnosis = require('./Diagnosis.js').Diagnosis;
32
30
  module.exports.DiagnosisSchema = require('./Diagnosis.js').DiagnosisSchema;
33
- module.exports.CommunicationFromProviderToPatient = require('./CommunicationFromProviderToPatient.js').CommunicationFromProviderToPatient;
34
- module.exports.CommunicationFromProviderToPatientSchema = require('./CommunicationFromProviderToPatient.js').CommunicationFromProviderToPatientSchema;
31
+ module.exports.CommunicationPerformed = require('./CommunicationPerformed.js').CommunicationPerformed;
32
+ module.exports.CommunicationPerformedSchema = require('./CommunicationPerformed.js').CommunicationPerformedSchema;
35
33
  module.exports.AssessmentPerformed = require('./AssessmentPerformed.js').AssessmentPerformed;
36
34
  module.exports.AssessmentPerformedSchema = require('./AssessmentPerformed.js').AssessmentPerformedSchema;
37
35
  module.exports.PatientCharacteristicClinicalTrialParticipant = require('./PatientCharacteristicClinicalTrialParticipant.js').PatientCharacteristicClinicalTrialParticipant;
@@ -50,8 +48,6 @@ module.exports.ResultComponent = require('./ResultComponent.js').ResultComponent
50
48
  module.exports.ResultComponentSchema = require('./ResultComponent.js').ResultComponentSchema;
51
49
  module.exports.FacilityLocation = require('./FacilityLocation.js').FacilityLocation;
52
50
  module.exports.FacilityLocationSchema = require('./FacilityLocation.js').FacilityLocationSchema;
53
- module.exports.CommunicationFromProviderToProvider = require('./CommunicationFromProviderToProvider.js').CommunicationFromProviderToProvider;
54
- module.exports.CommunicationFromProviderToProviderSchema = require('./CommunicationFromProviderToProvider.js').CommunicationFromProviderToProviderSchema;
55
51
  module.exports.MedicationActive = require('./MedicationActive.js').MedicationActive;
56
52
  module.exports.MedicationActiveSchema = require('./MedicationActive.js').MedicationActiveSchema;
57
53
  module.exports.LaboratoryTestOrder = require('./LaboratoryTestOrder.js').LaboratoryTestOrder;
@@ -64,6 +60,8 @@ module.exports.PatientCharacteristicPayer = require('./PatientCharacteristicPaye
64
60
  module.exports.PatientCharacteristicPayerSchema = require('./PatientCharacteristicPayer.js').PatientCharacteristicPayerSchema;
65
61
  module.exports.PatientCharacteristicExpired = require('./PatientCharacteristicExpired.js').PatientCharacteristicExpired;
66
62
  module.exports.PatientCharacteristicExpiredSchema = require('./PatientCharacteristicExpired.js').PatientCharacteristicExpiredSchema;
63
+ module.exports.AssessmentOrder = require('./AssessmentOrder.js').AssessmentOrder;
64
+ module.exports.AssessmentOrderSchema = require('./AssessmentOrder.js').AssessmentOrderSchema;
67
65
  module.exports.AssessmentRecommended = require('./AssessmentRecommended.js').AssessmentRecommended;
68
66
  module.exports.AssessmentRecommendedSchema = require('./AssessmentRecommended.js').AssessmentRecommendedSchema;
69
67
  module.exports.ImmunizationAdministered = require('./ImmunizationAdministered.js').ImmunizationAdministered;
@@ -86,8 +84,6 @@ module.exports.PatientCharacteristicBirthdate = require('./PatientCharacteristic
86
84
  module.exports.PatientCharacteristicBirthdateSchema = require('./PatientCharacteristicBirthdate.js').PatientCharacteristicBirthdateSchema;
87
85
  module.exports.AdverseEvent = require('./AdverseEvent.js').AdverseEvent;
88
86
  module.exports.AdverseEventSchema = require('./AdverseEvent.js').AdverseEventSchema;
89
- module.exports.CommunicationFromPatientToProvider = require('./CommunicationFromPatientToProvider.js').CommunicationFromPatientToProvider;
90
- module.exports.CommunicationFromPatientToProviderSchema = require('./CommunicationFromPatientToProvider.js').CommunicationFromPatientToProviderSchema;
91
87
  module.exports.DeviceRecommended = require('./DeviceRecommended.js').DeviceRecommended;
92
88
  module.exports.DeviceRecommendedSchema = require('./DeviceRecommended.js').DeviceRecommendedSchema;
93
89
  module.exports.DeviceApplied = require('./DeviceApplied.js').DeviceApplied;
@@ -20,9 +20,9 @@ const AllergyIntoleranceSchema = DataElementSchema({
20
20
  type: Code,
21
21
  severity: Code,
22
22
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.119' },
23
- category: { type: String, default: 'allergy' },
23
+ qdmCategory: { type: String, default: 'allergy' },
24
24
  qdmStatus: { type: String, default: 'intolerance' },
25
- qdmVersion: { type: String, default: '5.3' },
25
+ qdmVersion: { type: String, default: '5.4' },
26
26
  _type: { type: String, default: 'AllergyIntolerance' },
27
27
 
28
28
  });
@@ -14,17 +14,17 @@ const [Number, String] = [
14
14
  mongoose.Schema.Types.String,
15
15
  ];
16
16
 
17
- const CommunicationFromProviderToPatientSchema = DataElementSchema({
17
+ const AssessmentOrderSchema = DataElementSchema({
18
18
  authorDatetime: DateTime,
19
- relatedTo: [IdSchema],
20
19
  negationRationale: Code,
21
- hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.9' },
22
- category: { type: String, default: 'communication' },
23
- qdmStatus: { type: String, default: 'from_provider_to_patient' },
24
- qdmVersion: { type: String, default: '5.3' },
25
- _type: { type: String, default: 'CommunicationFromProviderToPatient' },
20
+ reason: Code,
21
+ hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.131' },
22
+ qdmCategory: { type: String, default: 'assessment' },
23
+ qdmStatus: { type: String, default: 'order' },
24
+ qdmVersion: { type: String, default: '5.4' },
25
+ _type: { type: String, default: 'AssessmentOrder' },
26
26
 
27
27
  });
28
28
 
29
- module.exports.CommunicationFromProviderToPatientSchema = CommunicationFromProviderToPatientSchema;
30
- module.exports.CommunicationFromProviderToPatient = mongoose.model('CommunicationFromProviderToPatient', CommunicationFromProviderToPatientSchema);
29
+ module.exports.AssessmentOrderSchema = AssessmentOrderSchema;
30
+ module.exports.AssessmentOrder = mongoose.model('AssessmentOrder', AssessmentOrderSchema);
@@ -23,9 +23,9 @@ const AssessmentPerformedSchema = DataElementSchema({
23
23
  components: [ComponentSchema],
24
24
  relatedTo: [IdSchema],
25
25
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.117' },
26
- category: { type: String, default: 'assessment' },
26
+ qdmCategory: { type: String, default: 'assessment' },
27
27
  qdmStatus: { type: String, default: 'performed' },
28
- qdmVersion: { type: String, default: '5.3' },
28
+ qdmVersion: { type: String, default: '5.4' },
29
29
  _type: { type: String, default: 'AssessmentPerformed' },
30
30
 
31
31
  });
@@ -18,11 +18,10 @@ const AssessmentRecommendedSchema = DataElementSchema({
18
18
  authorDatetime: DateTime,
19
19
  negationRationale: Code,
20
20
  reason: Code,
21
- method: Code,
22
21
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.118' },
23
- category: { type: String, default: 'assessment' },
22
+ qdmCategory: { type: String, default: 'assessment' },
24
23
  qdmStatus: { type: String, default: 'recommended' },
25
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmVersion: { type: String, default: '5.4' },
26
25
  _type: { type: String, default: 'AssessmentRecommended' },
27
26
 
28
27
  });
@@ -19,8 +19,8 @@ const CareGoalSchema = DataElementSchema({
19
19
  relatedTo: [IdSchema],
20
20
  targetOutcome: Any,
21
21
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.7' },
22
- category: { type: String, default: 'care_goal' },
23
- qdmVersion: { type: String, default: '5.3' },
22
+ qdmCategory: { type: String, default: 'care_goal' },
23
+ qdmVersion: { type: String, default: '5.4' },
24
24
  _type: { type: String, default: 'CareGoal' },
25
25
 
26
26
  });
@@ -14,17 +14,22 @@ const [Number, String] = [
14
14
  mongoose.Schema.Types.String,
15
15
  ];
16
16
 
17
- const CommunicationFromPatientToProviderSchema = DataElementSchema({
17
+ const CommunicationPerformedSchema = DataElementSchema({
18
18
  authorDatetime: DateTime,
19
+ category: Code,
20
+ medium: Code,
21
+ sender: Code,
22
+ recipient: Code,
19
23
  relatedTo: [IdSchema],
24
+ relevantPeriod: Interval,
20
25
  negationRationale: Code,
21
- hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.8' },
22
- category: { type: String, default: 'communication' },
23
- qdmStatus: { type: String, default: 'from_patient_to_provider' },
24
- qdmVersion: { type: String, default: '5.3' },
25
- _type: { type: String, default: 'CommunicationFromPatientToProvider' },
26
+ hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.132' },
27
+ qdmCategory: { type: String, default: 'communication' },
28
+ qdmStatus: { type: String, default: 'performed' },
29
+ qdmVersion: { type: String, default: '5.4' },
30
+ _type: { type: String, default: 'CommunicationPerformed' },
26
31
 
27
32
  });
28
33
 
29
- module.exports.CommunicationFromPatientToProviderSchema = CommunicationFromPatientToProviderSchema;
30
- module.exports.CommunicationFromPatientToProvider = mongoose.model('CommunicationFromPatientToProvider', CommunicationFromPatientToProviderSchema);
34
+ module.exports.CommunicationPerformedSchema = CommunicationPerformedSchema;
35
+ module.exports.CommunicationPerformed = mongoose.model('CommunicationPerformed', CommunicationPerformedSchema);
@@ -17,7 +17,7 @@ const [Number, String] = [
17
17
  const ComponentSchema = new mongoose.Schema({
18
18
  code: Code,
19
19
  result: Any,
20
- qdmVersion: { type: String, default: '5.3' },
20
+ qdmVersion: { type: String, default: '5.4' },
21
21
  _type: { type: String, default: 'Component' },
22
22
 
23
23
  });
@@ -20,11 +20,10 @@ const DeviceAppliedSchema = DataElementSchema({
20
20
  negationRationale: Code,
21
21
  reason: Code,
22
22
  anatomicalLocationSite: Code,
23
- anatomicalApproachSite: Code,
24
23
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.13' },
25
- category: { type: String, default: 'device' },
24
+ qdmCategory: { type: String, default: 'device' },
26
25
  qdmStatus: { type: String, default: 'applied' },
27
- qdmVersion: { type: String, default: '5.3' },
26
+ qdmVersion: { type: String, default: '5.4' },
28
27
  _type: { type: String, default: 'DeviceApplied' },
29
28
 
30
29
  });
@@ -19,9 +19,9 @@ const DeviceOrderSchema = DataElementSchema({
19
19
  negationRationale: Code,
20
20
  reason: Code,
21
21
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.15' },
22
- category: { type: String, default: 'device' },
22
+ qdmCategory: { type: String, default: 'device' },
23
23
  qdmStatus: { type: String, default: 'order' },
24
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmVersion: { type: String, default: '5.4' },
25
25
  _type: { type: String, default: 'DeviceOrder' },
26
26
 
27
27
  });
@@ -19,9 +19,9 @@ const DeviceRecommendedSchema = DataElementSchema({
19
19
  negationRationale: Code,
20
20
  reason: Code,
21
21
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.16' },
22
- category: { type: String, default: 'device' },
22
+ qdmCategory: { type: String, default: 'device' },
23
23
  qdmStatus: { type: String, default: 'recommended' },
24
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmVersion: { type: String, default: '5.4' },
25
25
  _type: { type: String, default: 'DeviceRecommended' },
26
26
 
27
27
  });
@@ -21,8 +21,8 @@ const DiagnosisSchema = DataElementSchema({
21
21
  severity: Code,
22
22
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.110' },
23
23
  qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.135' },
24
- category: { type: String, default: 'condition' },
25
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmCategory: { type: String, default: 'condition' },
25
+ qdmVersion: { type: String, default: '5.4' },
26
26
  _type: { type: String, default: 'Diagnosis' },
27
27
 
28
28
  });
@@ -17,12 +17,11 @@ const [Number, String] = [
17
17
  const DiagnosticStudyOrderSchema = DataElementSchema({
18
18
  authorDatetime: DateTime,
19
19
  reason: Code,
20
- method: Code,
21
20
  negationRationale: Code,
22
21
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.22' },
23
- category: { type: String, default: 'diagnostic_study' },
22
+ qdmCategory: { type: String, default: 'diagnostic_study' },
24
23
  qdmStatus: { type: String, default: 'order' },
25
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmVersion: { type: String, default: '5.4' },
26
25
  _type: { type: String, default: 'DiagnosticStudyOrder' },
27
26
 
28
27
  });
@@ -26,9 +26,9 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
26
26
  negationRationale: Code,
27
27
  components: [ComponentSchema],
28
28
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.23' },
29
- category: { type: String, default: 'diagnostic_study' },
29
+ qdmCategory: { type: String, default: 'diagnostic_study' },
30
30
  qdmStatus: { type: String, default: 'performed' },
31
- qdmVersion: { type: String, default: '5.3' },
31
+ qdmVersion: { type: String, default: '5.4' },
32
32
  _type: { type: String, default: 'DiagnosticStudyPerformed' },
33
33
 
34
34
  });
@@ -16,13 +16,12 @@ const [Number, String] = [
16
16
 
17
17
  const DiagnosticStudyRecommendedSchema = DataElementSchema({
18
18
  authorDatetime: DateTime,
19
- method: Code,
20
19
  negationRationale: Code,
21
20
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.24' },
22
21
  qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.19' },
23
- category: { type: String, default: 'diagnostic_study' },
22
+ qdmCategory: { type: String, default: 'diagnostic_study' },
24
23
  qdmStatus: { type: String, default: 'recommended' },
25
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmVersion: { type: String, default: '5.4' },
26
25
  _type: { type: String, default: 'DiagnosticStudyRecommended' },
27
26
 
28
27
  });
@@ -20,9 +20,9 @@ const EncounterOrderSchema = DataElementSchema({
20
20
  facilityLocation: FacilityLocationSchema,
21
21
  negationRationale: Code,
22
22
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.27' },
23
- category: { type: String, default: 'encounter' },
23
+ qdmCategory: { type: String, default: 'encounter' },
24
24
  qdmStatus: { type: String, default: 'order' },
25
- qdmVersion: { type: String, default: '5.3' },
25
+ qdmVersion: { type: String, default: '5.4' },
26
26
  _type: { type: String, default: 'EncounterOrder' },
27
27
 
28
28
  });
@@ -25,9 +25,9 @@ const EncounterPerformedSchema = DataElementSchema({
25
25
  negationRationale: Code,
26
26
  lengthOfStay: Quantity,
27
27
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.5' },
28
- category: { type: String, default: 'encounter' },
28
+ qdmCategory: { type: String, default: 'encounter' },
29
29
  qdmStatus: { type: String, default: 'performed' },
30
- qdmVersion: { type: String, default: '5.3' },
30
+ qdmVersion: { type: String, default: '5.4' },
31
31
  _type: { type: String, default: 'EncounterPerformed' },
32
32
 
33
33
  });
@@ -20,9 +20,9 @@ const EncounterRecommendedSchema = DataElementSchema({
20
20
  facilityLocation: FacilityLocationSchema,
21
21
  negationRationale: Code,
22
22
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.28' },
23
- category: { type: String, default: 'encounter' },
23
+ qdmCategory: { type: String, default: 'encounter' },
24
24
  qdmStatus: { type: String, default: 'recommended' },
25
- qdmVersion: { type: String, default: '5.3' },
25
+ qdmVersion: { type: String, default: '5.4' },
26
26
  _type: { type: String, default: 'EncounterRecommended' },
27
27
 
28
28
  });
@@ -17,7 +17,7 @@ const [Number, String] = [
17
17
  const FacilityLocationSchema = new mongoose.Schema({
18
18
  code: Code,
19
19
  locationPeriod: Interval,
20
- qdmVersion: { type: String, default: '5.3' },
20
+ qdmVersion: { type: String, default: '5.4' },
21
21
  _type: { type: String, default: 'FacilityLocation' },
22
22
 
23
23
  });
@@ -19,8 +19,8 @@ const FamilyHistorySchema = DataElementSchema({
19
19
  relationship: Code,
20
20
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.111' },
21
21
  qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.12' },
22
- category: { type: String, default: 'family_history' },
23
- qdmVersion: { type: String, default: '5.3' },
22
+ qdmCategory: { type: String, default: 'family_history' },
23
+ qdmVersion: { type: String, default: '5.4' },
24
24
  _type: { type: String, default: 'FamilyHistory' },
25
25
 
26
26
  });
@@ -8,7 +8,7 @@ const [Number, String] = [
8
8
  const IdSchema = mongoose.Schema({
9
9
  namingSystem: String,
10
10
  value: String,
11
- qdmVersion: { type: String, default: '5.3' },
11
+ qdmVersion: { type: String, default: '5.4' },
12
12
  _type: { type: String, default: 'Id' },
13
13
 
14
14
  }, { _id: false, id: false });
@@ -18,14 +18,13 @@ const ImmunizationAdministeredSchema = DataElementSchema({
18
18
  authorDatetime: DateTime,
19
19
  reason: Code,
20
20
  dosage: Quantity,
21
- supply: Quantity,
22
21
  route: Code,
23
22
  negationRationale: Code,
24
23
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.112' },
25
24
  qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.140' },
26
- category: { type: String, default: 'immunization' },
25
+ qdmCategory: { type: String, default: 'immunization' },
27
26
  qdmStatus: { type: String, default: 'administered' },
28
- qdmVersion: { type: String, default: '5.3' },
27
+ qdmVersion: { type: String, default: '5.4' },
29
28
  _type: { type: String, default: 'ImmunizationAdministered' },
30
29
 
31
30
  });
@@ -23,9 +23,9 @@ const ImmunizationOrderSchema = DataElementSchema({
23
23
  route: Code,
24
24
  negationRationale: Code,
25
25
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.113' },
26
- category: { type: String, default: 'immunization' },
26
+ qdmCategory: { type: String, default: 'immunization' },
27
27
  qdmStatus: { type: String, default: 'order' },
28
- qdmVersion: { type: String, default: '5.3' },
28
+ qdmVersion: { type: String, default: '5.4' },
29
29
  _type: { type: String, default: 'ImmunizationOrder' },
30
30
 
31
31
  });
@@ -19,9 +19,9 @@ const InterventionOrderSchema = DataElementSchema({
19
19
  reason: Code,
20
20
  negationRationale: Code,
21
21
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.35' },
22
- category: { type: String, default: 'intervention' },
22
+ qdmCategory: { type: String, default: 'intervention' },
23
23
  qdmStatus: { type: String, default: 'order' },
24
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmVersion: { type: String, default: '5.4' },
25
25
  _type: { type: String, default: 'InterventionOrder' },
26
26
 
27
27
  });
@@ -22,9 +22,9 @@ const InterventionPerformedSchema = DataElementSchema({
22
22
  status: Code,
23
23
  negationRationale: Code,
24
24
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.36' },
25
- category: { type: String, default: 'intervention' },
25
+ qdmCategory: { type: String, default: 'intervention' },
26
26
  qdmStatus: { type: String, default: 'performed' },
27
- qdmVersion: { type: String, default: '5.3' },
27
+ qdmVersion: { type: String, default: '5.4' },
28
28
  _type: { type: String, default: 'InterventionPerformed' },
29
29
 
30
30
  });
@@ -19,9 +19,9 @@ const InterventionRecommendedSchema = DataElementSchema({
19
19
  reason: Code,
20
20
  negationRationale: Code,
21
21
  hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.3.37' },
22
- category: { type: String, default: 'intervention' },
22
+ qdmCategory: { type: String, default: 'intervention' },
23
23
  qdmStatus: { type: String, default: 'recommended' },
24
- qdmVersion: { type: String, default: '5.3' },
24
+ qdmVersion: { type: String, default: '5.4' },
25
25
  _type: { type: String, default: 'InterventionRecommended' },
26
26
 
27
27
  });