diff --git a/SearchParameters/SearchParameter-Flag-category.xml b/SearchParameters/SearchParameter-Flag-category.xml
new file mode 100644
index 000000000..3d59bb290
--- /dev/null
+++ b/SearchParameters/SearchParameter-Flag-category.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/nl-core-BarthelADLIndex-01.xml b/examples/nl-core-BarthelADLIndex-01.xml
new file mode 100644
index 000000000..1f3272b4b
--- /dev/null
+++ b/examples/nl-core-BarthelADLIndex-01.xml
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-ChecklistPainBehavior-01.xml b/examples/nl-core-ChecklistPainBehavior-01.xml
new file mode 100644
index 000000000..d88fbfefb
--- /dev/null
+++ b/examples/nl-core-ChecklistPainBehavior-01.xml
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-DevelopmentChild-01.xml b/examples/nl-core-DevelopmentChild-01.xml
new file mode 100644
index 000000000..26e7f681c
--- /dev/null
+++ b/examples/nl-core-DevelopmentChild-01.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-FeedingPatternInfant-01-NutritionOrder-01.xml b/examples/nl-core-FeedingPatternInfant-01-NutritionOrder-01.xml
new file mode 100644
index 000000000..657d94977
--- /dev/null
+++ b/examples/nl-core-FeedingPatternInfant-01-NutritionOrder-01.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-FeedingPatternInfant-01.xml b/examples/nl-core-FeedingPatternInfant-01.xml
new file mode 100644
index 000000000..6bd68cf21
--- /dev/null
+++ b/examples/nl-core-FeedingPatternInfant-01.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-IllnessPerception-01.xml b/examples/nl-core-IllnessPerception-01.xml
new file mode 100644
index 000000000..e17baee98
--- /dev/null
+++ b/examples/nl-core-IllnessPerception-01.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-LifeStance-01.xml b/examples/nl-core-LifeStance-01.xml
new file mode 100644
index 000000000..9c3a02c70
--- /dev/null
+++ b/examples/nl-core-LifeStance-01.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-MedicationContraIndication-01-Practitioner-01.xml b/examples/nl-core-MedicationContraIndication-01-Practitioner-01.xml
index 838ef37cf..27ccfaa89 100644
--- a/examples/nl-core-MedicationContraIndication-01-Practitioner-01.xml
+++ b/examples/nl-core-MedicationContraIndication-01-Practitioner-01.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/examples/nl-core-PainScore-01.xml b/examples/nl-core-PainScore-01.xml
new file mode 100644
index 000000000..a751a1ea4
--- /dev/null
+++ b/examples/nl-core-PainScore-01.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-Patient-01.xml b/examples/nl-core-Patient-01.xml
index 76a666cad..e9ae35c5f 100644
--- a/examples/nl-core-Patient-01.xml
+++ b/examples/nl-core-Patient-01.xml
@@ -15,18 +15,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Pregnancy-01.xml b/examples/nl-core-Pregnancy-01.xml
new file mode 100644
index 000000000..b1a73f20a
--- /dev/null
+++ b/examples/nl-core-Pregnancy-01.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-Pregnancy.DateLastMenstruation-01.xml b/examples/nl-core-Pregnancy.DateLastMenstruation-01.xml
new file mode 100644
index 000000000..562af07e4
--- /dev/null
+++ b/examples/nl-core-Pregnancy.DateLastMenstruation-01.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-Pregnancy.EstimatedDateOfDelivery-01.xml b/examples/nl-core-Pregnancy.EstimatedDateOfDelivery-01.xml
new file mode 100644
index 000000000..9fdbb6e47
--- /dev/null
+++ b/examples/nl-core-Pregnancy.EstimatedDateOfDelivery-01.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-Pregnancy.Gravidity-01.xml b/examples/nl-core-Pregnancy.Gravidity-01.xml
new file mode 100644
index 000000000..96c819293
--- /dev/null
+++ b/examples/nl-core-Pregnancy.Gravidity-01.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-Pregnancy.Parity-01.xml b/examples/nl-core-Pregnancy.Parity-01.xml
new file mode 100644
index 000000000..e435c8322
--- /dev/null
+++ b/examples/nl-core-Pregnancy.Parity-01.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-Pregnancy.PregnancyDuration-01.xml b/examples/nl-core-Pregnancy.PregnancyDuration-01.xml
new file mode 100644
index 000000000..3bdbd797e
--- /dev/null
+++ b/examples/nl-core-Pregnancy.PregnancyDuration-01.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-Procedure-01-DeviceUseStatement-01.xml b/examples/nl-core-Procedure-01-DeviceUseStatement-01.xml
index c927a8fd9..f1cdb94f5 100644
--- a/examples/nl-core-Procedure-01-DeviceUseStatement-01.xml
+++ b/examples/nl-core-Procedure-01-DeviceUseStatement-01.xml
@@ -10,11 +10,6 @@
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-01-PractitionerRole-01.xml b/examples/nl-core-Procedure-01-PractitionerRole-09.xml
similarity index 89%
rename from examples/nl-core-Procedure-01-PractitionerRole-01.xml
rename to examples/nl-core-Procedure-01-PractitionerRole-09.xml
index 894221180..991335029 100644
--- a/examples/nl-core-Procedure-01-PractitionerRole-01.xml
+++ b/examples/nl-core-Procedure-01-PractitionerRole-09.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/examples/nl-core-Procedure-02-Device-01.xml b/examples/nl-core-Procedure-02-Device-01.xml
deleted file mode 100644
index e2e7e28bd..000000000
--- a/examples/nl-core-Procedure-02-Device-01.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-02-DeviceUseStatement-01.xml b/examples/nl-core-Procedure-02-DeviceUseStatement-01.xml
deleted file mode 100644
index e48364862..000000000
--- a/examples/nl-core-Procedure-02-DeviceUseStatement-01.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-03-Device-01.xml b/examples/nl-core-Procedure-03-Device-01.xml
deleted file mode 100644
index ef9834413..000000000
--- a/examples/nl-core-Procedure-03-Device-01.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-03-DeviceUseStatement-01.xml b/examples/nl-core-Procedure-03-DeviceUseStatement-01.xml
deleted file mode 100644
index 8f6ef0e21..000000000
--- a/examples/nl-core-Procedure-03-DeviceUseStatement-01.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-04-Device-01.xml b/examples/nl-core-Procedure-04-Device-01.xml
deleted file mode 100644
index b47daae96..000000000
--- a/examples/nl-core-Procedure-04-Device-01.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-04-DeviceUseStatement-01.xml b/examples/nl-core-Procedure-04-DeviceUseStatement-01.xml
deleted file mode 100644
index 6114fcb00..000000000
--- a/examples/nl-core-Procedure-04-DeviceUseStatement-01.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-event-01.xml b/examples/nl-core-Procedure-event-01.xml
index cd7521950..c7aa5c852 100644
--- a/examples/nl-core-Procedure-event-01.xml
+++ b/examples/nl-core-Procedure-event-01.xml
@@ -4,20 +4,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -31,13 +17,10 @@
-
-
-
-
+
-
+
diff --git a/examples/nl-core-Procedure-event-03.xml b/examples/nl-core-Procedure-event-03.xml
deleted file mode 100644
index 5b9b0b09e..000000000
--- a/examples/nl-core-Procedure-event-03.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-request-01.xml b/examples/nl-core-Procedure-request-01.xml
deleted file mode 100644
index 1fbf90ab9..000000000
--- a/examples/nl-core-Procedure-request-01.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-request-02.xml b/examples/nl-core-Procedure-request-02.xml
deleted file mode 100644
index 286c6efc9..000000000
--- a/examples/nl-core-Procedure-request-02.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-Procedure-request-04.xml b/examples/nl-core-Procedure-request-04.xml
deleted file mode 100644
index 8e4cdd7b5..000000000
--- a/examples/nl-core-Procedure-request-04.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/examples/nl-core-PulseRate-01.xml b/examples/nl-core-PulseRate-01.xml
new file mode 100644
index 000000000..3c0db835d
--- /dev/null
+++ b/examples/nl-core-PulseRate-01.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-SkinDisorder-01-Condition-01.xml b/examples/nl-core-SkinDisorder-01-Condition-01.xml
new file mode 100644
index 000000000..2031045d2
--- /dev/null
+++ b/examples/nl-core-SkinDisorder-01-Condition-01.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-SkinDisorder-01.xml b/examples/nl-core-SkinDisorder-01.xml
new file mode 100644
index 000000000..5657c15b7
--- /dev/null
+++ b/examples/nl-core-SkinDisorder-01.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-StrongKidsScore-01.xml b/examples/nl-core-StrongKidsScore-01.xml
new file mode 100644
index 000000000..e1ad32ecf
--- /dev/null
+++ b/examples/nl-core-StrongKidsScore-01.xml
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/nl-core-TextResult-Procedure-01.xml b/examples/nl-core-TextResult-01-Procedure-01.xml
similarity index 87%
rename from examples/nl-core-TextResult-Procedure-01.xml
rename to examples/nl-core-TextResult-01-Procedure-01.xml
index 27783d6e5..67512efb0 100644
--- a/examples/nl-core-TextResult-Procedure-01.xml
+++ b/examples/nl-core-TextResult-01-Procedure-01.xml
@@ -1,10 +1,10 @@
-
+
-
+
-
+
diff --git a/examples/nl-core-TextResult-01.xml b/examples/nl-core-TextResult-01.xml
index d74e2d251..8ea7e76a4 100644
--- a/examples/nl-core-TextResult-01.xml
+++ b/examples/nl-core-TextResult-01.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/examples/nl-core-TextResult.VisualResult-01.xml b/examples/nl-core-TextResult.VisualResult-01.xml
index db42b52b1..1579c1877 100644
--- a/examples/nl-core-TextResult.VisualResult-01.xml
+++ b/examples/nl-core-TextResult.VisualResult-01.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/known-issues.yml b/known-issues.yml
index 1baa6fd04..fa3899ef8 100644
--- a/known-issues.yml
+++ b/known-issues.yml
@@ -45,13 +45,13 @@ pattern-GstdSimpleQuantity:
ignored issues:
StructureDefinition:
- message: "Rule sd-pg-08: 'The title of the StructureDefinition should conform to the profiling guidelines'"
- reason: The title is shown in the hosting profiles as the name of the datatype. "G-Standaard SimpleQuantity" is more descriptive than the title according to the profiling guidelines ("pattern GstdSimpleQuantity").
+ reason: The title is shown in the hosting profiles as the name of the datatype. "G-Standard SimpleQuantity" is more descriptive than the title according to the profiling guidelines ("pattern GstdSimpleQuantity").
pattern-GstdQuantity:
ignored issues:
StructureDefinition:
- message: "Rule sd-pg-08: 'The title of the StructureDefinition should conform to the profiling guidelines'"
- reason: The title is shown in the hosting profiles as the name of the datatype. "G-Standaard Quantity" is more descriptive than the title according to the profiling guidelines ("pattern GstdQuantity").
+ reason: The title is shown in the hosting profiles as the name of the datatype. "G-Standard Quantity" is more descriptive than the title according to the profiling guidelines ("pattern GstdQuantity").
pattern-NlCoreHealthProfessionalReference:
ignored issues:
@@ -64,24 +64,24 @@ pattern-VitalSigns:
Observation.category:VSCat:
- message: "Rule sd-pg-13: 'Slice names should be camelCased starting with a lowercase letter.'"
reason: This slice name is adopted from the Vital Signs profile.
-
+
pattern-ZibHealthProfessionalReference:
ignored issues:
StructureDefinition:
- message: "Rule sd-pg-08: 'The title of the StructureDefinition should conform to the profiling guidelines'"
reason: The title is shown in the hosting profiles as the name of the datatype. "zib HealthProfessional Reference" is more descriptive than the title according to the profiling guidelines ("pattern ZibHealthProfessionalReference").
-
+
zib-AbilityToUseToilet:
zib deviations:
Observation:
- - short: AbilityToUseToilet
- reason: The root concept name 'ToiletUseAbility' is a mistake in the zib and will be fixed in the next prepublication.
+ - short: AbilityToUseToilet instead of ToiletUseAbility
+ reason: The root of the zib is called "ToiletUseAbility" (which is incorrect), even though the zib itself is called "AbilityToUseToilet".
zib-AbilityToGroom:
zib deviations:
Observation:
- - short: AbilityToGroom
- reason: The root of the zib is still called AbilityToGroome (which is incorrect), even though the zib itself has been renamed.
+ - short: AbilityToGroom instead of AbilityToGroome
+ reason: The root of the zib is called "AbilityToGroome" (which is incorrect), even though the zib itself is called "AbilityToGroom".
zib-AddressInformation:
zib deviations:
@@ -111,7 +111,7 @@ zib-AllergyIntolerance:
zib-ApgarScore-*Minute:
zib deviations:
Observation.component:muscleToneScore.value[x]:
- - short: MuscleToneScore
+ - short: MuscleToneScore instead of MusleToneScore
reason: The zib concept name "MusleToneScore" is an incorrect translation of the Dutch name into English.
zib-BloodPressure:
@@ -170,6 +170,9 @@ zib-ContactPerson:
zib-Encounter:
ignored issues:
+ Encounter.participant:healthProfessional.individual:
+ - message: "Rule sd-zpg-03: 'References to other resource profiles should be added next to the HL7 base references.'"
+ reason: The restriction only applies to, and defines, this slice. The slicing is open so the base references can still be used.
Encounter.reasonReference:*:
- message: "Rule sd-zpg-03: 'References to other resource profiles should be added next to the HL7 base references.'"
reason: The restriction only applies to, and defines, this slice. The slicing is open so the base references can still be used.
@@ -190,18 +193,18 @@ zib-Encounter:
zib-FLACCpainScale:
zib deviations:
Observation:
- - short: FLACCpainScale
- reason: The root concept name 'FLACCpainScore' is a mistake in the zib and will be fixed in the next pre-publication.
+ - short: FLACCpainScale instead of FLACCpainScore
+ reason: The root of the zib is called "FLACCpainScore" (which is incorrect), even though the zib itself is called "FLACCpainScale".
zib-FreedomRestrictingIntervention:
ignored issues:
- Procedure.reasonReference:legalSituation:
+ Procedure.reasonReference:legalSituation-*:
- message: "Rule sd-zpg-03: 'References to other resource profiles should be added next to the HL7 base references.'"
reason: The restriction only applies to, and defines, this slice. The slicing is open so the base references can still be used.
zib deviations:
Procedure:
- short: FreedomRestrictingIntervention instead of FreedomrestrictingIntervention
- reason: The root of the zib is called FreedomrestrictingIntervention (which is incorrect), even though the zib itself is called FreedomRestrictingIntervention.
+ reason: The root of the zib is called "FreedomrestrictingIntervention" (which is incorrect), even though the zib itself is called "FreedomRestrictingIntervention".
zib-FunctionalOrMentalStatus:
zib deviations:
@@ -221,7 +224,7 @@ zib-HealthcareProvider:
reason: The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the missing root element of zib part ContactInformation in FHIR. Instead, the two containers of the zib (TelephoneNumbers and EmailAddresses), which both have a cardinality of 0..*, are mapped directly into the resource. Thereby this mapping is still honoring the cardinality requirements of the zib.
Location.telecom*:
- datatype: ContactPoint instead of a reference
- reason: ContactInformation in FHIR is represented using the ContactPoint datatype, not as a separate resource. Because the FHIR profile for ContactInformation consists of two parts the root concept of the ContactInformation is mapped on .telecom.
+ reason: ContactInformation in FHIR is represented using the ContactPoint datatype, not as a separate resource. Because the FHIR profile for ContactInformation consists of two parts the root concept of ContactInformation is mapped on .telecom.
zib-HealthProfessional-Practitioner:
zib deviations:
@@ -236,7 +239,7 @@ zib-HealthProfessional-Practitioner:
reason: The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the missing root element of zib part ContactInformation in FHIR. Instead, the two containers of the zib (TelephoneNumbers and EmailAddresses), which both have a cardinality of 0..*, are mapped directly into the resource. Thereby this mapping is still honoring the cardinality requirements of the zib.
Practitioner.telecom*:
- datatype: ContactPoint instead of a reference
- reason: ContactInformation in FHIR is represented using the ContactPoint datatype, not as a separate resource. Because the FHIR profile for ContactInformation consists of two parts the root concept of the ContactInformation is mapped on .telecom.
+ reason: ContactInformation in FHIR is represented using the ContactPoint datatype, not as a separate resource. Because the FHIR profile for ContactInformation consists of two parts the root concept of ContactInformation is mapped on .telecom.
Practitioner.address:
- datatype: Address instead of a reference
reason: An address in FHIR is represented using the Address datatype, not as a separate resource.
@@ -248,7 +251,7 @@ zib-HealthProfessional-PractitionerRole:
reason: The cardinality mismatch between the zib (0..1) and FHIR (0..*) is explained by the missing root element of zib part ContactInformation in FHIR. Instead, the two containers of the zib (TelephoneNumbers and EmailAddresses), which both have a cardinality of 0..*, are mapped directly into the resource. Thereby this mapping is still honoring the cardinality requirements of the zib.
PractitionerRole.telecom*:
- datatype: ContactPoint instead of a reference
- reason: ContactInformation in FHIR is represented using the ContactPoint datatype, not as a separate resource. Because the FHIR profile for ContactInformation consists of two parts the root concept of the ContactInformation is mapped on .telecom.
+ reason: ContactInformation in FHIR is represented using the ContactPoint datatype, not as a separate resource. Because the FHIR profile for ContactInformation consists of two parts the root concept of ContactInformation is mapped on .telecom.
zib-HearingFunction.HearingAid:
ignored issues:
@@ -264,7 +267,7 @@ zib-HearingFunction.HearingAid:
reason: The referenced zib AnatomicalLocation is profiled on a datatype level and not a resource. Therefore it cannot be referenced, rather its concepts and constraints are added inline. This element conforms to the zib AnatomicalLocation.
DeviceUseStatement.timing[x]:timingPeriod.end:
- short: EndDate instead of EindDatum
- reason: Incorrect short in zib definition. This is reported in https://bits.nictiz.nl/browse/ZIB-1534.
+ reason: The zib concept name "EindDatum" has not been translated into English.
zib-HearingFunction.HearingAid.Product:
ignored issues:
@@ -290,6 +293,9 @@ zib-LaboratoryTestResult:
Observation.performer:performer:
- message: "Rule sd-zpg-03: 'References to other resource profiles should be added next to the HL7 base references.'"
reason: The restriction only applies to, and defines, this slice. The slicing is open so the base references can still be used.
+ Observation.hasMember:laboratoryTest:
+ - message: "Rule sd-zpg-03: 'References to other resource profiles should be added next to the HL7 base references.'"
+ reason: The restriction only applies to, and defines, this slice. The slicing is open so the base references can still be used.
zib deviations:
Observation.status:
- cardinality: 1..1 instead of 0..1
@@ -302,7 +308,7 @@ zib-LaboratoryTestResult:
reason: In FHIR there's no datatype ANY. All stated datatypes in the description can be accommodated using this element (Quantity and CodeableConcept are in fact both supported).
Observation.referenceRange.*:
- datatype: Quantity instead of ANY
- reason: The zib concepts ReferenceRangeUpperLimit and ReferenceRangeLowerLimit are defined as datatype ANY, but it is unclear how these concepts should work for anything that is not a Quantity. In addition, there's no obvious way in FHIR to support reference values other than of type Quantity (with the possible exception of String). Until this issue is resolved, support for reference ranges in the profile has been restricted to Quantity. See https://bits.nictiz.nl/browse/ZIB-1703.
+ reason: The zib concepts ReferenceRangeUpperLimit and ReferenceRangeLowerLimit are defined as datatype ANY, but these concepts only have meaning when they apply to a Quantity. See https://bits.nictiz.nl/browse/ZIB-1703.
zib-LaboratoryTestResult.Specimen:
zib deviations:
@@ -311,7 +317,7 @@ zib-LaboratoryTestResult.Specimen:
reason: Although a single SpecimenId is allowed according to the zib, .identifier is often used for additional identifiers outside the scope of the zib. It's not possible to create a slice or pattern specifically for SpecimenId without further formal requirements by the zib.
Specimen.subject:
- datatype: Reference instead of string
- reason: The zib concept SpecimenSource is communicated using a string within the profile zib-LaboratoryTestResult.Specimen.Source, which is referenced here.
+ reason: The zib concept SpecimenSource is communicated using a string within the profile zib-LaboratoryTestResult.SpecimenSource, which is referenced here.
Specimen.collection.bodySite:
- datatype: CodeableConcept instead of a reference
reason: Zib AnatomicalLocation is implemented as a datatype profile on CodeableConcept, so the datatype is not a Reference.
@@ -325,7 +331,7 @@ zib-LaboratoryTestResult.Specimen:
- cardinality: 1..1 instead of 0..1
reason: The value in the extension is 1..1, but the extension itself is 0..1, effectively matching the zib cardinality.
-zib-LaboratoryTestResult.Specimen.Source:
+zib-LaboratoryTestResult.SpecimenSource:
zib deviations:
Device.deviceName.name:
- cardinality: 1..1 instead of 0..1
@@ -348,7 +354,7 @@ zib-MedicalDevice:
reason: This is a special slice that represents situations where zib MedicalDevice is referenced from another zib through the reasonReference element. Because this reference is reversed in FHIR, this profile needs to contain the mappings for the references in _all_ these zibs. A common slice is defined with an indicative name rather than the name of all the targets.
DeviceUseStatement.timing[x]:timingPeriod.end:
- short: EndDate instead of EindDatum
- reason: Incorrect short in zib definition. This is reported in https://bits.nictiz.nl/browse/ZIB-1534.
+ reason: The zib concept name "EindDatum" has not been translated into English.
zib-MedicalDevice.Product:
zib deviations:
@@ -379,19 +385,19 @@ zib-MedicationContraIndication:
zib deviations:
Flag.code:
- cardinality: 1..1 instead of 0..1
- reason: Flag.code is manadatory in FHIR. The cardinality matches the cardinality of the zib, but not the conceptual cardinality. This should not be a major problem, as a contraindication is useless without specifying what it pertains to.
+ reason: Flag.code is mandatory in FHIR. The cardinality matches the cardinality of the zib, but not the conceptual cardinality. This should not be a major problem, as a contraindication is useless without specifying what it pertains to.
zib-NameInformation:
zib deviations:
HumanName.prefix:
- cardinality: 0..* instead of 0..1
- reason: prefix and suffix are mapped to the "titles" concept from the zib. There's a mismatch however in the way this information is represented in the zib and in FHIR. The mapping is documented in the profile.
+ reason: Both prefix and suffix are mapped to the "titles" concept from the zib. There's a mismatch however in the way this information is represented in the zib and in FHIR. The mapping is documented in the profile.
HumanName.suffix:
- cardinality: 0..* instead of 0..1
- reason: prefix and suffix are mapped to the "titles" concept from the zib. There's a mismatch however in the way this information is represented in the zib and in FHIR. The mapping is documented in the profile.
+ reason: Both prefix and suffix are mapped to the "titles" concept from the zib. There's a mismatch however in the way this information is represented in the zib and in FHIR. The mapping is documented in the profile.
HumanName.given:
- short: FirstName / Initial
- reason: The zib defines both the complete list of first names and of initals as a single string. In FHIR this is done fundamentally different, by using separate names. Hence, the short has been changed to the singular form.
+ reason: The zib defines both the complete list of first names and of initials as a single string. In FHIR this is done fundamentally different, by using separate names. Hence, the short has been changed to the singular form.
- alias: first name,middle name,Voornaam,Initiaal
reason: The first two initials are provided by FHIR. For the singular form of the latter two, see the remark above.
- cardinality: 0..* instead of 0..1
@@ -410,13 +416,13 @@ zib-NursingIntervention:
zib deviations:
CarePlan.activity.detail.scheduled[x]:scheduledTiming.repeat.frequency:
- datatype: positiveInt instead of Quantity
- reason: zib concepts Interval and Frequency are represented by a combination of .frequency, .period and .periodUnit, not by a single element of Quantity datatype.
+ reason: The zib concepts Interval and Frequency are represented by a combination of .frequency, .period and .periodUnit, not by a single element of Quantity datatype.
CarePlan.activity.detail.scheduled[x]:scheduledTiming.repeat.period:
- datatype: decimal instead of Quantity
- reason: zib concepts Interval and Frequency are represented by a combination of .frequency, .period and .periodUnit, not by a single element of Quantity datatype.
+ reason: The zib concepts Interval and Frequency are represented by a combination of .frequency, .period and .periodUnit, not by a single element of Quantity datatype.
CarePlan.activity.detail.scheduled[x]:scheduledTiming.repeat.periodUnit:
- datatype: code instead of Quantity
- reason: zib concepts Interval and Frequency are represented by a combination of .frequency, .period and .periodUnit, not by a single element of Quantity datatype.
+ reason: The zib concepts Interval and Frequency are represented by a combination of .frequency, .period and .periodUnit, not by a single element of Quantity datatype.
CarePlan.activity.detail.extension:medicalDevice.value[x]:
- cardinality: 0..1 instead of 0..*
reason: The value of the extension can only occur once, but the use of the extension itself is unlimited, making the effective cardinality 0..* as required by the zib.
@@ -427,7 +433,7 @@ zib-NursingIntervention:
CarePlan.activity.detail.performer:*:
- message: "Rule sd-zpg-03: 'References to other resource profiles should be added next to the HL7 base references.'"
reason: The slice is constrained on the target profile because this is what defines the slice. The HL7 base references are still available in the default slice.
-
+
zib-Patient:
zib deviations:
Patient.extension:nationality.extension:code.value[x]:
@@ -495,7 +501,7 @@ zib-PharmaceuticalProduct:
reason: The appropriate representation of Ingredient in FHIR is Medication.ingredient. The container can be properly mapped to this BackboneElement.
Medication.ingredient.strength:
- datatype: Ratio instead of Container
- reason: The `ingredient.strength` acts as a container for the two child elements and can the be correctly mapped to the zib Concentration container.
+ reason: The .ingredient.strength acts as a container for the two child elements and can thus be correctly mapped to the zib Concentration container.
zib-Payer.InsuranceCompany:
zib deviations:
@@ -562,20 +568,20 @@ zib-Refraction:
- datatype: CodeableConcept
reason: The zib has both a reference to AnatomicalLocation and a mapping on AnatomicalLocation::Laterality, while it seems only the latter is important. This leads to unexpected results. https://bits.nictiz.nl/browse/ZIB-1442.
Observation.component:cylindricalRefractionAxis.value[x]:
- - short: CylindricalRefractionAxis
- reason: The zib concept name "CilindricRefractionAxis" contains a typo which is corrected in a later release of the zibs.
+ - short: CylindricalRefractionAxis instead of CilindricRefractionAxis
+ reason: The zib concept name "CilindricRefractionAxis" is an incorrect translation of the Dutch name into English.
Observation.component:prismValue.value[x]:
- - short: PrismValue
- reason: The zib concept name "PrismaValue" contains a typo which is corrected in a later release of the zibs.
+ - short: PrismValue instead of PrismaValue
+ reason: The zib concept name "PrismaValue" is an incorrect translation of the Dutch name into English.
Observation.component:prismBase.value[x]:
- - short: PrismBase
- reason: The zib concept name "PrismaBase" contains a typo which is corrected in a later release of the zibs.
+ - short: PrismBase instead of PrismaBase
+ reason: The zib concept name "PrismaBase" is an incorrect translation of the Dutch name into English.
Observation.component:sphericalRefractionValue.value[x]:
- - short: SphericalRefractionValue
- reason: The zib concept name "SfericRefractionValue" contains a typo which is corrected in a later release of the zibs.
+ - short: SphericalRefractionValue instead of SfericRefractionValue
+ reason: The zib concept name "SfericRefractionValue" is an incorrect translation of the Dutch name into English.
Observation.component:sphericalEquivalent.value[x]:
- - short: SphericalEquivalent
- reason: The zib concept name "SfericalEquivalent" contains a typo which is corrected in a later release of the zibs.
+ - short: SphericalEquivalent instead of SfericalEquivalent
+ reason: The zib concept name "SfericalEquivalent" is an incorrect translation of the Dutch name into English.
zib-SOAPReport:
zib deviations:
@@ -598,20 +604,26 @@ zib-SOAPReport.SOAPLine:
- cardinality: 1..1 instead of 0..1
reason: The cardinality of both zib (SOAPLineHeader) and FHIR is 1..1, but because of conceptual cardinality 0..1 is expected. In case of absent data, the profiling guidelines provide guidance.
+zib-SkinDisorder:
+ zib deviations:
+ Condition.bodySite:
+ - datatype: CodeableConcept instead of a reference
+ reason: The referenced zib AnatomicalLocation is profiled on a datatype level and not a resource. Therefore it cannot be referenced, rather its concepts and constraints are added inline. This element conforms to the zib AnatomicalLocation.
+
zib-Stoma:
zib deviations:
Condition.code:
- cardinality: 1..1 instead of 0..1
reason: The FHIR profiles are expected to implement zib cardinalities as conceptual cardinalities, but StomaType is essential to identify the Stoma. This aligns with the intention of the zib, as the StomaType concept is required for zib Stoma to make sense.
Condition.bodySite:
- - datatype: CodeableConcept
+ - datatype: CodeableConcept instead of a reference
reason: The referenced zib AnatomicalLocation is profiled on a datatype level and not a resource. Therefore it cannot be referenced, rather its concepts and constraints are added inline. This element conforms to the zib AnatomicalLocation.
zib-TextResult:
zib deviations:
DiagnosticReport.status:
- cardinality: 1..1 instead of 0..1
- reason: TextResultStatus (0..1) is mapped to mandatory .status element which should not be a problem because implementers shall have to support .status one way or another. When TextResultStatus is absent, other codes may be used than from the zib. The _unknown_ code can be used as a fallback.
+ reason: TextResultStatus (0..1) is mapped to the mandatory .status element which should not be a problem because implementers shall have to support .status one way or another. When TextResultStatus is absent, other codes may be used than from the zib. The _unknown_ code can be used as a fallback.
DiagnosticReport.code:
- cardinality: 1..1 instead of 0..1
reason: The cardinality in both zib and FHIR is 1..1, but because of conceptual cardinality 0..1 is expected. In case of absent data, the profiling guidelines provide guidance.
@@ -663,7 +675,7 @@ zib-VisualFunction.VisualAid:
reason: The referenced zib AnatomicalLocation is profiled on a datatype level and not a resource. Therefore it cannot be referenced, rather its concepts and constraints are added inline. This element conforms to the zib AnatomicalLocation.
DeviceUseStatement.timing[x]:timingPeriod.end:
- short: EndDate instead of EindDatum
- reason: Incorrect short in zib definition. This is reported in https://bits.nictiz.nl/browse/ZIB-1534.
+ reason: The zib concept name "EindDatum" has not been translated into English.
zib-VisualFunction.VisualAid.Product:
ignored issues:
@@ -696,7 +708,7 @@ issues should occur: false
"*":
ignored issues:
Consent.scope*:
- - message: Unknown Code http://terminology.hl7.org/CodeSystem/consentscope#adr in http://terminology.hl7.org/CodeSystem/consentscope
+ - message: Unknown Code 'adr' in the system 'http://terminology.hl7.org/CodeSystem/consentscope'
reason: This concerns an error in the FHIR terminology server. The adr code has been removed for R5 and the terminology server was updated for it too soon. They will fix it according to zulip chat https://chat.fhir.org/#narrow/stream/179166-implementers/topic/Consent.2Escope.3A.20diff.20in.20codes.20shown.20on.20FHIR.20vs.20Tx.20server.
- message: None of the codings provided are in the value set 'Consent Scope Codes' (http://hl7.org/fhir/ValueSet/consent-scope), and a coding should come from this value set unless it has no suitable code
reason: See above.
@@ -710,8 +722,11 @@ nl-core-*:
- message: None of the codings provided are in the value set 'VerrichtingTypeCodelijsten'
reason: The current version of the Validator incorrectly raises an error on combined ValueSets.
"*.telecom[*].system.extension[*].value.ofType(CodeableConcept).coding[*]":
- - message: Display Name for http://terminology.hl7.org/CodeSystem/v3-AddressUse#MC should be one of 'mobile contact)' instead of 'Mobile Phone' for 'http://terminology.hl7.org/CodeSystem/v3-AddressUse#MC'
+ - message: Wrong Display Name 'Mobile Phone' for http://terminology.hl7.org/CodeSystem/v3-AddressUse#MC
reason: This core display value is redefined by the ValueSet, but this isn't properly recognized by the Validator
+ "*.contentType":
+ - message: The value provided ('application/octet-stream') is not in the value set 'MimeType'
+ reason: The Validator is unable to check mime types in absence of a terminology server.
Condition.code:
- message: None of the codings provided are in the value set 'ProbleemNaamCodelijst'
reason: This ValueSet contains two SNOMED refsets. The terminology servers are unable to determine if a code is part of this refset.
@@ -725,18 +740,47 @@ nl-core-AllergyIntolerance*:
- message: None of the codings provided are in the value set 'SpecifiekeStofCodelijsten'
reason: The terminology servers cannot handle the refset specified in the ValueSet.
+nl-core-BodyHeight-*:
+ ignored issues:
+ Observation.value.ofType(Quantity).code:
+ - message: The value provided ('cm') is not in the value set 'Body Length Units'
+ reason: In absence of a terminology server, the Validator cannot check if 'cm' is a valid UCUM unit and raises an error.
nl-core-DOSScore-01:
ignored issues:
Observation.code.coding[0]:
- message: 'Local Error: Resolved system http://snomed.info/sct, but the definition is not complete. Server Error: Unable to find code 160591000146109 in http://snomed.info/sct'
reason: This is a Dutch SNOMED extension which is not present yet on the international terminology server.
-nl-core-HearingFunction.HearingAid-*:
+nl-core-*Function.*Aid-*:
ignored issues:
DeviceUseStatement:
- - message: 'DeviceUseStatement.reasonReference:zibMedicalDeviceReference: max allowed = 0, but found 1'
+ - message: 'DeviceUseStatement.reasonReference:functionalOrMentalStatus: max allowed = 0, but found 1'
reason: The Validator cannot actually inspect the referenced resources, and falsely assumes the reference is a reference to the offending profile.
+nl-core-HearingFunction.HearingAid-*:
+ ignored issues:
+ DeviceUseStatement.reasonReference[*]:
+ - message: 'Profile http://nictiz.nl/fhir/StructureDefinition/nl-core-HearingFunction.HearingAid, Element matches more than one slice'
+ reason: The Validator cannot actually inspect the referenced resources, and falsely assumes the reference is a reference to the offending profile.
+
+nl-core-VisualFunction.VisualAid-*:
+ ignored issues:
+ DeviceUseStatement.reasonReference[*]:
+ - message: 'Profile http://nictiz.nl/fhir/StructureDefinition/nl-core-VisualFunction.VisualAid, Element matches more than one slice'
+ reason: The Validator cannot actually inspect the referenced resources, and falsely assumes the reference is a reference to the offending profile.
+
+nl-core-PainScore-01:
+ ignored issues:
+ Observation.method:
+ - message: None of the codings provided are in the value set 'PijnMeetmethodeCodelijst'
+ reason: The terminology servers used don't know this code system and wrongly conclude that this is an invalid code.
+
+nl-core-Patient-01:
+ ignored issues:
+ Patient.communication[0].language:
+ - message: None of the codings provided are in the value set 'CommunicatieTaalCodelijst'
+ reason: The terminology servers used don't know this code system and wrongly conclude that this is an invalid code.
+
nl-core-PharmaceuticalProduct-01:
ignored issues:
Medication.code:
@@ -762,18 +806,6 @@ nl-core-Vaccination-event-03:
- message: 'Local Error: Resolved system http://snomed.info/sct, but the definition is not complete. Server Error: Unable to find code 159731000146104 in http://snomed.info/sct'
reason: This is a Dutch SNOMED extension which is not present yet on the international terminology server.
-nl-core-VisualFunction.VisualAid-*:
- ignored issues:
- DeviceUseStatement:
- - message: 'DeviceUseStatement.reasonReference:zibMedicalDeviceReference: max allowed = 0, but found 1'
- reason: The Validator cannot actually inspect the referenced resources, and falsely assumes the reference is a reference to the offending profile.
-
-zib-*Function.*Aid:
- zib deviations:
- DeviceUseStatement.reasonReference:zibMedicalDeviceReference:
- - short: zib MedicalDevice reference
- reason: The profiles zib-HearingFunction.HearingAid and zib-VisualFunction.VisualAid are derived from zib-MedicalDevice, where this slice is defined, but this slice is disabled in these derived profiles. However, the mapping still ends up in the snapshot, resulting in a warning here.
-
zib-*Function.*Aid.Product:
ignored issues:
Device.type:
diff --git a/qa.yaml b/qa.yaml
index 1f9628239..3c67879e4 100644
--- a/qa.yaml
+++ b/qa.yaml
@@ -14,6 +14,7 @@ patterns:
- resources/nl-core/*.xml
conceptmaps: resources/**/conceptmap-*.xml
terminology: resources/**/terminology/*.xml
+ SearchParameters: SearchParameters/*.xml
examples: examples/*.xml
steps:
@@ -44,6 +45,10 @@ steps:
validate other terminology:
description: Validate the other terminology resources
patterns: terminology
+ validate SearchParameters:
+ description: Validate SearchParameters
+ patterns: SearchParameters
+ profile: "http://nictiz.nl/fhir/StructureDefinition/ProfilingGuidelinesR4-SearchParameters"
validate examples:
description: Validate examples using the generic FHIR validation rules
patterns: examples
@@ -64,4 +69,4 @@ steps:
script: check-id.sh
check nl-core overrides:
patterns: nl-core profiles
- script: nl-core-overrides.sh
\ No newline at end of file
+ script: nl-core-overrides.sh
diff --git a/release-notes.md b/release-notes.md
index 379d240ea..7d95173b6 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -17,7 +17,6 @@ This document contains release notes per zib, indicating differences with their
## zib-AbilityToGroom
* No specific changes have been made to this profile other than the generic changes for the Observation resource.
-
## zib-AbilityToUseToilet
* No specific changes have been made to this profile other than the generic changes for the Observation resource.
@@ -26,19 +25,19 @@ This document contains release notes per zib, indicating differences with their
* Removed mapping to BRP.
* Added guidance on adding a value to `Address.line` to duplicate the relevant information in case the extensions are not supported.
* Renamed `Address.line` extensions to their functional counterparts.
-* Added a comment to `line.extension:houseNumberLetter-houseNumberAddition` on the possibility of a leading space not being parsed.
-* Added a constraint to `line.extension:houseNumberIndication` to restrict it to the values 'by' or 'to'.
+* Added a comment to `.line.extension:houseNumberLetter-houseNumberAddition` on the possibility of a leading space not being parsed.
+* Added a constraint to `.line.extension:houseNumberIndication` to restrict it to the values 'by' or 'to'.
* Mapped AddressType to `extension:addressType` and added ConceptMaps to map AddressType to `.use` and `.type` to adhere to international use. However, `extension:official` was removed. AddressType code 'HP' is now mapped to `.use` 'home' and `.type` 'both'. This was done because of two reasons:
* The notion to mark an address as 'official' seems to have its origin in the BRP, but is absent in the zib model.
- * The addition of `extension:official` seemed based on the rationale: "if implementers do not support the custom `extension:addressType`, you should be able to determine the AddressType by looking at `.use`, `.type` and custom `extension:official`". However, in this use case extension:official would probably also be not supported. By mapping 'HP' to .type 'both', all AddressType codes can be mapped to a combination of .type and .use.
+ * The addition of `extension:official` seemed based on the rationale: "if implementers do not support the custom `extension:addressType`, you should be able to determine the AddressType by looking at `.use`, `.type` and custom `extension:official`". However, in this use case `extension:official` would probably also not be supported. By mapping 'HP' to `.type` 'both', all AddressType codes can be mapped to a combination of `.type` and `.use`.
## zib-AlcoholUse
-* The code on `Observation.component:amount.code` has changed to 897148007
+* The code on `Observation.component:amount.code` has changed to 897148007.
## zib-Alert
* Renamed `extension:ConcernReference` to `extension:concern` to match its functional counterpart.
-* Added EndDateTime and Comment concepts
-* Added constraints in the profile on the choice that the zib provides between Concern and AlertName. Add guidance on which code to add to Flag.code if a reference to Concern is added.
+* Added EndDateTime and Comment concepts.
+* Added constraints in the profile on the choice that the zib provides between Concern and AlertName. Added guidance on which code to add to `Flag.code` if a reference to Concern is added.
## zib-AdvanceDirective
* Moved TypeOfLivingWill from `Consent.category` to `Consent.provision.code`, renamed it to LivingWillType in accordance with the zib and made the element 0..1 rather than 1..1 to adhere to the conceptual cardinalities of the zib.
@@ -50,10 +49,10 @@ This document contains release notes per zib, indicating differences with their
* Added guidance for mandatory elements `Consent.status`,`Consent.scope` and `Consent.policy` or `Consent.policyRule`.
# zib-AllergyIntolerance
-* Applied 'combined ValueSets' to `code` and `reaction.substance` instead of slicing per ValueSet.
-* The code-specification extensions have been removed from `clinicalStatus` and `reaction.severity` because the zib concepts can be fully mapped to FHIR.
-* Because AlleryStatus maps to both `clinicalStatus` and `verificationStatus`, but `verificationStatus` now has cardinality 0..1 compared to 1..1 in STU3, guidance on how to interpret the mapping has been added to the root, but has been simplified.
-* Changed cardinality of `note` from 0..* to 0..1 to align with the zib.
+* Applied 'combined ValueSets' to `.code` and `.reaction.substance` instead of slicing per ValueSet.
+* The code-specification extensions have been removed from `.clinicalStatus` and `.reaction.severity` because the zib concepts can be fully mapped to FHIR.
+* Because AlleryStatus maps to both `.clinicalStatus` and `.verificationStatus`, but `.verificationStatus` now has cardinality 0..1 compared to 1..1 in STU3, guidance on how to interpret the mapping has been added to the root, but has been simplified.
+* Changed cardinality of `.note` from 0..* to 0..1 to align with the zib.
## zib-AnatomicalLocation
* New partial zib. The anatomical location in FHIR is usually mapped on `.bodySite` (CodeableConcept with example binding). This zib has therefore been mapped onto a data type profile that can be used for `.bodySite`.
@@ -61,6 +60,9 @@ This document contains release notes per zib, indicating differences with their
## zib-ApgarScore
* ApgarScore is now divided into 3 profiles with their own time unit. Each profile also has its own terminology codes that correspond to the minutes.
+## zib-BarthelADLIndex
+* There was no profile in the STU3 version and therefore no diff.
+
## zib-BowelFunction
* The mapping of the Stoma concept has been moved from extension to profile level.
* MedicalDevice extension has been removed because the reference is reversed in FHIR. The MedicalDevice profile refers to this profile.
@@ -68,17 +70,32 @@ This document contains release notes per zib, indicating differences with their
## zib-CareTeam
* CareTeam is a newly added zib in the 2020 release. It has no previous profile and therefore no diff.
+## zib-ChecklistPainBehavior
+* The data type of `Observation.value[x]` (zib concept TotalScore) has been changed from Quantity to Integer, and minimum and maximum allowed values of 0 and 10 respectively are applied.
+* The system value on the `Observation.component.code` slices has changed from 'urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0' to 'urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1'.
+* The data type of the `Observation.component.value[x]` slices has changed from Quantity to Integer.
+* The code on `Observation.component:face.code` has changed from '12.17.3' to '12017003'.
+* The code on `Observation.component:mouth.code` has changed from '12.17.4' to '12017004'.
+* The code on `Observation.component:grimace.code` has changed from '12.17.5' to '12017005'.
+* The code on `Observation.component:lookingSad.code` has changed from '12.17.6' to '12017006'.
+* The code on `Observation.component:eyes.code` has changed from '12.17.7' to '12017007'.
+* The code on `Observation.component:panic.code` has changed from '12.17.8' to '12017008'.
+* The code on `Observation.component:moaning.code` has changed from '12.17.9' to '12017009'.
+* The code on `Observation.component:cry.code` has changed from '12.17.10' to '12017010'.
+* The code on `Observation.component:soundsOfRestlessness.code` has changed from '12.17.11' to '12017011'.
+* The code on `Observation.component:tears.code` has changed from '12.17.12' to '12017012'.
+
## zib-ContactInformation
-* zib ContactInformation is mapped onto two profiles: one for the concept TelephoneNumbers and one for the concept E-mailAddresses. Both are added to the hosting profile.
-* Removed mapping guidance on the root comment of zib-ContactInformation-E-mailAddresses, as this is now straightforward.
+* The zib ContactInformation is mapped onto two profiles: one for the concept TelephoneNumbers and one for the concept EmailAddresses. Both are added to the hosting profile.
+* Removed mapping guidance on the root comment of zib-ContactInformation-EmailAddresses, as this is now straightforward.
* Simplified mapping guidance on the root comment of zib-ContactInformation-TelephoneNumbers, as this is now straightforward.
-* `ContactPoint.system` has a fixed value for zib-ContactInformation-E-mailAddresses and a restricted ValueSet for zib-ContactInformation-TelephoneNumbers to implement only the relevant zib parts.
+* `ContactPoint.system` has a fixed value for zib-ContactInformation-EmailAddresses and a restricted ValueSet for zib-ContactInformation-TelephoneNumbers to implement only the relevant zib parts.
* `ContactPoint.use` has a restricted ValueSet in both profiles to implement only the relevant zib parts.
* The extension zib-ContactInformation-TelecomType, which replaced the generic code-specification extensions from release 2.x of the zib2017 package onwards, has been deprecated again in favor of code-specication, as the mapping is now much more straightforward.
* The element TelephoneNumbers/Comment was introduced. This is represented using the ext-Comment extension in the profile for TelephoneNumbers.
## zib-ComfortScale
-* The datatype of `Observation.value[x]` (zib concept TotalScore) element has been changed from Quantity to Integer, and minimum and maximum allowed values of 0 and 35 respectively are applied.
+* The data type of `Observation.value[x]` (zib concept TotalScore) has been changed from Quantity to Integer, and minimum and maximum allowed values of 0 and 35 respectively are applied.
* The code on `Observation.component:alertness.code` has changed from 12.12.3 to 12012003.
* The code on `Observation.component:calmnessAgitation.code` has changed from 12.12.4 to 12012004.
* The code on `Observation.component:respiratoryResponse.code` has changed from 12.12.5 to 12012005.
@@ -92,21 +109,26 @@ This document contains release notes per zib, indicating differences with their
* Removed the role extension (http://fhir.nl/fhir/StructureDefinition/nl-core-relatedperson-role) because `RelatedPerson.relationship` has changed from 0..1 to 0..*. The zib concept role is now mapped to a slice on relationship.
* Updated to new zib-NameInformation, zib-AddressInformation and zib-ContactInformation profiles.
+## zib-DevelopmentChild
+* The binding strength of all ValueSets has changed from 'extensible' to 'required'.
+* The data type for AgeFirstMenstruation has been changed from dateTime to Quantity, and the UCUM unit for 'year' (a) has been added.
+* The code on `Observation.component:developmentCognition.code` has been changed from 364644000 to 311465003.
+
## zib-DrugUse
-* The drugUseCode is mapped to `Observation.code` and based on a pattern
-* The code on `Observation.component:drugOrMedicationType.code` has changed to 105590001
-* The code on `Observation.component:amount.code` has changed to 363908000
+* The drugUseCode is mapped to `Observation.code` and is based on a pattern.
+* The code on `Observation.component:drugOrMedicationType.code` has changed to 105590001.
+* The code on `Observation.component:amount.code` has changed to 363908000.
## zib-DOSScore
* DOSScore is a newly added zib in the 2020 release. It has no previous profile and therefore no diff.
## zib-Encounter
* ContactWith is mapped on a slice of `Encounter.participant`.
-* `Encounter.participant.type` now honours the maximum cardinality of HealthProfessionalRole.
-* `Encounter.period.start` changed to cardinality 0 .. 1 due to the zibs conceptual cardinalities concept.
+* `Encounter.participant.type` now honors the maximum cardinality of HealthProfessionalRole.
+* `Encounter.period.start` changed to cardinality 0..1 due to the zibs conceptual cardinalities concept.
* The mapping of concepts Problem, Procedure and DeviatingResult is moved to `Encounter.reasonReference`.
* The mapping of Location is moved to `Encounter.location.location`.
-* Reference to other profiles not accounted for by the zib have been removed.
+* References to other profiles not accounted for by the zib have been removed.
## zib-Education
* There is no previous profile for Education in STU3 and therefore no diff.
@@ -116,6 +138,9 @@ This document contains release notes per zib, indicating differences with their
* The extension EpisodOfCare-Title has been replaced by ext-EpisodeOfCare.EpisodeOfCareName because this zib concept is functionally equivalent.
* The extensions EpisodeOfCare-DateFirstEncounter and EpisodeOfCare-DateLastEncounter from the previous profile are not inherited because no functional backing exists.
+## zib-FeedingPatternInfant
+* No specific changes have been made to this profile other than the generic changes for the Observation resource.
+
## zib-FLACCpainScale
* The semantic codes on the `Observation.component.code` elements have changed from LOINC to codes from the ScoreObservaties code system (urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1).
* The system value on `Observation.code` has changed from http://loinc.org to http://snomed.info/sct and the code value has changed from 38213-5 to 108291000146105.
@@ -137,15 +162,15 @@ This document contains release notes per zib, indicating differences with their
## zib-HealthcareProvider
* `Organization.identifier` is now sliced based on a pattern.
-* `Organization.type[DepartmentSpecialty]` and `Organization.type[OrganizationType]` from 0..* to 0..1.
-* For `Organization.type` the slicing discriminator is changed from fixed system values to valueset binding.
+* Changed cardinality of `Organization.type[DepartmentSpecialty]` and `Organization.type[OrganizationType]` from 0..* to 0..1.
+* For `Organization.type` the slicing discriminator is changed from fixed system values to a ValueSet binding.
* Removed comments on `Organization.alias` because it has no basis in the zib.
-* Added comments on the root to point out to the usage of Location resource and the `Organization.partOf`.
+* Added comments on the root to point out the usage of the Location resource and the `Organization.partOf`.
* Major change: use of Location resource.
## zib-HealthProfessional
* `Practitioner.identifier` slices changed cardinality from 0..1 to 0..*.
-* Added HealthProfessionalIdentificationNumber mapping on `PracititionerRole.identifier`.
+* Added HealthProfessionalIdentificationNumber mapping on `PractitionerRole.identifier`.
* Added new mapping of Gender in Practitioner.
* Added textual guidance on the root to clarify the use of Practitioner and PractitionerRole.
* Added textual guidance on the root of the concept of HealthProfessionalRole.
@@ -154,7 +179,7 @@ This document contains release notes per zib, indicating differences with their
## zib-HearingFunction
* Changed fixed slice on `.code.coding` to a pattern on `.code`.
-* Relaxed cardinality of `value[x]` to 0..1 of the conceptual cardinalities of the zib.
+* Relaxed cardinality of `.value[x]` to 0..1 of the conceptual cardinalities of the zib.
## zib-HelpFromOthers
* The mappings on `CarePlan.identifier`, `CarePlan.subject`, `CarePlan.author` and `CarePlan.careTeam` have been removed.
@@ -172,14 +197,17 @@ This document contains release notes per zib, indicating differences with their
## zib-LegalSituation
* New zib in 2020. However, in the zib2017 package the zib-patient-legalstatus extension exists, which corresponds to the LegalStatus concept of the zib FreedomRestrictingMeasures (withdrawn in the 2020 release). This new zib profile expands on that LegalStatus concept.
+## zib-LifeStance
+* This zib was previously represented as an extension in the Patient profile, but this has been changed to a profile on Observation in order to prevent custom extensions.
+
## zib-LivingSituation
* Added two new concepts and modelled them on `Observation.component:homeAdaption` and `Observation.component:livingCondition`.
-* Concept 'HouseType' has been moved to its own valueCodeableConcept slice.
+* Concept 'HouseType' has been moved to its own `.valueCodeableConcept` slice.
* The comment element has been moved to `Observation.note.text`.
## zib-MedicalDevice
* Indication no longer requires a custom extension because the concept can be mapped to a native FHIR element, namely `.reasonReference`.
-* Provided more documenation on how to exchange ProductID in FHIR.
+* Provided more documentation on how to exchange ProductID in FHIR.
* Removed references on `.source` because those are not accounted for by the zib.
* Provided documentation on how to populate mandatory `.status` element.
@@ -190,26 +218,29 @@ This document contains release notes per zib, indicating differences with their
* The comment element is mapped on `Observation.note.text` instead of `Observation.comment`.
## zib-MUSTScore
-* The datatype of `Observation.value[x]` (zib concept TotalScore) element has been changed from Quantity to Integer, and minimum and maximum allowed values of 0 and 6 respectively are applied.
+* The data type of `Observation.value[x]` (zib concept TotalScore) has been changed from Quantity to Integer, and minimum and maximum allowed values of 0 and 6 respectively are applied.
* The code on `Observation.component:bmiScore.code` has changed to 4005003 and the system value to urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1.
* The code on `Observation.component:weightLossScore.code` has changed to 4005004 and the system value to urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1.
* The code on `Observation.component:illnessScore.code` has changed to 4005005 and the system value to urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1.
+## zib-IllnessPerception
+* The concept PatientIllnessInsight with ID NL-CM:18.5.3 has been moved to `Observation.value[x]:valueString`
+
## zib-NameInformation
-* The way this partial zib has been modelled on the HumanName datatype has been overhauled to properly accommodate the way first names are handled. In the STU3 version, official first names, initials of this first name, and the given name (nickname, roepnaam) were all added to a `.given` element in the same HumanName instance, with a annotation of the type using an extension. This turned out to be the wrong approach, as all `.given` names are to be concatenated to the complete list of first names. So instead, there are now different instances of HumanName used to communicate the official names and the given name, indicated by `.use` -- resulting in two profiles. Communicating initials is now only done for names where the full name is not known (this deviates from the zib model).
+* The way this partial zib has been modelled on the HumanName data type has been overhauled to properly accommodate the way first names are handled. In the STU3 version, official first names, initials of this first name, and the given name (nickname, roepnaam) were all added to a `.given` element in the same HumanName instance, with an annotation of the type using an extension. This turned out to be the wrong approach, as all `.given` names are to be concatenated to the complete list of first names. So instead, there are now different instances of HumanName used to communicate the official names and the given name, indicated by `.use` -- resulting in two profiles. Communicating initials is now only done for names where the full name is not known (this deviates from the zib model).
* `.use` has been made mandatory (instead of discouraged).
-* Moved information and mappings from the extension level to the `value[x]` level.
+* Moved information and mappings from the extension level to the `.value[x]` level.
* `.family.extension`'s now have the zib concept names as slice names instead of the extension names.
* The `.given.extension` slice name has been changed to indicate that it is only about full name or initial.
-* Added mappings for the newly added zib concept 'titels' on `prefix` and `suffix`. Added documentation/implementation guidance on `prefix` and the root.
+* Added mappings for the newly added zib concept 'titels' on `.prefix` and `.suffix`. Added documentation/implementation guidance on `.prefix` and the root.
* Removed copied FHIR definitions and comments as these originated from DSTU2 and are given in the base data type. Moreover, this increases the focus on our added comments.
* Removed explanation of splitting up family names, as this is already given by the zib.
-* Aliases has been aligned with the zib.
+* Aliases have been aligned with the zib.
* Removed BRP mappings.
* Added the notion on the root that populating `HumanName.text` is encouraged.
## zib-NursingIntervention
-* The resource to represent this zib has been changed from Procedure to CarePlan. This aligns better with the meaning of the zib: a statement of a plan (which may or not may have been completed) rather than the record of a procedure that has been carried out. The profile for the current version is created from scratch.
+* The resource to represent this zib has been changed from Procedure to CarePlan. This aligns better with the meaning of the zib: a statement of a plan (which may or may not have been completed) rather than the record of a procedure that has been carried out. The profile for the current version is created from scratch.
* Because there's a better match with CarePlan, the five custom extensions are removed. One custom extension is added to mark a `CarePlan.contributor` as the zib Requester, and another one to define the materials used.
* Note: although the zib has changed quite dramatically since release 2017, the previous version of the profile was based on a pre-adopt of zib pre-release 2018, which is the same as release 2020.
@@ -219,38 +250,74 @@ This document contains release notes per zib, indicating differences with their
* New concept Indication mapped on the extension `NutritionOrder.extension:indication`.
* The comment extension has been replaced by a mapping to `NutritionOrder.note.text`.
+## zib-PainScore
+* Removed mapping on `Observation.bodySite` because the AnatomicalLocation concept has been removed from the zib.
+* Removed laterality extension because the Laterality concept has been removed from the zib.
+* Cardinality of `Observation.method` has changed from 1..1 to 0..1.
+* The data type of `Observation.value[x]` (zib concept PainScoreValue) has been changed from Quantity to Integer.
+
## zib-ParticipationInSociety
* No specific changes have been made to this profile other than the generic changes for the Observation resource
## zib-Patient
-* Includes Nationality, MaritalStatus, LanguageProficiency, LifeStance.
+* Includes Nationality, MaritalStatus, LanguageProficiency.
* Cardinality of `Patient.extension:nationality` left at 0..* due to the nature of the nationality core extension (which allows for a period to be placed next to the nationality and thus allows for different nationalities over time).
* Cardinality of `Patient.name` left at 0..* to allow including several name elements with a different `name.use` each.
* Cardinality of `Patient.telecom` left at 0..* to allow including several contact elements, because the zib ContactInformation includes a container that FHIR does not.
-* Added a comment to `deceased[x]`: When exporting the data, if `deceasedDateTime` (DateOfDeath) is present and has a value, DeathIndicator may be set to 'true', since DeathIndicator and DateOfDeath cannot both be represented at the same time.
+* Added a comment to `deceased[x]`: When exporting the data, if `.deceasedDateTime` (DateOfDeath) is present and has a value, DeathIndicator may be set to 'true', since DeathIndicator and DateOfDeath cannot both be represented at the same time.
## zib-Payer
* The STU3 version of the profile mapped part of the InsuranceCompany concept in the nl-core-organization profile, while these types of organizations do not necessarily have anything in common with HealthcareProviders, and it also did not allow for the situation where PayerPerson is an organization. To fix this, two separate profiles have been created for the situations where the Payer is a PayerPerson or an InsuranceCompany. These profiles could not be combined because slicing on .type with a maximum cardinality of 1 is not allowed.
* Both InsuranceCompany and 'PayerPerson as Organization' have been mapped in the profile Payer-Organization.
+## zib-Pregnancy
+* The value of `Condition.code` has changed from 118185001 to 364320009.
+
+## zib-Pregnancy.DateLastMenstruation
+* The zib-Pregnancy extension has moved from `Observation.extension` to `Observation.focus`.
+
+## zib-Pregnancy.EstimatedDateOfDelivery
+* The profile name has changed from zib-Pregnancy-TermDate to zib-Pregnancy.EstimatedDateOfDelivery.
+* The value of `Condition.code` has changed from 11778-8 (LOINC) to 161714006 (SNOMED CT).
+* The system of `Condition.code` has changed from http://loinc.org to http://snomed.info/sct.
+* The zib-Pregnancy extension has moved from `Observation.extension` to `Observation.focus`.
+
+## zib-Pregnancy.Gravidity
+* The value of `Condition.code` has changed from 11996-6 (LOINC) to 161732006 (SNOMED CT).
+* The system of `Condition.code` has changed from http://loinc.org to http://snomed.info/sct.
+* The data type on `Observation.value` has changed from Quantity to integer.
+* The zib-Pregnancy extension has moved from `Observation.extension` to `Observation.focus`.
+
+## zib-Pregnancy.Parity
+* The value of `Condition.code` has changed from 11977-6 (LOINC) to 364325004 (SNOMED CT).
+* The system of `Condition.code` has changed from http://loinc.org to http://snomed.info/sct.
+* The data type on `Observation.value` has changed from Quantity to integer.
+* The zib-Pregnancy extension has moved from `Observation.extension` to `Observation.focus`.
+
+## zib-Pregnancy.PregnancyDuration
+* The zib-Pregnancy extension has moved from `Observation.extension` to `Observation.focus`.
+
## zib-Problem
* ProblemType has been added on a slice of `Condition.category` allowing the category element to be used for other purposes too.
* FurtherSpecificationProblemName has been added with an extension on `Condition.code`.
* `Condition.bodySite` is now based on the zib AnatomicalLocation profile.
* ProblemStartDate and ProblemEndDate are placed on a DateTime type slice of `Condition.onset[x]` and `Condition.abatement[x]` allowing the option to use other types.
-* `Condition.note` now honours the max cardinality of zib Comment.
+* `Condition.note` now honors the max cardinality of zib Comment.
* `Condition.verificationStatus` contains a mandatory `.coding` element to capture the zib terminology because of the required binding on the CodeableConcept level and the zib and FHIR ValueSet do not completely map.
## Procedure
* Renamed profiles from zib-Procedure and zib-ProcedureRequest to zib-Procedure-event and zib-Procedure-request conform profiling guidelines.
-* ProcedureStartDate and ProcedureEndDate have been mapped to `Procedure.performed[x]` instead of `Procedure.performedPeriod` to account for the use of `Procedure.performedDateTime` when the zib Procedure concerns a instantaneous procedure.
-* Aligned cardinality of ProcedureMethod by setting the 'procedure-method' to 0..* instead of 0..0.
-* The ProcedureAnatomicalLocation is mapped on `Procedure.bodySite` and the cadinality has been set to 0..1 instead of 0..*.
+* ProcedureStartDate and ProcedureEndDate have been mapped to `Procedure.performed[x]` instead of `Procedure.performedPeriod` to account for the use of `Procedure.performedDateTime` when the zib Procedure concerns an instantaneous procedure.
+* Changed cardinality of the ProcedureMethod concept to 0..* instead of 0..1.
+* The ProcedureAnatomicalLocation is mapped on `Procedure.bodySite` and the cardinality has been set to 0..1 instead of 0..*.
* The resource ProcedureRequest has been renamed to ServiceRequest and now includes a mapping for all the possible concepts of zib Procedure. Compared to STU3 a mapping has been added for ProcedureMethod, ProcedureAnatomicalLocation, MedicalDevice, ProcedureStartDate and ProcedureEndDate.
* `Procedure.location` and `ServiceRequest.locationReference` are used to reference the zib HealthcareProvider instead of `Procedure.performer` and `ProcedureRequest.performer` to indicate where the Procedure takes place.
* The `Procedure.performer` only references the zib HealthProfessional represented in a PractitionerRole resource. Other references not dictated by the zib are removed.
* `ServiceRequest.performer` contains a reference to the zib CareTeam because the FHIR definition deviates from the zib Performer concept when multiple references are provided. This is described in the element's comment.
+## zib-PulseRate
+* The binding strength of the PulseRegularityCodelist has been changed from 'extensible' to 'required'.
+
## zib-Range
* There is no profile for this partial zib because the relevant parts can be modelled directly in the profiles where this zib is used.
@@ -258,21 +325,31 @@ This document contains release notes per zib, indicating differences with their
* Refraction is a newly added zib in the 2020 release. It has no previous profile and therefore no diff.
## zib-SOAPReport
-This is a newly added zib but had profiles that preceded the zib, namely gp-EncounterReport and gp-JournalEntry.
+* This is a newly added zib but had profiles that preceded the zib, namely gp-EncounterReport and gp-JournalEntry.
* Removed constraints not accounted for by the zib.
* Placed SOAPLine on a slice of `Composition.section` with a max cardinality of 4 conform the zib.
* Removed min cardinality of `Composition.section.text`.
* Removed min cardinality of `Observation.valueString` and moved mapping to a string type slice.
-* Removed fixed value of `Observation.status`
+* Removed fixed value of `Observation.status`.
* In the SOAPLineCode extension the fixed value on `.valueCodeableConcept.coding.system` has been removed because it is now covered by a required binding.
* Moved mapping of SOAPLineCode from `Observation.component`s to a custom extension because of lacking terminology codes to provide definiton ot the component.
+## zib-SkinDisorder
+* Renamed `extension:dueTo` to `extension:cause` to match its functional counterpart.
+* Changed fixed slice on `.category.coding` to a pattern on `.category`.
+* `Condition.bodySite` is now based on the zib AnatomicalLocation profile.
+* `Condition.note` now honours the max cardinality of zib Comment.
+
## zib-Stoma
* The resource to represent this zib has been changed from Observation to Condition. This aligns better with the meaning of the zib, as a stoma requires long term management.
* The general code of a Stoma has been added as a pattern to `Condition.category` allowing the category element to be used for other purposes too.
* `Condition.bodySite` is now based on the zib AnatomicalLocation profile.
* `Condition.note` now honours the max cardinality of zib Comment.
+## zib-StrongKidsScore
+* The data type of Observation.value[x] (zib concept TotalScore) element has been changed from Quantity to Integer, and minimum and maximum allowed values of 0 and 5 respectively are applied.
+* The system value of the Observation.component.code elements is changed to urn:oid:2.16.840.1.113883.2.4.3.11.60.40.4.0.1.
+
## zib-TimeInterval
* In the previous release, the concepts of this partial zib were mapped directly in the profiles where they are used. In this release the usage of this partial zib has been expanded and profiles have been created to aid the usage in profiles in the various situations that might occur.
@@ -282,8 +359,8 @@ This is a newly added zib but had profiles that preceded the zib, namely gp-Enco
# zib-TobaccoUse
* StartDate and EndDate are placed on a type slice of `Observation.effective[x]` adhering to the open world modelling principle.
* TobaccoUseStatus is placed on a type slice of `Observation.value[x]` adhering to the open world modelling principle.
-* The comment element is moved to `Observation.note.text` instead of `Observation.comment`
-* The datatype for PackYears has been changed from Quantity to integer to align with the functional definition and the Quantity datatype does not bring additional benefits to justify not aligning with the zib.
+* The comment element is moved to `Observation.note.text` instead of `Observation.comment`.
+* The data type for PackYears has been changed from Quantity to integer to align with the functional definition and the Quantity data type does not bring additional benefits to justify not aligning with the zib.
## zib-TreatmentDirective2
* This is a new zib loosely based on the previous zib TreatmentDirective. Below the most relevant changes compared to the previous zib and the STU3 profile are described.
@@ -296,16 +373,16 @@ This is a newly added zib but had profiles that preceded the zib, namely gp-Enco
* Removed references that are not defined by the zib (e.g. `Consent.organization` and `Consent.actor`).
## zib-Vaccination
-* Renamed profiles names: zib-Vaccination to zib-Vaccination-event and zib-VaccinationRecommendation to zib-Vaccination-request conform new profiling guidelines.
+* Renamed profile names: zib-Vaccination to zib-Vaccination-event and zib-VaccinationRecommendation to zib-Vaccination-request conform new profiling guidelines.
* Removed references not accounted for by the zib (e.g. `Immunization.location`, `Immunization.manufacturer` and `ImmunizationRecommendation.recommendation.supportingImmunization`).
* Aligned cardinality of `Immunization.note` with the zib by making it 0..1.
-* Moved VaccinationDate on a type slice on `Immunization.occurrence[x]:occurrenceDateTime`. This element has been renamed from `date` to `occurence[x]` in R4.
+* Moved VaccinationDate on a type slice on `Immunization.occurrence[x]:occurrenceDateTime`. This element has been renamed from `date` to `occurrence[x]` in R4.
* Moved Administrator to a slice on `Immunization.performer` with a mandatory fixed pattern in `Immunization.performer.function`.
-* Added a pattern on `Immunization.doseQuantity` to mandate the use of mL by ucum because the definition of Dose states to use milliliters.
+* Added a pattern on `Immunization.doseQuantity` to mandate the use of mL by UCUM because the definition of Dose states to use milliliters.
* Removed orderStatus extension because PlannedCareActivityForTransfer zib does not exist anymore.
-* Aligned cardinalities of ImmunizationRecommendation with the zib by constraining them and documentend this on the root element.
+* Aligned cardinalities of ImmunizationRecommendation with the zib by constraining them and documented this on the root element.
* Removed mapping of DesiredDateForRevaccination because it has been removed by the zib as well. The DesiredDateForRevaccination concept has been replaced by mapping to VaccinationDate which is placed on `ImmunizationRecommendation.recommendation.dateCriterion.value`. The mapping to PlannedCareActivityForTransfer start and end dates have been removed from this element.
## zib-VisualFunction
* Changed fixed slice on `.code.coding` to a pattern on `.code`.
-* Relaxed cardinality of `value[x]` to 0..1 of the conceptual cardinalities of the zib.
+* Relaxed cardinality of `value[x]` to 0..1 of the conceptual cardinalities of the zib.
\ No newline at end of file
diff --git a/resources/nl-core/ext-AdditionalCategory.xml b/resources/nl-core/ext-AdditionalCategory.xml
new file mode 100644
index 000000000..ad25fe4c9
--- /dev/null
+++ b/resources/nl-core/ext-AdditionalCategory.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/ext-CopyIndicator.xml b/resources/nl-core/ext-CopyIndicator.xml
index 633a64192..57ad0d89d 100644
--- a/resources/nl-core/ext-CopyIndicator.xml
+++ b/resources/nl-core/ext-CopyIndicator.xml
@@ -44,6 +44,10 @@
+
+
+
+
diff --git a/resources/nl-core/nl-core-AbilityToDressOneself.xml b/resources/nl-core/nl-core-AbilityToDressOneself.xml
index 73456baac..097dad0c5 100644
--- a/resources/nl-core/nl-core-AbilityToDressOneself.xml
+++ b/resources/nl-core/nl-core-AbilityToDressOneself.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AbilityToDrink.xml b/resources/nl-core/nl-core-AbilityToDrink.xml
index 889df38d8..5b586ddf7 100644
--- a/resources/nl-core/nl-core-AbilityToDrink.xml
+++ b/resources/nl-core/nl-core-AbilityToDrink.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AbilityToEat.xml b/resources/nl-core/nl-core-AbilityToEat.xml
index a124ce059..d76f860c4 100644
--- a/resources/nl-core/nl-core-AbilityToEat.xml
+++ b/resources/nl-core/nl-core-AbilityToEat.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AbilityToGroom.xml b/resources/nl-core/nl-core-AbilityToGroom.xml
index 5b86370ba..f2d02f7fb 100644
--- a/resources/nl-core/nl-core-AbilityToGroom.xml
+++ b/resources/nl-core/nl-core-AbilityToGroom.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AbilityToUseToilet.xml b/resources/nl-core/nl-core-AbilityToUseToilet.xml
index 3802e71d9..6095a7fea 100644
--- a/resources/nl-core/nl-core-AbilityToUseToilet.xml
+++ b/resources/nl-core/nl-core-AbilityToUseToilet.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AbilityToWashOneself.xml b/resources/nl-core/nl-core-AbilityToWashOneself.xml
index 27f2b83b4..303cbefef 100644
--- a/resources/nl-core/nl-core-AbilityToWashOneself.xml
+++ b/resources/nl-core/nl-core-AbilityToWashOneself.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AddressInformation.xml b/resources/nl-core/nl-core-AddressInformation.xml
index 5719ff902..5918f1169 100644
--- a/resources/nl-core/nl-core-AddressInformation.xml
+++ b/resources/nl-core/nl-core-AddressInformation.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AdvanceDirective.xml b/resources/nl-core/nl-core-AdvanceDirective.xml
index 2fe646e9d..e89dabb0a 100644
--- a/resources/nl-core/nl-core-AdvanceDirective.xml
+++ b/resources/nl-core/nl-core-AdvanceDirective.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AlcoholUse.xml b/resources/nl-core/nl-core-AlcoholUse.xml
index f74c58c39..e7f91362f 100644
--- a/resources/nl-core/nl-core-AlcoholUse.xml
+++ b/resources/nl-core/nl-core-AlcoholUse.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Alert.xml b/resources/nl-core/nl-core-Alert.xml
index 340b1d73b..cea9bb100 100644
--- a/resources/nl-core/nl-core-Alert.xml
+++ b/resources/nl-core/nl-core-Alert.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AllergyIntolerance.xml b/resources/nl-core/nl-core-AllergyIntolerance.xml
index 54615f1d0..660231e31 100644
--- a/resources/nl-core/nl-core-AllergyIntolerance.xml
+++ b/resources/nl-core/nl-core-AllergyIntolerance.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-AnatomicalLocation.xml b/resources/nl-core/nl-core-AnatomicalLocation.xml
index d17df6849..74114652f 100644
--- a/resources/nl-core/nl-core-AnatomicalLocation.xml
+++ b/resources/nl-core/nl-core-AnatomicalLocation.xml
@@ -14,10 +14,15 @@
-
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-ApgarScore-10Minute.xml b/resources/nl-core/nl-core-ApgarScore-10Minute.xml
index 2ecb88546..06773d4be 100644
--- a/resources/nl-core/nl-core-ApgarScore-10Minute.xml
+++ b/resources/nl-core/nl-core-ApgarScore-10Minute.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-ApgarScore-1Minute.xml b/resources/nl-core/nl-core-ApgarScore-1Minute.xml
index 33a0d93e2..01d71fd57 100644
--- a/resources/nl-core/nl-core-ApgarScore-1Minute.xml
+++ b/resources/nl-core/nl-core-ApgarScore-1Minute.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-ApgarScore-5Minute.xml b/resources/nl-core/nl-core-ApgarScore-5Minute.xml
index 3b36d8d86..59ab8b9ce 100644
--- a/resources/nl-core/nl-core-ApgarScore-5Minute.xml
+++ b/resources/nl-core/nl-core-ApgarScore-5Minute.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-BarthelADLIndex.xml b/resources/nl-core/nl-core-BarthelADLIndex.xml
new file mode 100644
index 000000000..1eb2b6881
--- /dev/null
+++ b/resources/nl-core/nl-core-BarthelADLIndex.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-BloodPressure.xml b/resources/nl-core/nl-core-BloodPressure.xml
index d9e26db6b..0fc80f0ba 100644
--- a/resources/nl-core/nl-core-BloodPressure.xml
+++ b/resources/nl-core/nl-core-BloodPressure.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-BodyHeight.xml b/resources/nl-core/nl-core-BodyHeight.xml
index 34980ac66..f18af2b59 100644
--- a/resources/nl-core/nl-core-BodyHeight.xml
+++ b/resources/nl-core/nl-core-BodyHeight.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-BodyTemperature.xml b/resources/nl-core/nl-core-BodyTemperature.xml
index d5481e820..6036744a0 100644
--- a/resources/nl-core/nl-core-BodyTemperature.xml
+++ b/resources/nl-core/nl-core-BodyTemperature.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-BodyWeight.xml b/resources/nl-core/nl-core-BodyWeight.xml
index cf848f8b3..9fe8420fb 100644
--- a/resources/nl-core/nl-core-BodyWeight.xml
+++ b/resources/nl-core/nl-core-BodyWeight.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-CareTeam.xml b/resources/nl-core/nl-core-CareTeam.xml
index e607f910c..0ca33b4bb 100644
--- a/resources/nl-core/nl-core-CareTeam.xml
+++ b/resources/nl-core/nl-core-CareTeam.xml
@@ -18,6 +18,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -28,11 +38,11 @@
-
+
-
+
-
+
diff --git a/resources/nl-core/nl-core-ChecklistPainBehavior.xml b/resources/nl-core/nl-core-ChecklistPainBehavior.xml
new file mode 100644
index 000000000..c690627fb
--- /dev/null
+++ b/resources/nl-core/nl-core-ChecklistPainBehavior.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-ComfortScale.xml b/resources/nl-core/nl-core-ComfortScale.xml
index 092c0ed3d..037389147 100644
--- a/resources/nl-core/nl-core-ComfortScale.xml
+++ b/resources/nl-core/nl-core-ComfortScale.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-ContactInformation-EmailAddresses.xml b/resources/nl-core/nl-core-ContactInformation-EmailAddresses.xml
index 196af2912..6373cd510 100644
--- a/resources/nl-core/nl-core-ContactInformation-EmailAddresses.xml
+++ b/resources/nl-core/nl-core-ContactInformation-EmailAddresses.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-ContactInformation-TelephoneNumbers.xml b/resources/nl-core/nl-core-ContactInformation-TelephoneNumbers.xml
index 769169e9d..09b52420f 100644
--- a/resources/nl-core/nl-core-ContactInformation-TelephoneNumbers.xml
+++ b/resources/nl-core/nl-core-ContactInformation-TelephoneNumbers.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-ContactPerson.xml b/resources/nl-core/nl-core-ContactPerson.xml
index d753a33d8..51921c14e 100644
--- a/resources/nl-core/nl-core-ContactPerson.xml
+++ b/resources/nl-core/nl-core-ContactPerson.xml
@@ -18,6 +18,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-DOSScore.xml b/resources/nl-core/nl-core-DOSScore.xml
index 9c48eb810..416ff9196 100644
--- a/resources/nl-core/nl-core-DOSScore.xml
+++ b/resources/nl-core/nl-core-DOSScore.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-DevelopmentChild.xml b/resources/nl-core/nl-core-DevelopmentChild.xml
new file mode 100644
index 000000000..520def571
--- /dev/null
+++ b/resources/nl-core/nl-core-DevelopmentChild.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-DrugUse.xml b/resources/nl-core/nl-core-DrugUse.xml
index 11b0791f3..ecadcef31 100644
--- a/resources/nl-core/nl-core-DrugUse.xml
+++ b/resources/nl-core/nl-core-DrugUse.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Education.xml b/resources/nl-core/nl-core-Education.xml
index 93080f71a..d61ad57cf 100644
--- a/resources/nl-core/nl-core-Education.xml
+++ b/resources/nl-core/nl-core-Education.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Encounter.xml b/resources/nl-core/nl-core-Encounter.xml
index 75b4ecebf..fa030238c 100644
--- a/resources/nl-core/nl-core-Encounter.xml
+++ b/resources/nl-core/nl-core-Encounter.xml
@@ -18,6 +18,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -43,6 +53,7 @@
+
diff --git a/resources/nl-core/nl-core-EpisodeOfCare.xml b/resources/nl-core/nl-core-EpisodeOfCare.xml
index 0155a9b06..979365ec2 100644
--- a/resources/nl-core/nl-core-EpisodeOfCare.xml
+++ b/resources/nl-core/nl-core-EpisodeOfCare.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-FLACCpainScale.xml b/resources/nl-core/nl-core-FLACCpainScale.xml
index 8376092d0..089dee529 100644
--- a/resources/nl-core/nl-core-FLACCpainScale.xml
+++ b/resources/nl-core/nl-core-FLACCpainScale.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-FeedingPatternInfant.xml b/resources/nl-core/nl-core-FeedingPatternInfant.xml
new file mode 100644
index 000000000..330af2d20
--- /dev/null
+++ b/resources/nl-core/nl-core-FeedingPatternInfant.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-FluidBalance.xml b/resources/nl-core/nl-core-FluidBalance.xml
index 74814b87c..b598e3709 100644
--- a/resources/nl-core/nl-core-FluidBalance.xml
+++ b/resources/nl-core/nl-core-FluidBalance.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-FreedomRestrictingIntervention.xml b/resources/nl-core/nl-core-FreedomRestrictingIntervention.xml
index 4a5c802ce..0b7c4e8cc 100644
--- a/resources/nl-core/nl-core-FreedomRestrictingIntervention.xml
+++ b/resources/nl-core/nl-core-FreedomRestrictingIntervention.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -37,12 +42,19 @@
-
+
-
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-FunctionalOrMentalStatus.xml b/resources/nl-core/nl-core-FunctionalOrMentalStatus.xml
index 8820795cd..76b1c1595 100644
--- a/resources/nl-core/nl-core-FunctionalOrMentalStatus.xml
+++ b/resources/nl-core/nl-core-FunctionalOrMentalStatus.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HeadCircumference.xml b/resources/nl-core/nl-core-HeadCircumference.xml
index 339e06394..04f6b2622 100644
--- a/resources/nl-core/nl-core-HeadCircumference.xml
+++ b/resources/nl-core/nl-core-HeadCircumference.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HealthProfessional-Practitioner.xml b/resources/nl-core/nl-core-HealthProfessional-Practitioner.xml
index 1df662c13..8dce830e4 100644
--- a/resources/nl-core/nl-core-HealthProfessional-Practitioner.xml
+++ b/resources/nl-core/nl-core-HealthProfessional-Practitioner.xml
@@ -18,6 +18,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml b/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
index 0d10cc418..322f7752c 100644
--- a/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
+++ b/resources/nl-core/nl-core-HealthProfessional-PractitionerRole.xml
@@ -18,6 +18,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HealthcareProvider-Organization.xml b/resources/nl-core/nl-core-HealthcareProvider-Organization.xml
index e38c22201..5ead4a11b 100644
--- a/resources/nl-core/nl-core-HealthcareProvider-Organization.xml
+++ b/resources/nl-core/nl-core-HealthcareProvider-Organization.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HealthcareProvider.xml b/resources/nl-core/nl-core-HealthcareProvider.xml
index 348278bc6..6353d6e37 100644
--- a/resources/nl-core/nl-core-HealthcareProvider.xml
+++ b/resources/nl-core/nl-core-HealthcareProvider.xml
@@ -18,6 +18,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HearingFunction.HearingAid.Product.xml b/resources/nl-core/nl-core-HearingFunction.HearingAid.Product.xml
index e874f5bd6..815e3d9fd 100644
--- a/resources/nl-core/nl-core-HearingFunction.HearingAid.Product.xml
+++ b/resources/nl-core/nl-core-HearingFunction.HearingAid.Product.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HearingFunction.HearingAid.xml b/resources/nl-core/nl-core-HearingFunction.HearingAid.xml
index 73f723073..34679d3a4 100644
--- a/resources/nl-core/nl-core-HearingFunction.HearingAid.xml
+++ b/resources/nl-core/nl-core-HearingFunction.HearingAid.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -50,7 +55,6 @@
-
@@ -75,15 +79,22 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
@@ -100,15 +111,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/resources/nl-core/nl-core-HearingFunction.xml b/resources/nl-core/nl-core-HearingFunction.xml
index 51ea17253..6cee28532 100644
--- a/resources/nl-core/nl-core-HearingFunction.xml
+++ b/resources/nl-core/nl-core-HearingFunction.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HeartRate.xml b/resources/nl-core/nl-core-HeartRate.xml
index 3087fc272..6f5d8694c 100644
--- a/resources/nl-core/nl-core-HeartRate.xml
+++ b/resources/nl-core/nl-core-HeartRate.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-HelpFromOthers.xml b/resources/nl-core/nl-core-HelpFromOthers.xml
index f17073e7b..b785a8359 100644
--- a/resources/nl-core/nl-core-HelpFromOthers.xml
+++ b/resources/nl-core/nl-core-HelpFromOthers.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-IllnessPerception.xml b/resources/nl-core/nl-core-IllnessPerception.xml
new file mode 100644
index 000000000..403a96d83
--- /dev/null
+++ b/resources/nl-core/nl-core-IllnessPerception.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-LaboratoryTestResult.Specimen.xml b/resources/nl-core/nl-core-LaboratoryTestResult.Specimen.xml
index f5d45623f..64a8a072f 100644
--- a/resources/nl-core/nl-core-LaboratoryTestResult.Specimen.xml
+++ b/resources/nl-core/nl-core-LaboratoryTestResult.Specimen.xml
@@ -35,7 +35,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -64,9 +64,9 @@
+
-
diff --git a/resources/nl-core/nl-core-LaboratoryTestResult.Specimen.Source.xml b/resources/nl-core/nl-core-LaboratoryTestResult.SpecimenSource.xml
similarity index 72%
rename from resources/nl-core/nl-core-LaboratoryTestResult.Specimen.Source.xml
rename to resources/nl-core/nl-core-LaboratoryTestResult.SpecimenSource.xml
index e8750266c..99a9b7210 100644
--- a/resources/nl-core/nl-core-LaboratoryTestResult.Specimen.Source.xml
+++ b/resources/nl-core/nl-core-LaboratoryTestResult.SpecimenSource.xml
@@ -1,9 +1,9 @@
-
-
+
+
-
+
@@ -15,9 +15,14 @@
-
+
+
+
+
+
+
@@ -26,12 +31,12 @@
-
+
-
+
diff --git a/resources/nl-core/nl-core-LaboratoryTestResult.xml b/resources/nl-core/nl-core-LaboratoryTestResult.xml
index 16b292146..49b39484a 100644
--- a/resources/nl-core/nl-core-LaboratoryTestResult.xml
+++ b/resources/nl-core/nl-core-LaboratoryTestResult.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -131,14 +136,12 @@
-
+
+
-
-
-
-
+
diff --git a/resources/nl-core/nl-core-LegalSituation-LegalStatus.xml b/resources/nl-core/nl-core-LegalSituation-LegalStatus.xml
index d5ab3b0eb..1c0bb6000 100644
--- a/resources/nl-core/nl-core-LegalSituation-LegalStatus.xml
+++ b/resources/nl-core/nl-core-LegalSituation-LegalStatus.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-LegalSituation-Representation.xml b/resources/nl-core/nl-core-LegalSituation-Representation.xml
index 93b2d6134..e8b4d03c3 100644
--- a/resources/nl-core/nl-core-LegalSituation-Representation.xml
+++ b/resources/nl-core/nl-core-LegalSituation-Representation.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-LifeStance.xml b/resources/nl-core/nl-core-LifeStance.xml
new file mode 100644
index 000000000..a42abde2e
--- /dev/null
+++ b/resources/nl-core/nl-core-LifeStance.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-LivingSituation.xml b/resources/nl-core/nl-core-LivingSituation.xml
index 3e6b06671..d9b579e72 100644
--- a/resources/nl-core/nl-core-LivingSituation.xml
+++ b/resources/nl-core/nl-core-LivingSituation.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-MUSTScore.xml b/resources/nl-core/nl-core-MUSTScore.xml
index 9b07975e8..cc95b5123 100644
--- a/resources/nl-core/nl-core-MUSTScore.xml
+++ b/resources/nl-core/nl-core-MUSTScore.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-MedicalDevice.Product.xml b/resources/nl-core/nl-core-MedicalDevice.Product.xml
index 240bc4107..47867df28 100644
--- a/resources/nl-core/nl-core-MedicalDevice.Product.xml
+++ b/resources/nl-core/nl-core-MedicalDevice.Product.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -28,5 +33,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-MedicalDevice.xml b/resources/nl-core/nl-core-MedicalDevice.xml
index ff920877d..8a5bb4e80 100644
--- a/resources/nl-core/nl-core-MedicalDevice.xml
+++ b/resources/nl-core/nl-core-MedicalDevice.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -46,11 +51,9 @@
-
-
@@ -75,15 +78,22 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
@@ -100,14 +110,28 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-MedicationContraIndication.xml b/resources/nl-core/nl-core-MedicationContraIndication.xml
index c9a471a87..18d8b1042 100644
--- a/resources/nl-core/nl-core-MedicationContraIndication.xml
+++ b/resources/nl-core/nl-core-MedicationContraIndication.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Mobility.xml b/resources/nl-core/nl-core-Mobility.xml
index c31c9a1ed..3e29f593b 100644
--- a/resources/nl-core/nl-core-Mobility.xml
+++ b/resources/nl-core/nl-core-Mobility.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-NameInformation.GivenName.xml b/resources/nl-core/nl-core-NameInformation.GivenName.xml
index 3a284f93d..f92db1258 100644
--- a/resources/nl-core/nl-core-NameInformation.GivenName.xml
+++ b/resources/nl-core/nl-core-NameInformation.GivenName.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-NameInformation.xml b/resources/nl-core/nl-core-NameInformation.xml
index 5e5cf554a..ff605aa15 100644
--- a/resources/nl-core/nl-core-NameInformation.xml
+++ b/resources/nl-core/nl-core-NameInformation.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-NursingIntervention.xml b/resources/nl-core/nl-core-NursingIntervention.xml
index 85b064703..c217396c9 100644
--- a/resources/nl-core/nl-core-NursingIntervention.xml
+++ b/resources/nl-core/nl-core-NursingIntervention.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-NutritionAdvice.xml b/resources/nl-core/nl-core-NutritionAdvice.xml
index 93dd9d76b..9b3c7c0f6 100644
--- a/resources/nl-core/nl-core-NutritionAdvice.xml
+++ b/resources/nl-core/nl-core-NutritionAdvice.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-O2Saturation.xml b/resources/nl-core/nl-core-O2Saturation.xml
index ff985a9ba..ee581ba51 100644
--- a/resources/nl-core/nl-core-O2Saturation.xml
+++ b/resources/nl-core/nl-core-O2Saturation.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-PainScore.xml b/resources/nl-core/nl-core-PainScore.xml
new file mode 100644
index 000000000..9d927b9a9
--- /dev/null
+++ b/resources/nl-core/nl-core-PainScore.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-ParticipationInSociety.xml b/resources/nl-core/nl-core-ParticipationInSociety.xml
index 8f91f4d7b..f57dcb127 100644
--- a/resources/nl-core/nl-core-ParticipationInSociety.xml
+++ b/resources/nl-core/nl-core-ParticipationInSociety.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Patient.xml b/resources/nl-core/nl-core-Patient.xml
index dd9c19d93..de6ea0d70 100644
--- a/resources/nl-core/nl-core-Patient.xml
+++ b/resources/nl-core/nl-core-Patient.xml
@@ -18,6 +18,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Payer-Organization.xml b/resources/nl-core/nl-core-Payer-Organization.xml
index 6b00ce91f..72d878a77 100644
--- a/resources/nl-core/nl-core-Payer-Organization.xml
+++ b/resources/nl-core/nl-core-Payer-Organization.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Payer.InsuranceCompany.xml b/resources/nl-core/nl-core-Payer.InsuranceCompany.xml
index 0fe328a3e..a8b2b8d82 100644
--- a/resources/nl-core/nl-core-Payer.InsuranceCompany.xml
+++ b/resources/nl-core/nl-core-Payer.InsuranceCompany.xml
@@ -21,6 +21,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Payer.PayerPerson.xml b/resources/nl-core/nl-core-Payer.PayerPerson.xml
index 2de8be88c..8460caa91 100644
--- a/resources/nl-core/nl-core-Payer.PayerPerson.xml
+++ b/resources/nl-core/nl-core-Payer.PayerPerson.xml
@@ -21,6 +21,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-PharmaceuticalProduct.xml b/resources/nl-core/nl-core-PharmaceuticalProduct.xml
index 709c263f6..a7c8798eb 100644
--- a/resources/nl-core/nl-core-PharmaceuticalProduct.xml
+++ b/resources/nl-core/nl-core-PharmaceuticalProduct.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Pregnancy.DateLastMenstruation.xml b/resources/nl-core/nl-core-Pregnancy.DateLastMenstruation.xml
new file mode 100644
index 000000000..a50ed89cd
--- /dev/null
+++ b/resources/nl-core/nl-core-Pregnancy.DateLastMenstruation.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Pregnancy.EstimatedDateOfDelivery.xml b/resources/nl-core/nl-core-Pregnancy.EstimatedDateOfDelivery.xml
new file mode 100644
index 000000000..d961e59a7
--- /dev/null
+++ b/resources/nl-core/nl-core-Pregnancy.EstimatedDateOfDelivery.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Pregnancy.Gravidity.xml b/resources/nl-core/nl-core-Pregnancy.Gravidity.xml
new file mode 100644
index 000000000..641932329
--- /dev/null
+++ b/resources/nl-core/nl-core-Pregnancy.Gravidity.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Pregnancy.Parity.xml b/resources/nl-core/nl-core-Pregnancy.Parity.xml
new file mode 100644
index 000000000..93e30c9c7
--- /dev/null
+++ b/resources/nl-core/nl-core-Pregnancy.Parity.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Pregnancy.PregnancyDuration.xml b/resources/nl-core/nl-core-Pregnancy.PregnancyDuration.xml
new file mode 100644
index 000000000..100a13ffd
--- /dev/null
+++ b/resources/nl-core/nl-core-Pregnancy.PregnancyDuration.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Pregnancy.xml b/resources/nl-core/nl-core-Pregnancy.xml
new file mode 100644
index 000000000..cbc9c4ad3
--- /dev/null
+++ b/resources/nl-core/nl-core-Pregnancy.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Problem.xml b/resources/nl-core/nl-core-Problem.xml
index b981cdd75..b9b2073b2 100644
--- a/resources/nl-core/nl-core-Problem.xml
+++ b/resources/nl-core/nl-core-Problem.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Procedure-event.xml b/resources/nl-core/nl-core-Procedure-event.xml
index 9f589bf01..7d365c430 100644
--- a/resources/nl-core/nl-core-Procedure-event.xml
+++ b/resources/nl-core/nl-core-Procedure-event.xml
@@ -18,6 +18,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Procedure-request.xml b/resources/nl-core/nl-core-Procedure-request.xml
index 61324b5b9..cd0d2b6dd 100644
--- a/resources/nl-core/nl-core-Procedure-request.xml
+++ b/resources/nl-core/nl-core-Procedure-request.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -42,7 +47,7 @@
-
+
diff --git a/resources/nl-core/nl-core-PulseRate.xml b/resources/nl-core/nl-core-PulseRate.xml
new file mode 100644
index 000000000..1ab409de4
--- /dev/null
+++ b/resources/nl-core/nl-core-PulseRate.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Refraction.xml b/resources/nl-core/nl-core-Refraction.xml
index 5b9eea393..563e91f7f 100644
--- a/resources/nl-core/nl-core-Refraction.xml
+++ b/resources/nl-core/nl-core-Refraction.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-SOAPReport.SOAPLine.xml b/resources/nl-core/nl-core-SOAPReport.SOAPLine.xml
index 885ac9314..b0dae6d0f 100644
--- a/resources/nl-core/nl-core-SOAPReport.SOAPLine.xml
+++ b/resources/nl-core/nl-core-SOAPReport.SOAPLine.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-SOAPReport.xml b/resources/nl-core/nl-core-SOAPReport.xml
index 6eae8ce79..27bcb9c23 100644
--- a/resources/nl-core/nl-core-SOAPReport.xml
+++ b/resources/nl-core/nl-core-SOAPReport.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -61,7 +66,7 @@
-
+
diff --git a/resources/nl-core/nl-core-SkinDisorder.xml b/resources/nl-core/nl-core-SkinDisorder.xml
new file mode 100644
index 000000000..8b276c3d5
--- /dev/null
+++ b/resources/nl-core/nl-core-SkinDisorder.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-Stoma.xml b/resources/nl-core/nl-core-Stoma.xml
index 04e9f19ec..b4aa36ae2 100644
--- a/resources/nl-core/nl-core-Stoma.xml
+++ b/resources/nl-core/nl-core-Stoma.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-StrongKidsScore.xml b/resources/nl-core/nl-core-StrongKidsScore.xml
new file mode 100644
index 000000000..5006ec9f6
--- /dev/null
+++ b/resources/nl-core/nl-core-StrongKidsScore.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-TextResult.VisualResult.xml b/resources/nl-core/nl-core-TextResult.VisualResult.xml
index c546fe7e3..e0586dc52 100644
--- a/resources/nl-core/nl-core-TextResult.VisualResult.xml
+++ b/resources/nl-core/nl-core-TextResult.VisualResult.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-TextResult.xml b/resources/nl-core/nl-core-TextResult.xml
index f908ac942..5502a42d5 100644
--- a/resources/nl-core/nl-core-TextResult.xml
+++ b/resources/nl-core/nl-core-TextResult.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-TimeInterval.xml b/resources/nl-core/nl-core-TimeInterval.xml
index 3b4681661..07a773c38 100644
--- a/resources/nl-core/nl-core-TimeInterval.xml
+++ b/resources/nl-core/nl-core-TimeInterval.xml
@@ -1,32 +1,37 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/resources/nl-core/nl-core-TobaccoUse.xml b/resources/nl-core/nl-core-TobaccoUse.xml
index d2189fab3..594fed3d8 100644
--- a/resources/nl-core/nl-core-TobaccoUse.xml
+++ b/resources/nl-core/nl-core-TobaccoUse.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-TreatmentDirective2.xml b/resources/nl-core/nl-core-TreatmentDirective2.xml
index ad2b5783a..3f7438b55 100644
--- a/resources/nl-core/nl-core-TreatmentDirective2.xml
+++ b/resources/nl-core/nl-core-TreatmentDirective2.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-Vaccination-event.xml b/resources/nl-core/nl-core-Vaccination-event.xml
index e03fdce5c..86f0a0805 100644
--- a/resources/nl-core/nl-core-Vaccination-event.xml
+++ b/resources/nl-core/nl-core-Vaccination-event.xml
@@ -23,6 +23,11 @@
+
+
+
+
+
@@ -108,7 +113,7 @@
-
+
@@ -145,7 +150,7 @@
-
+
diff --git a/resources/nl-core/nl-core-Vaccination-request.xml b/resources/nl-core/nl-core-Vaccination-request.xml
index 03b6224ea..012782498 100644
--- a/resources/nl-core/nl-core-Vaccination-request.xml
+++ b/resources/nl-core/nl-core-Vaccination-request.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-VisualFunction.VisualAid.Product.xml b/resources/nl-core/nl-core-VisualFunction.VisualAid.Product.xml
index 60d820ab7..e6ed4ae30 100644
--- a/resources/nl-core/nl-core-VisualFunction.VisualAid.Product.xml
+++ b/resources/nl-core/nl-core-VisualFunction.VisualAid.Product.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/nl-core-VisualFunction.VisualAid.xml b/resources/nl-core/nl-core-VisualFunction.VisualAid.xml
index 816c9b6cd..d2cae23e1 100644
--- a/resources/nl-core/nl-core-VisualFunction.VisualAid.xml
+++ b/resources/nl-core/nl-core-VisualFunction.VisualAid.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
@@ -50,7 +55,6 @@
-
@@ -75,15 +79,22 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
@@ -100,15 +111,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/resources/nl-core/nl-core-VisualFunction.xml b/resources/nl-core/nl-core-VisualFunction.xml
index 4d991ca15..af8387d47 100644
--- a/resources/nl-core/nl-core-VisualFunction.xml
+++ b/resources/nl-core/nl-core-VisualFunction.xml
@@ -18,6 +18,11 @@
+
+
+
+
+
diff --git a/resources/nl-core/package.json b/resources/nl-core/package.json
index d8475d3b3..1668389f9 100644
--- a/resources/nl-core/package.json
+++ b/resources/nl-core/package.json
@@ -1,12 +1,12 @@
{
"name": "nictiz.fhir.nl.r4.nl-core",
- "version": "0.7.0-beta.1",
+ "version": "0.9.0-beta.1",
"homepage": "https://zibs.nl/wiki/HCIM_Release_2020(EN)",
"title": "FHIR implementation of zibs 2020",
"description": "NL package of FHIR R4 conformance resources for zib (Zorginformatiebouwstenen, Clinical Information Models) release 2020.",
"dependencies": {
"hl7.fhir.r4.core": "4.0.x",
- "nictiz.fhir.nl.r4.zib2020": "0.7.0-beta.1"
+ "nictiz.fhir.nl.r4.zib2020": "0.9.0-beta.1"
},
"keywords": [
"nl",
diff --git a/resources/nl-core/pattern-NlCoreHealthProfessionalReference.xml b/resources/nl-core/pattern-NlCoreHealthProfessionalReference.xml
index 8069ff4cf..9fbbc76a2 100644
--- a/resources/nl-core/pattern-NlCoreHealthProfessionalReference.xml
+++ b/resources/nl-core/pattern-NlCoreHealthProfessionalReference.xml
@@ -26,7 +26,7 @@
-
+
\ No newline at end of file
diff --git a/resources/zib/ext-CodeSpecification.xml b/resources/zib/ext-CodeSpecification.xml
index d1e0b03a2..f6d97fb9d 100644
--- a/resources/zib/ext-CodeSpecification.xml
+++ b/resources/zib/ext-CodeSpecification.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/resources/zib/ext-FeedingPatternInfant.FeedingMethod.xml b/resources/zib/ext-FeedingPatternInfant.FeedingMethod.xml
new file mode 100644
index 000000000..f6c0c6198
--- /dev/null
+++ b/resources/zib/ext-FeedingPatternInfant.FeedingMethod.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/zib/ext-MedicalDevice.HealthProfessional.xml b/resources/zib/ext-MedicalDevice.HealthProfessional.xml
index 997243afd..898e283a3 100644
--- a/resources/zib/ext-MedicalDevice.HealthProfessional.xml
+++ b/resources/zib/ext-MedicalDevice.HealthProfessional.xml
@@ -14,7 +14,7 @@
-
+
@@ -45,13 +45,11 @@
-
-
diff --git a/resources/zib/ext-MedicalDevice.Location.xml b/resources/zib/ext-MedicalDevice.Location.xml
index b6c91efc7..7967ec8b3 100644
--- a/resources/zib/ext-MedicalDevice.Location.xml
+++ b/resources/zib/ext-MedicalDevice.Location.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/resources/zib/ext-MedicationContraIndication.ReasonClosure.xml b/resources/zib/ext-MedicationContraIndication.ReasonClosure.xml
index 90cc9a782..5e0c0f44e 100644
--- a/resources/zib/ext-MedicationContraIndication.ReasonClosure.xml
+++ b/resources/zib/ext-MedicationContraIndication.ReasonClosure.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/resources/zib/ext-Procedure.ProcedureMethod.xml b/resources/zib/ext-Procedure.ProcedureMethod.xml
index 71b71d1ea..7bf1cdddb 100644
--- a/resources/zib/ext-Procedure.ProcedureMethod.xml
+++ b/resources/zib/ext-Procedure.ProcedureMethod.xml
@@ -33,11 +33,6 @@
-
-
-
-
-
diff --git a/resources/zib/ext-SOAPReport.SOAPLineCode.xml b/resources/zib/ext-SOAPReport.SOAPLineCode.xml
index c5165b504..4d6f02ee5 100644
--- a/resources/zib/ext-SOAPReport.SOAPLineCode.xml
+++ b/resources/zib/ext-SOAPReport.SOAPLineCode.xml
@@ -9,13 +9,13 @@
-
-
-
+
+
+
-
-
+
+
@@ -44,7 +44,7 @@
-
+
diff --git a/resources/zib/ext-TimeInterval.Duration.xml b/resources/zib/ext-TimeInterval.Duration.xml
index 872055f74..8a3d55a15 100644
--- a/resources/zib/ext-TimeInterval.Duration.xml
+++ b/resources/zib/ext-TimeInterval.Duration.xml
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/resources/zib/ext-TimeInterval.Period.xml b/resources/zib/ext-TimeInterval.Period.xml
index b9f08454d..6952df1f6 100644
--- a/resources/zib/ext-TimeInterval.Period.xml
+++ b/resources/zib/ext-TimeInterval.Period.xml
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/resources/zib/fhirpkg.lock.json b/resources/zib/fhirpkg.lock.json
index d4c08da73..9b6164f15 100644
--- a/resources/zib/fhirpkg.lock.json
+++ b/resources/zib/fhirpkg.lock.json
@@ -1,9 +1,5 @@
{
-<<<<<<< HEAD
- "updated": "2021-05-04T10:30:38.7234451+02:00",
-=======
"updated": "2021-05-10T09:57:42.2770517+02:00",
->>>>>>> Added extension, healthprofrole added
"dependencies": {
"hl7.fhir.r4.core": "4.0.1"
},
diff --git a/resources/zib/package.json b/resources/zib/package.json
index 60abd7f99..a7b00b2e8 100644
--- a/resources/zib/package.json
+++ b/resources/zib/package.json
@@ -1,6 +1,6 @@
{
"name": "nictiz.fhir.nl.r4.zib2020",
- "version": "0.7.0-beta.1",
+ "version": "0.9.0-beta.1",
"homepage": "https://zibs.nl/wiki/HCIM_Release_2020(EN)",
"title": "FHIR implementation of zibs 2020",
"description": "NL package of FHIR R4 conformance resources for zib (Zorginformatiebouwstenen, Clinical Information Models) release 2020.",
diff --git a/resources/zib/pattern-GstdQuantity.xml b/resources/zib/pattern-GstdQuantity.xml
index 4f03d3a22..772c06fbd 100644
--- a/resources/zib/pattern-GstdQuantity.xml
+++ b/resources/zib/pattern-GstdQuantity.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
-
-
+
+
+
-
-
+
+
@@ -33,18 +33,20 @@
+
-
+
+
-
+
-
+
diff --git a/resources/zib/pattern-GstdSimpleQuantity.xml b/resources/zib/pattern-GstdSimpleQuantity.xml
index f2b4a29cb..0fb9c6d28 100644
--- a/resources/zib/pattern-GstdSimpleQuantity.xml
+++ b/resources/zib/pattern-GstdSimpleQuantity.xml
@@ -3,19 +3,19 @@
-
+
-
+
-
-
-
+
+
+
-
-
+
+
@@ -33,19 +33,20 @@
+
-
+
+
-
+
-
-
+
diff --git a/resources/zib/terminology/AanUitkledenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.8--20200901000000.xml b/resources/zib/terminology/AanUitkledenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.8--20200901000000.xml
new file mode 100644
index 000000000..fe6102b55
--- /dev/null
+++ b/resources/zib/terminology/AanUitkledenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.8--20200901000000.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/AdemhalingScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.1--20200901000000.xml b/resources/zib/terminology/AdemhalingScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.1--20200901000000.xml
index f85929c41..1a4be7140 100644
--- a/resources/zib/terminology/AdemhalingScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.1--20200901000000.xml
+++ b/resources/zib/terminology/AdemhalingScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.1--20200901000000.xml
@@ -1,71 +1,72 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/BadenDouchenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.10--20200901000000.xml b/resources/zib/terminology/BadenDouchenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.10--20200901000000.xml
new file mode 100644
index 000000000..3c6cc7e68
--- /dev/null
+++ b/resources/zib/terminology/BadenDouchenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.10--20200901000000.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/BepalingsMethodeCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.7.14.1--20200901000000.xml b/resources/zib/terminology/BepalingsMethodeCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.7.14.1--20200901000000.xml
new file mode 100644
index 000000000..a56117abe
--- /dev/null
+++ b/resources/zib/terminology/BepalingsMethodeCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.7.14.1--20200901000000.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/zib/terminology/BlaasCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.2--20200901000000.xml b/resources/zib/terminology/BlaasCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.2--20200901000000.xml
new file mode 100644
index 000000000..fbe064891
--- /dev/null
+++ b/resources/zib/terminology/BlaasCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.2--20200901000000.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/DarmCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.1--20200901000000.xml b/resources/zib/terminology/DarmCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.1--20200901000000.xml
new file mode 100644
index 000000000..f3afc370d
--- /dev/null
+++ b/resources/zib/terminology/DarmCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.1--20200901000000.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/EtenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.5--20200901000000.xml b/resources/zib/terminology/EtenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.5--20200901000000.xml
new file mode 100644
index 000000000..976053f1d
--- /dev/null
+++ b/resources/zib/terminology/EtenCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.4.2.5--20200901000000.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/HartslagScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.2--20200901000000.xml b/resources/zib/terminology/HartslagScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.2--20200901000000.xml
index ce2ed83ad..c296853a9 100644
--- a/resources/zib/terminology/HartslagScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.2--20200901000000.xml
+++ b/resources/zib/terminology/HartslagScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.2--20200901000000.xml
@@ -1,71 +1,72 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/HuidskleurScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.4--20200901000000.xml b/resources/zib/terminology/HuidskleurScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.4--20200901000000.xml
index 13875192a..12ed42201 100644
--- a/resources/zib/terminology/HuidskleurScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.4--20200901000000.xml
+++ b/resources/zib/terminology/HuidskleurScoreCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.16.4--20200901000000.xml
@@ -1,71 +1,72 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/zib/terminology/LateraliteitCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.20.2--20200901000000.xml b/resources/zib/terminology/LateraliteitCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.20.2--20200901000000.xml
index f4282f712..f6f3bf2ce 100644
--- a/resources/zib/terminology/LateraliteitCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.20.2--20200901000000.xml
+++ b/resources/zib/terminology/LateraliteitCodelijst-2.16.840.1.113883.2.4.3.11.60.40.2.12.20.2--20200901000000.xml
@@ -43,7 +43,7 @@
-
+
-
+