From e1057fa05f126673dd56f03359bc102390861eb1 Mon Sep 17 00:00:00 2001
From: jlyle1 <jay@lyle.net>
Date: Tue, 3 Dec 2024 16:36:17 -0500
Subject: [PATCH 1/7] update versions, assets for jan 25 ballot

---
 xml/FHIR-us-ccda.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/xml/FHIR-us-ccda.xml b/xml/FHIR-us-ccda.xml
index 5d8b9b10b..2640c8107 100644
--- a/xml/FHIR-us-ccda.xml
+++ b/xml/FHIR-us-ccda.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/us/ccda/2023May" ciUrl="http://build.fhir.org/ig/HL7/ccda-on-fhir" defaultVersion="1.2.0" defaultWorkgroup="cgp" gitUrl="https://github.com/HL7/ccda-on-fhir" url="http://hl7.org/fhir/us/ccda">
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/us/ccda/2025Jan" ciUrl="http://build.fhir.org/ig/HL7/ccda-on-fhir" defaultVersion="2.0.0" defaultWorkgroup="cgp" gitUrl="https://github.com/HL7/ccda-on-fhir" url="http://hl7.org/fhir/us/ccda">
 <version code="current" url="http://build.fhir.org/ig/HL7/ccda-on-fhir"/>
-<version code="1.2.0" url="http://hl7.org/fhir/us/ccda/STU1.2"/>
-<version code="1.2.0-ballot" url="http://hl7.org/fhir/us/ccda/2023May"/>
+<version code="2.0.0" url="http://hl7.org/fhir/us/ccda/STU2.0"/>
+<version code="2.0.0-ballot" url="http://hl7.org/fhir/us/ccda/2025Jan"/>
+<version code="1.2.0" deprecated="true" url="http://hl7.org/fhir/us/ccda/STU1.2"/>
+<version code="1.2.0-ballot" deprecated="true" url="http://hl7.org/fhir/us/ccda/2023May"/>
 <version code="1.1.0" deprecated="true" url="http://hl7.org/fhir/us/ccda/STU1.1"/>
 <version code="1.0.0" deprecated="true" url="http://hl7.org/fhir/us/ccda/STU1"/>
 <version code="1.8.0" deprecated="true" url="http://hl7.org/fhir/us/ccda/2017Jan"/>
@@ -103,6 +105,10 @@
 <artifact id="ConceptMap/FC-TelecomType" key="ConceptMap-FC-TelecomType" name="FHIR to C-CDA Telecom Type"/>
 <artifact id="ConceptMap/FC-TelecomUse" key="ConceptMap-FC-TelecomUse" name="FHIR to C-CDA Telecom Use"/>
 <artifact id="ConceptMap/FC-AllergyIntoleranceCategory" key="ConceptMap-FC-AllergyIntoleranceCategory" name="FHIR to CCDA Allergy Intolerance Category"/>
+<artifact id="ConceptMap/CF-EncounterStatus" key="ConceptMap-CF-EncounterStatus" name="CCDA Encounter Status to FHIR Encounter Status"/>
+<artifact id="ConceptMap/CF-ResultReportStatus" key="ConceptMap-CF-ResultReportStatus" name="CCDA Result Report Status to FHIR Result Report Status"/>
+<artifact id="ConceptMap/CF-ResultStatus" key="ConceptMap-CF-ResultStatus" name="CCDA Result Status to FHIR Result Status"/>
+<artifact id="ConceptMap/FC-Observation Status" key="ConceptMap-FC-ObservationStatus" name="FHIR Observation Status to CCDA Observation Status"/>
 <artifact deprecated="true" id="ConceptMap/F2C-AllergyIntolerance" key="ConceptMap-F2C-AllergyIntolerance" name="FHIR-to-CCDA map for AllergyIntolerance"/>
 <artifact deprecated="true" id="ConceptMap/F2C-Condition" key="ConceptMap-F2C-Condition" name="FHIR-to-CCDA map for Condition"/>
 <artifact deprecated="true" id="ConceptMap/F2C-Immunization" key="ConceptMap-F2C-Immunization" name="FHIR-to-CCDA map for Immunization"/>
