added careconnect deps, tidy diagrams, include contact via yml

NHSDigital · Mar 10, 2024 · 7768953 · 7768953
1 parent a446338
commit 7768953
Show file tree

Hide file tree

Showing 45 changed files with 127 additions and 1,707 deletions.
diff --git a/input/fsh/codesystem/CPIS-ConditionCategory.fsh b/input/fsh/codesystem/CPIS-ConditionCategory.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the category of a condition within CPIS."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/CPIS-ConditionCode.fsh b/input/fsh/codesystem/CPIS-ConditionCode.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the SNOMED-CT concept representing an Imp
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/CPIS-ConsentPurpose.fsh b/input/fsh/codesystem/CPIS-ConsentPurpose.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the purpose of the consent given within C
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/CPIS-FlagCategory.fsh b/input/fsh/codesystem/CPIS-FlagCategory.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem containing CPIS flag categories"
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/FGM-ConditionCategory.fsh b/input/fsh/codesystem/FGM-ConditionCategory.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the category of a condition within FGM."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/FGM-ConditionCode.fsh b/input/fsh/codesystem/FGM-ConditionCode.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the SNOMED-CT concept representing an Imp
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/FGM-ConsentPurpose.fsh b/input/fsh/codesystem/FGM-ConsentPurpose.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the purpose of the consent given within F
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/FGM-FlagCategory.fsh b/input/fsh/codesystem/FGM-FlagCategory.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem containing FGM flag categories"
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/FlagProxyRole.fsh b/input/fsh/codesystem/FlagProxyRole.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the type/role of the proxy involved"
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/PatientFlagCategory.fsh b/input/fsh/codesystem/PatientFlagCategory.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the type/category of Flag."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/RA-ConditionCategory.fsh b/input/fsh/codesystem/RA-ConditionCategory.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the category of a condition within Reason
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/RA-ConditionCode.fsh b/input/fsh/codesystem/RA-ConditionCode.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the SNOMED-CT concept representing an Imp
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/RA-ConsentPurpose.fsh b/input/fsh/codesystem/RA-ConsentPurpose.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the purpose of the consent given within R
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/codesystem/RA-FlagCategory.fsh b/input/fsh/codesystem/RA-FlagCategory.fsh
@@ -10,7 +10,7 @@ Description: "A CodeSystem to identify the category of the adjustments required"
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^caseSensitive = true
 * ^content = #complete

diff --git a/input/fsh/examples/0014-PatientExample1.fsh b/input/fsh/examples/0014-PatientExample1.fsh
@@ -1,7 +1,9 @@
 Instance: PatientExample1
 InstanceOf: Patient
-Title: "A simple NHS patient example"
+Title: "UKCore patient example with very basic details."
 Usage: #example
+* meta.profile = "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient"
+
 * identifier.system = "https://fhir.nhs.uk/Id/nhs-number"
 * identifier.value = "9912003888"
 * active = true

diff --git a/input/fsh/extensions/Extension-AdjustmentNotes.fsh b/input/fsh/extensions/Extension-AdjustmentNotes.fsh
@@ -10,7 +10,7 @@ Context: Flag
 * ^status = #draft
 * ^date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * value[x] 1..
 * value[x] only Annotation
diff --git a/input/fsh/extensions/Extension-ConsentCreateSummary.fsh b/input/fsh/extensions/Extension-ConsentCreateSummary.fsh
@@ -10,7 +10,7 @@ Context: Consent
 * ^status = #draft
 * ^date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * value[x] 1..
 * value[x] only Annotation
diff --git a/input/fsh/extensions/Extension-RemoveCreateSummary.fsh b/input/fsh/extensions/Extension-RemoveCreateSummary.fsh
@@ -10,7 +10,7 @@ Context: Consent
 * ^status = #draft
 * ^date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * value[x] 1..
 * value[x] only Annotation
diff --git a/input/fsh/profiles/FlagCondition.fsh b/input/fsh/profiles/FlagCondition.fsh
@@ -16,7 +16,7 @@ Description: "Record an individual condition for a flag in NHS England"
 * contained contains provenance 1..1
 * contained[provenance] only FlagProvenance
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * category ^slicing.discriminator.type = #pattern
 * category ^slicing.rules = #open

diff --git a/input/fsh/profiles/FlagConsent.fsh b/input/fsh/profiles/FlagConsent.fsh
@@ -10,7 +10,7 @@ Description: "Record consent to capture information for NHS England flags"
 * ^status = #draft
 * ^date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * extension contains
     Extension-ConsentCreateSummary named createSummary 0..1 and

diff --git a/input/fsh/profiles/FlagProvenance.fsh b/input/fsh/profiles/FlagProvenance.fsh
@@ -10,7 +10,7 @@ Description: "Record details of the practitioner recording or removing an indivi
 * ^status = #draft
 * ^date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * target only Reference(FlagCondition or FlagConsent or ProgrammeFlag or PatientFlag)
 * agent.role from $ValueSetFlagProvenanceRole (extensible)

diff --git a/input/fsh/profiles/PatientFlag.fsh b/input/fsh/profiles/PatientFlag.fsh
@@ -10,7 +10,7 @@ Description: "Record whether a Patient Flags exists"
 * ^status = #draft
 * ^date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * extension contains
     Extension-FlagNotes named flagNotes 0..1 and

diff --git a/input/fsh/profiles/ProgrammeFlag.fsh b/input/fsh/profiles/ProgrammeFlag.fsh
@@ -10,7 +10,7 @@ Description: "Record an individual flag for an NHS England programme."
 * ^status = #draft
 * ^date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * extension contains
     Extension-FlagNotes named flagNotes 0..1 

