Merge branch 'master' into master

HL7 · Aug 14, 2024 · 11115a0 · 11115a0
2 parents b164baa + 9d0779f
commit 11115a0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/schemas/workgroupList.xsd b/schemas/workgroupList.xsd
@@ -32,7 +32,7 @@
               </xs:annotation>
               <xs:simpleType>
                 <xs:restriction base="xs:NMTOKEN">
-                  <xs:pattern value="[a-z][a-z0-9\-]+"/>
+                  <xs:pattern value="(Vocab)|([a-z][a-z0-9\-]+)"/>
                 </xs:restriction>
               </xs:simpleType>
             </xs:attribute>

diff --git a/xml/FHIR-application-feature.xml b/xml/FHIR-application-feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/application-feature/2024Sept" ciUrl="https://build.fhir.org/ig/HL7/capstmt" defaultVersion="1.0.0-ballot" defaultWorkgroup="fhir-i" gitUrl="https://github.com/HL7/capstmt"  url="http://hl7.org/fhir/uv/application-feature">
-<version code="current" url="https://build.fhir.org/ig/HL7/capstmt"/>
-<version code="1.0.0-ballot" url="http://hl7.org/fhir/uv/application-feature/2024Sept"/>
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/application-feature/2024Sep" ciUrl="http://build.fhir.org/ig/HL7/capstmt" defaultVersion="1.0.0-ballot" defaultWorkgroup="fhir-i" gitUrl="https://github.com/HL7/capstmt"  url="http://hl7.org/fhir/uv/application-feature">
+<version code="current" url="http://build.fhir.org/ig/HL7/capstmt"/>
+<version code="1.0.0-ballot" url="http://hl7.org/fhir/uv/application-feature/2024Sep"/>
 <artifactPageExtension value="-definitions"/>
 <artifactPageExtension value="-examples"/>
 <artifactPageExtension value="-mappings"/>
@@ -26,4 +26,4 @@
 <page key="index" name="Home"/>
 <page key="specification" name="Specification"/>
 <page key="toc" name="Table of Contents"/>
-</specification>
+</specification>
diff --git a/xml/FHIR-phd.xml b/xml/FHIR-phd.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/phd/2019May" ciUrl="http://build.fhir.org/ig/HL7/phd" defaultVersion="1.1.0" defaultWorkgroup="dev" gitUrl="https://github.com/HL7/PHD" url="http://hl7.org/fhir/uv/phd">
-<version code="current" url="http://build.fhir.org/ig/HL7/phd"/>
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/phd/2024Sep" ciUrl="http://build.fhir.org/ig/HL7/phd" defaultVersion="1.1.0" defaultWorkgroup="dev" gitUrl="https://github.com/HL7/PHD" url="http://hl7.org/fhir/uv/phd">
+<version code="current" url="http://hl7.org/fhir/uv/phd/STU1.1"/>
+<version code="2.0.0-ballot" url="http://hl7.org/fhir/uv/phd/2024Sep"/>
 <version code="1.1.0" url="http://hl7.org/fhir/uv/phd/STU1.1"/>
 <version code="1.0.0" deprecated="true" url="http://hl7.org/fhir/uv/phd/STU1"/>
 <version code="0.3.0" deprecated="true" url="http://hl7.org/fhir/uv/phd/2019May"/>
@@ -123,4 +124,4 @@
 <page key="ObservationIdentifier" name="The Observation Identifier"/>
 <page key="UseCases" name="Use Cases"/>
 <page deprecated="true" key="languages" name="languages" url="languages"/>
-</specification>
+</specification>
diff --git a/xml/FHIR-termchangeset.xml b/xml/FHIR-termchangeset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/termchangeset/2024Sep" ciUrl="https://build.fhir.org/ig/HL7/termchangeset-ig" defaultVersion="1.0.0-ballot" defaultWorkgroup="vocab" gitUrl="https://github.com/HL7/termchangeset-ig" url="https://hl7.org/fhir/uv/termchangeset">
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/termchangeset/2024Sep" ciUrl="https://build.fhir.org/ig/HL7/termchangeset-ig" defaultVersion="1.0.0-ballot" defaultWorkgroup="vocab" gitUrl="https://github.com/HL7/termchangeset-ig" url="http://hl7.org/fhir/uv/termchangeset">
     <version code="current" url="https://build.fhir.org/ig/HL7/termchangeset-ig"/>
     <version code="1.0.0-ballot" url="http://hl7.org/fhir/uv/termchangeset/2024Sep"/>
     <artifactPageExtension value="-definitions"/>