@@ -166,6 +172,13 @@
 <page key="CF-problems" name="C-CDA to FHIR Problems"/>
 <page key="CF-procedures" name="C-CDA to FHIR Procedures"/>
 <page key="CF-index" name="C-CDA → FHIR Index"/>
+<page key="CF-encounters" name="C-CDA to FHIR Encounters"/>
+<page key="CF-notes" name="C-CDA to FHIR Notes"/>
+<page key="CF-participation" name="C-CDA to FHIR Participation"/>
+<page key="CF-results" name="C-CDA to FHIR Results"/>
+<page key="CF-social" name="C-CDA to FHIR Social History"/>
+<page key="CF-vitals" name="C-CDA to FHIR Vital Signs"/>
+<page key="FC-vitals" name="FHIR to C-CDA Vital Signs"/>
 <page key="downloads" name="Downloads"/>
 <page key="FC-allergies" name="FHIR to C-CDA Allergies"/>
 <page key="FC-immunizations" name="FHIR to C-CDA Immunizations"/>

From c11ad37902f0a15ff80628c98769570c7d9335ff Mon Sep 17 00:00:00 2001
From: jlyle1 <jay@lyle.net>
Date: Thu, 12 Dec 2024 14:43:30 -0500
Subject: [PATCH 2/7] updated jira xml for ccda fhir

---
 xml/FHIR-us-ccda.xml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/xml/FHIR-us-ccda.xml b/xml/FHIR-us-ccda.xml
index 2640c8107..a0f3ce01b 100644
--- a/xml/FHIR-us-ccda.xml
+++ b/xml/FHIR-us-ccda.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/us/ccda/2025Jan" ciUrl="http://build.fhir.org/ig/HL7/ccda-on-fhir" defaultVersion="2.0.0" defaultWorkgroup="cgp" gitUrl="https://github.com/HL7/ccda-on-fhir" url="http://hl7.org/fhir/us/ccda">
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/us/ccda/2025Jan" ciUrl="http://build.fhir.org/ig/HL7/ccda-on-fhir" defaultVersion="1.2.0" defaultWorkgroup="cgp" gitUrl="https://github.com/HL7/ccda-on-fhir" url="http://hl7.org/fhir/us/ccda">
 <version code="current" url="http://build.fhir.org/ig/HL7/ccda-on-fhir"/>
-<version code="2.0.0" url="http://hl7.org/fhir/us/ccda/STU2.0"/>
 <version code="2.0.0-ballot" url="http://hl7.org/fhir/us/ccda/2025Jan"/>
-<version code="1.2.0" deprecated="true" url="http://hl7.org/fhir/us/ccda/STU1.2"/>
+<version code="1.2.0" url="http://hl7.org/fhir/us/ccda/STU1.2"/>
 <version code="1.2.0-ballot" deprecated="true" url="http://hl7.org/fhir/us/ccda/2023May"/>
 <version code="1.1.0" deprecated="true" url="http://hl7.org/fhir/us/ccda/STU1.1"/>
 <version code="1.0.0" deprecated="true" url="http://hl7.org/fhir/us/ccda/STU1"/>
@@ -28,6 +27,7 @@
 <artifact id="ConceptMap/CF-AddressUse" key="ConceptMap-CF-AddressUse" name="C-CDA to FHIR Address Use"/>
 <artifact id="ConceptMap/CF-AdministrativeGender" key="ConceptMap-CF-AdministrativeGender" name="C-CDA to FHIR Adminmistrative Gender"/>
 <artifact id="ConceptMap/CF-AllergyStatus" key="ConceptMap-CF-AllergyStatus" name="C-CDA to FHIR Allergy Status"/>
