diff --git a/input/intro-notes/StructureDefinition-qicore-doNotPerformReason-intro.xml b/archived/resources/StructureDefinition-qicore-doNotPerformReason-intro.xml similarity index 90% rename from input/intro-notes/StructureDefinition-qicore-doNotPerformReason-intro.xml rename to archived/resources/StructureDefinition-qicore-doNotPerformReason-intro.xml index 5521a513..ac4d38df 100644 --- a/input/intro-notes/StructureDefinition-qicore-doNotPerformReason-intro.xml +++ b/archived/resources/StructureDefinition-qicore-doNotPerformReason-intro.xml @@ -27,10 +27,8 @@ - -
Device Not Requested Example
Service Not Requested Example
diff --git a/input/resources/StructureDefinition-qicore-doNotPerformReason.json b/archived/resources/StructureDefinition-qicore-doNotPerformReason.json similarity index 100% rename from input/resources/StructureDefinition-qicore-doNotPerformReason.json rename to archived/resources/StructureDefinition-qicore-doNotPerformReason.json diff --git a/input/resources/StructureDefinition-qicore-encounter-diagnosisPresentOnAdmission.json b/archived/resources/StructureDefinition-qicore-encounter-diagnosisPresentOnAdmission.json similarity index 100% rename from input/resources/StructureDefinition-qicore-encounter-diagnosisPresentOnAdmission.json rename to archived/resources/StructureDefinition-qicore-encounter-diagnosisPresentOnAdmission.json diff --git a/input/intro-notes/StructureDefinition-qicore-isElective-intro.xml b/archived/resources/StructureDefinition-qicore-isElective-intro.xml similarity index 100% rename from input/intro-notes/StructureDefinition-qicore-isElective-intro.xml rename to archived/resources/StructureDefinition-qicore-isElective-intro.xml diff --git a/input/resources/StructureDefinition-qicore-isElective.json b/archived/resources/StructureDefinition-qicore-isElective.json similarity index 100% rename from input/resources/StructureDefinition-qicore-isElective.json rename to archived/resources/StructureDefinition-qicore-isElective.json diff --git a/input/intro-notes/StructureDefinition-qicore-notDoneReason-intro.xml b/archived/resources/StructureDefinition-qicore-notDoneReason-intro.xml similarity index 100% rename from input/intro-notes/StructureDefinition-qicore-notDoneReason-intro.xml rename to archived/resources/StructureDefinition-qicore-notDoneReason-intro.xml diff --git a/input/resources/StructureDefinition-qicore-notDoneReason.json b/archived/resources/StructureDefinition-qicore-notDoneReason.json similarity index 100% rename from input/resources/StructureDefinition-qicore-notDoneReason.json rename to archived/resources/StructureDefinition-qicore-notDoneReason.json diff --git a/input/intro-notes/StructureDefinition-qicore-recorded-intro.xml b/archived/resources/StructureDefinition-qicore-recorded-intro.xml similarity index 100% rename from input/intro-notes/StructureDefinition-qicore-recorded-intro.xml rename to archived/resources/StructureDefinition-qicore-recorded-intro.xml diff --git a/input/resources/StructureDefinition-qicore-recorded.json b/archived/resources/StructureDefinition-qicore-recorded.json similarity index 100% rename from input/resources/StructureDefinition-qicore-recorded.json rename to archived/resources/StructureDefinition-qicore-recorded.json diff --git a/input/resources/structuredefinition-qicore-servicerequest-appropriatenessscore.xml b/archived/resources/structuredefinition-qicore-servicerequest-appropriatenessscore.xml similarity index 100% rename from input/resources/structuredefinition-qicore-servicerequest-appropriatenessscore.xml rename to archived/resources/structuredefinition-qicore-servicerequest-appropriatenessscore.xml diff --git a/input/data/new_items.yml b/input/data/new_items.yml index 407e877a..dac2e914 100644 --- a/input/data/new_items.yml +++ b/input/data/new_items.yml @@ -24,7 +24,7 @@ list: 1. **Applied**: Add reference to 3 new US Core observation profiles in QI-Core ([FHIR-45359](https://jira.hl7.org/browse/FHIR-45359)) Applied ([here](profiles.html)) 1. **Applied**: Update QI-Core references to USCDI consistent with US Core 7.0 approach ([FHIR-45360](https://jira.hl7.org/browse/FHIR-45360)) Applied in each profile ([here](profiles.html)) 1. **Applied**: Update qiqore-notDoneValueSet Extension ([FHIR-45368](https://jira.hl7.org/browse/FHIR-45368)) Applied ([here](extensions.html)) - 1. **Resolved-Change Required**: Update QI-Core to use extensions pack ([FHIR-45369](https://jira.hl7.org/browse/FHIR-45369)) Applied ([here](extensions.html)) + 1. **Applied**: Update QI-Core to use extensions pack ([FHIR-45369](https://jira.hl7.org/browse/FHIR-45369)) Applied ([here](extensions.html)), ([here](StructureDefinition-qicore-servicenotrequested.html)), ([here](StructureDefinition-qicore-devicenotrequested.html)), ([here](StructureDefinition-qicore-observationcancelled.html)), ([here](StructureDefinition-qicore-procedurenotdone.html)), ([here](StructureDefinition-qicore-medicationdispensedeclined.html)) and ([here](StructureDefinition-qicore-medicationadministrationnotdone.html)) 1. **Applied**: Update AllergyIntolerance, CarePlan, CareTeam, and Coverage profiles to address US Core 7.0 ([FHIR-45395](https://jira.hl7.org/browse/FHIR-45395)) Applied ([here](StructureDefinition-qicore-careplan.html)) and ([here](StructureDefinition-qicore-careteam.html)) 1. **Applied**: Update QI-Core Condition Encounter Diagnosis and QI-Core Condition Problems and Health Concerns Profiles to build off of US Core 7.0 ([FHIR-45396](https://jira.hl7.org/browse/FHIR-45396)) Applied ([here](StructureDefinition-qicore-condition-problems-health-concerns.html)) and ([here](StructureDefinition-qicore-condition-encounter-diagnosis.html)) 1. **Applied**: Update QICore DiagnosticReport Profile for Laboratory Results Reporting and QI Core DiagnosticReport Profile for Report and Note Exchange to reflect updates in US Core 7.0's respective profile ([FHIR-45397](https://jira.hl7.org/browse/FHIR-45397)) Applied ([here](StructureDefinition-qicore-diagnosticreport-lab.html)) diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt index 4f41138a..f8e7de24 100644 --- a/input/ignoreWarnings.txt +++ b/input/ignoreWarnings.txt @@ -15,7 +15,7 @@ INFORMATION: Observation/example-odh: Observation.value.ofType(CodeableConcept). # The following messages are being generated from the inherited/base resource snapshot WARNING: StructureDefinition/qicore-careplan: StructureDefinition.snapshot.element[9].comment: The markdown contains content that appears to be an embedded HTML tag starting at 'Th'. This will (or SHOULD) be escaped by the presentation layer. The content should be checked to confirm that this is the desired behaviour -INFORMATION: StructureDefinition/qicore-medicationdispense: StructureDefinition.snapshot.element[28].mapping[0].map: The string value contains text that looks like embedded HTML tags. If this content is rendered to HTML without appropriate post-processing, it may be a security risk +INFORMATION: StructureDefinition/qicore-medicationdispense: StructureDefinition.snapshot.element[29].mapping[0].map: The string value contains text that looks like embedded HTML tags. If this content is rendered to HTML without appropriate post-processing, it may be a security risk INFORMATION: StructureDefinition/qicore-medicationdispensedeclined: StructureDefinition.snapshot.element[32].mapping[0].map: The string value contains text that looks like embedded HTML tags. If this content is rendered to HTML without appropriate post-processing, it may be a security risk INFORMATION: StructureDefinition/qicore-organization: StructureDefinition.snapshot.element[10].pattern.ofType(Identifier): The repeating element has a pattern. The pattern will apply to all the repeats (this has not been clear to all users) INFORMATION: StructureDefinition/qicore-organization: StructureDefinition.snapshot.element[11].pattern.ofType(Identifier): The repeating element has a pattern. The pattern will apply to all the repeats (this has not been clear to all users) diff --git a/input/pages/changes.md b/input/pages/changes.md index 8db0e6d3..6bcf5161 100644 --- a/input/pages/changes.md +++ b/input/pages/changes.md @@ -6,30 +6,55 @@ This page lists the change history for each version of QI-Core. ### STU7-ballot (7.0.0) -1. Update AllergyIntolerance, CarePlan, CareTeam, and Coverage profiles to address US Core 7.0([FHIR-45395](https://jira.hl7.org/browse/FHIR-45395)) Applied ([here](StructureDefinition-qicore-careplan.html)) and ([here](StructureDefinition-qicore-careteam.html)) +1. Should have a CapablityStatement to describe the capabilities of a deployed and configured solution that follows this IG. - 2018-Jan QI-Core #29 ([FHIR-14994](https://jira.hl7.org/browse/FHIR-14994)) Applied ([here](index.html#summary-of-conformance-requirements)) +1. It'd be helpful to list a default retriever for each profile ([FHIR-42084](https://jira.hl7.org/browse/FHIR-42084)) Applied in each profile ([here](profiles.html)) +1. Consider refactoring to Using CQL IG ([FHIR-43570](https://jira.hl7.org/browse/FHIR-43570)) Applied ([here](modelinfo.html)) and ([here](patterns.html)) and ([here](negation.html)) +1. MedicationNotRequested binding is incorrect ([FHIR-44737](https://jira.hl7.org/browse/FHIR-44737)) Applied ([here](StructureDefinition-qicore-medicationnotrequested.html)) +1. MedicationDispenseDeclined negation pattern incorrectly allows for medication reference ([FHIR-44738](https://jira.hl7.org/browse/FHIR-44738)) Applied ([here](StructureDefinition-qicore-medicationdispensedeclined.html)) +1. TLS 1.1 has been deprecated ([FHIR-44743](https://jira.hl7.org/browse/FHIR-44743)) Applied ([here](index.html#privacy-security-and-consent)) +1. Link to Terminology "guidance section" doesn't work as intended ([FHIR-44808](https://jira.hl7.org/browse/FHIR-44808)) Applied ([here](terminology.html)) +1. Add reference to 3 new US Core observation profiles in QI-Core ([FHIR-45359](https://jira.hl7.org/browse/FHIR-45359)) Applied ([here](profiles.html)) +1. Update QI-Core references to USCDI consistent with US Core 7.0 approach ([FHIR-45360](https://jira.hl7.org/browse/FHIR-45360)) Applied in each profile ([here](profiles.html)) +1. Update qiqore-notDoneValueSet Extension ([FHIR-45368](https://jira.hl7.org/browse/FHIR-45368)) Applied ([here](extensions.html)) +1. Update QI-Core to use extensions pack ([FHIR-45369](https://jira.hl7.org/browse/FHIR-45369)) Applied ([here](extensions.html)) +1. Update AllergyIntolerance, CarePlan, CareTeam, and Coverage profiles to address US Core 7.0 ([FHIR-45395](https://jira.hl7.org/browse/FHIR-45395)) Applied ([here](StructureDefinition-qicore-careplan.html)) and ([here](StructureDefinition-qicore-careteam.html)) 1. Update QI-Core Condition Encounter Diagnosis and QI-Core Condition Problems and Health Concerns Profiles to build off of US Core 7.0 ([FHIR-45396](https://jira.hl7.org/browse/FHIR-45396)) Applied ([here](StructureDefinition-qicore-condition-problems-health-concerns.html)) and ([here](StructureDefinition-qicore-condition-encounter-diagnosis.html)) 1. Update QICore DiagnosticReport Profile for Laboratory Results Reporting and QI Core DiagnosticReport Profile for Report and Note Exchange to reflect updates in US Core 7.0's respective profile ([FHIR-45397](https://jira.hl7.org/browse/FHIR-45397)) Applied ([here](StructureDefinition-qicore-diagnosticreport-lab.html)) 1. Update QICore Encounter profile to build off of US Core 7.0 Encounter profile ([FHIR-45398](https://jira.hl7.org/browse/FHIR-45398)) Applied ([here](StructureDefinition-qicore-encounter.html)) +1. Update QI-Core Goal profile to reflect US Core 7.0 Goal profile ([FHIR-45399](https://jira.hl7.org/browse/FHIR-45399)) Applied ([here](StructureDefinition-qicore-goal.html)) 1. Update QI-Core Immunization, QI-Core ImmunizationNotDone profiles to build from US 7.0 Core Immunization Profile ([FHIR-45400](https://jira.hl7.org/browse/FHIR-45400)) Applied ([here](StructureDefinition-qicore-immunizationnotdone.html)) +1. Update QI-Core Location profile consistently with US Core version 7.0 Location Profile ([FHIR-45401](https://jira.hl7.org/browse/FHIR-45401)) Applied ([here](StructureDefinition-qicore-location.html)) 1. Update QI-Core Medication and QI-Core MedicationDispense and QI-Core MedicationDispenseDeclined profiles to build from US Core 7.0 Medication and MedicationDispense profiles ([FHIR-45402](https://jira.hl7.org/browse/FHIR-45402)) Applied ([here](StructureDefinition-qicore-medicationdispense.html)) and ([here](StructureDefinition-qicore-medicationdispensedeclined.html)) +1. Update QI-Core MedicationRequest and QI-Core MedicationNotRequested to changes reflected in US Core 7.0 MedicationRequest Profile ([FHIR-45403](https://jira.hl7.org/browse/FHIR-45403)) Applied ([here](StructureDefinition-qicore-medicationrequest.html)) and ([here](StructureDefinition-qicore-medicationnotrequested.html)) 1. update QI-Core SimpleObservation and ObservationCancelled to reflect changes in US Core 7.0 ([FHIR-45415](https://jira.hl7.org/browse/FHIR-45415)) Applied ([here](StructureDefinition-qicore-simple-observation.html)) and ([here](StructureDefinition-qicore-observationcancelled.html)) 1. Update QI-Core ObservationClinicalResult and QI-Core LaboratoryResultObservation Profile to reflect changes in US Core 7.0 ([FHIR-45416](https://jira.hl7.org/browse/FHIR-45416)) Applied ([here](StructureDefinition-qicore-observation-clinical-result.html)) and ([here](StructureDefinition-qicore-observation-lab.html)) -1. Update QI-Core ObservationScreeningAssessment to reflect changes in US Core 7.0([FHIR-45417](https://jira.hl7.org/browse/FHIR-45417)) Applied ([here](StructureDefinition-qicore-observation-screening-assessment.html)) -1. Update QI-Core Related Person to reflect changes in US Core 7.0([FHIR-45427](https://jira.hl7.org/browse/FHIR-45427)) Applied ([here](StructureDefinition-qicore-relatedperson.html)) -1. limit subject reference in AdverseEvent to patient([FHIR-45693](https://jira.hl7.org/browse/FHIR-45693)) Applied ([here](StructureDefinition-qicore-adverseevent.html)) -1. Update medication[x] content across not done for reason medication actions to assure consistency ([FHIR-46291](https://jira.hl7.org/browse/FHIR-46291)) Applied ([here](StructureDefinition-qicore-medicationdispensedeclined.html)) -1. Update QI-Core Claim to include key elements for present on admission and principal diagnosis([FHIR-45959](https://jira.hl7.org/browse/FHIR-45959)) Applied ([here](StructureDefinition-qicore-claim.html)) -1. QICore MedicationRequest prohibits reportedBoolean ([FHIR-46040](https://jira.hl7.org/browse/FHIR-46040)) Applied ([here](StructureDefinition-qicore-medicationrequest.html)) +1. Update QI-Core ObservationScreeningAssessment to reflect changes in US Core 7.0 ([FHIR-45417](https://jira.hl7.org/browse/FHIR-45417)) Applied ([here](StructureDefinition-qicore-observation-screening-assessment.html)) +1. Update QI-Core Organization Profile to reflect changes in US Core 7.0 ([FHIR-45419](https://jira.hl7.org/browse/FHIR-45419)) Applied ([here](StructureDefinition-qicore-organization.html)) +1. Update QI-Core Patient profile to align with changes in US Core 7.0 ([FHIR-45424](https://jira.hl7.org/browse/FHIR-45424)) Applied ([here](StructureDefinition-qicore-patient.html)) +1. Update QI-Core Practitioner profile to reflect changes in US Core 7.0 ([FHIR-45425](https://jira.hl7.org/browse/FHIR-45425)) Applied ([here](StructureDefinition-qicore-practitioner.html)) +1. Update QI-Core PractitionerRole profile to reflect changes in US Core 7.0 ([FHIR-45426](https://jira.hl7.org/browse/FHIR-45426)) Applied ([here](StructureDefinition-qicore-practitionerrole.html)) +1. Update QI-Core Related Person to reflect changes in US Core 7.0 ([FHIR-45427](https://jira.hl7.org/browse/FHIR-45427)) Applied ([here](StructureDefinition-qicore-relatedperson.html)) +1. Update QI-Core Procedure and ProcedureNotDone to reference US Core 7.0 respective profile ([FHIR-45429](https://jira.hl7.org/browse/FHIR-45429)) Applied ([here](StructureDefinition-qicore-procedure.html)) and ([here](StructureDefinition-qicore-procedurenotdone.html)) +1. Update QI-Core QuestionnaireResponse profile to align with updated US Core 7.0 respective profile ([FHIR-45430](https://jira.hl7.org/browse/FHIR-45430)) Applied ([here](StructureDefinition-qicore-questionnaireresponse.html)) +1. Update QI-Core ServiceRequest and QI-Core ServiceNotRequested to align with changes to US Core 7.0 respective profiles ([FHIR-45431](https://jira.hl7.org/browse/FHIR-45431)) Applied ([here](StructureDefinition-qicore-servicerequest.html)) and ([here](StructureDefinition-qicore-servicenotrequested.html)) 1. Update QDM to QI-Core Mapping Tables to reference changes in QI-Core 7.0 ([FHIR-45597](https://jira.hl7.org/browse/FHIR-45597)) Applied ([here](qdm-to-qicore.html)) - +1. Limit subject reference in AdverseEvent to patient ([FHIR-45693](https://jira.hl7.org/browse/FHIR-45693)) Applied ([here](StructureDefinition-qicore-adverseevent.html)) +1. Update Negation page to include 3 new US Core observation profiles ([FHIR-45722](https://jira.hl7.org/browse/FHIR-45722)) Applied ([here](negation.html)) +1. Update landing page for version 7.0 ([FHIR-45947](https://jira.hl7.org/browse/FHIR-45947)) Applied ([here](index.html)) +1. Move Negation Value Set to THO ([FHIR-45957](https://jira.hl7.org/browse/FHIR-45957)) Applied ([here](ValueSet-qicore-negation-reason.html)) +1. Update QI-Core Claim to include key elements for present on admission and principal diagnosis ([FHIR-45959](https://jira.hl7.org/browse/FHIR-45959)) Applied ([here](StructureDefinition-qicore-claim.html)) +1. Add (QI) tags to QI-Core profile elements used in test FHIR measures ([FHIR-46015](https://jira.hl7.org/browse/FHIR-46015)) Applied in each profile ([here](profiles.html)) +1. Add list of QI-Core-flagged elements to the narrative ([FHIR-46030](https://jira.hl7.org/browse/FHIR-46030)) Applied in each profile ([here](profiles.html)) +1. QICore MedicationRequest prohibits reportedBoolean ([FHIR-46040](https://jira.hl7.org/browse/FHIR-46040)) Applied ([here](StructureDefinition-qicore-medicationrequest.html)) +1. Update medication[x] content across not done for reason medication actions to assure consistency ([FHIR-46291](https://jira.hl7.org/browse/FHIR-46291)) Applied ([here](StructureDefinition-qicore-medicationnotrequested.html)) and ([here](StructureDefinition-qicore-medicationadministrationnotdone.html)) and ([here](StructureDefinition-qicore-medicationdispensedeclined.html)) ### STU6 Release (6.0.0) 1. QICore Simple Observation Profile - removed additional subjects ([FHIR-41755](https://jira.hl7.org/browse/FHIR-41755)) -1. QI-Core is spelled various ways throughout the implementation guide ([FHIR-41783](https://jira.hl7.org/browse/FHIR-41783)) -1. Technical correction: remove "`" at the end of the sentence. ([FHIR-41784](https://jira.hl7.org/browse/FHIR-41784)) -1. The first sentence of bullet point 1 in 1.0.1 must be updated ([FHIR-41786](https://jira.hl7.org/browse/FHIR-41786)) -1. Add a space between "support" and "(vMR)"([FHIR-41787](https://jira.hl7.org/browse/FHIR-41787)) +1. QI-Core is spelled various ways throughout the implementation guide ([FHIR-41783](https://jira.hl7.org/browse/FHIR-41783)) +1. Technical correction: remove "`" at the end of the sentence. ([FHIR-41784](https://jira.hl7.org/browse/FHIR-41784)) +1. The first sentence of bullet point 1 in 1.0.1 must be updated ([FHIR-41786](https://jira.hl7.org/browse/FHIR-41786)) +1. Add a space between "support" and "(vMR)"([FHIR-41787](https://jira.hl7.org/browse/FHIR-41787)) 1. Remove comma after "data" ([FHIR-41788](https://jira.hl7.org/browse/FHIR-41788)) 1. Consider capitalizing "url" to "URL" throughout the entire implementation guide. ([FHIR-41789](https://jira.hl7.org/browse/FHIR-41789)) 1. Are any of these duplicates in the table in 8.7? ([FHIR-41790](https://jira.hl7.org/browse/FHIR-41790)) diff --git a/input/pages/index.md b/input/pages/index.md index bf50630d..b235759d 100644 --- a/input/pages/index.md +++ b/input/pages/index.md @@ -193,9 +193,10 @@ preferred in the US Core base profile, but in general, the QI-Core profiles use that QI-Core is currently a US Realm specification. To support applications outside the US Realm, additional binding analysis and effort would be required. -QI-Core's extensions have also been reviewed by HL7 Work Groups and other initiatives to validate that QI-Core -extensions will not create future conflicts. Other initiatives that the QI-Core effort is aligning with include the +
+This IG contains only one QI-Core-specific extension "QI-Core Key Element Extension" to enable entry of (QI) references to specific profile elements. Otherwise, this IG uses only FHIR or US Core extensions. Other initiatives that the QI-Core effort is aligning with include the [Clinical Information Modeling Initiative (CIMI)](https://confluence.hl7.org/display/CIMI/Mission%2C+Charter%2C+Work+Products%2C+HL7+Working+Group+Relationships) and [Graphite Health](https://www.graphitehealth.io/). +
In addition, the QI-Core effort *continues* to update the mapping from QDM to QI-Core such that a CQL-based artifact written with QDM as the model would be executable against a QI-Core compliant FHIR endpoint. diff --git a/input/pages/negation.md b/input/pages/negation.md index 1d4d7198..101ee7d7 100644 --- a/input/pages/negation.md +++ b/input/pages/negation.md @@ -76,6 +76,8 @@ In the following example the measure numerator criterion allows for documentatio See the MedicationAdministration example using a specific code) for a complete example. +
+ ```json { @@ -91,7 +93,7 @@ See the Medic "extension" : [{ -"url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-recorded", +"url" : "http://hl7.org/fhir/5.0/StructureDefinition/extension-MedicationAdministration.recorded", "valueDateTime" : "2015-01-15" @@ -144,6 +146,8 @@ See the Medic } ``` +
+ #### Documenting no members of an entire value set were performed for a given reason. This is applicable when a measure criterion can be satisfied when none of the medications in a value set is administered for a specified reason. This can occur when the no treatment of the type included in the value set is appropriate. The approach provided allows systems to document using one profiled data instance that none of the activities in a particular value set were performed, rather than requiring documentation of multiple individual activities from the value set. @@ -154,6 +158,8 @@ The following example documents that providers did not prescribe any of the medi See the MedicationAdministration example using a value set for a complete example. +
+ ```json { @@ -169,7 +175,7 @@ See the MedicationAdmin "extension" : [{ -"url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-recorded", +"url" : "http://hl7.org/fhir/5.0/StructureDefinition/extension-MedicationAdministration.recorded", "valueDateTime" : "2015-01-15" @@ -222,6 +228,8 @@ See the MedicationAdmin } ``` +
+ ### Negation in CQL For quality measurement and reporting, measure expression may only need to determine the existence or absence of an activity or event to determine if criteria have been met. If the reason for absence is not relevant to the measure evaluation, the absence of evidence pattern should be used as described on the [Patterns page of the Using CQL with FHIR IG](https://hl7.org/fhir/us/cqfmeasures/using-cql.html#negation-in-fhir). diff --git a/input/pages/qdm-to-qicore.md b/input/pages/qdm-to-qicore.md index c84da2e4..04994978 100644 --- a/input/pages/qdm-to-qicore.md +++ b/input/pages/qdm-to-qicore.md @@ -183,7 +183,12 @@ Assessment, Order uses the ServiceRequest resource. The codes for ordering speci Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html) and reference the code element specified in the respective observation profile: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.extension.code:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -239,7 +244,12 @@ single observable entity that is part of such a collection of questions. ##### Negation Rationale for Assessment, Performed Use [QICoreObservationCancelled](StructureDefinition-qicore-observationcancelled.html) and reference the code element specified in the respective observation profile: * [Observation.status](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.status) - Fixed as "cancelled" -* [Observation.extension:notDoneReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:notDoneReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [Observation.extension:event-StatusReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:event-statusReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [Observation.issued](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.issued) - When this was made available * [Observation.code.extension:notDoneValueSet](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific Observation that was not performed @@ -277,7 +287,12 @@ Assessment, Recommended uses the ServiceRequest resource. The codes for recommen Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html) and reference the code element specified in the respective observation profile: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -431,7 +446,7 @@ Encounter** | medium | [Communication.medium](StructureDefinition-qicore-communication-definitions.html#Communication.medium) | How communication occurs (e.g., physical presence, online written, email, handwritten, etc.). This element is not present in the QI-Core profile Key Elements Table. | | sentDatetime | [Communication.sent](StructureDefinition-qicore-communication-definitions.html#Communication.sent) | When sent | | receivedDatetime | [Communication.received](StructureDefinition-qicore-communication-definitions.html#Communication.received) | When received | -| authorDatetime | [Communication.extension:recorded](StructureDefinition-qicore-communicationnotdone-definitions.html#Communication.extension:recorded) | Use of this QDM attribute is restricted to the QDM negation rationale use case. It does not apply to a communication with any status other than “not-done”. See Negation Rationale for Communication, Performed. | +| authorDatetime | [Communication.extension:event-recorded](StructureDefinition-qicore-communicationnotdone-definitions.html#Communication.extension:event-recorded) | Use of this QDM attribute is restricted to the QDM negation rationale use case. It does not apply to a communication with any status other than “not-done”. See Negation Rationale for Communication, Performed. | | relatedTo | [Communication.basedOn](StructureDefinition-qicore-communication-definitions.html#Communication.basedOn) | An order, proposal or plan fulfilled in whole or in part by this Communication. No current measures require this attribute. Therefore, this element is not present in the QI-Core profile Key Elements Table | | | [Communication.inResponseTo](StructureDefinition-qicore-communication-definitions.html#Communication.inResponseTo) | Response to a communication | | sender | [Communication.sender](StructureDefinition-qicore-communication-definitions.html#Communication.sender) | Message sender | @@ -444,7 +459,12 @@ Encounter** Use [QICoreCommunicationNotDone](StructureDefinition-qicore-communicationnotdone.html), which contains: * [Communication.status](StructureDefinition-qicore-communicationnotdone-definitions.html#Communication.status) - Fixed Value: "not-done" * [Communication.statusReason](StructureDefinition-qicore-communicationnotdone-definitions.html#Communication.statusReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) -* [Communication.extension:recorded](StructureDefinition-qicore-communicationnotdone-definitions.html#Communication.extension:recorded) - dateTime when this was made available + +
+ +* [Communication.extension:event-recorded](StructureDefinition-qicore-communicationnotdone-definitions.html#Communication.extension:event-recorded) - dateTime when this was made available +
+ * [Communication.topic.extension:notDoneValueSet](StructureDefinition-qicore-communicationnotdone-definitions.html#Communication.topic.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific Communication that was not performed @@ -544,7 +564,12 @@ Procedure, Performed, i.e., placement of or adjustment to a device. Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html), which contains: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -572,7 +597,12 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h Use [QICoreDeviceNotRequested](StructureDefinition-qicore-devicenotrequested.html), which contains: * [DeviceRequest.modifierExtension:doNotPerform](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.modifierExtension:doNotPerform) - Fixed value: "true" * [DeviceRequest.status](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.status) - Fixed value: "completed" -* [DeviceRequest.extension:doNotPerformReason](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.extension:doNotPerformReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [DeviceRequest.reasonCode](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [DeviceRequest.authoredOn](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.authoredOn) - dateTime when this was made available * [DeviceRequest.code\[x\].extension:doNotPerformValueSet](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.code%5Bx%5D.extension:doNotPerformValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific DeviceRequest that was not performed @@ -600,7 +630,12 @@ Use [QICoreDeviceNotRequested](StructureDefinition-qicore-devicenotrequested.htm Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html), which contains: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -626,7 +661,12 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h Use [QICoreDeviceNotRequested](StructureDefinition-qicore-devicenotrequested.html), which contains: * [DeviceRequest.modifierExtension:doNotPerform](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.modifierExtension:doNotPerform) - Fixed value: "true" * [DeviceRequest.status](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.status) - Fixed value: "completed" -* [DeviceRequest.extension:doNotPerformReason](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.extension:doNotPerformReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [DeviceRequest.reasonCode](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [DeviceRequest.authoredOn](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.authoredOn) - dateTime when this was made available * [DeviceRequest.code\[x\].extension:doNotPerformValueSet](StructureDefinition-qicore-devicenotrequested-definitions.html#DeviceRequest.code%5Bx%5D.extension:doNotPerformValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific DeviceRequest that was not performed @@ -668,7 +708,12 @@ QI-Core has added specific constraints on the US Core STU7 profile that address Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html) and reference the code element specified in the respective observation profile: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -708,7 +753,12 @@ Individual studies may use [QI-Core DiagnosticReport Profile for Report and Note Use [QICoreObservationCancelled](StructureDefinition-qicore-observationcancelled.html) and reference the code element specified in the respective observation profile: * [Observation.status](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.status) - Fixed value: "cancelled" -* [Observation.extension:notDoneReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:notDoneReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [Observation.extension:event-StatusReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:event-statusReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [Observation.issued](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.issued) - dateTime when this was made available * [Observation.code.extension:notDoneValueSet](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific Observation that was not performed @@ -737,7 +787,11 @@ Use [QICoreObservationCancelled](StructureDefinition-qicore-observationcancelled Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html) and reference the code element specified in the respective observation profile: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -853,7 +907,11 @@ procedures, context-dependent categories, and events; [Encounter.reasonReference Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html), which contains: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -911,7 +969,11 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.html), which contains: * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1269,7 +1331,11 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1296,7 +1362,12 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1338,7 +1409,11 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1378,7 +1453,12 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h Use [QICoreObservationCancelled](StructureDefinition-qicore-observationcancelled.html) and reference the code element specified in the respective observation profile: * [Observation.status](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.status) - Fixed value: "cancelled" -* [Observation.extension:notDoneReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:notDoneReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [Observation.extension:event-StatusReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:event-statusReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [Observation.issued](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.issued) - When this was made available * [Observation.code.extension:notDoneValueSet](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific Observation that was not performed @@ -1405,7 +1485,11 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1729,7 +1813,11 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1767,7 +1855,12 @@ QDM “Physical Exam, Performed” should reference the specific US Core vital s Use [QICoreObservationCancelled](StructureDefinition-qicore-observationcancelled.html) and reference the code element specified in the respective observation profile: * [Observation.status](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.status) - Fixed value: "cancelled" -* [Observation.extension:notDoneReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:notDoneReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [Observation.extension:event-StatusReason](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.extension:event-statusReason) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [Observation.issued](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.issued) - When this was made available * [Observation.code.extension:notDoneValueSet](StructureDefinition-qicore-observationcancelled-definitions.html#Observation.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific Observation that was not performed @@ -1798,7 +1891,12 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1957,7 +2055,12 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed @@ -1984,7 +2087,12 @@ Use [QICoreServiceNotRequested](StructureDefinition-qicore-servicenotrequested.h * [ServiceRequest.doNotPerform](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.doNotPerform) - Fixed value: "true" * [ServiceRequest.status](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.status) - Fixed value: "completed" -* [ServiceRequest.extension:reasonRefused](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.extension:reasonRefused) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) + +
+ +* [ServiceRequest.reasonCode](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.reasonCode) - Use value set [NegationReasonCodes](ValueSet-qicore-negation-reason.html) +
+ * [ServiceRequest.authoredOn](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.authoredOn) - dateTime when this was made available * [ServiceRequest.code.extension:notDoneValueSet](StructureDefinition-qicore-servicenotrequested-definitions.html#ServiceRequest.code.extension:notDoneValueSet) - Use [cqf-notDoneValueSet](http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet) to indicate the specific ServiceRequest that was not performed diff --git a/input/profiles/StructureDefinition-qicore-communicationnotdone.json b/input/profiles/StructureDefinition-qicore-communicationnotdone.json index 7f653483..ccfff086 100644 --- a/input/profiles/StructureDefinition-qicore-communicationnotdone.json +++ b/input/profiles/StructureDefinition-qicore-communicationnotdone.json @@ -1,180 +1,202 @@ { - "resourceType" : "StructureDefinition", - "id" : "qicore-communicationnotdone", - "extension" : [ + "resourceType": "StructureDefinition", + "id": "qicore-communicationnotdone", + "extension": [ { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-primaryCodePath", + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-primaryCodePath", "valueString": "reasonCode" }, { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isIncluded", + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isIncluded", "valueBoolean": true }, { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isRetrievable", + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isRetrievable", "valueBoolean": true }, { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-label", - "valueString":"CommunicationNotDone" + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-label", + "valueString": "CommunicationNotDone" } ], - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone", - "version" : "6.0.0", - "name" : "QICoreCommunicationNotDone", + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone", + "version": "6.0.0", + "name": "QICoreCommunicationNotDone", "title": "QICore Communication Not Done", - "status" : "active", - "experimental" : false, - "date" : "2023-08-01", - "publisher" : "http://www.hl7.org/Special/committees/cqi/index.cfm", - "contact" : [{ - "name" : "Clinical Quality Information WG", - "telecom" : [{ - "system" : "url", - "value" : "http://www.hl7.org/Special/committees/cqi" - }] - }], - "description" : "Profile of CommunicationNotDone for decision support/quality metrics. Defines the core set of elements and extensions for quality rule and measure authors.", - "jurisdiction" : [{ - "coding" : [{ - "system" : "urn:iso:std:iso:3166", - "code" : "US" - }] - }], - "fhirVersion" : "4.0.1", - "kind" : "resource", - "abstract" : false, - "type" : "Communication", - "baseDefinition" : "http://hl7.org/fhir/StructureDefinition/Communication", - "derivation" : "constraint", - "differential" : { - "element" : [{ - "id" : "Communication", - "path" : "Communication", - "constraint" : [{ - "key" : "cnd-1", - "severity" : "error", - "human" : "to indicate what communication was not carried out, either at least one coding in the topic or a notDoneValueSet extension shall be provided", - "expression" : "topic.extension('http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet').exists() xor topic.coding.exists()" - }], - "mustSupport" : false - }, + "status": "active", + "experimental": false, + "date": "2023-08-01", + "publisher": "http://www.hl7.org/Special/committees/cqi/index.cfm", + "contact": [ { - "id" : "Communication.extension:recorded", - "extension" : [ + "name": "Clinical Quality Information WG", + "telecom": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "system": "url", + "value": "http://www.hl7.org/Special/committees/cqi" } - ], - "path" : "Communication.extension", - "short": "(QI) Extension", - "sliceName" : "recorded", - "min" : 1, - "max" : "1", - "type" : [{ - "code" : "Extension", - "profile" : ["http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-recorded"] - }] - }, - { - "id" : "Communication.status", - "extension" : [ - { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true - } - ], - "path" : "Communication.status", - "short" : "(QI) preparation | in-progress | not-done | on-hold | stopped | completed | entered-in-error | unknown", - "min" : 1, - "max" : "1", - "type" : [{ - "code" : "code" - }], - "fixedCode" : "not-done" - }, + ] + } + ], + "description": "Profile of CommunicationNotDone for decision support/quality metrics. Defines the core set of elements and extensions for quality rule and measure authors.", + "jurisdiction": [ { - "id" : "Communication.statusReason", - "extension" : [ + "coding": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "system": "urn:iso:std:iso:3166", + "code": "US" } - ], - "path" : "Communication.statusReason", - "short" : "(QI) Reason for current status", - "min" : 1, - "max" : "1", - "binding" : { - "strength" : "extensible", - "valueSet" : "http://hl7.org/fhir/us/qicore/ValueSet/qicore-negation-reason" - } - }, - { - "id" : "Communication.subject", - "extension" : [ - { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + ] + } + ], + "fhirVersion": "4.0.1", + "kind": "resource", + "abstract": false, + "type": "Communication", + "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Communication", + "derivation": "constraint", + "differential": { + "element": [ + { + "id": "Communication", + "path": "Communication", + "constraint": [ + { + "key": "cnd-1", + "severity": "error", + "human": "to indicate what communication was not carried out, either at least one coding in the topic or a notDoneValueSet extension shall be provided", + "expression": "topic.extension('http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet').exists() xor topic.coding.exists()" + } + ], + "mustSupport": false + }, + { + "id": "Communication.extension:event-recorded", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "Communication.extension", + "short": "(QI) Captures the recorded date of the communication", + "sliceName": "event-recorded", + "min": 1, + "max": "1", + "type": [ + { + "code": "Extension", + "profile": [ + "http://hl7.org/fhir/StructureDefinition/event-recorded" + ] + } + ] + }, + { + "id": "Communication.status", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "Communication.status", + "short": "(QI) preparation | in-progress | not-done | on-hold | stopped | completed | entered-in-error | unknown", + "min": 1, + "max": "1", + "type": [ + { + "code": "code" + } + ], + "fixedCode": "not-done" + }, + { + "id": "Communication.statusReason", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "Communication.statusReason", + "short": "(QI) Reason for current status", + "min": 1, + "max": "1", + "binding": { + "strength": "extensible", + "valueSet": "http://hl7.org/fhir/us/qicore/ValueSet/qicore-negation-reason" } - ], - "path" : "Communication.subject", - "short" : "(QI) Focus of message", - "min" : 0, - "max" : "1", - "type" : [{ - "code" : "Reference", - "targetProfile" : ["http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient", - "http://hl7.org/fhir/StructureDefinition/Group"] - }] - }, - { - "id" : "Communication.topic", - "extension" : [ - { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + }, + { + "id": "Communication.subject", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "Communication.subject", + "short": "(QI) Focus of message", + "min": 0, + "max": "1", + "type": [ + { + "code": "Reference", + "targetProfile": [ + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient", + "http://hl7.org/fhir/StructureDefinition/Group" + ] + } + ] + }, + { + "id": "Communication.topic", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "Communication.topic", + "short": "(QI) Description of the purpose/content", + "min": 1, + "max": "1", + "binding": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", + "valueString": "CommunicationTopic" + } + ], + "strength": "preferred", + "description": "Codes describing the purpose or content of the communication.", + "valueSet": "http://hl7.org/fhir/ValueSet/communication-topic" } - ], - "path" : "Communication.topic", - "short" : "(QI) Description of the purpose/content", - "min" : 1, - "max" : "1", - "binding" : { - "extension" : [ + }, + { + "id": "Communication.topic.extension:notDoneValueSet", + "extension": [ { - "url" : "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString" : "CommunicationTopic" + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "strength" : "preferred", - "description" : "Codes describing the purpose or content of the communication.", - "valueSet" : "http://hl7.org/fhir/ValueSet/communication-topic" + "path": "Communication.topic.extension", + "sliceName": "notDoneValueSet", + "short": "(QI) Url of a value set of activities not requested or performed", + "definition": "A logical reference (e.g. a reference to ValueSet.url) to a value set/version that identifies a set of possible coded values representing activities that were not requested, ordered, or performed.", + "min": 0, + "max": "1", + "type": [ + { + "code": "Extension", + "profile": [ + "http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet" + ] + } + ] } - }, - { - "id" : "Communication.topic.extension:notDoneValueSet", - "extension" : [ - { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true - } - ], - "path" : "Communication.topic.extension", - "sliceName" : "notDoneValueSet", - "short" : "(QI) Url of a value set of activities not requested or performed", - "definition" : "A logical reference (e.g. a reference to ValueSet.url) to a value set/version that identifies a set of possible coded values representing activities that were not requested, ordered, or performed.", - "min" : 0, - "max" : "1", - "type" : [ - { - "code" : "Extension", - "profile" : [ - "http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet" - ] - } - ] - }] + ] } } diff --git a/input/profiles/StructureDefinition-qicore-devicenotrequested.json b/input/profiles/StructureDefinition-qicore-devicenotrequested.json index dfcba796..6439aac3 100644 --- a/input/profiles/StructureDefinition-qicore-devicenotrequested.json +++ b/input/profiles/StructureDefinition-qicore-devicenotrequested.json @@ -71,69 +71,37 @@ ], "mustSupport" : false }, - { - "id" : "DeviceRequest.extension:doNotPerformReason", - "extension" : [ - { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true - } - ], - "path" : "DeviceRequest.extension", - "short": "(QI) Extension", - "sliceName" : "doNotPerformReason", - "min" : 1, - "max" : "1", - "type" : [ - { - "code" : "Extension", - "profile" : [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-doNotPerformReason" - ] - } - ] - }, { "id" : "DeviceRequest.modifierExtension:doNotPerform", - "extension" : [ - { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true - } - ], + "extension" : [{ + "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean" : true + }], "path" : "DeviceRequest.modifierExtension", - "short": "(QI) Extension", "sliceName" : "doNotPerform", + "short" : "(QI) Extension", "min" : 1, "max" : "1", - "type" : [ - { - "code" : "Extension", - "profile" : [ - "http://hl7.org/fhir/5.0/StructureDefinition/extension-DeviceRequest.doNotPerform" - ] - } - ], + "type" : [{ + "code" : "Extension", + "profile" : ["http://hl7.org/fhir/5.0/StructureDefinition/extension-DeviceRequest.doNotPerform"] + }], "isModifier" : true, "isModifierReason" : "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them" }, { "id" : "DeviceRequest.modifierExtension:doNotPerform.value[x]", - "extension" : [ - { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true - } - ], + "extension" : [{ + "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean" : true + }], "path" : "DeviceRequest.modifierExtension.value[x]", "short" : "(QI) Value of extension", "min" : 1, "max" : "1", - "type" : [ - { - "code" : "boolean" - } - ], + "type" : [{ + "code" : "boolean" + }], "fixedBoolean" : true }, { @@ -241,7 +209,27 @@ "short" : "(QI) When recorded", "min" : 1, "max" : "1" + }, + { + "id": "DeviceRequest.reasonCode", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "DeviceRequest.reasonCode", + "short": "(QI) Explanation/Justification for procedure or service", + "type": [ + { + "code": "CodeableConcept" + } + ], + "binding": { + "strength": "extensible", + "valueSet": "http://hl7.org/fhir/us/qicore/ValueSet/qicore-negation-reason" + } } ] } -} \ No newline at end of file +} diff --git a/input/profiles/StructureDefinition-qicore-medicationadministration.json b/input/profiles/StructureDefinition-qicore-medicationadministration.json index 489fe152..25c1f091 100644 --- a/input/profiles/StructureDefinition-qicore-medicationadministration.json +++ b/input/profiles/StructureDefinition-qicore-medicationadministration.json @@ -57,6 +57,28 @@ "derivation" : "constraint", "differential" : { "element" : [ + { + "id" : "MedicationAdministration.extension:recorded", + "extension" : [ + { + "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean" : true + } + ], + "path" : "MedicationAdministration.extension", + "sliceName" : "recorded", + "short" : "(QI) Recorded", + "min" : 1, + "max" : "1", + "type" : [ + { + "code" : "Extension", + "profile" : [ + "http://hl7.org/fhir/5.0/StructureDefinition/extension-MedicationAdministration.recorded" + ] + } + ] + }, { "id" : "MedicationAdministration.status", "extension" : [ diff --git a/input/profiles/StructureDefinition-qicore-medicationadministrationnotdone.json b/input/profiles/StructureDefinition-qicore-medicationadministrationnotdone.json index f016f03a..c499f2df 100644 --- a/input/profiles/StructureDefinition-qicore-medicationadministrationnotdone.json +++ b/input/profiles/StructureDefinition-qicore-medicationadministrationnotdone.json @@ -92,14 +92,14 @@ ], "path" : "MedicationAdministration.extension", "sliceName" : "recorded", - "short" : "(QI) Extension", + "short" : "(QI) Recorded", "min" : 1, "max" : "1", "type" : [ { "code" : "Extension", "profile" : [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-recorded" + "http://hl7.org/fhir/5.0/StructureDefinition/extension-MedicationAdministration.recorded" ] } ] diff --git a/input/profiles/StructureDefinition-qicore-medicationdispense.json b/input/profiles/StructureDefinition-qicore-medicationdispense.json index 2093ab55..5782fd85 100644 --- a/input/profiles/StructureDefinition-qicore-medicationdispense.json +++ b/input/profiles/StructureDefinition-qicore-medicationdispense.json @@ -57,6 +57,28 @@ "derivation": "constraint", "differential": { "element": [ + { + "id" : "MedicationDispense.extension:recorded", + "extension" : [ + { + "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean" : true + } + ], + "path" : "MedicationDispense.extension", + "sliceName" : "recorded", + "short" : "(QI) Extension", + "min" : 1, + "max" : "1", + "type" : [ + { + "code" : "Extension", + "profile" : [ + "http://hl7.org/fhir/5.0/StructureDefinition/extension-MedicationDispense.recorded" + ] + } + ] + }, { "id": "MedicationDispense.status", "extension": [ diff --git a/input/profiles/StructureDefinition-qicore-medicationdispensedeclined.json b/input/profiles/StructureDefinition-qicore-medicationdispensedeclined.json index 2c0d0834..53a80ddb 100644 --- a/input/profiles/StructureDefinition-qicore-medicationdispensedeclined.json +++ b/input/profiles/StructureDefinition-qicore-medicationdispensedeclined.json @@ -87,7 +87,7 @@ { "code" : "Extension", "profile" : [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-recorded" + "http://hl7.org/fhir/5.0/StructureDefinition/extension-MedicationDispense.recorded" ] } ] diff --git a/input/profiles/StructureDefinition-qicore-observationcancelled.json b/input/profiles/StructureDefinition-qicore-observationcancelled.json index 05f1f7a9..f5018e25 100644 --- a/input/profiles/StructureDefinition-qicore-observationcancelled.json +++ b/input/profiles/StructureDefinition-qicore-observationcancelled.json @@ -1,231 +1,235 @@ { - "resourceType" : "StructureDefinition", - "id" : "qicore-observationcancelled", - "extension" : [ + "resourceType": "StructureDefinition", + "id": "qicore-observationcancelled", + "extension": [ { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-primaryCodePath", + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-primaryCodePath", "valueString": "code" }, { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isIncluded", + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isIncluded", "valueBoolean": true }, { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isRetrievable", + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isRetrievable", "valueBoolean": true }, { - "url" : "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-label", - "valueString":"ObservationCancelled" + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-label", + "valueString": "ObservationCancelled" } ], - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationcancelled", - "version" : "6.0.0", - "name" : "QICoreObservationCancelled", - "title" : "QICore Observation Cancelled", - "status" : "active", - "experimental" : false, - "date" : "2018-08-22", - "publisher" : "http://www.hl7.org/Special/committees/cqi/index.cfm", - "contact" : [ + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationcancelled", + "version": "6.0.0", + "name": "QICoreObservationCancelled", + "title": "QICore Observation Cancelled", + "status": "active", + "experimental": false, + "date": "2018-08-22", + "publisher": "http://www.hl7.org/Special/committees/cqi/index.cfm", + "contact": [ { - "name" : "Clinical Quality Information WG", - "telecom" : [ + "name": "Clinical Quality Information WG", + "telecom": [ { - "system" : "url", - "value" : "http://www.hl7.org/Special/committees/cqi" + "system": "url", + "value": "http://www.hl7.org/Special/committees/cqi" } ] } ], - "description" : "Profile of ObservationCancelled for decision support/quality metrics. Defines the core set of elements and extensions for quality rule and measure authors.", - "jurisdiction" : [ + "description": "Profile of ObservationCancelled for decision support/quality metrics. Defines the core set of elements and extensions for quality rule and measure authors.", + "jurisdiction": [ { - "coding" : [ + "coding": [ { - "system" : "urn:iso:std:iso:3166", - "code" : "US" + "system": "urn:iso:std:iso:3166", + "code": "US" } ] } ], - "fhirVersion" : "4.0.1", - "kind" : "resource", - "abstract" : false, - "type" : "Observation", - "baseDefinition" : "http://hl7.org/fhir/StructureDefinition/Observation", - "derivation" : "constraint", - "differential" : { - "element" : [ + "fhirVersion": "4.0.1", + "kind": "resource", + "abstract": false, + "type": "Observation", + "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Observation", + "derivation": "constraint", + "differential": { + "element": [ { - "id" : "Observation", - "path" : "Observation", - "alias" : [ + "id": "Observation", + "path": "Observation", + "alias": [ "Vital Signs", "Measurement", "Results", "Tests" ], - "constraint" : [ + "constraint": [ { - "key" : "ond-1", - "severity" : "error", - "human" : "to indicate what observation was not recorded, either at least one coding in the code or a notDoneValueSet extension shall be provided", - "expression" : "code.extension('http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet').exists() xor code.coding.exists()", - "xpath" : "exists(f:extension)" + "key": "ond-1", + "severity": "error", + "human": "to indicate what observation was not recorded, either at least one coding in the code or a notDoneValueSet extension shall be provided", + "expression": "code.extension('http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet').exists() xor code.coding.exists()", + "xpath": "exists(f:extension)" } ] }, { - "id" : "Observation.extension:notDoneReason", - "extension" : [ + "id": "Observation.extension:FHIRevent-statusReason", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.extension", - "sliceName" : "notDoneReason", - "short" : "(QI) Extension", - "min" : 1, - "max" : "1", - "type" : [ + "path": "Observation.extension", + "sliceName": "event-statusReason", + "short": "(QI) Event Status Reason", + "min": 1, + "max": "1", + "type": [ { - "code" : "Extension", - "profile" : [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-notDoneReason" + "code": "Extension", + "profile": [ + "http://hl7.org/fhir/StructureDefinition/event-statusReason" ] } - ] + ], + "binding": { + "strength": "extensible", + "valueSet": "http://hl7.org/fhir/us/qicore/ValueSet/qicore-negation-reason" + } }, { - "id" : "Observation.status", - "extension" : [ + "id": "Observation.status", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.status", - "short" : "(QI) registered | preliminary | final | amended +", - "min" : 1, - "max" : "1", - "type" : [ + "path": "Observation.status", + "short": "(QI) registered | preliminary | final | amended +", + "min": 1, + "max": "1", + "type": [ { - "code" : "code" + "code": "code" } ], - "binding" : { - "strength" : "required", - "description" : "SNOMED CT for coded results", - "valueSet" : "http://hl7.org/fhir/ValueSet/observation-status" + "binding": { + "strength": "required", + "description": "SNOMED CT for coded results", + "valueSet": "http://hl7.org/fhir/ValueSet/observation-status" }, - "fixedCode" : "cancelled" + "fixedCode": "cancelled" }, { - "id" : "Observation.category", - "extension" : [ + "id": "Observation.category", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.category", - "short" : "(QI) Classification of type of observation", - "min" : 1, - "max" : "*" + "path": "Observation.category", + "short": "(QI) Classification of type of observation", + "min": 1, + "max": "*" }, { - "id" : "Observation.code", - "extension" : [ + "id": "Observation.code", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.code", - "short" : "(QI) Type of observation (code / type)", - "min" : 1, - "max" : "1" + "path": "Observation.code", + "short": "(QI) Type of observation (code / type)", + "min": 1, + "max": "1" }, { - "id" : "Observation.code.extension:notDoneValueSet", - "extension" : [ + "id": "Observation.code.extension:notDoneValueSet", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.code.extension", - "sliceName" : "notDoneValueSet", - "short" : "(QI) What was not done", - "definition" : "Specifies the value set that characterizes the events or activities that did not occur or were not performed.", - "requirements" : "Must be able to indicate the value set from which the expected event would be drawn, had it occurred.", - "min" : 0, - "max" : "1", - "type" : [ + "path": "Observation.code.extension", + "sliceName": "notDoneValueSet", + "short": "(QI) What was not done", + "definition": "Specifies the value set that characterizes the events or activities that did not occur or were not performed.", + "requirements": "Must be able to indicate the value set from which the expected event would be drawn, had it occurred.", + "min": 0, + "max": "1", + "type": [ { - "code" : "Extension", - "profile" : [ + "code": "Extension", + "profile": [ "http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet" ] } ] }, { - "id" : "Observation.subject", - "extension" : [ + "id": "Observation.subject", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.subject", - "short" : "(QI) Who and/or what the observation is about", - "min" : 1, - "max" : "1", - "type" : [ + "path": "Observation.subject", + "short": "(QI) Who and/or what the observation is about", + "min": 1, + "max": "1", + "type": [ { - "code" : "Reference", - "targetProfile" : [ + "code": "Reference", + "targetProfile": [ "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient" ] } ] }, { - "id" : "Observation.effective[x]", - "extension" : [ + "id": "Observation.effective[x]", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.effective[x]", - "short" : "(QI) Clinically relevant time/time-period for observation", - "definition" : "The time or time-period the observed value is asserted as being true. For biological subjects - e.g. human patients - this is usually called the \"physiologically relevant time\". This is usually either the time of the procedure or of specimen collection, but very often the source of the date/time is not known, only the date/time itself.", - "comment" : "At least a date should be present unless this observation is a historical report. For recording imprecise or \"fuzzy\" times (For example, a blood glucose measurement taken \"after breakfast\") use the [Timing](http://hl7.org/fhir/R4/datatypes.html#timing) datatype which allow the measurement to be tied to regular life events." + "path": "Observation.effective[x]", + "short": "(QI) Clinically relevant time/time-period for observation", + "definition": "The time or time-period the observed value is asserted as being true. For biological subjects - e.g. human patients - this is usually called the \"physiologically relevant time\". This is usually either the time of the procedure or of specimen collection, but very often the source of the date/time is not known, only the date/time itself.", + "comment": "At least a date should be present unless this observation is a historical report. For recording imprecise or \"fuzzy\" times (For example, a blood glucose measurement taken \"after breakfast\") use the [Timing](http://hl7.org/fhir/R4/datatypes.html#timing) datatype which allow the measurement to be tied to regular life events." }, { - "id" : "Observation.issued", - "extension" : [ + "id": "Observation.issued", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.issued", - "short" : "(QI) Date/Time this version was made available", - "min" : 1, - "max" : "1" + "path": "Observation.issued", + "short": "(QI) Date/Time this version was made available", + "min": 1, + "max": "1" }, { - "id" : "Observation.performer", - "path" : "Observation.performer", - "type" : [ + "id": "Observation.performer", + "path": "Observation.performer", + "type": [ { - "code" : "Reference", - "targetProfile" : [ + "code": "Reference", + "targetProfile": [ "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-practitioner", "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-organization", "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient", @@ -235,144 +239,144 @@ ] }, { - "id" : "Observation.value[x]", - "extension" : [ + "id": "Observation.value[x]", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.value[x]", - "slicing" : { - "discriminator" : [ + "path": "Observation.value[x]", + "slicing": { + "discriminator": [ { - "type" : "type", - "path" : "$this" + "type": "type", + "path": "$this" } ], - "ordered" : false, - "rules" : "open" + "ordered": false, + "rules": "open" }, - "short" : "(QI) Actual result", - "definition" : "The information determined as a result of making the observation, if the information has a simple value.", - "comment" : "An observation may have; 1) a single value here, 2) both a value and a set of related or component values, or 3) only a set of related or component values. If a value is present, the datatype for this element should be determined by Observation.code. A CodeableConcept with just a text would be used instead of a string if the field was usually coded, or if the type associated with the Observation.code defines a coded value. For additional guidance, see the [Notes section](http://hl7.org/fhir/R4/observation.html#notes) below.", - "requirements" : "An observation exists to have a value, though it might not if it is in error, or if it represents a group of observations.", - "min" : 0, - "max" : "1", - "base" : { - "path" : "Observation.value[x]", - "min" : 0, - "max" : "1" + "short": "(QI) Actual result", + "definition": "The information determined as a result of making the observation, if the information has a simple value.", + "comment": "An observation may have; 1) a single value here, 2) both a value and a set of related or component values, or 3) only a set of related or component values. If a value is present, the datatype for this element should be determined by Observation.code. A CodeableConcept with just a text would be used instead of a string if the field was usually coded, or if the type associated with the Observation.code defines a coded value. For additional guidance, see the [Notes section](http://hl7.org/fhir/R4/observation.html#notes) below.", + "requirements": "An observation exists to have a value, though it might not if it is in error, or if it represents a group of observations.", + "min": 0, + "max": "1", + "base": { + "path": "Observation.value[x]", + "min": 0, + "max": "1" }, - "type" : [ + "type": [ { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "Quantity" + "code": "Quantity" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "CodeableConcept" + "code": "CodeableConcept" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "string" + "code": "string" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "boolean" + "code": "boolean" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "integer" + "code": "integer" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "Range" + "code": "Range" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "Ratio" + "code": "Ratio" }, { - "code" : "SampledData" + "code": "SampledData" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "time" + "code": "time" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "dateTime" + "code": "dateTime" }, { - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "code" : "Period" + "code": "Period" } ], - "isModifier" : false, - "isSummary" : true + "isModifier": false, + "isSummary": true }, { "id": "Observation.value[x].valueCodeableConcept", - "extension" : [ + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], "path": "Observation.value[x]", "sliceName": "valueCodeableConcept", - "short" : "(QI) Actual result", + "short": "(QI) Actual result", "base": { "path": "Observation.value[x]", "min": 0, @@ -384,61 +388,61 @@ } ], "isModifier": false, - "binding" : { - "strength" : "preferred", - "description" : "SNOMED CT for coded results", - "valueSet" : "http://hl7.org/fhir/us/core/ValueSet/us-core-observation-value-codes" + "binding": { + "strength": "preferred", + "description": "SNOMED CT for coded results", + "valueSet": "http://hl7.org/fhir/us/core/ValueSet/us-core-observation-value-codes" } }, { - "id" : "Observation.interpretation", - "extension" : [ + "id": "Observation.interpretation", + "extension": [ { - "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean" : true + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } ], - "path" : "Observation.interpretation", - "short" : "(QI) High, low, normal, etc.", - "definition" : "A categorical assessment of an observation value. For example, high, low, normal.", - "comment" : "Historically used for laboratory results (known as 'abnormal flag' ), its use extends to other use cases where coded interpretations are relevant. Often reported as one or more simple compact codes this element is often placed adjacent to the result value in reports and flow sheets to signal the meaning/normalcy status of the result.", - "requirements" : "For some results, particularly numeric results, an interpretation is necessary to fully understand the significance of a result.", - "alias" : [ + "path": "Observation.interpretation", + "short": "(QI) High, low, normal, etc.", + "definition": "A categorical assessment of an observation value. For example, high, low, normal.", + "comment": "Historically used for laboratory results (known as 'abnormal flag' ), its use extends to other use cases where coded interpretations are relevant. Often reported as one or more simple compact codes this element is often placed adjacent to the result value in reports and flow sheets to signal the meaning/normalcy status of the result.", + "requirements": "For some results, particularly numeric results, an interpretation is necessary to fully understand the significance of a result.", + "alias": [ "Abnormal Flag" ], - "min" : 0, - "max" : "*", - "base" : { - "path" : "Observation.interpretation", - "min" : 0, - "max" : "*" + "min": 0, + "max": "*", + "base": { + "path": "Observation.interpretation", + "min": 0, + "max": "*" }, - "type" : [ + "type": [ { - "code" : "CodeableConcept" + "code": "CodeableConcept" } ], - "isModifier" : false, - "isSummary" : false, - "binding" : { - "extension" : [ + "isModifier": false, + "isSummary": false, + "binding": { + "extension": [ { - "url" : "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString" : "ObservationInterpretation" + "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", + "valueString": "ObservationInterpretation" } ], - "strength" : "extensible", - "description" : "Codes identifying interpretations of observations.", - "valueSet" : "http://hl7.org/fhir/ValueSet/observation-interpretation" + "strength": "extensible", + "description": "Codes identifying interpretations of observations.", + "valueSet": "http://hl7.org/fhir/ValueSet/observation-interpretation" } }, { - "id" : "Observation.derivedFrom", - "path" : "Observation.derivedFrom", - "type" : [ + "id": "Observation.derivedFrom", + "path": "Observation.derivedFrom", + "type": [ { - "code" : "Reference", - "targetProfile" : [ + "code": "Reference", + "targetProfile": [ "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-simple-observation", "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-questionnaireresponse", "http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference", @@ -448,7 +452,7 @@ ] } ], - "mustSupport" : false + "mustSupport": false } ] } diff --git a/input/profiles/StructureDefinition-qicore-procedure.json b/input/profiles/StructureDefinition-qicore-procedure.json index feb24fb0..85867842 100644 --- a/input/profiles/StructureDefinition-qicore-procedure.json +++ b/input/profiles/StructureDefinition-qicore-procedure.json @@ -58,27 +58,24 @@ "differential": { "element": [ { - "id": "Procedure.extension:recorded", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "Procedure.extension", - "sliceName": "recorded", - "short": "(QI) When the procedure was first captured in the subject\u0027s record", - "definition": "The date the occurrence of the procedure was first captured in the record regardless of Procedure.status (potentially after the occurrence of the event).", - "min": 0, - "max": "1", - "type": [ - { - "code": "Extension", - "profile": [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-recorded" - ] - } - ] + "id" : "Procedure.extension:recorded", + "extension" : [{ + "url" : "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean" : true + }], + "path" : "Procedure.extension", + "sliceName" : "recorded", + "short" : "(QI) When the procedure was first captured in the subject's record", + "definition" : "The date the occurrence of the procedure was first captured in the record regardless of Procedure.status (potentially after the occurrence of the event).", + "min" : 1, + "max" : "1", + "type" : [{ + "code" : "Extension", + "profile": [ + "http://hl7.org/fhir/5.0/StructureDefinition/extension-Procedure.recorded" + ] + } + ] }, { "id": "Procedure.implicitRules", diff --git a/input/profiles/StructureDefinition-qicore-procedurenotdone.json b/input/profiles/StructureDefinition-qicore-procedurenotdone.json index 4a6920dc..8a6f162b 100644 --- a/input/profiles/StructureDefinition-qicore-procedurenotdone.json +++ b/input/profiles/StructureDefinition-qicore-procedurenotdone.json @@ -81,8 +81,11 @@ "max" : "1", "type" : [{ "code" : "Extension", - "profile" : ["http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-recorded"] - }] + "profile": [ + "http://hl7.org/fhir/5.0/StructureDefinition/extension-Procedure.recorded" + ] + } + ] }, { "id" : "Procedure.basedOn", diff --git a/input/profiles/StructureDefinition-qicore-servicenotrequested.json b/input/profiles/StructureDefinition-qicore-servicenotrequested.json index e705759f..376a0a25 100644 --- a/input/profiles/StructureDefinition-qicore-servicenotrequested.json +++ b/input/profiles/StructureDefinition-qicore-servicenotrequested.json @@ -2,22 +2,22 @@ "resourceType": "StructureDefinition", "id": "qicore-servicenotrequested", "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-primaryCodePath", - "valueString": "code" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isIncluded", - "valueBoolean": true - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isRetrievable", - "valueBoolean": true - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-label", - "valueString": "ServiceNotRequested" - } + { + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-primaryCodePath", + "valueString": "code" + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isIncluded", + "valueBoolean": true + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-isRetrievable", + "valueBoolean": true + }, + { + "url": "http://hl7.org/fhir/StructureDefinition/cqf-modelInfo-label", + "valueString": "ServiceNotRequested" + } ], "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested", "version": "6.0.0", @@ -28,26 +28,26 @@ "date": "2018-08-22", "publisher": "http://www.hl7.org/Special/committees/cqi/index.cfm", "contact": [ - { - "name": "Clinical Quality Information WG", - "telecom": [ - { - "system": "url", - "value": "http://www.hl7.org/Special/committees/cqi" - } - ] - } + { + "name": "Clinical Quality Information WG", + "telecom": [ + { + "system": "url", + "value": "http://www.hl7.org/Special/committees/cqi" + } + ] + } ], "description": "Negation profile of ServiceRequest for decision support/quality metrics. Defines the core set of elements and extensions for quality rule and measure authors.", "jurisdiction": [ - { - "coding": [ - { - "system": "urn:iso:std:iso:3166", - "code": "US" - } - ] - } + { + "coding": [ + { + "system": "urn:iso:std:iso:3166", + "code": "US" + } + ] + } ], "fhirVersion": "4.0.1", "kind": "resource", @@ -56,278 +56,251 @@ "baseDefinition": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-servicerequest", "derivation": "constraint", "differential": { - "element": [ + "element": [ + { + "id": "ServiceRequest", + "path": "ServiceRequest", + "constraint": [ { - "id": "ServiceRequest", - "path": "ServiceRequest", - "constraint": [ - { - "key": "snr-1", - "severity": "error", - "human": "To indicate what service was not performed, either at least one coding in the code or a notDoneValueSet extension shall be provided", - "expression": "code.extension('http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet').exists() xor code.coding.exists()" - } - ], - "mustSupport": false - }, + "key": "snr-1", + "severity": "error", + "human": "To indicate what service was not performed, either at least one coding in the code or a notDoneValueSet extension shall be provided", + "expression": "code.extension('http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet').exists() xor code.coding.exists()" + } + ], + "mustSupport": false + }, + { + "id": "ServiceRequest.status", + "extension": [ { - "id": "ServiceRequest.extension:reasonRefused", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.extension", - "sliceName": "reasonRefused", - "short": "(QI) Extension", - "min": 1, - "max": "1", - "type": [ - { - "code": "Extension", - "profile": [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-doNotPerformReason" - ] - } - ] - }, + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "ServiceRequest.status", + "short": "(QI) draft | active | on-hold | revoked | completed | entered-in-error | unknown" + }, + { + "id": "ServiceRequest.intent", + "extension": [ { - "id": "ServiceRequest.status", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.status", - "short": "(QI) draft | active | on-hold | revoked | completed | entered-in-error | unknown" - }, + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "ServiceRequest.intent", + "short": "(QI) proposal | plan | directive | order | original-order | reflex-order | filler-order | instance-order | option", + "definition": "Whether the request is a proposal, plan, an original order or a reflex order." + }, + { + "id": "ServiceRequest.code.extension:notDoneValueSet", + "extension": [ { - "id": "ServiceRequest.intent", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.intent", - "short": "(QI) proposal | plan | directive | order | original-order | reflex-order | filler-order | instance-order | option", - "definition": "Whether the request is a proposal, plan, an original order or a reflex order." - }, + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "ServiceRequest.code.extension", + "sliceName": "notDoneValueSet", + "short": "(QI) What was not requested", + "min": 0, + "max": "1", + "base": { + "path": "Element.extension", + "min": 0, + "max": "*" + }, + "type": [ { - "id": "ServiceRequest.doNotPerform", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.doNotPerform", - "short": "(QI) True if service/procedure should not be performed", - "min": 1, - "max": "1", - "type": [ - { - "code": "boolean" - } - ], - "fixedBoolean": true - }, + "code": "Extension", + "profile": [ + "http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet" + ] + } + ] + }, + { + "id": "ServiceRequest.subject", + "extension": [ { - "id": "ServiceRequest.code.extension:notDoneValueSet", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.code.extension", - "sliceName": "notDoneValueSet", - "short": "(QI-Core) What was not requested", - "definition": "A logical reference (e.g. a reference to ValueSet.url) to a value set/version that identifies a set of possible coded values representing activities that were not requested, ordered, or performed.", - "min": 0, - "max": "1", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension", - "profile": [ - "http://hl7.org/fhir/StructureDefinition/cqf-notDoneValueSet" - ] - } - ] - }, + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "ServiceRequest.subject", + "short": "(QI) Individual or Entity the service is ordered for", + "type": [ { - "id": "ServiceRequest.subject", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.subject", - "short": "(QI) Individual or Entity the service is ordered for", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient" - ] - } - ] - }, + "code": "Reference", + "targetProfile": [ + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient" + ] + } + ] + }, + { + "id": "ServiceRequest.encounter", + "path": "ServiceRequest.encounter", + "short": "Encounter in which the request was created", + "definition": "An encounter that provides additional information about the healthcare context in which this request is made.", + "alias": [ + "context" + ], + "min": 0, + "max": "1", + "base": { + "path": "ServiceRequest.encounter", + "min": 0, + "max": "1" + }, + "type": [ { - "id": "ServiceRequest.encounter", - "path": "ServiceRequest.encounter", - "short": "Encounter in which the request was created", - "definition": "An encounter that provides additional information about the healthcare context in which this request is made.", - "alias": [ - "context" - ], - "min": 0, - "max": "1", - "base": { - "path": "ServiceRequest.encounter", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter" - ] - } - ] - }, + "code": "Reference", + "targetProfile": [ + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter" + ] + } + ] + }, + { + "id": "ServiceRequest.occurrence[x]", + "extension": [ { - "id": "ServiceRequest.occurrence[x]", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.occurrence[x]", - "short": "(QI) When service should occur", - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "code": "dateTime" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "code": "Period" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "code": "Timing" - } - ] - }, + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "ServiceRequest.occurrence[x]", + "short": "(QI) When service should occur", + "type": [ { - "id": "ServiceRequest.authoredOn", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.authoredOn", - "short": "(QI) Date request signed", - "min": 1, - "max": "1" + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "code": "dateTime" }, { - "id": "ServiceRequest.requester", - "path": "ServiceRequest.requester", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-practitioner", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-practitionerrole", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-organization", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-relatedperson", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-device", - "http://hl7.org/fhir/us/core/StructureDefinition/us-core-implantable-device" - ] - } - ] + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "code": "Period" }, { - "id": "ServiceRequest.reasonCode", - "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.reasonCode", - "short": "(QI) Explanation/Justification for procedure or service", - "type": [ - { - "code": "CodeableConcept" - } - ], - "binding": { - "strength": "extensible", - "valueSet": "http://hl7.org/fhir/us/core/ValueSet/us-core-condition-code" + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } - }, + ], + "code": "Timing" + } + ] + }, + { + "id": "ServiceRequest.authoredOn", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "ServiceRequest.authoredOn", + "short": "(QI) Date request signed", + "min": 1, + "max": "1" + }, + { + "id": "ServiceRequest.requester", + "path": "ServiceRequest.requester", + "type": [ + { + "code": "Reference", + "targetProfile": [ + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-practitioner", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-practitionerrole", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-organization", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-relatedperson", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-device", + "http://hl7.org/fhir/us/core/StructureDefinition/us-core-implantable-device" + ] + } + ] + }, + { + "id": "ServiceRequest.reasonCode", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true + } + ], + "path": "ServiceRequest.reasonCode", + "short": "(QI) Explanation/Justification for procedure or service", + "type": [ { - "id": "ServiceRequest.reasonReference", + "code": "CodeableConcept" + } + ], + "binding": { + "extension": [ + { + "url": "http://hl7.org/fhir/tools/StructureDefinition/additional-binding", "extension": [ - { - "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", - "valueBoolean": true - } - ], - "path": "ServiceRequest.reasonReference", - "short": "(QI) Explanation/Justification for service or service", - "definition": "Indicates another resource that provides a justification for why this service is being requested. May relate to the resources referred to in `supportingInfo`.", - "comment": "This element represents why the referral is being made and may be used to decide how the service will be performed, or even if it will be performed at all. To be as specific as possible, a reference to *Observation* or *Condition* should be used if available. Otherwise when referencing *DiagnosticReport* it should contain a finding in `DiagnosticReport.conclusion` and/or `DiagnosticReport.conclusionCode`. When using a reference to *DocumentReference*, the target document should contain clear findings language providing the relevant reason for this service request. Use the CodeableConcept text element in `ServiceRequest.reasonCode` if the data is free (uncoded) text as shown in the [CT Scan example](servicerequest-example-di.html).", - "min": 0, - "max": "*", - "base": { - "path": "ServiceRequest.reasonReference", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition-encounter-diagnosis", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition-problems-health-concerns", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-diagnosticreport-note", - "http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference", - "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-simple-observation" - ] - } + { + "url": "purpose", + "valueCode": "current" + }, + { + "url": "valueSet", + "valueCanonical": "http://hl7.org/fhir/us/qicore/ValueSet/qicore-negation-reason" + } ] + } + ], + "strength": "extensible", + "valueSet": "http://hl7.org/fhir/us/core/ValueSet/us-core-condition-code" + } + }, + { + "id": "ServiceRequest.reasonReference", + "extension": [ + { + "url": "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-keyelement", + "valueBoolean": true } - ] + ], + "path": "ServiceRequest.reasonReference", + "short": "(QI) Explanation/Justification for service or service", + "definition": "Indicates another resource that provides a justification for why this service is being requested. May relate to the resources referred to in `supportingInfo`.", + "comment": "This element represents why the referral is being made and may be used to decide how the service will be performed, or even if it will be performed at all. To be as specific as possible, a reference to *Observation* or *Condition* should be used if available. Otherwise when referencing *DiagnosticReport* it should contain a finding in `DiagnosticReport.conclusion` and/or `DiagnosticReport.conclusionCode`. When using a reference to *DocumentReference*, the target document should contain clear findings language providing the relevant reason for this service request. Use the CodeableConcept text element in `ServiceRequest.reasonCode` if the data is free (uncoded) text as shown in the [CT Scan example](servicerequest-example-di.html).", + "min": 0, + "max": "*", + "base": { + "path": "ServiceRequest.reasonReference", + "min": 0, + "max": "*" + }, + "type": [ + { + "code": "Reference", + "targetProfile": [ + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition-encounter-diagnosis", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition-problems-health-concerns", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-diagnosticreport-note", + "http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference", + "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-simple-observation" + ] + } + ] + } + ] } -} \ No newline at end of file +} diff --git a/input/qicore.xml b/input/qicore.xml index f62585c0..3e8484cb 100644 --- a/input/qicore.xml +++ b/input/qicore.xml @@ -926,7 +926,7 @@ - + diff --git a/input/resources/communication-negation-example.xml b/input/resources/communication-negation-example.xml index 3c2916cb..14c97757 100644 --- a/input/resources/communication-negation-example.xml +++ b/input/resources/communication-negation-example.xml @@ -4,7 +4,7 @@ - + diff --git a/input/resources/devicerequest-negation-example.xml b/input/resources/devicerequest-negation-example.xml index e723d14b..ed0dbe13 100644 --- a/input/resources/devicerequest-negation-example.xml +++ b/input/resources/devicerequest-negation-example.xml @@ -4,15 +4,6 @@ - - - - - - - - - diff --git a/input/resources/devicerequest-negation-with-code-example.xml b/input/resources/devicerequest-negation-with-code-example.xml index 50871174..efaa28e9 100644 --- a/input/resources/devicerequest-negation-with-code-example.xml +++ b/input/resources/devicerequest-negation-with-code-example.xml @@ -4,15 +4,6 @@ - - - - - - - - - diff --git a/input/resources/encounter-example.xml b/input/resources/encounter-example.xml index 97742ec5..3416d8fa 100644 --- a/input/resources/encounter-example.xml +++ b/input/resources/encounter-example.xml @@ -21,14 +21,6 @@ - - - - - - - - diff --git a/input/resources/medicationadministration-cmd-example.xml b/input/resources/medicationadministration-cmd-example.xml index ec6f2646..6b10499c 100644 --- a/input/resources/medicationadministration-cmd-example.xml +++ b/input/resources/medicationadministration-cmd-example.xml @@ -19,6 +19,9 @@ http://hl7.org/fhir/us/qicore/qdm-to-qicore.html + + + diff --git a/input/resources/medicationadministration-example.xml b/input/resources/medicationadministration-example.xml index 2d9d8c4c..8fc40b60 100644 --- a/input/resources/medicationadministration-example.xml +++ b/input/resources/medicationadministration-example.xml @@ -4,6 +4,9 @@ + + + diff --git a/input/resources/medicationadministration-negation-example.xml b/input/resources/medicationadministration-negation-example.xml index 05882acd..d8b6b64b 100644 --- a/input/resources/medicationadministration-negation-example.xml +++ b/input/resources/medicationadministration-negation-example.xml @@ -4,7 +4,7 @@ - + diff --git a/input/resources/medicationadministration-negation-with-code-example.xml b/input/resources/medicationadministration-negation-with-code-example.xml index 650eb780..db1bdfa3 100644 --- a/input/resources/medicationadministration-negation-with-code-example.xml +++ b/input/resources/medicationadministration-negation-with-code-example.xml @@ -4,7 +4,7 @@ - + diff --git a/input/resources/medicationdispense-cmd-example.xml b/input/resources/medicationdispense-cmd-example.xml index 0eaf3782..7c02cab5 100644 --- a/input/resources/medicationdispense-cmd-example.xml +++ b/input/resources/medicationdispense-cmd-example.xml @@ -15,6 +15,9 @@ http://hl7.org/fhir/us/qicore/qdm-to-qicore.html + + + diff --git a/input/resources/medicationdispense-example.xml b/input/resources/medicationdispense-example.xml index c16133a0..34725465 100644 --- a/input/resources/medicationdispense-example.xml +++ b/input/resources/medicationdispense-example.xml @@ -17,6 +17,9 @@ --> + + + diff --git a/input/resources/medicationdispense-negation-example.xml b/input/resources/medicationdispense-negation-example.xml index 4da141a1..fd55ea2a 100644 --- a/input/resources/medicationdispense-negation-example.xml +++ b/input/resources/medicationdispense-negation-example.xml @@ -4,7 +4,7 @@ - + diff --git a/input/resources/medicationdispense-negation-with-code-example.xml b/input/resources/medicationdispense-negation-with-code-example.xml index 694d7f9d..7fc65338 100644 --- a/input/resources/medicationdispense-negation-with-code-example.xml +++ b/input/resources/medicationdispense-negation-with-code-example.xml @@ -4,7 +4,7 @@ - + diff --git a/input/resources/observation-negation-example.xml b/input/resources/observation-negation-example.xml index f775e4fa..72e29a58 100644 --- a/input/resources/observation-negation-example.xml +++ b/input/resources/observation-negation-example.xml @@ -1,7 +1,7 @@ - + diff --git a/input/resources/observation-negation-with-code-example.xml b/input/resources/observation-negation-with-code-example.xml index ef3231c6..3f0b7f60 100644 --- a/input/resources/observation-negation-with-code-example.xml +++ b/input/resources/observation-negation-with-code-example.xml @@ -1,7 +1,7 @@ - + diff --git a/input/resources/procedure-example.xml b/input/resources/procedure-example.xml index 9961e69f..a129db2f 100644 --- a/input/resources/procedure-example.xml +++ b/input/resources/procedure-example.xml @@ -4,7 +4,7 @@ - + diff --git a/input/resources/procedure-negation-example.xml b/input/resources/procedure-negation-example.xml index f3a37fe8..c9eabb0b 100644 --- a/input/resources/procedure-negation-example.xml +++ b/input/resources/procedure-negation-example.xml @@ -4,7 +4,7 @@ - + diff --git a/input/resources/procedure-negation-with-code-example.xml b/input/resources/procedure-negation-with-code-example.xml index 00a90cca..b52aa10f 100644 --- a/input/resources/procedure-negation-with-code-example.xml +++ b/input/resources/procedure-negation-with-code-example.xml @@ -1,7 +1,7 @@ - + diff --git a/input/resources/servicerequest-appropriateness-example.xml b/input/resources/servicerequest-appropriateness-example.xml index 996a0178..0b821e65 100644 --- a/input/resources/servicerequest-appropriateness-example.xml +++ b/input/resources/servicerequest-appropriateness-example.xml @@ -1,8 +1,5 @@ - - - diff --git a/input/resources/servicerequest-elective-example.xml b/input/resources/servicerequest-elective-example.xml index 721bf2a8..70ef9d24 100644 --- a/input/resources/servicerequest-elective-example.xml +++ b/input/resources/servicerequest-elective-example.xml @@ -1,9 +1,6 @@ - - - diff --git a/input/resources/servicerequest-negation-example-code.xml b/input/resources/servicerequest-negation-example-code.xml index 9b60dcbd..0223f331 100644 --- a/input/resources/servicerequest-negation-example-code.xml +++ b/input/resources/servicerequest-negation-example-code.xml @@ -1,15 +1,6 @@ - - - - - - - - - @@ -36,4 +27,11 @@ + + + + + + + diff --git a/input/resources/servicerequest-negation-example.xml b/input/resources/servicerequest-negation-example.xml index 6c63716d..b7a7bc37 100644 --- a/input/resources/servicerequest-negation-example.xml +++ b/input/resources/servicerequest-negation-example.xml @@ -1,15 +1,6 @@ - - - - - - - - - @@ -35,6 +26,13 @@ + + + + + + +