diff --git a/.../NHSEngland-PublisherContactCopyright.fsh → input/fsh/rulesets/NHSEngland-Copyright.fsh b/.../NHSEngland-PublisherContactCopyright.fsh → input/fsh/rulesets/NHSEngland-Copyright.fsh
@@ -1,16 +1,2 @@
-RuleSet: NHSEngland-PublisherContactCopyright
-* ^publisher = "NHS England"
-* ^contact[0].name = "NHS England"
-* ^contact[=].telecom[0].system = #email
-* ^contact[=].telecom[=].value = "[email protected]"
-* ^contact[=].telecom[=].use = #work
-* ^contact[=].telecom[=].rank = 1
-* ^copyright = "Copyright © 2023+ NHS England Licensed under the Apache License, Version 2.0 (the \\\"License\\\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \\\"AS IS\\\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at  https://www.hl7.org/fhir/license.html."
-
-RuleSet: NHSEngland-PublisherContactCopyright-Instance
-* publisher = "NHS England"
-* contact[0].name = "NHS England"
-* contact[=].telecom[0].system = #email
-* contact[=].telecom[=].value = "[email protected]"
-* contact[=].telecom[=].use = #work
-* contact[=].telecom[=].rank = 1
+RuleSet: NHSEngland-Copyright
+* ^copyright = "Copyright © 2024+ NHS England Licensed under the Apache License, Version 2.0 (the \\\"License\\\"); you may not use this file except in compliance with the License. You may obtain a copy of the License at  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \\\"AS IS\\\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at  https://www.hl7.org/fhir/license.html."
diff --git a/input/fsh/searchparameter/FlagCategory.fsh b/input/fsh/searchparameter/FlagCategory.fsh
@@ -10,8 +10,6 @@ Description: "Search by category in the Flag resource"
 * status = #active
 * date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright-Instance
-
 * code = #category
 * base = #Flag
 * type = #token

diff --git a/input/fsh/searchparameter/FlagCode.fsh b/input/fsh/searchparameter/FlagCode.fsh
@@ -10,8 +10,6 @@ Description: "Search by code in the Flag resource"
 * status = #active
 * date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright-Instance
-
 * code = #code
 * base = #Flag
 * type = #token

diff --git a/input/fsh/searchparameter/FlagDetail.fsh b/input/fsh/searchparameter/FlagDetail.fsh
@@ -10,8 +10,6 @@ Description: "Search for Condition, Flag or Consent resources referenced in flag
 * status = #active
 * date = "2024-02-14"
 
-* insert NHSEngland-PublisherContactCopyright-Instance
-
 * code = #detail
 * base = #Flag
 * type = #reference

diff --git a/input/fsh/valuesets/CPIS-FlagCode.fsh b/input/fsh/valuesets/CPIS-FlagCode.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet containing flag codes for the Child Protection Informat
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "http://snomed.info/sct"

diff --git a/input/fsh/valuesets/FGM-FlagCode.fsh b/input/fsh/valuesets/FGM-FlagCode.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet containing flag codes for the Female Genital Mutilation
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "http://snomed.info/sct"

diff --git a/input/fsh/valuesets/FlagConditionCategory.fsh b/input/fsh/valuesets/FlagConditionCategory.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet to identify the category of a condition."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCategory"

diff --git a/input/fsh/valuesets/FlagConditionCode.fsh b/input/fsh/valuesets/FlagConditionCode.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet to identify a condition."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode"

diff --git a/input/fsh/valuesets/FlagConsentPurpose.fsh b/input/fsh/valuesets/FlagConsentPurpose.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet to identify the purpose of a consent given for an NHS E
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConsentPurpose"

diff --git a/input/fsh/valuesets/FlagProxyRole.fsh b/input/fsh/valuesets/FlagProxyRole.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet to identify the type/role of the proxy involved."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/FlagProxyRole"

diff --git a/input/fsh/valuesets/PatientFlagCategory.fsh b/input/fsh/valuesets/PatientFlagCategory.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet to identify the type/category of a flag."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/PatientFlagCategory"

diff --git a/input/fsh/valuesets/ProgrammeFlagCategory.fsh b/input/fsh/valuesets/ProgrammeFlagCategory.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet to identify the flag category."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory"

diff --git a/input/fsh/valuesets/ProgrammeFlagCode.fsh b/input/fsh/valuesets/ProgrammeFlagCode.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet containing flag codes for the NHS England Programmes."
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * codes from system $ValueSetRAFlagCode
 * codes from system $ValueSetCPISFlagCode

diff --git a/input/fsh/valuesets/RA-FlagCode.fsh b/input/fsh/valuesets/RA-FlagCode.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet containing flag codes for the Reasonable Adjustments NH
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * ^expansion.timestamp = "2024-02-14T12:00:00+00:00"
 * ^expansion.contains[0].system = "http://snomed.info/sct"

diff --git a/input/fsh/valuesets/RA-ProvenanceRole.fsh b/input/fsh/valuesets/RA-ProvenanceRole.fsh
@@ -10,7 +10,7 @@ Description: "A ValueSet to identify the role in which someone recording provena
 * ^date = "2024-02-14"
 * ^experimental = false
 
-* insert NHSEngland-PublisherContactCopyright
+* insert NHSEngland-Copyright
 
 * $CareConnect-SDSJobRoleName-1#R0010 "Medical Director"
 * $CareConnect-SDSJobRoleName-1#R0020 "Clinical Director - Medical"