+<artifact id="ConceptMap/CF-EncounterStatus" key="ConceptMap-CF-EncounterStatus" name="C-CDA to FHIR Encounter Status"/>
 <artifact id="ConceptMap/CF-ImmunizationStatus" key="ConceptMap-CF-ImmunizationStatus" name="C-CDA to FHIR Immunization Status"/>
 <artifact id="ConceptMap/CF-MedicationStatus" key="ConceptMap-CF-MedicationStatus" name="C-CDA to FHIR Medication Status"/>
 <artifact id="ConceptMap/CF-NameUse" key="ConceptMap-CF-NameUse" name="C-CDA to FHIR NameUse"/>
@@ -38,6 +38,8 @@
 <artifact id="ConceptMap/CF-Criticality" key="ConceptMap-CF-Criticality" name="CCDA Criticality to FHIR Criticality"/>
 <artifact id="ConceptMap/CF-MedActivityMood" key="ConceptMap-CF-MedActivityMood" name="CCDA Medication Activity Mood to FHIR MedicationRequest.intent"/>
 <artifact id="ConceptMap/CF-ConditionClinicalStatus" key="ConceptMap-CF-ConditionClinicalStatus" name="CCDA Problem Concern Status to FHIR Condition Clinical Status"/>
+<artifact id="ConceptMap/CF-ResultReportStatus" key="ConceptMap-CF-ResultReportStatus" name="CCDA ResultStatus to FHIR DiagnosticReport status"/>
+<artifact id="ConceptMap/CF-ResultStatus" key="ConceptMap-CF-ResultStatus" name="CCDA ResultStatus to FHIR Observation Status"/>
 <artifact id="CapabilityStatement/CcdaOnFhirClient" key="CapabilityStatement-CcdaOnFhirClient" name="CCDA on FHIR Client"/>
 <artifact id="CapabilityStatement/CcdaOnFhirServer" key="CapabilityStatement-CcdaOnFhirServer" name="CCDA on FHIR Server"/>
 <artifact id="ConceptMap/CF-AllergyIntoleranceCategory" key="ConceptMap-CF-AllergyIntoleranceCategory" name="CCDA to FHIR Allergy Intolerance Category"/>
@@ -93,6 +95,7 @@
 <artifact id="ConceptMap/FC-DataAbsentReasonNullFlavor" key="ConceptMap-FC-DataAbsentReasonNullFlavor" name="FHIR Data Absent Reason to C-CDA NullFlavor"/>
 <artifact id="ConceptMap/FC-ImmunizationSite" key="ConceptMap-FC-ImmunizationSite" name="FHIR Immunization Site to C-CDA Immunization approachSiteCode"/>
 <artifact id="ConceptMap/FC-ImmunizationRefusal" key="ConceptMap-FC-ImmunizationRefusal" name="FHIR Immunization Status Reason to C-CDA Immunization Refusal"/>
+<artifact id="ConceptMap/FC-ObservationStatus" key="ConceptMap-FC-ObservationStatus" name="FHIR ObservationStatus to C-CDA ObservationStatus"/>
 <artifact id="ConceptMap/FC-Severity" key="ConceptMap-FC-Severity" name="FHIR Severity to C-CDA Severity"/>
 <artifact id="ConceptMap/FC-AddressUse" key="ConceptMap-FC-AddressUse" name="FHIR to C-CDA Address Use"/>
 <artifact id="ConceptMap/FC-AdministrativeGender" key="ConceptMap-FC-AdministrativeGender" name="FHIR to C-CDA Adminmistrative Gender"/>
@@ -105,10 +108,6 @@
 <artifact id="ConceptMap/FC-TelecomType" key="ConceptMap-FC-TelecomType" name="FHIR to C-CDA Telecom Type"/>
 <artifact id="ConceptMap/FC-TelecomUse" key="ConceptMap-FC-TelecomUse" name="FHIR to C-CDA Telecom Use"/>
 <artifact id="ConceptMap/FC-AllergyIntoleranceCategory" key="ConceptMap-FC-AllergyIntoleranceCategory" name="FHIR to CCDA Allergy Intolerance Category"/>
