Merge branch 'main' of github.com:nuts-foundation/nl-anw-ig

Author: gbeskers

input/fsh/ANWBronhouderCapabilityStatement-v1.fsh

@@ -1,7 +1,7 @@
 Instance: ANWBronhouderCapabilityStatement-v1
 InstanceOf: CapabilityStatement
 Usage: #definition
-Title: "ANW Bronhouder Capability Statement v1.0"
+Title: "ANW Bronhouder Capability Statement v1.0.0"
 Description: "Capability statement describing the basic requirements for ANW FHIR servers  (version 1.0.0, ANW-bronhouder)"
 * url = "http://nuts-foundation.github.io/nl-generic-anw-ig/CapabilityStatement/ANW-Bronhouder"
 * version = "1.0.0"
@@ -45,22 +45,8 @@ Description: "Capability statement describing the basic requirements for ANW FHI
 * rest.resource[1].searchParam[3].type = #number
 
 // Observation: BloodPressure
-* rest.resource[1].type = #Observation
-* rest.resource[1].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BloodPressure"
-* rest.resource[1].interaction[0].code = #search-type
-* rest.resource[1].interaction[1].code = #create
-* rest.resource[1].searchParam[0].name = "patient"
-* rest.resource[1].searchParam[0].type = #reference
-* rest.resource[1].searchParam[1].name = "_profile"
-* rest.resource[1].searchParam[1].type = #string
-* rest.resource[1].searchParam[2].name = "_sort"
-* rest.resource[1].searchParam[2].type = #string
-* rest.resource[1].searchParam[3].name = "_count"
-* rest.resource[1].searchParam[3].type = #number
-
-// Observation: BodyTemperature
 * rest.resource[2].type = #Observation
-* rest.resource[2].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BodyTemperature"
+* rest.resource[2].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BloodPressure"
 * rest.resource[2].interaction[0].code = #search-type
 * rest.resource[2].interaction[1].code = #create
 * rest.resource[2].searchParam[0].name = "patient"
@@ -72,9 +58,9 @@ Description: "Capability statement describing the basic requirements for ANW FHI
 * rest.resource[2].searchParam[3].name = "_count"
 * rest.resource[2].searchParam[3].type = #number
 
-// Observation: BodyHeight
+// Observation: BodyTemperature
 * rest.resource[3].type = #Observation
-* rest.resource[3].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BodyHeight"
+* rest.resource[3].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BodyTemperature"
 * rest.resource[3].interaction[0].code = #search-type
 * rest.resource[3].interaction[1].code = #create
 * rest.resource[3].searchParam[0].name = "patient"
@@ -86,10 +72,11 @@ Description: "Capability statement describing the basic requirements for ANW FHI
 * rest.resource[3].searchParam[3].name = "_count"
 * rest.resource[3].searchParam[3].type = #number
 
-// Observation: BodyWeight
+// Observation: BodyHeight
 * rest.resource[4].type = #Observation
-* rest.resource[4].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BodyWeight"
+* rest.resource[4].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BodyHeight"
 * rest.resource[4].interaction[0].code = #search-type
+* rest.resource[4].interaction[1].code = #create
 * rest.resource[4].searchParam[0].name = "patient"
 * rest.resource[4].searchParam[0].type = #reference
 * rest.resource[4].searchParam[1].name = "_profile"
@@ -99,9 +86,9 @@ Description: "Capability statement describing the basic requirements for ANW FHI
 * rest.resource[4].searchParam[3].name = "_count"
 * rest.resource[4].searchParam[3].type = #number
 
-// Observation: Respiration
+// Observation: BodyWeight
 * rest.resource[5].type = #Observation
-* rest.resource[5].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-Respiration"
+* rest.resource[5].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-BodyWeight"
 * rest.resource[5].interaction[0].code = #search-type
 * rest.resource[5].searchParam[0].name = "patient"
 * rest.resource[5].searchParam[0].type = #reference
@@ -112,11 +99,10 @@ Description: "Capability statement describing the basic requirements for ANW FHI
 * rest.resource[5].searchParam[3].name = "_count"
 * rest.resource[5].searchParam[3].type = #number
 
-// Observation: NursingReport
+// Observation: Respiration
 * rest.resource[6].type = #Observation
-* rest.resource[6].profile = "https://nuts.nl/fhir/StructureDefinition/nl-core-nursingreport"
+* rest.resource[6].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-Respiration"
 * rest.resource[6].interaction[0].code = #search-type
