Skip to content

Commit

Permalink
Merge branch 'master' into phr
Browse files Browse the repository at this point in the history
  • Loading branch information
@lynnlaakso
lynnlaakso authored Dec 17, 2024
2 parents 3153c64 + 819181e commit e6265a1
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 10 deletions.
6 changes: 4 additions & 2 deletions xml/CDA-cda-sd.xml
View file
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down Expand Up @@ -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)"/>
Expand Down
10 changes: 9 additions & 1 deletion xml/FHIR-sdc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 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"/>
Expand Down Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand All @@ -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"/>
Expand Down Expand Up @@ -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"/>
Expand Down
20 changes: 18 additions & 2 deletions xml/FHIR-us-ccda.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?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="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-ballot" url="http://hl7.org/fhir/us/ccda/2025Jan"/>
<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="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"/>
Expand All @@ -26,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"/>
Expand All @@ -36,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"/>
Expand Down Expand Up @@ -91,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"/>
Expand Down Expand Up @@ -160,19 +165,30 @@
<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-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="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-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"/>
Expand Down
14 changes: 9 additions & 5 deletions xml/FHIR-uv-cql.xml
View file
Original file line number Diff line number Diff line change
@@ -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"/>
Expand Down Expand Up @@ -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)"/>
Expand All @@ -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>

0 comments on commit e6265a1

Please sign in to comment.