-<artifact id="ConceptMap/CF-EncounterStatus" key="ConceptMap-CF-EncounterStatus" name="CCDA Encounter Status to FHIR Encounter Status"/>
-<artifact id="ConceptMap/CF-ResultReportStatus" key="ConceptMap-CF-ResultReportStatus" name="CCDA Result Report Status to FHIR Result Report Status"/>
-<artifact id="ConceptMap/CF-ResultStatus" key="ConceptMap-CF-ResultStatus" name="CCDA Result Status to FHIR Result Status"/>
-<artifact id="ConceptMap/FC-Observation Status" key="ConceptMap-FC-ObservationStatus" name="FHIR Observation Status to CCDA Observation Status"/>
 <artifact deprecated="true" id="ConceptMap/F2C-AllergyIntolerance" key="ConceptMap-F2C-AllergyIntolerance" name="FHIR-to-CCDA map for AllergyIntolerance"/>
 <artifact deprecated="true" id="ConceptMap/F2C-Condition" key="ConceptMap-F2C-Condition" name="FHIR-to-CCDA map for Condition"/>
 <artifact deprecated="true" id="ConceptMap/F2C-Immunization" key="ConceptMap-F2C-Immunization" name="FHIR-to-CCDA map for Immunization"/>
@@ -166,26 +165,31 @@
 <page key="artifacts" name="Artifacts Summary"/>
 <page key="background" name="Background"/>
 <page key="CF-allergies" name="C-CDA to FHIR Allergies"/>
+<page key="CF-encounters" name="C-CDA to FHIR Encounters"/>
 <page key="CF-immunizations" name="C-CDA to FHIR Immunizations"/>
 <page key="CF-medications" name="C-CDA to FHIR Medications"/>
+<page key="CF-notes" name="C-CDA to FHIR Notes"/>
+<page key="CF-participations" name="C-CDA to FHIR Participations"/>
 <page key="CF-patient" name="C-CDA to FHIR Patient"/>
 <page key="CF-problems" name="C-CDA to FHIR Problems"/>
 <page key="CF-procedures" name="C-CDA to FHIR Procedures"/>
-<page key="CF-index" name="C-CDA → FHIR Index"/>
-<page key="CF-encounters" name="C-CDA to FHIR Encounters"/>
-<page key="CF-notes" name="C-CDA to FHIR Notes"/>
-<page key="CF-participation" name="C-CDA to FHIR Participation"/>
 <page key="CF-results" name="C-CDA to FHIR Results"/>
 <page key="CF-social" name="C-CDA to FHIR Social History"/>
 <page key="CF-vitals" name="C-CDA to FHIR Vital Signs"/>
-<page key="FC-vitals" name="FHIR to C-CDA Vital Signs"/>
+<page key="CF-index" name="C-CDA → FHIR Index"/>
+<page key="mappingChangelog" name="Change Log"/>
 <page key="downloads" name="Downloads"/>
 <page key="FC-allergies" name="FHIR to C-CDA Allergies"/>
+<page key="FC-encounters" name="FHIR to C-CDA Encounters"/>
 <page key="FC-immunizations" name="FHIR to C-CDA Immunizations"/>
 <page key="FC-medications" name="FHIR to C-CDA Medications"/>
+<page key="FC-medications" name="FHIR to C-CDA Medications"/>
 <page key="FC-patient" name="FHIR to C-CDA Patient"/>
 <page key="FC-problems" name="FHIR to C-CDA Problems"/>
 <page key="FC-procedures" name="FHIR to C-CDA Procedures"/>
+<page key="FC-results" name="FHIR to C-CDA Results"/>
+<page key="FC-social" name="FHIR to C-CDA Social History"/>
+<page key="FC-vitals" name="FHIR to C-CDA Vital Signs"/>
 <page key="FC-index" name="FHIR → C-CDA Index"/>
 <page deprecated="true" key="Guidance" name="Guidance"/>
 <page key="index" name="Home Page"/>

From 839a73df1bd4ecb0a881428c2cc58c33f67d5225 Mon Sep 17 00:00:00 2001
From: Bryn Rhodes <bryn@databaseconsultinggroup.com>
Date: Sun, 15 Dec 2024 20:00:30 -0700
Subject: [PATCH 3/7] Updates for Using CQL With FHIR IG STU2 Ballot

