update to issue #2

ahdis · Dec 8, 2020 · b96dd01 · b96dd01
1 parent 818b3cf
commit b96dd01
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/input/examples/bundle/AlisExampleComplete43.xml b/input/examples/bundle/AlisExampleComplete43.xml
@@ -40,18 +40,18 @@
                 </source>
 
                 <focus>
-                    <reference value="Bundle/Transaction"/>
+                    <reference value="urn:uuid:cbb59175-ad00-4316-8f0f-0cf75a0214b6"/>
+                    <type value="Bundle"/>
                 </focus>
 
             </MessageHeader>
         </resource>
     </entry>
 
     <entry>
-        <fullUrl value="http://fhir.ch/ig/ch-alis/Bundle/Transaction"/>
+        <fullUrl value="urn:uuid:cbb59175-ad00-4316-8f0f-0cf75a0214b6"/>
         <resource>
             <Bundle>
-                <id value="Transaction"/>
                 <type value="transaction"/>
 
                 <entry>

diff --git a/input/resources/structuredefinition/ch-alis-message.xml b/input/resources/structuredefinition/ch-alis-message.xml
@@ -67,16 +67,6 @@
 			</slicing>
 			<min value="2"/>
 		</element>
-		<element id="Bundle.entry.fullUrl">
-			<path value="Bundle.entry.fullUrl"/>
-			<min value="1"/>
-			<constraint>
-				<key value="ch-alis-message-1"/>
-				<severity value="error"/>
-				<human value="The fullUrl must be an absolute URL server address or an URI for UUID/OID"/>
-				<expression value="startsWith('http') or startsWith('urn:uuid:') = true"/>
-			</constraint>
-		</element>
 
 		<element id="Bundle.entry:MessageHeader">
 			<path value="Bundle.entry" />
@@ -85,6 +75,16 @@
 			<min value="1" />
 			<max value="1" />
 		</element>
+		<element id="Bundle.entry:MessageHeader.fullUrl">
+			<path value="Bundle.entry.fullUrl"/>
+			<min value="1"/>
+			<constraint>
+				<key value="ch-alis-message-1"/>
+				<severity value="error"/>
+				<human value="The fullUrl for the MessageHeader as first entry must be an absolute URL server address"/>
+				<expression value="startsWith('http') = true"/>
+			</constraint>
+		</element>
 		<element id="Bundle.entry:MessageHeader.resource">
 			<path value="Bundle.entry.resource" />
 			<min value="1" />
@@ -101,6 +101,16 @@
 			<min value="1" />
 			<max value="1" />
 		</element>
+		<element id="Bundle.entry:Transaction.fullUrl">
+			<path value="Bundle.entry.fullUrl"/>
+			<min value="1"/>
+			<constraint>
+				<key value="ch-alis-message-2"/>
+				<severity value="error"/>
+				<human value="The fullUrl must be an absolute URL server address or an URI for UUID/OID"/>
+				<expression value="startsWith('http') or startsWith('urn:uuid:') = true"/>
+			</constraint>
+		</element>
 		<element id="Bundle.entry:Transaction.resource">
 			<path value="Bundle.entry.resource" />
 			<min value="1" />