cqm-models 3.0.4 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8208f3cf4b7526de218cacd347ed0d1cefe129047257e41b0636cbbed9c1547e
-  data.tar.gz: daef8cba832f1f300e96663815a581376e63c3724a405edc83f56fb493da5785
+  metadata.gz: 85bf553127da27f99d10b18c86684ddfa57c4f2f7e992ca54d093c6e27888db6
+  data.tar.gz: b899eb5db26a8cf98655d34b82ae8ff2c105c98c6332af7b1e3b37bb18b19a85
 SHA512:
-  metadata.gz: 8422a52fe5fb65c349c54ae619a6c44075b732b4b0febc3c912258f54aa353cf67d30dfdf39b55cf0e188c7934132dae86dbedff2157eeacdf368556aaa6592a
-  data.tar.gz: 3b01fe32540586d4b905ba8099e284fe194610a659292f64988d5fa785c4d8247d42f5fdd22c5604a7164416fb1b3d420881a447a870114b8383bda08731ca4a
+  metadata.gz: aeb672673dbb27b9ecef2d1e1e1b718d84ebd9ad793bfd75a8b733b7c113e45604281865916fe82e5e12fa4034fa1ea6c0598b76e0e615979fc31e3fc822381c
+  data.tar.gz: 8102ced4699a1bdd4ec549ffb7cc8c649a61d1fd0d2f123ab5bed1a1b2aeff0c5194d49e1f6163cb4dcc15c822ec1e913558b84ab63af10c855542180fe0c358