---
 xml/FHIR-uv-cql.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/xml/FHIR-uv-cql.xml b/xml/FHIR-uv-cql.xml
index f9681fcb5..296001a0c 100644
--- a/xml/FHIR-uv-cql.xml
+++ b/xml/FHIR-uv-cql.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/cql/2024Jan" ciUrl="http://build.fhir.org/ig/HL7/cql-ig" defaultVersion="1.0.0" defaultWorkgroup="cds" gitUrl="https://github.com/HL7/cql-ig" url="http://hl7.org/fhir/uv/cql">
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/cql/2025Jan" ciUrl="http://build.fhir.org/ig/HL7/cql-ig" defaultVersion="1.0.0" defaultWorkgroup="cds" gitUrl="https://github.com/HL7/cql-ig" url="http://hl7.org/fhir/uv/cql">
 <version code="current" url="http://build.fhir.org/ig/HL7/cql-ig"/>
+<version code="2.0.0-ballot" url="http://hl7.org/fhir/uv/cql/2025Jan"/>
 <version code="1.0.0" url="http://hl7.org/fhir/uv/cql/STU1"/>
-<version code="1.0.0-snapshot" url="http://hl7.org/fhir/uv/cqly/1.0.0-snapshot"/>
-<version code="1.0.0-ballot" url="http://hl7.org/fhir/uv/cql/2024Jan"/>
+<version code="1.0.0-snapshot" url="http://hl7.org/fhir/uv/cql/1.0.0-snapshot"/>
+<version code="1.0.0-ballot" deprecated="true" url="http://hl7.org/fhir/uv/cql/2024Jan"/>
 <artifactPageExtension value="-definitions"/>
 <artifactPageExtension value="-examples"/>
 <artifactPageExtension value="-mappings"/>
@@ -45,7 +46,10 @@
 <artifact id="Patient/example" key="Patient-example" name="Example Patient"/>
 <artifact id="ValueSet/shareable-example" key="ValueSet-shareable-example" name="Example Specific health concern(s) Codes"/>
 <artifact id="Parameters/cql-typemappingexampleresult" key="Parameters-cql-typemappingexampleresult" name="Example Type Mapping Evaluation Result Parameters"/>
-<artifact deprecated="true" id="Library/FHIRCommon" key="Library-FHIRCommon" name="FHIR Common"/>
+<artifact id="Library/FHIRCommon" key="Library-FHIRCommon" name="FHIR Common"/>
+<artifact id="Library/FHIRHelpers" key="Library-FHIRHelpers" name="FHIR Helpers"/>
+<artifact id="Library/FHIRHelpersTests" key="Library-FHIRHelpersTests" name="FHIR HelpersTests"/>
+<artifact id="Library/FHIR-ModelInfo" key="Library-FHIR-ModelInfo" name="FHIR Model Definition"/>
 <artifact id="CapabilityStatement/cql-evaluation-service-example" key="CapabilityStatement-cql-evaluation-service-example" name="Library Evaluation Service Capability Statement Example"/>
 <artifact id="Library/ParameterExample" key="Library-ParameterExample" name="Parameter Example"/>
 <artifact id="StructureDefinition/cql-specifichealthconcerns-profile-example" key="StructureDefinition-cql-specifichealthconcerns-profile-example" name="Specific health concern(s)"/>
@@ -69,4 +73,4 @@
 <page key="using-cql" name="Using CQL"/>
 <page key="using-elm" name="Using ELM"/>
 <page key="using-modelinfo" name="Using ModelInfo"/>
-</specification>
+</specification>
\ No newline at end of file

From 4801d7b80fecb1443fac998fc85d849c3249c8f3 Mon Sep 17 00:00:00 2001
From: Lloyd McKenzie <lloyd@lmckenzie.com>
Date: Mon, 16 Dec 2024 00:55:05 -0700
Subject: [PATCH 4/7] Additional SDC updates

---
 xml/FHIR-sdc.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/xml/FHIR-sdc.xml b/xml/FHIR-sdc.xml