diff --git a/xml/FHIR-us-nhsn-dqm.xml b/xml/FHIR-us-nhsn-dqm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/us/nhsn-dqm/2024Sep" ciUrl="http://build.fhir.org/ig/HL7/nhsn-dqm" defaultVersion="1.0.0-ballot" defaultWorkgroup="pher" gitUrl="https://github.com/HL7/nhsn-dqm" url="http://hl7.org/fhir/us/nhsn-dqm">
-<version code="current" url="https://build.fhir.org/ig/HL7/nhsn-dqm"/>
-<version code="1.0.0-ballot" url="http://hl7.org/fhir/us/nhsn-dqm/2024Sept"/>
+<version code="current" url="http://build.fhir.org/ig/HL7/nhsn-dqm"/>
+<version code="1.0.0-ballot" url="http://hl7.org/fhir/us/nhsn-dqm/2024Sep"/>
 <artifactPageExtension value="-definitions"/>
 <artifactPageExtension value="-examples"/>
 <artifactPageExtension value="-mappings"/>

diff --git a/xml/FHIR-us-vrdr.xml b/xml/FHIR-us-vrdr.xml
@@ -144,6 +144,7 @@
 <artifact deprecated="true" id="Observation/636dafac-0d92-4649-b838-004bcf714f5aj" key="Observation-636dafac-0d92-4649-b838-004bcf714f5aj" name="Decedent Military Service Example"/>
 <artifact id="StructureDefinition/vrdr-decedent-mother" key="StructureDefinition-vrdr-decedent-mother" name="Decedent Mother"/>
 <artifact deprecated="true" id="RelatedPerson/89ababc6-8c2a-4e76-9f53-8677822f54a9" key="RelatedPerson-89ababc6-8c2a-4e76-9f53-8677822f54a9" name="Decedent Mother Example"/>
+<artifact deprecated="true" id="StructureDefinition/vrdr-decedent-pregnancy-status" key="StructureDefinition-VRDR-Decedent-Pregnancy" name="Decedent Pregnancy"/>
 <artifact deprecated="true" id="Observation/092e7b13-224d-46a6-ac31-0d98d4c84126" key="Observation-092e7b13-224d-46a6-ac31-0d98d4c84126" name="Decedent Pregnancy Example"/>
 <artifact id="StructureDefinition/vrdr-decedent-spouse" key="StructureDefinition-VRDR-Decedent-Spouse" name="Decedent Spouse"/>
 <artifact deprecated="true" id="RelatedPerson/962fded4-b90a-44f7-950e-3832011ad65f" key="RelatedPerson-962fded4-b90a-44f7-950e-3832011ad65f" name="Decedent Spouse Example"/>
@@ -285,8 +286,7 @@
 <artifact deprecated="true" id="ValueSet/vrdr-not-applicable-vs" key="ValueSet-vrdr-not-applicable-vs" name="NotApplicable"/>
 <artifact deprecated="true" id="ConceptMap/NotApplicableCM" key="ConceptMap-NotApplicableCM" name="NotApplicable Concept Map"/>
 <artifact deprecated="true" key="Observation" name="Observation"/>
-<artifact deprecated="true" id="StructureDefinition/vrdr-decedent-pregnancy-status" key="StructureDefinition-vrdr-decedent-pregnancy-status" name="Observation - Decedent Pregnancy"/>
-<artifact deprecated="true" id="StructureDefinition/vrdr-decedent-pregnancy-status-a" key="StructureDefinition-VRDR-Decedent-Pregnancy" name="old Decedent Pregnancy"/>
+<artifact deprecated="true" id="StructureDefinition/vrdr-decedent-pregnancy-status-old" key="StructureDefinition-vrdr-decedent-pregnancy-status" name="Observation - Decedent Pregnancy"/>
 <artifact deprecated="true" id="StructureDefinition/Observation-Location" key="StructureDefinition-Observation-Location" name="Observation Location"/>
 <artifact deprecated="true" key="Organization" name="Organization"/>
 <artifact deprecated="true" id="StructureDefinition/vrdr-parameters-2022" key="StructureDefinition-vrdr-parameters-2022" name="Parameters for 2022 Submission"/>

diff --git a/xml/_workgroups.xml b/xml/_workgroups.xml
@@ -59,7 +59,7 @@
   <workgroup key="tsc" webcode="tsc" name="Technical Steering Committee"/>
   <workgroup key="tsmg" webcode="tsmanagement" name="Terminology Services Management Group" listserv="tsmg@lists.HL7.org/"/>
   <workgroup key="us-realm" webcode="usrealm" name="US Realm Task Force" deprecated="true"/>
-  <workgroup key="vocab" webcode="vocab" name="Terminology Infrastructure" listserv="ti@lists.HL7.org/"/>
+  <workgroup key="vocab" webcode="Vocab" name="Terminology Infrastructure" listserv="ti@lists.HL7.org/"/>
   <workgroup key="v2mg" webcode="v2management" name="V2 Mgmt Group" listserv="v2mgmtgrp@lists.HL7.org/"/>
   <workgroup key="eu" webcode="eu" name="HL7 Europe" listserv="europe@lists.hl7.org/"/>  
   <workgroup key="au-v2" webcode="au-v2" name="HL7 Australia V2" listserv="hl7v2wgballot@hl7.com.au"/>