data/.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: Continuous Integration
+on:
+  pull_request:
+    branches:
+      - master
+      - cqm_models_3_x
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.5]
+        mongodb-version: [4.0.18, 4.4]
+        node-version: [12.x, 14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: 2.1.4
+    - name: Install dependencies
+      run: bundle install
+    - name: Start MongoDB
+      uses: supercharge/mongodb-github-action@1.3.0
+      with:
+        mongodb-version: ${{ matrix.mongodb-version }}
+    - name: Run audit
+      run: |
+        bundle exec bundle-audit check --update
+        bundle exec bundle-audit check
+    - name: Run rake
+      run: bundle exec rake
+    - name: Run rubocop
+      run: bundle exec rubocop
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install Yarn
+      run: npm install -g yarn
+    - name: Run yarn
+      run: |
+        yarn install
+        yarn run lint
+        yarn run test
+        yarn audit
+    - name: Run validation
+      run: |
+        ./bin/validate_dist.sh
+        ./bin/validate_browser.sh
+        ./bin/validate_generator.sh

data/README.md

@@ -17,7 +17,7 @@ See the top of the `lib/generate_models.rb` script for RubyGem requirements.
 
 To use, execute the following:
 ```
-ruby lib/generate_models.rb modelinfo/qdm-modelinfo-5.5.xml data/oids_qdm_5.5.json
+ruby lib/generate_models.rb modelinfo/qdm-modelinfo-5.6.xml data/oids_qdm_5.6.json
 ```
 
 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.
@@ -41,7 +41,7 @@ QDM::PatientGeneration.generate_exhaustive_data_element_patients()
 
 To generate a single patient that has every data element from a specific model-info file execute the following:
 ```
-QDM::PatientGeneration.generate_exhaustive_data_element_patients(false, 'qdm-modelinfo-5.3.xml')
+QDM::PatientGeneration.generate_exhaustive_data_element_patients(false, 'qdm-modelinfo-5.6.xml')
 ```
 
 ## Running the tests
@@ -69,6 +69,7 @@ Starting with version **2.0.0** released on 6/20/2019, cqm-models versioning has
   | --- | --- |
   | 2 | 5.4 |
   | 3 | 5.5 |
+  | 4 | 5.6 |
 
 * **Y** indicates major changes (incompatible API changes)
 

data/app/assets/javascripts/AdverseEvent.js

@@ -25,11 +25,11 @@ const AdverseEventSchema = DataElementSchema({
   severity: Code,
   facilityLocation: FacilityLocationSchema,
   type: Code,
-  recorder: AnyEntity,
+  recorder: [AnyEntity],
   qdmTitle: { type: String, default: 'Adverse Event' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.120' },
   qdmCategory: { type: String, default: 'adverse_event' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::AdverseEvent' },
 
 });

data/app/assets/javascripts/AllDataElements.js

@@ -12,6 +12,8 @@ module.exports.Practitioner = require('./attributes/Practitioner.js').Practition
 module.exports.PractitionerSchema = require('./attributes/Practitioner.js').PractitionerSchema;
 module.exports.Organization = require('./attributes/Organization.js').Organization;
 module.exports.OrganizationSchema = require('./attributes/Organization.js').OrganizationSchema;
+module.exports.Location = require('./attributes/Location.js').Location;
+module.exports.LocationSchema = require('./attributes/Location.js').LocationSchema;
 module.exports.PhysicalExamOrder = require('./PhysicalExamOrder.js').PhysicalExamOrder;
 module.exports.PhysicalExamOrderSchema = require('./PhysicalExamOrder.js').PhysicalExamOrderSchema;
 module.exports.Participation = require('./Participation.js').Participation;
@@ -96,8 +98,6 @@ module.exports.AdverseEvent = require('./AdverseEvent.js').AdverseEvent;
 module.exports.AdverseEventSchema = require('./AdverseEvent.js').AdverseEventSchema;
 module.exports.DeviceRecommended = require('./DeviceRecommended.js').DeviceRecommended;
 module.exports.DeviceRecommendedSchema = require('./DeviceRecommended.js').DeviceRecommendedSchema;
-module.exports.DeviceApplied = require('./DeviceApplied.js').DeviceApplied;
-module.exports.DeviceAppliedSchema = require('./DeviceApplied.js').DeviceAppliedSchema;
 module.exports.MedicationDischarge = require('./MedicationDischarge.js').MedicationDischarge;
 module.exports.MedicationDischargeSchema = require('./MedicationDischarge.js').MedicationDischargeSchema;
 module.exports.InterventionPerformed = require('./InterventionPerformed.js').InterventionPerformed;

data/app/assets/javascripts/AllergyIntolerance.js

@@ -24,12 +24,12 @@ const AllergyIntoleranceSchema = DataElementSchema({
   prevalencePeriod: Interval,
   type: Code,
   severity: Code,
-  recorder: AnyEntity,
+  recorder: [AnyEntity],
   qdmTitle: { type: String, default: 'Allergy/Intolerance' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.119' },
   qdmCategory: { type: String, default: 'allergy' },
   qdmStatus: { type: String, default: 'intolerance' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::AllergyIntolerance' },
 
 });

data/app/assets/javascripts/AssessmentOrder.js

@@ -23,12 +23,12 @@ const AssessmentOrderSchema = DataElementSchema({
   authorDatetime: DateTime,
   negationRationale: Code,
   reason: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Assessment, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.131' },
   qdmCategory: { type: String, default: 'assessment' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::AssessmentOrder' },
 
 });

data/app/assets/javascripts/AssessmentPerformed.js

@@ -27,14 +27,15 @@ const AssessmentPerformedSchema = DataElementSchema({
   reason: Code,
   method: Code,
   result: Any,
+  interpretation: Code,
   components: [ComponentSchema],
   relatedTo: [String],
-  performer: AnyEntity,
+  performer: [AnyEntity],
   qdmTitle: { type: String, default: 'Assessment, Performed' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.117' },
   qdmCategory: { type: String, default: 'assessment' },
   qdmStatus: { type: String, default: 'performed' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::AssessmentPerformed' },
 
 });

data/app/assets/javascripts/AssessmentRecommended.js

@@ -23,12 +23,12 @@ const AssessmentRecommendedSchema = DataElementSchema({
   authorDatetime: DateTime,
   negationRationale: Code,
   reason: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Assessment, Recommended' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.118' },
   qdmCategory: { type: String, default: 'assessment' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::AssessmentRecommended' },
 
 });

data/app/assets/javascripts/CareGoal.js

@@ -24,11 +24,11 @@ const CareGoalSchema = DataElementSchema({
   relevantPeriod: Interval,
   relatedTo: [String],
   targetOutcome: Any,
-  performer: AnyEntity,
+  performer: [AnyEntity],
   qdmTitle: { type: String, default: 'Care Goal' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.7' },
   qdmCategory: { type: String, default: 'care_goal' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::CareGoal' },
 
 });

data/app/assets/javascripts/CommunicationPerformed.js

@@ -23,8 +23,8 @@ const CommunicationPerformedSchema = DataElementSchema({
   authorDatetime: DateTime,
   category: Code,
   medium: Code,
-  sender: AnyEntity,
-  recipient: AnyEntity,
+  sender: [AnyEntity],
+  recipient: [AnyEntity],
   relatedTo: [String],
   sentDatetime: DateTime,
   receivedDatetime: DateTime,
@@ -33,7 +33,7 @@ const CommunicationPerformedSchema = DataElementSchema({
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.132' },
   qdmCategory: { type: String, default: 'communication' },
   qdmStatus: { type: String, default: 'performed' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::CommunicationPerformed' },
 
 });

data/app/assets/javascripts/DeviceOrder.js

@@ -23,12 +23,12 @@ const DeviceOrderSchema = DataElementSchema({
   authorDatetime: DateTime,
   negationRationale: Code,
   reason: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Device, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.15' },
   qdmCategory: { type: String, default: 'device' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::DeviceOrder' },
 
 });

data/app/assets/javascripts/DeviceRecommended.js

@@ -23,12 +23,12 @@ const DeviceRecommendedSchema = DataElementSchema({
   authorDatetime: DateTime,
   negationRationale: Code,
   reason: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Device, Recommended' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.16' },
   qdmCategory: { type: String, default: 'device' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::DeviceRecommended' },
 
 });

data/app/assets/javascripts/Diagnosis.js

@@ -24,12 +24,12 @@ const DiagnosisSchema = DataElementSchema({
   prevalencePeriod: Interval,
   anatomicalLocationSite: Code,
   severity: Code,
-  recorder: AnyEntity,
+  recorder: [AnyEntity],
   qdmTitle: { type: String, default: 'Diagnosis' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.110' },
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.135' },
   qdmCategory: { type: String, default: 'condition' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::Diagnosis' },
 
 });

data/app/assets/javascripts/DiagnosticStudyOrder.js

@@ -23,12 +23,12 @@ const DiagnosticStudyOrderSchema = DataElementSchema({
   authorDatetime: DateTime,
   reason: Code,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Diagnostic Study, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.22' },
   qdmCategory: { type: String, default: 'diagnostic_study' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::DiagnosticStudyOrder' },
 
 });

data/app/assets/javascripts/DiagnosticStudyPerformed.js

@@ -26,17 +26,19 @@ const DiagnosticStudyPerformedSchema = DataElementSchema({
   reason: Code,
   result: Any,
   resultDatetime: DateTime,
+  interpretation: Code,
   status: Code,
   method: Code,
   facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
   components: [ComponentSchema],
-  performer: AnyEntity,
+  performer: [AnyEntity],
+  relatedTo: [String],
   qdmTitle: { type: String, default: 'Diagnostic Study, Performed' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.23' },
   qdmCategory: { type: String, default: 'diagnostic_study' },
   qdmStatus: { type: String, default: 'performed' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::DiagnosticStudyPerformed' },
 
 });

data/app/assets/javascripts/DiagnosticStudyRecommended.js

@@ -22,13 +22,13 @@ const [Number, String] = [
 const DiagnosticStudyRecommendedSchema = DataElementSchema({
   authorDatetime: DateTime,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Diagnostic Study, Recommended' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.24' },
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.19' },
   qdmCategory: { type: String, default: 'diagnostic_study' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::DiagnosticStudyRecommended' },
 
 });

data/app/assets/javascripts/EncounterOrder.js

@@ -24,13 +24,13 @@ const EncounterOrderSchema = DataElementSchema({
   reason: Code,
   facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   priority: Code,
   qdmTitle: { type: String, default: 'Encounter, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.27' },
   qdmCategory: { type: String, default: 'encounter' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::EncounterOrder' },
 
 });

data/app/assets/javascripts/EncounterPerformed.js

@@ -22,19 +22,20 @@ const [Number, String] = [
 const EncounterPerformedSchema = DataElementSchema({
   authorDatetime: DateTime,
   admissionSource: Code,
+  class: Code,
   relevantPeriod: Interval,
   dischargeDisposition: Code,
   facilityLocations: [FacilityLocationSchema],
   diagnoses: [DiagnosisComponentSchema],
-  negationRationale: Code,
   lengthOfStay: Quantity,
   priority: Code,
-  participant: AnyEntity,
+  participant: [AnyEntity],
+  relatedTo: [String],
   qdmTitle: { type: String, default: 'Encounter, Performed' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.5' },
   qdmCategory: { type: String, default: 'encounter' },
   qdmStatus: { type: String, default: 'performed' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::EncounterPerformed' },
 
 });
@@ -44,6 +45,9 @@ class EncounterPerformed extends mongoose.Document {
   constructor(object) {
     super(object, EncounterPerformedSchema);
     this._type = 'QDM::EncounterPerformed';
+    if (object && object.clazz) {
+      this.class = object.clazz;
+    }
   }
 }
 

data/app/assets/javascripts/EncounterRecommended.js

@@ -24,12 +24,12 @@ const EncounterRecommendedSchema = DataElementSchema({
   reason: Code,
   facilityLocation: FacilityLocationSchema,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Encounter, Recommended' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.28' },
   qdmCategory: { type: String, default: 'encounter' },
   qdmStatus: { type: String, default: 'recommended' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::EncounterRecommended' },
 
 });

data/app/assets/javascripts/FamilyHistory.js

@@ -22,12 +22,12 @@ const [Number, String] = [
 const FamilyHistorySchema = DataElementSchema({
   authorDatetime: DateTime,
   relationship: Code,
-  recorder: AnyEntity,
+  recorder: [AnyEntity],
   qdmTitle: { type: String, default: 'Family History' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.111' },
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.12' },
   qdmCategory: { type: String, default: 'family_history' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::FamilyHistory' },
 
 });

data/app/assets/javascripts/ImmunizationAdministered.js

@@ -26,13 +26,13 @@ const ImmunizationAdministeredSchema = DataElementSchema({
   dosage: Quantity,
   route: Code,
   negationRationale: Code,
-  performer: AnyEntity,
+  performer: [AnyEntity],
   qdmTitle: { type: String, default: 'Immunization, Administered' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.112' },
   qrdaOid: { type: String, default: '2.16.840.1.113883.10.20.24.3.140' },
   qdmCategory: { type: String, default: 'immunization' },
   qdmStatus: { type: String, default: 'administered' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::ImmunizationAdministered' },
 
 });

data/app/assets/javascripts/ImmunizationOrder.js

@@ -27,12 +27,12 @@ const ImmunizationOrderSchema = DataElementSchema({
   reason: Code,
   route: Code,
   negationRationale: Code,
-  requester: AnyEntity,
+  requester: [AnyEntity],
   qdmTitle: { type: String, default: 'Immunization, Order' },
   hqmfOid: { type: String, default: '2.16.840.1.113883.10.20.28.4.113' },
   qdmCategory: { type: String, default: 'immunization' },
   qdmStatus: { type: String, default: 'order' },
-  qdmVersion: { type: String, default: '5.5' },
+  qdmVersion: { type: String, default: '5.6' },
   _type: { type: String, default: 'QDM::ImmunizationOrder' },
 
 });