index 9a58891ea..15bc81aba 100644
--- a/xml/FHIR-sdc.xml
+++ b/xml/FHIR-sdc.xml
@@ -84,6 +84,8 @@
 <artifact id="StructureDefinition/sdc-questionnaire-itemMedia" key="StructureDefinition-sdc-questionnaire-itemMedia" name="Item Media"/>
 <artifact deprecated="true" id="StructureDefinition/sdc-questionnaire-itemContext" key="StructureDefinition-sdc-questionnaire-itemContext" name="Item context"/>
 <artifact id="StructureDefinition/sdc-questionnaire-itemPopulationContext" key="StructureDefinition-sdc-questionnaire-itemPopulationContext" name="Item population context"/>
+<artifact id="StructureDefinition/sdc-questionnaire-keyboard" key="StructureDefinition-sdc-questionnaire-keyboard" name="Keyboard Type"/>
+<artifact id="CodeSystem/keyboardType" key="CodeSystem-keyboardType" name="Keyboard Type"/>
 <artifact id="StructureDefinition/sdc-questionnaire-openLabel" key="StructureDefinition-sdc-questionnaire-openLabel" name="Label for 'open' items"/>
 <artifact id="CodeSystem/launchContext" key="CodeSystem-launchContext" name="Launch Context"/>
 <artifact id="StructureDefinition/sdc-questionnaire-launchContext" key="StructureDefinition-sdc-questionnaire-launchContext" name="Launch Contexts"/>
@@ -124,6 +126,7 @@
 <artifact id="ValueSet/entryMode" key="ValueSet-entryMode" name="Questionnaire Entry Mode"/>
 <artifact id="SearchParameter/questionnaire-assemble-expectation" key="SearchParameter-questionnaire-assemble-expectation" name="Questionnaire Is Modular Search Parameter"/>
 <artifact id="ValueSet/collapsible" key="ValueSet-collapsible" name="Questionnaire Item Collapsible"/>
+<artifact id="ValueSet/keyboardType" key="ValueSet-keyboardType" name="Questionnaire Item Keyboard Type"/>
 <artifact id="SearchParameter/questionnaire-definition" key="SearchParameter-questionnaire-definition" name="Questionnaire Item definition"/>
 <artifact id="ValueSet/launchContext" key="ValueSet-launchContext" name="Questionnaire Launch Context"/>
 <artifact id="ValueSet/performerType" key="ValueSet-performerType" name="Questionnaire Performer Type"/>
@@ -142,6 +145,8 @@
 <artifact id="Task/request-task-example" key="Task-request-task-example" name="Request-based solicitation example - Task"/>
 <artifact id="StructureDefinition/sdc-questionnaire" key="StructureDefinition-sdc-questionnaire" name="SDC Base Questionnaire"/>
 <artifact id="StructureDefinition/sdc-codesystem" key="StructureDefinition-sdc-codesystem" name="SDC Code System"/>
+<artifact id="Questionnaire/sdc-derivation-child" key="Questionnaire-sdc-derivation-child" name="SDC Derivation Child"/>
+<artifact id="Questionnaire/sdc-derivation-parent" key="Questionnaire-sdc-derivation-parent" name="SDC Derivation Parent"/>
 <artifact id="CapabilityStatement/sdc-form-archiver" key="CapabilityStatement-sdc-form-archiver" name="SDC Form Archiver"/>
 <artifact id="CapabilityStatement/sdc-form-designer" key="CapabilityStatement-sdc-form-designer" name="SDC Form Designer"/>
 <artifact id="CapabilityStatement/sdc-form-filler" key="CapabilityStatement-sdc-form-filler" name="SDC Form Filler"/>
@@ -154,7 +159,9 @@
 <artifact id="Bundle/map-population-example" key="Bundle-map-population-example" name="SDC Map population source bundle example"/>
 <artifact id="StructureDefinition/sdc-questionnaire-modular" key="StructureDefinition-sdc-questionnaire-modular" name="SDC Modular Questionnaire"/>
 <artifact id="StructureDefinition/SdcQuestionLibrary" key="StructureDefinition-sdc-question-library" name="SDC Question Library"/>
