Skip to content

Commit 6a1db52

Browse files
eyhlaieyhlai
committed
Merge remote-tracking branch 'origin/MP9-3.0.0-rc.1' into NICTIZ-34243
2 parents e6ed9ce + 5159ead commit 6a1db52

File tree

1,812 files changed

+2712
-1698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,812 files changed

+2712
-1698
lines changed

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Receiving-System/properties.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Receiving-System",
8+
"description" : "System that receives information from a sending system" },
9+
"category" : "MedicationData",
10+
"fhirPackage" :
11+
[
12+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
13+
"version" : "2.0.0-beta.6" } ],
14+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/AdministrationAgreement/properties.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Retrieving-System",
8+
"description" : "Client that queries information from a server (Serving-System)" },
9+
"category" : "MedicationData",
10+
"subcategory" : "AdministrationAgreement",
11+
"fhirPackage" :
12+
[
13+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14+
"version" : "2.0.0-beta.6" } ],
15+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/DispenseRequest/properties.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Retrieving-System",
8+
"description" : "Client that queries information from a server (Serving-System)" },
9+
"category" : "MedicationData",
10+
"subcategory" : "DispenseRequest",
11+
"fhirPackage" :
12+
[
13+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14+
"version" : "2.0.0-beta.6" } ],
15+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAdministration/properties.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Retrieving-System",
8+
"description" : "Client that queries information from a server (Serving-System)" },
9+
"category" : "MedicationData",
10+
"subcategory" : "MedicationAdministration",
11+
"fhirPackage" :
12+
[
13+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14+
"version" : "2.0.0-beta.6" } ],
15+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationAgreement/properties.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Retrieving-System",
8+
"description" : "Client that queries information from a server (Serving-System)" },
9+
"category" : "MedicationData",
10+
"subcategory" : "MedicationAgreement",
11+
"fhirPackage" :
12+
[
13+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14+
"version" : "2.0.0-beta.6" } ],
15+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationDispense/properties.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Retrieving-System",
8+
"description" : "Client that queries information from a server (Serving-System)" },
9+
"category" : "MedicationData",
10+
"subcategory" : "MedicationDispense",
11+
"fhirPackage" :
12+
[
13+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14+
"version" : "2.0.0-beta.6" } ],
15+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/MedicationUse/properties.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Retrieving-System",
8+
"description" : "Client that queries information from a server (Serving-System)" },
9+
"category" : "MedicationData",
10+
"subcategory" : "MedicationUse",
11+
"fhirPackage" :
12+
[
13+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14+
"version" : "2.0.0-beta.6" } ],
15+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Retrieving-System/VariableDosingRegimen/properties.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
{ "goal" : "Cert",
3+
"fhirVersion" : "R4",
4+
"informationStandard" : "MP9 3.0.0-rc.1",
5+
"usecase" : "MO",
6+
"role" :
7+
{ "name" : "Retrieving-System",
8+
"description" : "Client that queries information from a server (Serving-System)" },
9+
"category" : "MedicationData",
10+
"subcategory" : "VariableDosingRegimen",
11+
"fhirPackage" :
12+
[
13+
{ "name" : "nictiz.fhir.nl.r4.medicationprocess9",
14+
"version" : "2.0.0-beta.6" } ],
15+
"serverAlias" : "nictiz" }

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Send/MA-script1.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
3+
<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Send/MA-script1.xml
34
<id value="mp9-meddata-send-1-x"/>
45
<url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x"/>
56
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
67
<name value="MP9 - Client - Scenario 1.x - Send MedicationData - MA-script1"/>
8+
=======
9+
<id value="mp9-meddata-send-1-x-Nictiz-intern"/>
10+
<url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-1-x-Nictiz-intern"/>
11+
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
12+
<name value="MP9 - Client - Scenario 1.x - Send MedicationData - MA-script1 - target Nictiz-intern"/>
13+
>>>>>>> origin/MP9-3.0.0-rc.1:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script1.xml
714
<status value="active"/>
815
<publisher value="Nictiz"/>
916
<contact>

‎output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Send/MA-script2.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<TestScript xmlns="http://hl7.org/fhir" xmlns:nts="http://nictiz.nl/xsl/testscript">
3+
<<<<<<< HEAD:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Send/MA-script2.xml
34
<id value="mp9-meddata-send-2-x"/>
45
<url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x"/>
56
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
67
<name value="MP9 - Client - Scenario 2.x - Send MedicationData - MA-script2"/>
8+
=======
9+
<id value="mp9-meddata-send-2-x-Nictiz-intern"/>
10+
<url value="http://nictiz.nl/fhir/TestScript/mp9-meddata-send-2-x-Nictiz-intern"/>
11+
<version value="r4-mp9-3.0.0-beta-patchlevel 2025.31"/>
12+
<name value="MP9 - Client - Scenario 2.x - Send MedicationData - MA-script2 - target Nictiz-intern"/>
13+
>>>>>>> origin/MP9-3.0.0-rc.1:output/R4/MP9-3-0-0-beta/MO/Cert/MedicationData/Sending-System-Nictiz-intern/MA-script2.xml
714
<status value="active"/>
815
<publisher value="Nictiz"/>
916
<contact>

0 commit comments

Comments
 (0)