-* rest.resource[6].interaction[1].code = #create
 * rest.resource[6].searchParam[0].name = "patient"
 * rest.resource[6].searchParam[0].type = #reference
 * rest.resource[6].searchParam[1].name = "_profile"
@@ -126,10 +112,11 @@ Description: "Capability statement describing the basic requirements for ANW FHI
 * rest.resource[6].searchParam[3].name = "_count"
 * rest.resource[6].searchParam[3].type = #number
 
-// Observation: LivingSituation
+// Observation: NursingReport
 * rest.resource[7].type = #Observation
-* rest.resource[7].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-LivingSituation"
+* rest.resource[7].profile = "https://nuts.nl/fhir/StructureDefinition/nl-core-nursingreport"
 * rest.resource[7].interaction[0].code = #search-type
+* rest.resource[7].interaction[1].code = #create
 * rest.resource[7].searchParam[0].name = "patient"
 * rest.resource[7].searchParam[0].type = #reference
 * rest.resource[7].searchParam[1].name = "_profile"
@@ -139,33 +126,46 @@ Description: "Capability statement describing the basic requirements for ANW FHI
 * rest.resource[7].searchParam[3].name = "_count"
 * rest.resource[7].searchParam[3].type = #number
 
-// Flag resource
-* rest.resource[8].type = #Flag
-* rest.resource[8].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-Alert"
+// Observation: LivingSituation
+* rest.resource[8].type = #Observation
+* rest.resource[8].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-LivingSituation"
 * rest.resource[8].interaction[0].code = #search-type
 * rest.resource[8].searchParam[0].name = "patient"
 * rest.resource[8].searchParam[0].type = #reference
 * rest.resource[8].searchParam[1].name = "_profile"
 * rest.resource[8].searchParam[1].type = #string
+* rest.resource[8].searchParam[2].name = "_sort"
+* rest.resource[8].searchParam[2].type = #string
+* rest.resource[8].searchParam[3].name = "_count"
+* rest.resource[8].searchParam[3].type = #number
 
-// Consent resource
-* rest.resource[9].type = #Consent
-* rest.resource[9].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-AdvanceDirective"
+// Flag resource
+* rest.resource[9].type = #Flag
+* rest.resource[9].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-Alert"
 * rest.resource[9].interaction[0].code = #search-type
 * rest.resource[9].searchParam[0].name = "patient"
 * rest.resource[9].searchParam[0].type = #reference
 * rest.resource[9].searchParam[1].name = "_profile"
 * rest.resource[9].searchParam[1].type = #string
 
-// AllergyIntolerance resource
-* rest.resource[10].type = #AllergyIntolerance
-* rest.resource[10].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-AllergyIntolerance"
+// Consent resource
+* rest.resource[10].type = #Consent
+* rest.resource[10].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-AdvanceDirective"
 * rest.resource[10].interaction[0].code = #search-type
 * rest.resource[10].searchParam[0].name = "patient"
 * rest.resource[10].searchParam[0].type = #reference
 * rest.resource[10].searchParam[1].name = "_profile"
 * rest.resource[10].searchParam[1].type = #string
 
+// AllergyIntolerance resource
+* rest.resource[11].type = #AllergyIntolerance
+* rest.resource[11].profile = "http://nictiz.nl/fhir/StructureDefinition/zib-AllergyIntolerance"
+* rest.resource[11].interaction[0].code = #search-type
+* rest.resource[11].searchParam[0].name = "patient"
+* rest.resource[11].searchParam[0].type = #reference
+* rest.resource[11].searchParam[1].name = "_profile"
+* rest.resource[11].searchParam[1].type = #string
+
 // Operations
 * rest.operation[0].name = "bronhouder-notification-endpoint"
 * rest.operation[0].definition = "https://github.com/nuts-foundation/bolts/blob/master/anw/TD-ANWv2024.1.md#anw-bronhouder"

input/fsh/ANWRegisseurCapabilityStatement-v1.fsh

@@ -1,7 +1,7 @@
 Instance: ANWRegisseurCapabilityStatement-v1
 InstanceOf: CapabilityStatement
 Usage: #definition
-Title: "ANW Regisseur Capability Statement v1.0"
+Title: "ANW Regisseur Capability Statement v1.0.0"
 Description: "Capability statement describing the basic requirements for ANW FHIR servers  (version 1.0.0, ANW-Regisseur)"
 * url = "http://nuts-foundation.github.io/nl-generic-anw-ig/CapabilityStatement/ANW-Regisseur"
 * version = "1.0.0"