-<artifact id="StructureDefinition/sdc-questionnaireresponse" key="QuestionnaireAnswers" name="SDC Questionnaire Response"/>
+<artifact id="StructureDefinition/sdc-questionnairecommon" key="StructureDefinition-sdc-questionnairecommon" name="SDC Questionnaire Common Elements"/>
+<artifact id="StructureDefinition/sdc-questionnaireresponsecommon" key="StructureDefinition-sdc-questionnaireresponsecommon" name="SDC Questionnaire Response Common Elements"/>
+<artifact id="StructureDefinition/sdc-questionnaireresponse" key="QuestionnaireAnswers" name="SDC Standard Questionnaire Response"/>
 <artifact id="ValueSet/task-code" key="ValueSet-task-code" name="SDC Task Code"/>
 <artifact id="Questionnaire/questionnaire-sdc-test-all-data-types" key="Questionnaire-questionnaire-sdc-test-all-data-types" name="SDC Test Form - All Data Types"/>
 <artifact id="Questionnaire/questionnaire-sdc-test-fhirpath-prepop-candexpr" key="Questionnaire-questionnaire-sdc-test-fhirpath-prepop-candexpr" name="SDC Test Form - Candidate Expression"/>
@@ -215,6 +222,7 @@
 <page key="search" name="Finding a Questionnaire"/>
 <page key="behavior" name="Form Behavior and Calculation"/>
 <page key="extraction" name="Form Data Extraction"/>
+<page key="derive" name="Form Derivation"/>
 <page key="populate" name="Form Population"/>
 <page key="changes" name="IG Change History"/>
 <page key="intro" name="Introduction"/>

From 77113a915945b3787f06ead9edaf3dbdc499e54d Mon Sep 17 00:00:00 2001
From: Lloyd McKenzie <lloyd@lmckenzie.com>
Date: Mon, 16 Dec 2024 00:57:31 -0700
Subject: [PATCH 5/7] Fixed SDC

---
 xml/FHIR-sdc.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xml/FHIR-sdc.xml b/xml/FHIR-sdc.xml
index 15bc81aba..6ea133f5a 100644
--- a/xml/FHIR-sdc.xml
+++ b/xml/FHIR-sdc.xml
@@ -84,8 +84,8 @@
 <artifact id="StructureDefinition/sdc-questionnaire-itemMedia" key="StructureDefinition-sdc-questionnaire-itemMedia" name="Item Media"/>
 <artifact deprecated="true" id="StructureDefinition/sdc-questionnaire-itemContext" key="StructureDefinition-sdc-questionnaire-itemContext" name="Item context"/>
 <artifact id="StructureDefinition/sdc-questionnaire-itemPopulationContext" key="StructureDefinition-sdc-questionnaire-itemPopulationContext" name="Item population context"/>
-<artifact id="StructureDefinition/sdc-questionnaire-keyboard" key="StructureDefinition-sdc-questionnaire-keyboard" name="Keyboard Type"/>
-<artifact id="CodeSystem/keyboardType" key="CodeSystem-keyboardType" name="Keyboard Type"/>
+<artifact id="StructureDefinition/sdc-questionnaire-keyboard" key="StructureDefinition-sdc-questionnaire-keyboard" name="Keyboard Type Extension"/>
+<artifact id="CodeSystem/keyboardType" key="CodeSystem-keyboardType" name="Keyboard Type Codes"/>
 <artifact id="StructureDefinition/sdc-questionnaire-openLabel" key="StructureDefinition-sdc-questionnaire-openLabel" name="Label for 'open' items"/>
 <artifact id="CodeSystem/launchContext" key="CodeSystem-launchContext" name="Launch Context"/>
 <artifact id="StructureDefinition/sdc-questionnaire-launchContext" key="StructureDefinition-sdc-questionnaire-launchContext" name="Launch Contexts"/>

From b692691d10bd83447e671af99cf901ae11d0135c Mon Sep 17 00:00:00 2001
From: jlyle1 <jay@lyle.net>
Date: Mon, 16 Dec 2024 14:42:42 -0500
Subject: [PATCH 6/7] removed duplicate page row

---
 xml/FHIR-us-ccda.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xml/FHIR-us-ccda.xml b/xml/FHIR-us-ccda.xml
index a0f3ce01b..f6bac0503 100644
--- a/xml/FHIR-us-ccda.xml
+++ b/xml/FHIR-us-ccda.xml
@@ -183,7 +183,6 @@
 <page key="FC-encounters" name="FHIR to C-CDA Encounters"/>
 <page key="FC-immunizations" name="FHIR to C-CDA Immunizations"/>
 <page key="FC-medications" name="FHIR to C-CDA Medications"/>
-<page key="FC-medications" name="FHIR to C-CDA Medications"/>
 <page key="FC-patient" name="FHIR to C-CDA Patient"/>
 <page key="FC-problems" name="FHIR to C-CDA Problems"/>
 <page key="FC-procedures" name="FHIR to C-CDA Procedures"/>

From d9bd521b2314831dd6fd6167353c7a1334ea8661 Mon Sep 17 00:00:00 2001
From: Jean Duteau <jean@duteaudesign.com>
Date: Mon, 16 Dec 2024 14:48:19 -0700
Subject: [PATCH 7/7] Updated CDA-sd version.

---
 xml/CDA-cda-sd.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xml/CDA-cda-sd.xml b/xml/CDA-cda-sd.xml
index ce4305725..bf4a679bd 100644
--- a/xml/CDA-cda-sd.xml
+++ b/xml/CDA-cda-sd.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/cda/stds/core/2023Sep" ciUrl="http://build.fhir.org/ig/HL7/CDA-core-sd" defaultVersion="2.0.0-sd" defaultWorkgroup="sd" url="http://hl7.org/cda/stds/core">
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/cda/stds/core/2023Sep" ciUrl="http://build.fhir.org/ig/HL7/CDA-core-sd" defaultVersion="2.0.1-sd" defaultWorkgroup="sd" url="http://hl7.org/cda/stds/core">
 <version code="current" url="http://build.fhir.org/ig/HL7/CDA-core-sd"/>
-<version code="2.0.0-sd" url="https://hl7.org/cda/stds/core"/>
+<version code="2.0.1-sd" url="http://hl7.org/cda/stds/core/2.0.1-sd"/>
+<version code="2.0.0-sd" url="http://hl7.org/cda/stds/core/2.0.0-sd"/>
 <version code="2.0.0-sd-snapshot1" deprecated="true" url="http://hl7.org/cda/stds/core/2.0.0-sd-snapshot1"/>
 <version code="2.0.0-sd-ballot" deprecated="true" url="http://hl7.org/cda/stds/core/2023Sep"/>
 <version code="2.1.0-draft1" deprecated="true" url="http://hl7.org/cda/stds/core/draft1"/>
@@ -82,6 +83,7 @@
 <artifact id="StructureDefinition/ExternalProcedure" key="StructureDefinition-ExternalProcedure" name="ExternalProcedure (CDA Class)"/>
 <artifact id="StructureDefinition/Guardian" key="StructureDefinition-Guardian" name="Guardian (CDA Class)"/>
 <artifact id="StructureDefinition/HealthCareFacility" key="StructureDefinition-HealthCareFacility" name="HealthCareFacility (CDA Class)"/>
+<artifact id="CodeSystem/IGParametersCDAValidation" key="CodeSystem-IGParametersCDAValidation" name="IG Parameters CDA Validation"/>
 <artifact id="StructureDefinition/II" key="StructureDefinition-II" name="II: InstanceIdentifier (V3 Data Type)"/>
 <artifact id="StructureDefinition/INT" key="StructureDefinition-INT" name="INT: IntegerNumber (V3 Data Type)"/>
 <artifact id="StructureDefinition/INT-POS" key="StructureDefinition-INT-POS" name="INT_POS: Positive integer numbers (V3 Data Type)"/>