From 855f1c86a1ab8a06336413bab1e74546abe9fd4a Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Thu, 7 Mar 2024 10:20:13 +0000 Subject: [PATCH 01/14] generalised flag profiles --- input/fsh/aliases.fsh | 2 +- .../codesystem/CPIS-AdjustmentCategory.fsh | 17 +++++++ .../fsh/codesystem/FGM-AdjustmentCategory.fsh | 17 +++++++ ...stmentCategory.fsh => RA-FlagCategory.fsh} | 6 +-- ...AddConditionTransactionExample1-bundle.fsh | 2 +- ...AddConditionTransactionExample2-bundle.fsh | 4 +- ...agExample1.fsh => 0016-RAFlagExample1.fsh} | 4 +- ...agExample2.fsh => 0018-RAFlagExample2.fsh} | 4 +- input/fsh/profiles/MasterFlag.fsh | 4 +- ...A-AdjustmentFlag.fsh => ProgrammeFlag.fsh} | 14 +++--- input/fsh/profiles/RA-Provenance.fsh | 2 +- ...Category.fsh => ProgrammeFlagCategory.fsh} | 44 +++++++++++-------- .../add-reasonable-adjustment-record.md | 4 +- 13 files changed, 83 insertions(+), 41 deletions(-) create mode 100644 input/fsh/codesystem/CPIS-AdjustmentCategory.fsh create mode 100644 input/fsh/codesystem/FGM-AdjustmentCategory.fsh rename input/fsh/codesystem/{RA-AdjustmentCategory.fsh => RA-FlagCategory.fsh} (87%) rename input/fsh/examples/{0016-AdjustmentFlagExample1.fsh => 0016-RAFlagExample1.fsh} (90%) rename input/fsh/examples/{0018-AdjustmentFlagExample2.fsh => 0018-RAFlagExample2.fsh} (90%) rename input/fsh/profiles/{RA-AdjustmentFlag.fsh => ProgrammeFlag.fsh} (62%) rename input/fsh/valuesets/{RA-AdjustmentCategory.fsh => ProgrammeFlagCategory.fsh} (69%) diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh index 5fa43d2..1918960 100644 --- a/input/fsh/aliases.fsh +++ b/input/fsh/aliases.fsh @@ -15,7 +15,7 @@ Alias: $CareConnect-SDSJobRoleName-1 = https://fhir.hl7.org.uk/STU3/CodeSystem/C Alias: $ValueSetRAConditionCategory = https://fhir.nhs.uk/England/ValueSet/RA-ConditionCategory Alias: $ValueSetRAConditionCode = https://fhir.nhs.uk/England/ValueSet/RA-ConditionCode Alias: $ValueSetPatientFlagCategory = https://fhir.nhs.uk/England/ValueSet/PatientFlagCategory -Alias: $ValueSetRAAdjustmentCategory = https://fhir.nhs.uk/England/ValueSet/RA-AdjustmentCategory +Alias: $ValueSetProgrammeFlagCategory = https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCategory Alias: $ValueSetRAFlagCode = https://fhir.nhs.uk/England/ValueSet/RA-FlagCode Alias: $ExtensionFlagDetail = http://hl7.org/fhir/StructureDefinition/flag-detail Alias: $ValueSetRAProvenanceRole = https://fhir.nhs.uk/England/ValueSet/RA-ProvenanceRole diff --git a/input/fsh/codesystem/CPIS-AdjustmentCategory.fsh b/input/fsh/codesystem/CPIS-AdjustmentCategory.fsh new file mode 100644 index 0000000..cf7f1c9 --- /dev/null +++ b/input/fsh/codesystem/CPIS-AdjustmentCategory.fsh @@ -0,0 +1,17 @@ +CodeSystem: CPIS-FlagCategory +Id: CPIS-FlagCategory +Title: "CPIS Flag Category" +Description: "A CodeSystem containing CPIS flag categories" + +* ^name = "CPISFlagCategory" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-FlagCategory" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #001 "Example CPIS category" diff --git a/input/fsh/codesystem/FGM-AdjustmentCategory.fsh b/input/fsh/codesystem/FGM-AdjustmentCategory.fsh new file mode 100644 index 0000000..c0f72bb --- /dev/null +++ b/input/fsh/codesystem/FGM-AdjustmentCategory.fsh @@ -0,0 +1,17 @@ +CodeSystem: FGM-FlagCategory +Id: FGM-FlagCategory +Title: "FGM Flag Category" +Description: "A CodeSystem containing FGM flag categories" + +* ^name = "CPISFlagCategory" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-FlagCategory" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #001 "Example FGM category" diff --git a/input/fsh/codesystem/RA-AdjustmentCategory.fsh b/input/fsh/codesystem/RA-FlagCategory.fsh similarity index 87% rename from input/fsh/codesystem/RA-AdjustmentCategory.fsh rename to input/fsh/codesystem/RA-FlagCategory.fsh index 7aabecc..2d7bf6d 100644 --- a/input/fsh/codesystem/RA-AdjustmentCategory.fsh +++ b/input/fsh/codesystem/RA-FlagCategory.fsh @@ -1,10 +1,10 @@ -CodeSystem: RA-AdjustmentCategory -Id: RA-AdjustmentCategory +CodeSystem: RA-FlagCategory +Id: RA-FlagCategory Title: "Reasonable Adjustments Record Adjustment Category" Description: "A CodeSystem to identify the category of the Adjustment required" * ^name = "ReasonableAdjustmentsCategory" -* ^url = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" diff --git a/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh b/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh index e8c9468..66ecc78 100644 --- a/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh +++ b/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh @@ -19,6 +19,6 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Flag/fba99f70-fe1d-42e2-b77a-916e44b53c19" * entry[+].fullUrl = "urn:uuid:04adcb5b-3de7-4f67-97f0-b2fdf941ba85" -* entry[=].resource = AdjustmentFlagExample1 +* entry[=].resource = RAFlagExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Flag/04adcb5b-3de7-4f67-97f0-b2fdf941ba85" diff --git a/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh b/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh index adebf29..762e3ef 100644 --- a/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh +++ b/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh @@ -19,7 +19,7 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Flag/fba99f70-fe1d-42e2-b77a-916e44b53c19" * entry[+].fullUrl = "urn:uuid:04adcb5b-3de7-4f67-97f0-b2fdf941ba85" -* entry[=].resource = AdjustmentFlagExample1 +* entry[=].resource = RAFlagExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Flag/04adcb5b-3de7-4f67-97f0-b2fdf941ba85" * entry[+].fullUrl = "urn:uuid:b19124e9-f742-49b4-9247-5c2d58ac1ef4" @@ -27,6 +27,6 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Condition/b19124e9-f742-49b4-9247-5c2d58ac1ef4" * entry[+].fullUrl = "urn:uuid:212c1018-f52a-4db7-9bc2-59a88622eb4f" -* entry[=].resource = AdjustmentFlagExample2 +* entry[=].resource = RAFlagExample2 * entry[=].request.method = #PUT * entry[=].request.url = "Flag/212c1018-f52a-4db7-9bc2-59a88622eb4f" diff --git a/input/fsh/examples/0016-AdjustmentFlagExample1.fsh b/input/fsh/examples/0016-RAFlagExample1.fsh similarity index 90% rename from input/fsh/examples/0016-AdjustmentFlagExample1.fsh rename to input/fsh/examples/0016-RAFlagExample1.fsh index 821b44f..ac742cb 100644 --- a/input/fsh/examples/0016-AdjustmentFlagExample1.fsh +++ b/input/fsh/examples/0016-RAFlagExample1.fsh @@ -1,11 +1,11 @@ -Instance: AdjustmentFlagExample1 +Instance: RAFlagExample1 InstanceOf: Flag Usage: #example * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" * extension[=].valueAnnotation.text = "Example of flag notes extension text in adjustment flag" * status = #active * category[0] = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" -* category[+] = RA-AdjustmentCategory#001 "Communication support" +* category[+] = RA-FlagCategory#001 "Communication support" * code = $sct#1082681000000103 "Requires support for receptive communication needs" * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" diff --git a/input/fsh/examples/0018-AdjustmentFlagExample2.fsh b/input/fsh/examples/0018-RAFlagExample2.fsh similarity index 90% rename from input/fsh/examples/0018-AdjustmentFlagExample2.fsh rename to input/fsh/examples/0018-RAFlagExample2.fsh index 5d348da..6bc6b8e 100644 --- a/input/fsh/examples/0018-AdjustmentFlagExample2.fsh +++ b/input/fsh/examples/0018-RAFlagExample2.fsh @@ -1,11 +1,11 @@ -Instance: AdjustmentFlagExample2 +Instance: RAFlagExample2 InstanceOf: Flag Usage: #example * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" * extension[=].valueAnnotation.text = "Example of adjustment notes extension text in adjustment flag" * status = #active * category[0] = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" -* category[+] = RA-AdjustmentCategory#011 "Bespoke Reasonable adjustments" +* category[+] = RA-FlagCategory#011 "Bespoke Reasonable adjustments" * code = $sct#73618009 "Autistic spectrum disorder with isolated skills" * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" diff --git a/input/fsh/profiles/MasterFlag.fsh b/input/fsh/profiles/MasterFlag.fsh index 78d48d3..014c804 100644 --- a/input/fsh/profiles/MasterFlag.fsh +++ b/input/fsh/profiles/MasterFlag.fsh @@ -1,7 +1,7 @@ Profile: MasterFlag Parent: Flag Id: MasterFlag -Title: "Patient Master Flag Profile" +Title: "NHS England Patient Master Flag Profile" Description: "To record whether a Patient Flags exists" * ^name = "MasterFlag" @@ -19,7 +19,7 @@ Description: "To record whether a Patient Flags exists" * extension[flagNotes].value[x] only Annotation * extension[flagNotes].valueAnnotation 1.. -* extension[flagDetail].valueReference only Reference(RA-AdjustmentFlag or RA-Consent or RA-Provenance) +* extension[flagDetail].valueReference only Reference(ProgrammeFlag or RA-Consent or RA-Provenance) * contained ^slicing.discriminator.type = #profile * contained ^slicing.rules = #open diff --git a/input/fsh/profiles/RA-AdjustmentFlag.fsh b/input/fsh/profiles/ProgrammeFlag.fsh similarity index 62% rename from input/fsh/profiles/RA-AdjustmentFlag.fsh rename to input/fsh/profiles/ProgrammeFlag.fsh index 11554dd..f2ea4d2 100644 --- a/input/fsh/profiles/RA-AdjustmentFlag.fsh +++ b/input/fsh/profiles/ProgrammeFlag.fsh @@ -1,11 +1,11 @@ -Profile: RA-AdjustmentFlag +Profile: ProgrammeFlag Parent: Flag -Id: RA-AdjustmentFlag -Title: "Reasonable Adjustments Flag Profile" -Description: "To (optionally) record an individual Adjustment for a Reasonable Adjustment Flag" +Id: ProgrammeFlag +Title: "NHS England Programme Flag Profile" +Description: "Record an individual flag for an NHS England programme." -* ^name = "ReasonableAdjustmentsFlag" -* ^url = "https://fhir.nhs.uk/England/StructureDefinition/RA-AdjustmentFlag" +* ^name = "ProgrammeFlag" +* ^url = "https://fhir.nhs.uk/England/StructureDefinition/ProgrammeFlag" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" @@ -26,7 +26,7 @@ Description: "To (optionally) record an individual Adjustment for a Reasonable A * category[masterFlag] from $ValueSetPatientFlagCategory (required) * category contains adjustmentFlag 1.. MS -* category[adjustmentFlag] from $ValueSetRAAdjustmentCategory (required) +* category[adjustmentFlag] from $ValueSetProgrammeFlagCategory (required) * code MS * code from $ValueSetRAFlagCode (extensible) diff --git a/input/fsh/profiles/RA-Provenance.fsh b/input/fsh/profiles/RA-Provenance.fsh index 16cb5f0..dfa2d78 100644 --- a/input/fsh/profiles/RA-Provenance.fsh +++ b/input/fsh/profiles/RA-Provenance.fsh @@ -12,7 +12,7 @@ Description: "To record details of the practitioner recording or removing an ind * insert NHSEngland-PublisherContactCopyright -* target only Reference(Condition or RA-Consent or RA-AdjustmentFlag or MasterFlag) +* target only Reference(Condition or RA-Consent or ProgrammeFlag or MasterFlag) * agent.role from $ValueSetRAProvenanceRole (extensible) * agent.who only Reference(Practitioner) * agent.onBehalfOf only Reference(Organization) diff --git a/input/fsh/valuesets/RA-AdjustmentCategory.fsh b/input/fsh/valuesets/ProgrammeFlagCategory.fsh similarity index 69% rename from input/fsh/valuesets/RA-AdjustmentCategory.fsh rename to input/fsh/valuesets/ProgrammeFlagCategory.fsh index 25db3c2..c7784d6 100644 --- a/input/fsh/valuesets/RA-AdjustmentCategory.fsh +++ b/input/fsh/valuesets/ProgrammeFlagCategory.fsh @@ -1,10 +1,10 @@ -ValueSet: RA-AdjustmentCategory -Id: RA-AdjustmentCategory -Title: "Reasonable Adjustments Record Adjustment Category" -Description: "A ValueSet to identify the category of a Reasonable Adjustment" +ValueSet: ProgrammeFlagCategory +Id: ProgrammeFlagCategory +Title: "Programme Flag Category" +Description: "A ValueSet to identify the flag category of an NHS England programme" -* ^name = "ReasonableAdjustmentsCategory" -* ^url = "https://fhir.nhs.uk/England/ValueSet/RA-AdjustmentCategory" +* ^name = "ProgrammeFlagCategory" +* ^url = "https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCategory" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" @@ -13,36 +13,44 @@ Description: "A ValueSet to identify the category of a Reasonable Adjustment" * insert NHSEngland-PublisherContactCopyright * ^expansion.timestamp = "2024-02-14T12:00:00+00:00" -* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #001 * ^expansion.contains[=].display = "Communication support" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #002 * ^expansion.contains[=].display = "Requires communication professional" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #003 * ^expansion.contains[=].display = "Requires specific contact method" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #004 * ^expansion.contains[=].display = "Requires specific information format" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #005 * ^expansion.contains[=].display = "Additional communication needs and support" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #006 * ^expansion.contains[=].display = "Community Language Support" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #007 * ^expansion.contains[=].display = "Adjustments for providing Additional Support to patients" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #008 * ^expansion.contains[=].display = "Adjustments for Individual Care Requirements" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #009 * ^expansion.contains[=].display = "Adjustments in relation to the environment of care" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #010 * ^expansion.contains[=].display = "Adjustments to support Additional needs" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-AdjustmentCategory" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" * ^expansion.contains[=].code = #011 -* ^expansion.contains[=].display = "Bespoke Reasonable adjustments" \ No newline at end of file +* ^expansion.contains[=].display = "Bespoke Reasonable adjustments" + +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/CPIS-FlagCategory" +* ^expansion.contains[=].code = #001 +* ^expansion.contains[=].display = "Example CPIS category" + +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/FGM-FlagCategory" +* ^expansion.contains[=].code = #001 +* ^expansion.contains[=].display = "Example FGM category" \ No newline at end of file diff --git a/input/pagecontent/add-reasonable-adjustment-record.md b/input/pagecontent/add-reasonable-adjustment-record.md index b2441bd..c961af9 100644 --- a/input/pagecontent/add-reasonable-adjustment-record.md +++ b/input/pagecontent/add-reasonable-adjustment-record.md @@ -109,13 +109,13 @@ A transaction Bundle is also given that allows these resources (plus the patient * [Consent](Consent-ConsentExample1.html) * [Master flag](Flag-MasterFlagExample1.html) -* [Adjustment flag 1](Flag-AdjustmentFlagExample1.html) +* [Adjustment flag 1](Flag-RAFlagExample1.html) * [Condition 1](Condition-ConditionExample1.html) * [Transaction Bundle 1](Bundle-AddConditionTransactionExample1.html) The following set of examples are for the same patient, and constitute an addition flag and condition. The transaction Bundle here illustates an idempotent update by simply adding the new resources to the first transaction Bundle. -* [Adjustment flag 2](Flag-AdjustmentFlagExample2.html) +* [Adjustment flag 2](Flag-RAFlagExample2.html) * [Condition 2](Condition-ConditionExample2.html) * [Transaction Bundle 2](Bundle-AddConditionTransactionExample2.html) From 965ff0d181524cfb239a019953d7816e9d350607 Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Thu, 7 Mar 2024 10:21:50 +0000 Subject: [PATCH 02/14] generalised flag profiles --- .../{CPIS-AdjustmentCategory.fsh => CPIS-FlagCategory.fsh} | 0 .../{FGM-AdjustmentCategory.fsh => FGM-FlagCategory.fsh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename input/fsh/codesystem/{CPIS-AdjustmentCategory.fsh => CPIS-FlagCategory.fsh} (100%) rename input/fsh/codesystem/{FGM-AdjustmentCategory.fsh => FGM-FlagCategory.fsh} (100%) diff --git a/input/fsh/codesystem/CPIS-AdjustmentCategory.fsh b/input/fsh/codesystem/CPIS-FlagCategory.fsh similarity index 100% rename from input/fsh/codesystem/CPIS-AdjustmentCategory.fsh rename to input/fsh/codesystem/CPIS-FlagCategory.fsh diff --git a/input/fsh/codesystem/FGM-AdjustmentCategory.fsh b/input/fsh/codesystem/FGM-FlagCategory.fsh similarity index 100% rename from input/fsh/codesystem/FGM-AdjustmentCategory.fsh rename to input/fsh/codesystem/FGM-FlagCategory.fsh From 625fe85c2b2c5a82c16361799f015ed73533bb3f Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Thu, 7 Mar 2024 10:28:12 +0000 Subject: [PATCH 03/14] generalised flag profiles --- .../examples/0003-AddConditionTransactionExample1-bundle.fsh | 2 +- .../examples/0004-AddConditionTransactionExample2-bundle.fsh | 2 +- input/fsh/examples/0015-MasterFlagExample1.fsh | 2 +- input/pagecontent/add-reasonable-adjustment-record.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh b/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh index 66ecc78..f66767c 100644 --- a/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh +++ b/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh @@ -15,7 +15,7 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Condition?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:fba99f70-fe1d-42e2-b77a-916e44b53c19" -* entry[=].resource = MasterFlagExample1 +* entry[=].resource = RAMasterFlagExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Flag/fba99f70-fe1d-42e2-b77a-916e44b53c19" * entry[+].fullUrl = "urn:uuid:04adcb5b-3de7-4f67-97f0-b2fdf941ba85" diff --git a/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh b/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh index 762e3ef..0e59726 100644 --- a/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh +++ b/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh @@ -15,7 +15,7 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Condition?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:fba99f70-fe1d-42e2-b77a-916e44b53c19" -* entry[=].resource = MasterFlagExample1 +* entry[=].resource = RAMasterFlagExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Flag/fba99f70-fe1d-42e2-b77a-916e44b53c19" * entry[+].fullUrl = "urn:uuid:04adcb5b-3de7-4f67-97f0-b2fdf941ba85" diff --git a/input/fsh/examples/0015-MasterFlagExample1.fsh b/input/fsh/examples/0015-MasterFlagExample1.fsh index f7c22b5..7bccfea 100644 --- a/input/fsh/examples/0015-MasterFlagExample1.fsh +++ b/input/fsh/examples/0015-MasterFlagExample1.fsh @@ -1,4 +1,4 @@ -Instance: MasterFlagExample1 +Instance: RAMasterFlagExample1 InstanceOf: Flag Usage: #example * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" diff --git a/input/pagecontent/add-reasonable-adjustment-record.md b/input/pagecontent/add-reasonable-adjustment-record.md index c961af9..19a7071 100644 --- a/input/pagecontent/add-reasonable-adjustment-record.md +++ b/input/pagecontent/add-reasonable-adjustment-record.md @@ -108,7 +108,7 @@ The following set of examples constitute the individual associated resources wit A transaction Bundle is also given that allows these resources (plus the patient) to be entered in an atomic traction. It uses PUTs, where in the case of an intial update, it may be done as a [conditional update](https://www.hl7.org/fhir/http.html#cond-update) * [Consent](Consent-ConsentExample1.html) -* [Master flag](Flag-MasterFlagExample1.html) +* [Master flag](Flag-RAMasterFlagExample1.html) * [Adjustment flag 1](Flag-RAFlagExample1.html) * [Condition 1](Condition-ConditionExample1.html) * [Transaction Bundle 1](Bundle-AddConditionTransactionExample1.html) From 2e17a6f8fa0f5327fb2599749ad85e732e2867df Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Thu, 7 Mar 2024 10:29:16 +0000 Subject: [PATCH 04/14] generalised flag profiles --- ...{0015-MasterFlagExample1.fsh => 0015-RAMasterFlagExample1.fsh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename input/fsh/examples/{0015-MasterFlagExample1.fsh => 0015-RAMasterFlagExample1.fsh} (100%) diff --git a/input/fsh/examples/0015-MasterFlagExample1.fsh b/input/fsh/examples/0015-RAMasterFlagExample1.fsh similarity index 100% rename from input/fsh/examples/0015-MasterFlagExample1.fsh rename to input/fsh/examples/0015-RAMasterFlagExample1.fsh From b421558f668e60d2ac36401737a91e0042e031c2 Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Thu, 7 Mar 2024 14:41:56 +0000 Subject: [PATCH 05/14] generalise condition, fix refs and names --- ...0005-add-ra-record-transaction-example.md} | 0 ...0006-add-ra-record-transaction-example.md} | 0 ...0007-add-ra-record-transaction-example.md} | 0 input/fsh/aliases.fsh | 9 +++-- .../fsh/codesystem/CPIS-ConditionCategory.fsh | 17 ++++++++ input/fsh/codesystem/CPIS-ConditionCode.fsh | 17 ++++++++ .../fsh/codesystem/FGM-ConditionCategory.fsh | 17 ++++++++ input/fsh/codesystem/FGM-ConditionCode.fsh | 17 ++++++++ input/fsh/codesystem/PatientFlagCategory.fsh | 2 +- input/fsh/codesystem/RA-ConditionCategory.fsh | 2 +- ...AddRARecordTransactionExample1-bundle.fsh} | 7 ++-- ...AddRARecordTransactionExample2-bundle.fsh} | 9 +++-- .../examples/0012-RemoveRARecordExample.fsh | 5 ++- ...xample1.fsh => 0013-RAConsentExample1.fsh} | 3 +- input/fsh/examples/0014-PatientExample1.fsh | 1 + .../examples/0015-RAMasterFlagExample1.fsh | 1 + input/fsh/examples/0016-RAFlagExample1.fsh | 1 + ...mple1.fsh => 0017-RAConditionExample1.fsh} | 3 +- input/fsh/examples/0018-RAFlagExample2.fsh | 1 + ...mple2.fsh => 0019-RAConditionExample2.fsh} | 3 +- input/fsh/profiles/FlagCondition.fsh | 32 +++++++++++++++ input/fsh/profiles/ProgrammeFlag.fsh | 12 +++--- input/fsh/profiles/RA-Condition.fsh | 24 ----------- input/fsh/searchparameter/FlagDetail.fsh | 4 +- input/fsh/valuesets/CPIS-FlagCode.fsh | 17 ++++++++ input/fsh/valuesets/FGM-FlagCode.fsh | 17 ++++++++ ...Category.fsh => FlagConditionCategory.fsh} | 16 ++++++-- ...onditionCode.fsh => FlagConditionCode.fsh} | 40 +++++++++++-------- input/fsh/valuesets/PatientFlagCategory.fsh | 2 +- input/fsh/valuesets/ProgrammeFlagCategory.fsh | 2 +- input/fsh/valuesets/ProgrammeFlagCode.fsh | 17 ++++++++ input/fsh/valuesets/RA-FlagCode.fsh | 2 +- input/fsh/valuesets/RA-ProvenanceRole.fsh | 2 +- .../add-reasonable-adjustment-record.md | 10 ++--- .../consent-to-share-information.md | 2 +- input/pagecontent/retrieve-ra-record.md | 8 ++-- input/pagecontent/server-examples.md | 12 +++--- 37 files changed, 245 insertions(+), 89 deletions(-) rename input/ci/queries/{0005-add-condition-transaction-example.md => 0005-add-ra-record-transaction-example.md} (100%) rename input/ci/queries/{0006-add-condition-transaction-example.md => 0006-add-ra-record-transaction-example.md} (100%) rename input/ci/queries/{0007-add-condition-transaction-example.md => 0007-add-ra-record-transaction-example.md} (100%) create mode 100644 input/fsh/codesystem/CPIS-ConditionCategory.fsh create mode 100644 input/fsh/codesystem/CPIS-ConditionCode.fsh create mode 100644 input/fsh/codesystem/FGM-ConditionCategory.fsh create mode 100644 input/fsh/codesystem/FGM-ConditionCode.fsh rename input/fsh/examples/{0003-AddConditionTransactionExample1-bundle.fsh => 0003-AddRARecordTransactionExample1-bundle.fsh} (85%) rename input/fsh/examples/{0004-AddConditionTransactionExample2-bundle.fsh => 0004-AddRARecordTransactionExample2-bundle.fsh} (85%) rename input/fsh/examples/{0013-ConsentExample1.fsh => 0013-RAConsentExample1.fsh} (93%) rename input/fsh/examples/{0017-ConditionExample1.fsh => 0017-RAConditionExample1.fsh} (88%) rename input/fsh/examples/{0019-ConditionExample2.fsh => 0019-RAConditionExample2.fsh} (90%) create mode 100644 input/fsh/profiles/FlagCondition.fsh delete mode 100644 input/fsh/profiles/RA-Condition.fsh create mode 100644 input/fsh/valuesets/CPIS-FlagCode.fsh create mode 100644 input/fsh/valuesets/FGM-FlagCode.fsh rename input/fsh/valuesets/{RA-ConditionCategory.fsh => FlagConditionCategory.fsh} (67%) rename input/fsh/valuesets/{RA-ConditionCode.fsh => FlagConditionCode.fsh} (72%) create mode 100644 input/fsh/valuesets/ProgrammeFlagCode.fsh diff --git a/input/ci/queries/0005-add-condition-transaction-example.md b/input/ci/queries/0005-add-ra-record-transaction-example.md similarity index 100% rename from input/ci/queries/0005-add-condition-transaction-example.md rename to input/ci/queries/0005-add-ra-record-transaction-example.md diff --git a/input/ci/queries/0006-add-condition-transaction-example.md b/input/ci/queries/0006-add-ra-record-transaction-example.md similarity index 100% rename from input/ci/queries/0006-add-condition-transaction-example.md rename to input/ci/queries/0006-add-ra-record-transaction-example.md diff --git a/input/ci/queries/0007-add-condition-transaction-example.md b/input/ci/queries/0007-add-ra-record-transaction-example.md similarity index 100% rename from input/ci/queries/0007-add-condition-transaction-example.md rename to input/ci/queries/0007-add-ra-record-transaction-example.md diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh index 1918960..8092c06 100644 --- a/input/fsh/aliases.fsh +++ b/input/fsh/aliases.fsh @@ -12,10 +12,13 @@ Alias: $ParticipationFunction = http://terminology.hl7.org/CodeSystem/v3-Partici Alias: $ParticipationType = http://terminology.hl7.org/CodeSystem/v3-ParticipationType Alias: $extra-security-role-type = http://terminology.hl7.org/CodeSystem/extra-security-role-type Alias: $CareConnect-SDSJobRoleName-1 = https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-SDSJobRoleName-1 -Alias: $ValueSetRAConditionCategory = https://fhir.nhs.uk/England/ValueSet/RA-ConditionCategory -Alias: $ValueSetRAConditionCode = https://fhir.nhs.uk/England/ValueSet/RA-ConditionCode Alias: $ValueSetPatientFlagCategory = https://fhir.nhs.uk/England/ValueSet/PatientFlagCategory Alias: $ValueSetProgrammeFlagCategory = https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCategory -Alias: $ValueSetRAFlagCode = https://fhir.nhs.uk/England/ValueSet/RA-FlagCode Alias: $ExtensionFlagDetail = http://hl7.org/fhir/StructureDefinition/flag-detail Alias: $ValueSetRAProvenanceRole = https://fhir.nhs.uk/England/ValueSet/RA-ProvenanceRole +Alias: $ValueSetRAFlagCode = https://fhir.nhs.uk/England/ValueSet/RA-FlagCode +Alias: $ValueSetCPISFlagCode = https://fhir.nhs.uk/England/ValueSet/CPIS-FlagCode +Alias: $ValueSetFGMFlagCode = https://fhir.nhs.uk/England/ValueSet/FGM-FlagCode +Alias: $ValueSetProgrammeFlagCode = https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCode +Alias: $ValueSetFlagConditionCategory = https://fhir.nhs.uk/England/ValueSet/FlagConditionCategory +Alias: $ValueSetFlagConditionCode = https://fhir.nhs.uk/England/ValueSet/FlagConditionCode \ No newline at end of file diff --git a/input/fsh/codesystem/CPIS-ConditionCategory.fsh b/input/fsh/codesystem/CPIS-ConditionCategory.fsh new file mode 100644 index 0000000..3c111d2 --- /dev/null +++ b/input/fsh/codesystem/CPIS-ConditionCategory.fsh @@ -0,0 +1,17 @@ +CodeSystem: CPIS-ConditionCategory +Id: CPIS-ConditionCategory +Title: "CPIS Condition Category" +Description: "A CodeSystem to identify the category of a condition within CPIS." + +* ^name = "ReasonableAdjustmentsConditionCategory" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConditionCategory" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #cpis-example-condition-category "CPIS example condition category" \ No newline at end of file diff --git a/input/fsh/codesystem/CPIS-ConditionCode.fsh b/input/fsh/codesystem/CPIS-ConditionCode.fsh new file mode 100644 index 0000000..4ca3d13 --- /dev/null +++ b/input/fsh/codesystem/CPIS-ConditionCode.fsh @@ -0,0 +1,17 @@ +CodeSystem: CPIS-ConditionCode +Id: CPIS-ConditionCode +Title: "CPIS Condition Code" +Description: "A CodeSystem to identify the SNOMED-CT concept representing an Impairment recorded as part of CPIS" + +* ^name = "CPISConditionCode" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConditionCode" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #1 "CPIS example condition code" \ No newline at end of file diff --git a/input/fsh/codesystem/FGM-ConditionCategory.fsh b/input/fsh/codesystem/FGM-ConditionCategory.fsh new file mode 100644 index 0000000..62df01a --- /dev/null +++ b/input/fsh/codesystem/FGM-ConditionCategory.fsh @@ -0,0 +1,17 @@ +CodeSystem: FGM-ConditionCategory +Id: FGM-ConditionCategory +Title: "FGM Condition Category" +Description: "A CodeSystem to identify the category of a condition within FGM." + +* ^name = "ReasonableAdjustmentsConditionCategory" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConditionCategory" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #fgm-example-condition-category "FGM example condition category" \ No newline at end of file diff --git a/input/fsh/codesystem/FGM-ConditionCode.fsh b/input/fsh/codesystem/FGM-ConditionCode.fsh new file mode 100644 index 0000000..e7115f3 --- /dev/null +++ b/input/fsh/codesystem/FGM-ConditionCode.fsh @@ -0,0 +1,17 @@ +CodeSystem: FGM-ConditionCode +Id: FGM-ConditionCode +Title: "FGM Condition Code" +Description: "A CodeSystem to identify the SNOMED-CT concept representing an Impairment recorded as part of FGM" + +* ^name = "FGMConditionCode" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConditionCode" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #1 "FGM example condition code" \ No newline at end of file diff --git a/input/fsh/codesystem/PatientFlagCategory.fsh b/input/fsh/codesystem/PatientFlagCategory.fsh index 3e6843e..c26f058 100644 --- a/input/fsh/codesystem/PatientFlagCategory.fsh +++ b/input/fsh/codesystem/PatientFlagCategory.fsh @@ -1,6 +1,6 @@ CodeSystem: PatientFlagCategory Id: PatientFlagCategory -Title: "Patient Flag Category" +Title: "NHS England Patient Flag Category" Description: "A CodeSystem to identify the type/category of Flag." * ^name = "PatientFlagCategory" diff --git a/input/fsh/codesystem/RA-ConditionCategory.fsh b/input/fsh/codesystem/RA-ConditionCategory.fsh index d2d033c..38646ad 100644 --- a/input/fsh/codesystem/RA-ConditionCategory.fsh +++ b/input/fsh/codesystem/RA-ConditionCategory.fsh @@ -1,7 +1,7 @@ CodeSystem: RA-ConditionCategory Id: RA-ConditionCategory Title: "Reasonable Adjustments Record Condition Category" -Description: "A CodeSystem to identify the category of a condition.." +Description: "A CodeSystem to identify the category of a condition within Reasonable Adjustments." * ^name = "ReasonableAdjustmentsConditionCategory" * ^url = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCategory" diff --git a/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh b/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh similarity index 85% rename from input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh rename to input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh index f66767c..aa378ec 100644 --- a/input/fsh/examples/0003-AddConditionTransactionExample1-bundle.fsh +++ b/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh @@ -1,5 +1,6 @@ -Instance: AddConditionTransactionExample1 +Instance: AddRARecordTransactionExample1 InstanceOf: Bundle +Title: "Example of adding an RA record with a Transaction" Usage: #example * type = #transaction * entry[0].fullUrl = "urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" @@ -7,11 +8,11 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Patient?identifier=9912003888" * entry[+].fullUrl = "urn:uuid:959fbc3c-0907-419e-aa3d-ab88f2d90c5e" -* entry[=].resource = ConsentExample1 +* entry[=].resource = RAConsentExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Consent?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:41a84a93-1c95-4162-b13c-1c617509e6e2" -* entry[=].resource = ConditionExample1 +* entry[=].resource = RAConditionExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Condition?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:fba99f70-fe1d-42e2-b77a-916e44b53c19" diff --git a/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh b/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh similarity index 85% rename from input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh rename to input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh index 0e59726..c0e16e2 100644 --- a/input/fsh/examples/0004-AddConditionTransactionExample2-bundle.fsh +++ b/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh @@ -1,5 +1,6 @@ -Instance: AddConditionTransactionExample2 +Instance: AddRARecordTransactionExample2 InstanceOf: Bundle +Title: "Example of idempotent update of an RA record with a Transaction" Usage: #example * type = #transaction * entry[0].fullUrl = "urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" @@ -7,11 +8,11 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Patient?identifier=9912003888" * entry[+].fullUrl = "urn:uuid:959fbc3c-0907-419e-aa3d-ab88f2d90c5e" -* entry[=].resource = ConsentExample1 +* entry[=].resource = RAConsentExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Consent?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:41a84a93-1c95-4162-b13c-1c617509e6e2" -* entry[=].resource = ConditionExample1 +* entry[=].resource = RAConditionExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Condition?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:fba99f70-fe1d-42e2-b77a-916e44b53c19" @@ -23,7 +24,7 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Flag/04adcb5b-3de7-4f67-97f0-b2fdf941ba85" * entry[+].fullUrl = "urn:uuid:b19124e9-f742-49b4-9247-5c2d58ac1ef4" -* entry[=].resource = ConditionExample2 +* entry[=].resource = RAConditionExample2 * entry[=].request.method = #PUT * entry[=].request.url = "Condition/b19124e9-f742-49b4-9247-5c2d58ac1ef4" * entry[+].fullUrl = "urn:uuid:212c1018-f52a-4db7-9bc2-59a88622eb4f" diff --git a/input/fsh/examples/0012-RemoveRARecordExample.fsh b/input/fsh/examples/0012-RemoveRARecordExample.fsh index 5463b0f..055034e 100644 --- a/input/fsh/examples/0012-RemoveRARecordExample.fsh +++ b/input/fsh/examples/0012-RemoveRARecordExample.fsh @@ -1,10 +1,11 @@ Instance: RemoveRARecordExample InstanceOf: Bundle +Title: "Example of deleting an RA record with a Transaction" Usage: #example * type = #transaction * entry[0].request.method = #DELETE * entry[=].request.url = "Flag/fba99f70-fe1d-42e2-b77a-916e44b53c19" * entry[+].request.method = #DELETE -* entry[=].request.url = "Consent/ConsentExample1" +* entry[=].request.url = "Consent/RAConsentExample1" * entry[+].request.method = #DELETE -* entry[=].request.url = "Condition/ConditionExample1" +* entry[=].request.url = "Condition/RAConditionExample1" diff --git a/input/fsh/examples/0013-ConsentExample1.fsh b/input/fsh/examples/0013-RAConsentExample1.fsh similarity index 93% rename from input/fsh/examples/0013-ConsentExample1.fsh rename to input/fsh/examples/0013-RAConsentExample1.fsh index 847bb4b..8a0f6d4 100644 --- a/input/fsh/examples/0013-ConsentExample1.fsh +++ b/input/fsh/examples/0013-RAConsentExample1.fsh @@ -1,5 +1,6 @@ -Instance: ConsentExample1 +Instance: RAConsentExample1 InstanceOf: Consent +Title: "Example of Consent resource for Reasonable Adjustments" Usage: #example * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-ConsentCreateSummary" * extension[=].valueAnnotation.text = "Example of consent create summary extension text" diff --git a/input/fsh/examples/0014-PatientExample1.fsh b/input/fsh/examples/0014-PatientExample1.fsh index 945d95d..4fcfb38 100644 --- a/input/fsh/examples/0014-PatientExample1.fsh +++ b/input/fsh/examples/0014-PatientExample1.fsh @@ -1,5 +1,6 @@ Instance: PatientExample1 InstanceOf: Patient +Title: "A simple NHS patient example" Usage: #example * identifier.system = "https://fhir.nhs.uk/Id/nhs-number" * identifier.value = "9912003888" diff --git a/input/fsh/examples/0015-RAMasterFlagExample1.fsh b/input/fsh/examples/0015-RAMasterFlagExample1.fsh index 7bccfea..0f0b6d7 100644 --- a/input/fsh/examples/0015-RAMasterFlagExample1.fsh +++ b/input/fsh/examples/0015-RAMasterFlagExample1.fsh @@ -1,5 +1,6 @@ Instance: RAMasterFlagExample1 InstanceOf: Flag +Title: "Example of a master Flag resource for Reasonable Adjustments" Usage: #example * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" * extension[=].valueAnnotation.text = "Example of flag notes extension text in master flag" diff --git a/input/fsh/examples/0016-RAFlagExample1.fsh b/input/fsh/examples/0016-RAFlagExample1.fsh index ac742cb..5899f0d 100644 --- a/input/fsh/examples/0016-RAFlagExample1.fsh +++ b/input/fsh/examples/0016-RAFlagExample1.fsh @@ -1,5 +1,6 @@ Instance: RAFlagExample1 InstanceOf: Flag +Title: "Example 1 of a Flag resource for Reasonable Adjustments" Usage: #example * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" * extension[=].valueAnnotation.text = "Example of flag notes extension text in adjustment flag" diff --git a/input/fsh/examples/0017-ConditionExample1.fsh b/input/fsh/examples/0017-RAConditionExample1.fsh similarity index 88% rename from input/fsh/examples/0017-ConditionExample1.fsh rename to input/fsh/examples/0017-RAConditionExample1.fsh index e86f79d..257cede 100644 --- a/input/fsh/examples/0017-ConditionExample1.fsh +++ b/input/fsh/examples/0017-RAConditionExample1.fsh @@ -1,5 +1,6 @@ -Instance: ConditionExample1 +Instance: RAConditionExample1 InstanceOf: Condition +Title: "Example 1 of a Condition resource for Reasonable Adjustments" Usage: #example * clinicalStatus = $condition-clinical#active * category = RA-ConditionCategory#issue "Issue" diff --git a/input/fsh/examples/0018-RAFlagExample2.fsh b/input/fsh/examples/0018-RAFlagExample2.fsh index 6bc6b8e..4d2255d 100644 --- a/input/fsh/examples/0018-RAFlagExample2.fsh +++ b/input/fsh/examples/0018-RAFlagExample2.fsh @@ -1,5 +1,6 @@ Instance: RAFlagExample2 InstanceOf: Flag +Title: "Example 2 of a Flag resource for Reasonable Adjustments" Usage: #example * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" * extension[=].valueAnnotation.text = "Example of adjustment notes extension text in adjustment flag" diff --git a/input/fsh/examples/0019-ConditionExample2.fsh b/input/fsh/examples/0019-RAConditionExample2.fsh similarity index 90% rename from input/fsh/examples/0019-ConditionExample2.fsh rename to input/fsh/examples/0019-RAConditionExample2.fsh index 715b141..bb54936 100644 --- a/input/fsh/examples/0019-ConditionExample2.fsh +++ b/input/fsh/examples/0019-RAConditionExample2.fsh @@ -1,5 +1,6 @@ -Instance: ConditionExample2 +Instance: RAConditionExample2 InstanceOf: Condition +Title: "Example 2 of a Condition resource for Reasonable Adjustments" Usage: #example * clinicalStatus = $condition-clinical#active * category = RA-ConditionCategory#issue "Issue" diff --git a/input/fsh/profiles/FlagCondition.fsh b/input/fsh/profiles/FlagCondition.fsh new file mode 100644 index 0000000..579f4b7 --- /dev/null +++ b/input/fsh/profiles/FlagCondition.fsh @@ -0,0 +1,32 @@ +Profile: FlagCondition +Parent: Condition +Id: FlagCondition +Title: "Condition Profile for flags in NHS England" +Description: "Record an individual condition for a flag in NHS England" + +* ^name = "ReasonableAdjustmentsCondition" +* ^url = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" + +* contained ^slicing.discriminator.type = #profile +* contained ^slicing.rules = #open +* contained ^slicing.discriminator.path = "contained" +* contained contains provenance 1..1 +* contained[provenance] only RA-Provenance + +* insert NHSEngland-PublisherContactCopyright + +* category ^slicing.discriminator.type = #type +* category ^slicing.rules = #open +* category ^slicing.discriminator.path = "system" + +* category contains patientFlag 1.. MS +* category[patientFlag] from $ValueSetPatientFlagCategory (required) + +* category contains conditionCategory 1.. MS +* category[conditionCategory] from $ValueSetFlagConditionCategory (required) + +* code 1.. MS +* code from $ValueSetFlagConditionCode (extensible) \ No newline at end of file diff --git a/input/fsh/profiles/ProgrammeFlag.fsh b/input/fsh/profiles/ProgrammeFlag.fsh index f2ea4d2..e941aa8 100644 --- a/input/fsh/profiles/ProgrammeFlag.fsh +++ b/input/fsh/profiles/ProgrammeFlag.fsh @@ -18,15 +18,15 @@ Description: "Record an individual flag for an NHS England programme." * extension[flagNotes].value[x] only Annotation * extension[flagNotes].valueAnnotation 1.. -* category ^slicing.discriminator.type = #profile +* category ^slicing.discriminator.type = #type * category ^slicing.rules = #open * category ^slicing.discriminator.path = "system" -* category contains masterFlag 1.. MS -* category[masterFlag] from $ValueSetPatientFlagCategory (required) +* category contains patientFlag 1.. MS +* category[patientFlag] from $ValueSetPatientFlagCategory (required) -* category contains adjustmentFlag 1.. MS -* category[adjustmentFlag] from $ValueSetProgrammeFlagCategory (required) +* category contains programmeFlag 1.. MS +* category[programmeFlag] from $ValueSetProgrammeFlagCategory (required) * code MS -* code from $ValueSetRAFlagCode (extensible) +* code from $ValueSetProgrammeFlagCode (extensible) diff --git a/input/fsh/profiles/RA-Condition.fsh b/input/fsh/profiles/RA-Condition.fsh deleted file mode 100644 index 8bf1e8c..0000000 --- a/input/fsh/profiles/RA-Condition.fsh +++ /dev/null @@ -1,24 +0,0 @@ -Profile: RA-Condition -Parent: Condition -Id: RA-Condition -Title: "Reasonable Adjustments Condition Profile" -Description: "To (optionally) record an individual Condition for a Reasonable Adjustment Flag" - -* ^name = "ReasonableAdjustmentsCondition" -* ^url = "https://fhir.nhs.uk/England/StructureDefinition/RA-Condition" -* ^version = "0.1.0" -* ^status = #draft -* ^date = "2024-02-14" - -* contained ^slicing.discriminator.type = #profile -* contained ^slicing.rules = #open -* contained ^slicing.discriminator.path = "contained" -* contained contains provenance 1..1 -* contained[provenance] only RA-Provenance - -* insert NHSEngland-PublisherContactCopyright - -* category 1.. MS -* category from $ValueSetRAConditionCategory (required) -* code 1.. MS -* code from $ValueSetRAConditionCode (extensible) \ No newline at end of file diff --git a/input/fsh/searchparameter/FlagDetail.fsh b/input/fsh/searchparameter/FlagDetail.fsh index 99966d3..297e9f6 100644 --- a/input/fsh/searchparameter/FlagDetail.fsh +++ b/input/fsh/searchparameter/FlagDetail.fsh @@ -1,8 +1,8 @@ Instance: FlagDetail InstanceOf: SearchParameter -Title: "SearchParameter for Condition, Flag or Consent resources in the flag-detail extension" +Title: "SearchParameter for flag-detail extension" Usage: #definition -Description: "Search using extension for flag detail extension in Flag resource" +Description: "Search for Condition, Flag or Consent resources using extension for flag detail extension in Flag resource" * name = "SearchParameterFlagDetailExtension" * url = "https://fhir.nhs.uk/England/SearchParameter/FlagDetail" diff --git a/input/fsh/valuesets/CPIS-FlagCode.fsh b/input/fsh/valuesets/CPIS-FlagCode.fsh new file mode 100644 index 0000000..442bf25 --- /dev/null +++ b/input/fsh/valuesets/CPIS-FlagCode.fsh @@ -0,0 +1,17 @@ +ValueSet: CPIS-FlagCode +Id: CPIS-FlagCode +Title: "Child Protection Information Sharing Flag Code" +Description: "A ValueSet containing flag codes for the CP-IS NHS England Programme" + +* ^name = "CPISFlagCode" +* ^url = "https://fhir.nhs.uk/England/ValueSet/CPIS-FlagCode" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^expansion.timestamp = "2024-02-14T12:00:00+00:00" +* ^expansion.contains[0].system = "http://snomed.info/sct" +* ^expansion.contains[=].code = #224353004 \ No newline at end of file diff --git a/input/fsh/valuesets/FGM-FlagCode.fsh b/input/fsh/valuesets/FGM-FlagCode.fsh new file mode 100644 index 0000000..afdef61 --- /dev/null +++ b/input/fsh/valuesets/FGM-FlagCode.fsh @@ -0,0 +1,17 @@ +ValueSet: FGM-FlagCode +Id: FGM-FlagCode +Title: "Female Genital Mutilation Flag Code" +Description: "A ValueSet containing flag codes for the FGM NHS England Programme" + +* ^name = "FGMFlagCode" +* ^url = "https://fhir.nhs.uk/England/ValueSet/FGM-FlagCode" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^expansion.timestamp = "2024-02-14T12:00:00+00:00" +* ^expansion.contains[0].system = "http://snomed.info/sct" +* ^expansion.contains[=].code = #902961000000107 \ No newline at end of file diff --git a/input/fsh/valuesets/RA-ConditionCategory.fsh b/input/fsh/valuesets/FlagConditionCategory.fsh similarity index 67% rename from input/fsh/valuesets/RA-ConditionCategory.fsh rename to input/fsh/valuesets/FlagConditionCategory.fsh index eed98fe..4107d2e 100644 --- a/input/fsh/valuesets/RA-ConditionCategory.fsh +++ b/input/fsh/valuesets/FlagConditionCategory.fsh @@ -1,10 +1,10 @@ -ValueSet: RA-ConditionCategoryy -Id: RA-ConditionCategory -Title: "Reasonable Adjustments Record Condition Category" +ValueSet: FlagConditionCategory +Id: FlagConditionCategory +Title: "NHS England Flag Condition Category" Description: "A ValueSet to identify the category of a condition." * ^name = "ReasonableAdjustmentsConditionCategory" -* ^url = "https://fhir.nhs.uk/England/ValueSet/RA-ConditionCategory" +* ^url = "https://fhir.nhs.uk/England/ValueSet/FlagConditionCategory" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" @@ -28,3 +28,11 @@ Description: "A ValueSet to identify the category of a condition." * ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCategory" * ^expansion.contains[=].code = #problem-list-item * ^expansion.contains[=].display = "Problem List Item" + +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConditionCategory" +* ^expansion.contains[=].code = #cpis-example-condition-category +* ^expansion.contains[=].display = "CPIS example condition category" + +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConditionCategory" +* ^expansion.contains[=].code = #fgm-example-condition-category +* ^expansion.contains[=].display = "FGM example condition category" diff --git a/input/fsh/valuesets/RA-ConditionCode.fsh b/input/fsh/valuesets/FlagConditionCode.fsh similarity index 72% rename from input/fsh/valuesets/RA-ConditionCode.fsh rename to input/fsh/valuesets/FlagConditionCode.fsh index 9949f1f..bc9b6f1 100644 --- a/input/fsh/valuesets/RA-ConditionCode.fsh +++ b/input/fsh/valuesets/FlagConditionCode.fsh @@ -1,10 +1,10 @@ -ValueSet: RA-ConditionCode -Id: RA-ConditionCode -Title: "Reasonable Adjustments Record Condition Code" -Description: "A ValueSet to identify the SNOMED-CT concept representing an Impairment recorded as part of a Reasonable Adjustment" +ValueSet: FlagConditionCode +Id: FlagConditionCode +Title: "NHS England Flag Condition Code" +Description: "A ValueSet to identify the SNOMED-CT concept representing a condition code in a flag within NHS England" * ^name = "ReasonableAdjustmentsConditionCode" -* ^url = "https://fhir.nhs.uk/England/ValueSet/RA-ConditionCode" +* ^url = "https://fhir.nhs.uk/England/ValueSet/FlagConditionCode" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" @@ -13,36 +13,44 @@ Description: "A ValueSet to identify the SNOMED-CT concept representing an Impai * insert NHSEngland-PublisherContactCopyright * ^expansion.timestamp = "2024-02-14T12:00:00+00:00" -* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #1 * ^expansion.contains[=].display = "Vision (for example blindness or partial sight)" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #2 * ^expansion.contains[=].display = "Hearing (for example deafness or partial hearing)" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #3 * ^expansion.contains[=].display = "Mobility (for example walking short distances or climbing stairs)" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #4 * ^expansion.contains[=].display = "Dexterity (for example lifting and carrying objects, using a keyboard)" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #5 * ^expansion.contains[=].display = "Learning or understanding or concentrating" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #6 * ^expansion.contains[=].display = "Memory" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #7 * ^expansion.contains[=].display = "Mental health" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #8 * ^expansion.contains[=].display = "Stamina or breathing or fatigue" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #9 * ^expansion.contains[=].display = "Social or behavioural (for example associated with autism spectrum disorder (ASD) which includes Asperger’s, or attention deficit hyperactivity disorder (ADHD))" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #10 * ^expansion.contains[=].display = "Other (please specify)" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RARecord-ConditionCode" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConditionCode" * ^expansion.contains[=].code = #12 * ^expansion.contains[=].display = "Patient would prefer not to say" + +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConditionCode" +* ^expansion.contains[=].code = #1 +* ^expansion.contains[=].display = "FGM example condition code" + +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConditionCode" +* ^expansion.contains[=].code = #1 +* ^expansion.contains[=].display = "CPIS example condition code" diff --git a/input/fsh/valuesets/PatientFlagCategory.fsh b/input/fsh/valuesets/PatientFlagCategory.fsh index 5505565..32780ca 100644 --- a/input/fsh/valuesets/PatientFlagCategory.fsh +++ b/input/fsh/valuesets/PatientFlagCategory.fsh @@ -1,6 +1,6 @@ ValueSet: PatientFlagCategory Id: PatientFlagCategory -Title: "PatientFlagCategory" +Title: "NHS England Patient Flag Category" Description: "A ValueSet to identify the type/category of Flag." * ^name = "PatientFlagCategory" diff --git a/input/fsh/valuesets/ProgrammeFlagCategory.fsh b/input/fsh/valuesets/ProgrammeFlagCategory.fsh index c7784d6..428c5b4 100644 --- a/input/fsh/valuesets/ProgrammeFlagCategory.fsh +++ b/input/fsh/valuesets/ProgrammeFlagCategory.fsh @@ -1,6 +1,6 @@ ValueSet: ProgrammeFlagCategory Id: ProgrammeFlagCategory -Title: "Programme Flag Category" +Title: "NHS England Programme Flag Category" Description: "A ValueSet to identify the flag category of an NHS England programme" * ^name = "ProgrammeFlagCategory" diff --git a/input/fsh/valuesets/ProgrammeFlagCode.fsh b/input/fsh/valuesets/ProgrammeFlagCode.fsh new file mode 100644 index 0000000..590f1bd --- /dev/null +++ b/input/fsh/valuesets/ProgrammeFlagCode.fsh @@ -0,0 +1,17 @@ +ValueSet: ProgrammeFlagCode +Id: ProgrammeFlagCode +Title: "NHS England Programme Flag Code" +Description: "A ValueSet containing flag codes for the NHS England Programmes" + +* ^name = "ProgrammeFlagCode" +* ^url = "https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCode" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* codes from system $ValueSetRAFlagCode +* codes from system $ValueSetCPISFlagCode +* codes from system $ValueSetFGMFlagCode \ No newline at end of file diff --git a/input/fsh/valuesets/RA-FlagCode.fsh b/input/fsh/valuesets/RA-FlagCode.fsh index 02b7a7f..f870710 100644 --- a/input/fsh/valuesets/RA-FlagCode.fsh +++ b/input/fsh/valuesets/RA-FlagCode.fsh @@ -1,6 +1,6 @@ ValueSet: RA-FlagCode Id: RA-FlagCode -Title: "ReasonableAdjustmentsFlagCode" +Title: "Reasonable Adjustments Flag Code" Description: "A ValueSet to identify codes representing Adjustments required for a patient" * ^name = "ReasonableAdjustmentsFlagCode" diff --git a/input/fsh/valuesets/RA-ProvenanceRole.fsh b/input/fsh/valuesets/RA-ProvenanceRole.fsh index 2d9c1ac..aa618ed 100644 --- a/input/fsh/valuesets/RA-ProvenanceRole.fsh +++ b/input/fsh/valuesets/RA-ProvenanceRole.fsh @@ -1,6 +1,6 @@ ValueSet: RA-ProvenanceRole Id: RA-ProvenanceRole -Title: "ReasonableAdjustmentsProvenanceRole" +Title: "Reasonable Adjustments Provenance Role" Description: "A ValueSet to identify the role in which someone recording provenance is acting" * ^name = "ReasonableAdjustmentsProvenanceRole" diff --git a/input/pagecontent/add-reasonable-adjustment-record.md b/input/pagecontent/add-reasonable-adjustment-record.md index 19a7071..e012f9c 100644 --- a/input/pagecontent/add-reasonable-adjustment-record.md +++ b/input/pagecontent/add-reasonable-adjustment-record.md @@ -107,17 +107,17 @@ The following set of examples constitute the individual associated resources wit A transaction Bundle is also given that allows these resources (plus the patient) to be entered in an atomic traction. It uses PUTs, where in the case of an intial update, it may be done as a [conditional update](https://www.hl7.org/fhir/http.html#cond-update) -* [Consent](Consent-ConsentExample1.html) +* [Consent](Consent-RAConsentExample1.html) * [Master flag](Flag-RAMasterFlagExample1.html) * [Adjustment flag 1](Flag-RAFlagExample1.html) -* [Condition 1](Condition-ConditionExample1.html) -* [Transaction Bundle 1](Bundle-AddConditionTransactionExample1.html) +* [Condition 1](Condition-RAConditionExample1.html) +* [Transaction Bundle 1](Bundle-AddRARecordTransactionExample1.html) The following set of examples are for the same patient, and constitute an addition flag and condition. The transaction Bundle here illustates an idempotent update by simply adding the new resources to the first transaction Bundle. * [Adjustment flag 2](Flag-RAFlagExample2.html) -* [Condition 2](Condition-ConditionExample2.html) -* [Transaction Bundle 2](Bundle-AddConditionTransactionExample2.html) +* [Condition 2](Condition-RAConditionExample2.html) +* [Transaction Bundle 2](Bundle-AddRARecordTransactionExample2.html) ### Relevant Documentation diff --git a/input/pagecontent/consent-to-share-information.md b/input/pagecontent/consent-to-share-information.md index c44c45c..cf8e459 100644 --- a/input/pagecontent/consent-to-share-information.md +++ b/input/pagecontent/consent-to-share-information.md @@ -72,6 +72,6 @@ If consent is removed, then all previous adjustment records must be deleted, inc ### Examples -* [Consent is given example](Consent-ConsentExample1.html) +* [Consent is given example](Consent-RAConsentExample1.html) * Consent is not given is implied by the absence of a Consent resource * Consent is revoked is implied by the absence of a Consent resource diff --git a/input/pagecontent/retrieve-ra-record.md b/input/pagecontent/retrieve-ra-record.md index 1041893..11a1bf5 100644 --- a/input/pagecontent/retrieve-ra-record.md +++ b/input/pagecontent/retrieve-ra-record.md @@ -33,10 +33,10 @@ This query will return the Patient resource using the patients NHS number (TODO embed in all or make separate)has a Provenance resource embedded in it. (TODO maybe a futher discussion section somewhere on options for provenance, i.e. linking to versions, _history and transaction considerations, options to use etag or X-provenance). -Another example [Bundle transaction](Bundle-AddConditionTransactionExample2.html) modifies the first transaction by adding additional resources for another Condition and adjustment (Flag). +Another example [Bundle transaction](Bundle-AddRARecordTransactionExample2.html) modifies the first transaction by adding additional resources for another Condition and adjustment (Flag). The transactions are using PUT's to provide (upsert)[https://hl7.org/fhir/http.html#upsert] functionality. The HAPI Starter Server (provided via docker) supports this part of the specification. @@ -84,13 +84,13 @@ which are all returned using default Patient SearchParameters (defined in the ba First Bundle example: -* [Bundle transaction](Bundle-AddConditionTransactionExample1.html) -* [Query output](Bundle-QUERY-OUTPUT--0005-add-condition-transaction-example.html) +* [Bundle transaction](Bundle-AddRARecordTransactionExample1.html) +* [Query output](Bundle-QUERY-OUTPUT--0005-add-ra-record-transaction-example.html) Second Bundle example: -* [Bundle transaction](Bundle-AddConditionTransactionExample2.html) -* [Query output](Bundle-QUERY-OUTPUT--0006-add-condition-transaction-example.html) +* [Bundle transaction](Bundle-AddRARecordTransactionExample2.html) +* [Query output](Bundle-QUERY-OUTPUT--0006-add-ra-record-transaction-example.html) #### Remove RA Record From 291e812147b12bf645c669d963582cadbbad7610 Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Thu, 7 Mar 2024 18:20:39 +0000 Subject: [PATCH 06/14] profiles generalised, apply profiles to examples --- input/fsh/aliases.fsh | 2 +- input/fsh/codesystem/CPIS-ConsentPurpose.fsh | 17 ++++++++++++ input/fsh/codesystem/FGM-ConsentPurpose.fsh | 17 ++++++++++++ .../{RA-ProxyRole.fsh => FlagProxyRole.fsh} | 10 +++---- input/fsh/codesystem/PatientFlagCategory.fsh | 2 +- input/fsh/codesystem/RA-ConditionCategory.fsh | 2 +- input/fsh/codesystem/RA-ConditionCode.fsh | 2 +- input/fsh/codesystem/RA-ConsentPurpose.fsh | 4 +-- input/fsh/codesystem/RA-FlagCategory.fsh | 4 +-- ...-AddRARecordTransactionExample1-bundle.fsh | 4 +-- ...-AddRARecordTransactionExample2-bundle.fsh | 4 +-- .../examples/0012-RemoveRARecordExample.fsh | 2 +- input/fsh/examples/0013-RAConsentExample1.fsh | 8 ++++-- input/fsh/examples/0014-PatientExample1.fsh | 4 +-- ...le1.fsh => 0015-RAPatientFlagExample1.fsh} | 10 ++++--- input/fsh/examples/0016-RAFlagExample1.fsh | 6 ++++- .../fsh/examples/0017-RAConditionExample1.fsh | 5 +++- input/fsh/examples/0018-RAFlagExample2.fsh | 6 ++++- .../fsh/examples/0019-RAConditionExample2.fsh | 5 +++- input/fsh/profiles/FlagCondition.fsh | 8 +++--- .../{RA-Consent.fsh => FlagConsent.fsh} | 19 +++++++------- input/fsh/profiles/FlagProvenance.fsh | 18 +++++++++++++ .../{MasterFlag.fsh => PatientFlag.fsh} | 14 +++++----- input/fsh/profiles/ProgrammeFlag.fsh | 2 +- input/fsh/profiles/RA-Provenance.fsh | 19 -------------- input/fsh/searchparameter/FlagCategory.fsh | 2 +- input/fsh/searchparameter/FlagCode.fsh | 2 +- input/fsh/searchparameter/FlagDetail.fsh | 4 +-- input/fsh/valuesets/CPIS-FlagCode.fsh | 4 +-- input/fsh/valuesets/FGM-FlagCode.fsh | 4 +-- input/fsh/valuesets/FlagConditionCategory.fsh | 2 +- input/fsh/valuesets/FlagConditionCode.fsh | 4 +-- input/fsh/valuesets/FlagConsentPurpose.fsh | 26 +++++++++++++++++++ .../{RA-ProxyRole.fsh => FlagProxyRole.fsh} | 18 ++++++------- input/fsh/valuesets/PatientFlagCategory.fsh | 4 +-- input/fsh/valuesets/ProgrammeFlagCategory.fsh | 4 +-- input/fsh/valuesets/ProgrammeFlagCode.fsh | 4 +-- input/fsh/valuesets/RA-ConsentPurpose.fsh | 18 ------------- input/fsh/valuesets/RA-FlagCode.fsh | 4 +-- input/fsh/valuesets/RA-ProvenanceRole.fsh | 8 +++--- .../add-record-sequence.plantuml | 2 +- input/images-source/consent-sequence.plantuml | 6 ++--- input/images-source/data-model.plantuml | 6 ++--- .../add-reasonable-adjustment-record.md | 20 +++++++------- .../consent-to-share-information.md | 2 +- input/pagecontent/data-model.md | 4 +-- input/pagecontent/server-examples.md | 2 +- 47 files changed, 203 insertions(+), 141 deletions(-) create mode 100644 input/fsh/codesystem/CPIS-ConsentPurpose.fsh create mode 100644 input/fsh/codesystem/FGM-ConsentPurpose.fsh rename input/fsh/codesystem/{RA-ProxyRole.fsh => FlagProxyRole.fsh} (73%) rename input/fsh/examples/{0015-RAMasterFlagExample1.fsh => 0015-RAPatientFlagExample1.fsh} (79%) rename input/fsh/profiles/{RA-Consent.fsh => FlagConsent.fsh} (65%) create mode 100644 input/fsh/profiles/FlagProvenance.fsh rename input/fsh/profiles/{MasterFlag.fsh => PatientFlag.fsh} (74%) delete mode 100644 input/fsh/profiles/RA-Provenance.fsh create mode 100644 input/fsh/valuesets/FlagConsentPurpose.fsh rename input/fsh/valuesets/{RA-ProxyRole.fsh => FlagProxyRole.fsh} (78%) delete mode 100644 input/fsh/valuesets/RA-ConsentPurpose.fsh diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh index 8092c06..23d5ba5 100644 --- a/input/fsh/aliases.fsh +++ b/input/fsh/aliases.fsh @@ -15,7 +15,7 @@ Alias: $CareConnect-SDSJobRoleName-1 = https://fhir.hl7.org.uk/STU3/CodeSystem/C Alias: $ValueSetPatientFlagCategory = https://fhir.nhs.uk/England/ValueSet/PatientFlagCategory Alias: $ValueSetProgrammeFlagCategory = https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCategory Alias: $ExtensionFlagDetail = http://hl7.org/fhir/StructureDefinition/flag-detail -Alias: $ValueSetRAProvenanceRole = https://fhir.nhs.uk/England/ValueSet/RA-ProvenanceRole +Alias: $ValueSetFlagProvenanceRole = https://fhir.nhs.uk/England/ValueSet/FlagProvenanceRole Alias: $ValueSetRAFlagCode = https://fhir.nhs.uk/England/ValueSet/RA-FlagCode Alias: $ValueSetCPISFlagCode = https://fhir.nhs.uk/England/ValueSet/CPIS-FlagCode Alias: $ValueSetFGMFlagCode = https://fhir.nhs.uk/England/ValueSet/FGM-FlagCode diff --git a/input/fsh/codesystem/CPIS-ConsentPurpose.fsh b/input/fsh/codesystem/CPIS-ConsentPurpose.fsh new file mode 100644 index 0000000..f0427cc --- /dev/null +++ b/input/fsh/codesystem/CPIS-ConsentPurpose.fsh @@ -0,0 +1,17 @@ +CodeSystem: CPIS-ConsentPurpose +Id: CPIS-ConsentPurpose +Title: "CPIS Consent Purpose" +Description: "A CodeSystem to identify the purpose of the consent given within CPIS" + +* ^name = "CPISConsentPurpose" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConsentPurpose" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #CPISCONSENT "CPIS - Consent to record CPIS flags" diff --git a/input/fsh/codesystem/FGM-ConsentPurpose.fsh b/input/fsh/codesystem/FGM-ConsentPurpose.fsh new file mode 100644 index 0000000..9d5ef38 --- /dev/null +++ b/input/fsh/codesystem/FGM-ConsentPurpose.fsh @@ -0,0 +1,17 @@ +CodeSystem: FGM-ConsentPurpose +Id: FGM-ConsentPurpose +Title: "FGM Consent Purpose" +Description: "A CodeSystem to identify the purpose of the consent given within FGM" + +* ^name = "FGMConsentPurpose" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConsentPurpose" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^caseSensitive = true +* ^content = #complete +* #FGMCONSENT "FGM - Consent to record FGM flags" diff --git a/input/fsh/codesystem/RA-ProxyRole.fsh b/input/fsh/codesystem/FlagProxyRole.fsh similarity index 73% rename from input/fsh/codesystem/RA-ProxyRole.fsh rename to input/fsh/codesystem/FlagProxyRole.fsh index c7d39a7..44016a5 100644 --- a/input/fsh/codesystem/RA-ProxyRole.fsh +++ b/input/fsh/codesystem/FlagProxyRole.fsh @@ -1,10 +1,10 @@ -CodeSystem: RA-ProxyRole -Id: RA-ProxyRole -Title: "Reasonable Adjustments Record Proxy Role" +CodeSystem: FlagProxyRole +Id: FlagProxyRole +Title: "NHSE Flag Proxy Role" Description: "A CodeSystem to identify the type/role of the proxy involved" -* ^name = "ReasonableAdjustmentsProxyRole" -* ^url = "https://fhir.nhs.uk/England/CodeSystem/RA-ProxyRole" +* ^name = "FlagProxyRole" +* ^url = "https://fhir.nhs.uk/England/CodeSystem/FlagProxyRole" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" diff --git a/input/fsh/codesystem/PatientFlagCategory.fsh b/input/fsh/codesystem/PatientFlagCategory.fsh index c26f058..a5d1f1b 100644 --- a/input/fsh/codesystem/PatientFlagCategory.fsh +++ b/input/fsh/codesystem/PatientFlagCategory.fsh @@ -1,6 +1,6 @@ CodeSystem: PatientFlagCategory Id: PatientFlagCategory -Title: "NHS England Patient Flag Category" +Title: "NHSE Patient Flag Category" Description: "A CodeSystem to identify the type/category of Flag." * ^name = "PatientFlagCategory" diff --git a/input/fsh/codesystem/RA-ConditionCategory.fsh b/input/fsh/codesystem/RA-ConditionCategory.fsh index 38646ad..de8932d 100644 --- a/input/fsh/codesystem/RA-ConditionCategory.fsh +++ b/input/fsh/codesystem/RA-ConditionCategory.fsh @@ -1,6 +1,6 @@ CodeSystem: RA-ConditionCategory Id: RA-ConditionCategory -Title: "Reasonable Adjustments Record Condition Category" +Title: "RA Condition Category" Description: "A CodeSystem to identify the category of a condition within Reasonable Adjustments." * ^name = "ReasonableAdjustmentsConditionCategory" diff --git a/input/fsh/codesystem/RA-ConditionCode.fsh b/input/fsh/codesystem/RA-ConditionCode.fsh index 99cecd5..403edfe 100644 --- a/input/fsh/codesystem/RA-ConditionCode.fsh +++ b/input/fsh/codesystem/RA-ConditionCode.fsh @@ -1,6 +1,6 @@ CodeSystem: RA-ConditionCode Id: RA-ConditionCode -Title: "Reasonable Adjustments Record Condition Code" +Title: "RA Record Condition Code" Description: "A CodeSystem to identify the SNOMED-CT concept representing an Impairment recorded as part of a Reasonable Adjustment" * ^name = "ReasonableAdjustmentsConditionCode" diff --git a/input/fsh/codesystem/RA-ConsentPurpose.fsh b/input/fsh/codesystem/RA-ConsentPurpose.fsh index 6886f92..79bc92c 100644 --- a/input/fsh/codesystem/RA-ConsentPurpose.fsh +++ b/input/fsh/codesystem/RA-ConsentPurpose.fsh @@ -1,7 +1,7 @@ CodeSystem: RA-ConsentPurpose Id: RA-ConsentPurpose -Title: "Reasonable Adjustments Record Consent Purpose" -Description: "A CodeSystem to identify the purpose of the consent given" +Title: "RA Record Consent Purpose" +Description: "A CodeSystem to identify the purpose of the consent given within Reasonable Adjustments" * ^name = "ReasonableAdjustmentsConsentPurpose" * ^url = "https://fhir.nhs.uk/England/CodeSystem/RA-ConsentPurpose" diff --git a/input/fsh/codesystem/RA-FlagCategory.fsh b/input/fsh/codesystem/RA-FlagCategory.fsh index 2d7bf6d..1a005f1 100644 --- a/input/fsh/codesystem/RA-FlagCategory.fsh +++ b/input/fsh/codesystem/RA-FlagCategory.fsh @@ -1,7 +1,7 @@ CodeSystem: RA-FlagCategory Id: RA-FlagCategory -Title: "Reasonable Adjustments Record Adjustment Category" -Description: "A CodeSystem to identify the category of the Adjustment required" +Title: "RA Adjustment Category" +Description: "A CodeSystem to identify the category of the adjustments required" * ^name = "ReasonableAdjustmentsCategory" * ^url = "https://fhir.nhs.uk/England/CodeSystem/RA-FlagCategory" diff --git a/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh b/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh index aa378ec..2e140b0 100644 --- a/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh +++ b/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh @@ -1,6 +1,6 @@ Instance: AddRARecordTransactionExample1 InstanceOf: Bundle -Title: "Example of adding an RA record with a Transaction" +Title: "RA Example of adding an RA record with a Transaction" Usage: #example * type = #transaction * entry[0].fullUrl = "urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" @@ -16,7 +16,7 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Condition?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:fba99f70-fe1d-42e2-b77a-916e44b53c19" -* entry[=].resource = RAMasterFlagExample1 +* entry[=].resource = RAPatientFlagExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Flag/fba99f70-fe1d-42e2-b77a-916e44b53c19" * entry[+].fullUrl = "urn:uuid:04adcb5b-3de7-4f67-97f0-b2fdf941ba85" diff --git a/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh b/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh index c0e16e2..131121d 100644 --- a/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh +++ b/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh @@ -1,6 +1,6 @@ Instance: AddRARecordTransactionExample2 InstanceOf: Bundle -Title: "Example of idempotent update of an RA record with a Transaction" +Title: "RA Example of idempotent update of an RA record with a Transaction" Usage: #example * type = #transaction * entry[0].fullUrl = "urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" @@ -16,7 +16,7 @@ Usage: #example * entry[=].request.method = #PUT * entry[=].request.url = "Condition?patient=urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" * entry[+].fullUrl = "urn:uuid:fba99f70-fe1d-42e2-b77a-916e44b53c19" -* entry[=].resource = RAMasterFlagExample1 +* entry[=].resource = RAPatientFlagExample1 * entry[=].request.method = #PUT * entry[=].request.url = "Flag/fba99f70-fe1d-42e2-b77a-916e44b53c19" * entry[+].fullUrl = "urn:uuid:04adcb5b-3de7-4f67-97f0-b2fdf941ba85" diff --git a/input/fsh/examples/0012-RemoveRARecordExample.fsh b/input/fsh/examples/0012-RemoveRARecordExample.fsh index 055034e..a0f77db 100644 --- a/input/fsh/examples/0012-RemoveRARecordExample.fsh +++ b/input/fsh/examples/0012-RemoveRARecordExample.fsh @@ -1,6 +1,6 @@ Instance: RemoveRARecordExample InstanceOf: Bundle -Title: "Example of deleting an RA record with a Transaction" +Title: "RA Example of deleting an RA record with a Transaction" Usage: #example * type = #transaction * entry[0].request.method = #DELETE diff --git a/input/fsh/examples/0013-RAConsentExample1.fsh b/input/fsh/examples/0013-RAConsentExample1.fsh index 8a0f6d4..63e7d93 100644 --- a/input/fsh/examples/0013-RAConsentExample1.fsh +++ b/input/fsh/examples/0013-RAConsentExample1.fsh @@ -1,11 +1,14 @@ Instance: RAConsentExample1 InstanceOf: Consent -Title: "Example of Consent resource for Reasonable Adjustments" +Title: "RA Example of Consent resource for Reasonable Adjustments" Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagConsent" + * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-ConsentCreateSummary" * extension[=].valueAnnotation.text = "Example of consent create summary extension text" * extension[+].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-ConsentRemoveSummary" * extension[=].valueAnnotation.text = "Example of consent remove summary extension text" + * status = #active * scope = $consentscope#patient-privacy * category = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" @@ -13,7 +16,8 @@ Usage: #example * patient = Reference(Patient/PatientExample1) * policy.authority = "https://www.gov.uk/" * policy.uri = "https://www.gov.uk/government/uploads/system/uploads/attachment_data/file/535024/data-security-review.pdf" -* policyRule = RA-ProxyRole#001 +* policyRule = FlagProxyRole#001 + * contained.resourceType = "Provenance" * contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" * contained.target.reference = "#" diff --git a/input/fsh/examples/0014-PatientExample1.fsh b/input/fsh/examples/0014-PatientExample1.fsh index 4fcfb38..05da70b 100644 --- a/input/fsh/examples/0014-PatientExample1.fsh +++ b/input/fsh/examples/0014-PatientExample1.fsh @@ -6,7 +6,7 @@ Usage: #example * identifier.value = "9912003888" * active = true * name.use = #official -* name.family = "Marks" -* name.given = "Sahil" +* name.family = "Mann" +* name.given = "Alan" * gender = #male * birthDate = "1970-01-01" \ No newline at end of file diff --git a/input/fsh/examples/0015-RAMasterFlagExample1.fsh b/input/fsh/examples/0015-RAPatientFlagExample1.fsh similarity index 79% rename from input/fsh/examples/0015-RAMasterFlagExample1.fsh rename to input/fsh/examples/0015-RAPatientFlagExample1.fsh index 0f0b6d7..f89561e 100644 --- a/input/fsh/examples/0015-RAMasterFlagExample1.fsh +++ b/input/fsh/examples/0015-RAPatientFlagExample1.fsh @@ -1,12 +1,16 @@ -Instance: RAMasterFlagExample1 +Instance: RAPatientFlagExample1 InstanceOf: Flag -Title: "Example of a master Flag resource for Reasonable Adjustments" +Title: "RA Example of a patient Flag resource for Reasonable Adjustments" Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/PatientFlag" + * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" -* extension[=].valueAnnotation.text = "Example of flag notes extension text in master flag" +* extension[=].valueAnnotation.text = "Example of flag notes extension text in patient flag" + * status = #active * code = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" * subject = Reference(Patient/PatientExample1) + * contained.resourceType = "Provenance" * contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" * contained.target.reference = "#" diff --git a/input/fsh/examples/0016-RAFlagExample1.fsh b/input/fsh/examples/0016-RAFlagExample1.fsh index 5899f0d..d078a65 100644 --- a/input/fsh/examples/0016-RAFlagExample1.fsh +++ b/input/fsh/examples/0016-RAFlagExample1.fsh @@ -1,14 +1,18 @@ Instance: RAFlagExample1 InstanceOf: Flag -Title: "Example 1 of a Flag resource for Reasonable Adjustments" +Title: "RA Example 1 of a Flag resource for Reasonable Adjustments" Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/ProgrammeFlag" + * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" * extension[=].valueAnnotation.text = "Example of flag notes extension text in adjustment flag" + * status = #active * category[0] = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" * category[+] = RA-FlagCategory#001 "Communication support" * code = $sct#1082681000000103 "Requires support for receptive communication needs" * subject = Reference(Patient/PatientExample1) + * contained.resourceType = "Provenance" * contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" * contained.target.reference = "#" diff --git a/input/fsh/examples/0017-RAConditionExample1.fsh b/input/fsh/examples/0017-RAConditionExample1.fsh index 257cede..c6dcff1 100644 --- a/input/fsh/examples/0017-RAConditionExample1.fsh +++ b/input/fsh/examples/0017-RAConditionExample1.fsh @@ -1,11 +1,14 @@ Instance: RAConditionExample1 InstanceOf: Condition -Title: "Example 1 of a Condition resource for Reasonable Adjustments" +Title: "RA Example 1 of a Condition resource for Reasonable Adjustments" Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" + * clinicalStatus = $condition-clinical#active * category = RA-ConditionCategory#issue "Issue" * code = RA-ConditionCode#5 "Learning or understanding or concentrating" * subject = Reference(Patient/PatientExample1) + * contained.resourceType = "Provenance" * contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" * contained.target.reference = "#" diff --git a/input/fsh/examples/0018-RAFlagExample2.fsh b/input/fsh/examples/0018-RAFlagExample2.fsh index 4d2255d..4c75272 100644 --- a/input/fsh/examples/0018-RAFlagExample2.fsh +++ b/input/fsh/examples/0018-RAFlagExample2.fsh @@ -1,14 +1,18 @@ Instance: RAFlagExample2 InstanceOf: Flag -Title: "Example 2 of a Flag resource for Reasonable Adjustments" +Title: "RA Example 2 of a Flag resource for Reasonable Adjustments" Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/ProgrammeFlag" + * extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" * extension[=].valueAnnotation.text = "Example of adjustment notes extension text in adjustment flag" + * status = #active * category[0] = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" * category[+] = RA-FlagCategory#011 "Bespoke Reasonable adjustments" * code = $sct#73618009 "Autistic spectrum disorder with isolated skills" * subject = Reference(Patient/PatientExample1) + * contained.resourceType = "Provenance" * contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" * contained.target.reference = "#" diff --git a/input/fsh/examples/0019-RAConditionExample2.fsh b/input/fsh/examples/0019-RAConditionExample2.fsh index bb54936..8948daa 100644 --- a/input/fsh/examples/0019-RAConditionExample2.fsh +++ b/input/fsh/examples/0019-RAConditionExample2.fsh @@ -1,11 +1,14 @@ Instance: RAConditionExample2 InstanceOf: Condition -Title: "Example 2 of a Condition resource for Reasonable Adjustments" +Title: "RA Example 2 of a Condition resource for Reasonable Adjustments" Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" + * clinicalStatus = $condition-clinical#active * category = RA-ConditionCategory#issue "Issue" * code = RA-ConditionCode#9 "Social or behavioural (for example associated with autism spectrum disorder (ASD) which includes Asperger’s, or attention deficit hyperactivity disorder (ADHD))" * subject = Reference(Patient/PatientExample1) + * contained.resourceType = "Provenance" * contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" * contained.target.reference = "#" diff --git a/input/fsh/profiles/FlagCondition.fsh b/input/fsh/profiles/FlagCondition.fsh index 579f4b7..243b11e 100644 --- a/input/fsh/profiles/FlagCondition.fsh +++ b/input/fsh/profiles/FlagCondition.fsh @@ -1,7 +1,7 @@ Profile: FlagCondition Parent: Condition Id: FlagCondition -Title: "Condition Profile for flags in NHS England" +Title: "NHSE Condition Profile for flags" Description: "Record an individual condition for a flag in NHS England" * ^name = "ReasonableAdjustmentsCondition" @@ -14,13 +14,13 @@ Description: "Record an individual condition for a flag in NHS England" * contained ^slicing.rules = #open * contained ^slicing.discriminator.path = "contained" * contained contains provenance 1..1 -* contained[provenance] only RA-Provenance +* contained[provenance] only FlagProvenance * insert NHSEngland-PublisherContactCopyright -* category ^slicing.discriminator.type = #type +* category ^slicing.discriminator.type = #pattern * category ^slicing.rules = #open -* category ^slicing.discriminator.path = "system" +* category ^slicing.discriminator.path = "$this" * category contains patientFlag 1.. MS * category[patientFlag] from $ValueSetPatientFlagCategory (required) diff --git a/input/fsh/profiles/RA-Consent.fsh b/input/fsh/profiles/FlagConsent.fsh similarity index 65% rename from input/fsh/profiles/RA-Consent.fsh rename to input/fsh/profiles/FlagConsent.fsh index 1630be9..578e227 100644 --- a/input/fsh/profiles/RA-Consent.fsh +++ b/input/fsh/profiles/FlagConsent.fsh @@ -1,11 +1,11 @@ -Profile: RA-Consent +Profile: FlagConsent Parent: Consent -Id: RA-Consent -Title: "Reasonable Adjustments Consent Profile" -Description: "To record consent to capture Reasonable Adjustments and Reasons for Reasonable Adjustments data" +Id: FlagConsent +Title: "NHSE Flag Consent Profile" +Description: "To record consent to capture information for NHS England flags" -* ^name = "ReasonableAdjustmentsConsent" -* ^url = "https://fhir.nhs.uk/England/StructureDefinition/RA-Consent" +* ^name = "FlagConsent" +* ^url = "https://fhir.nhs.uk/England/StructureDefinition/FlagConsent" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" @@ -26,15 +26,14 @@ Description: "To record consent to capture Reasonable Adjustments and Reasons fo * contained ^slicing.rules = #open * contained ^slicing.discriminator.path = "contained" * contained contains provenance 1..1 -* contained[provenance] only RA-Provenance +* contained[provenance] only FlagProvenance * category from $ValueSetPatientFlagCategory (extensible) * policy 1..1 * policy.uri 1.. * policyRule 1.. -* policyRule from RA-ProxyRole (extensible) +* policyRule from FlagProxyRole (extensible) * performer ..1 * performer only Reference(Organization or Patient or Practitioner) * provision.purpose 1..1 -* provision.purpose from RA-ConsentPurpose (extensible) - +* provision.purpose from FlagConsentPurpose (extensible) diff --git a/input/fsh/profiles/FlagProvenance.fsh b/input/fsh/profiles/FlagProvenance.fsh new file mode 100644 index 0000000..3a5dbf6 --- /dev/null +++ b/input/fsh/profiles/FlagProvenance.fsh @@ -0,0 +1,18 @@ +Profile: FlagProvenance +Parent: Provenance +Id: FlagProvenance +Title: "NHSE Flag Provenance Profile" +Description: "To record details of the practitioner recording or removing an individual Flag." + +* ^name = "FlagProvenance" +* ^url = "https://fhir.nhs.uk/England/StructureDefinition/FlagProvenance" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" + +* insert NHSEngland-PublisherContactCopyright + +* target only Reference(FlagCondition or FlagConsent or ProgrammeFlag or PatientFlag) +* agent.role from $ValueSetFlagProvenanceRole (extensible) +* agent.who only Reference(Practitioner) +* agent.onBehalfOf only Reference(Organization) diff --git a/input/fsh/profiles/MasterFlag.fsh b/input/fsh/profiles/PatientFlag.fsh similarity index 74% rename from input/fsh/profiles/MasterFlag.fsh rename to input/fsh/profiles/PatientFlag.fsh index 014c804..326fd65 100644 --- a/input/fsh/profiles/MasterFlag.fsh +++ b/input/fsh/profiles/PatientFlag.fsh @@ -1,11 +1,11 @@ -Profile: MasterFlag +Profile: PatientFlag Parent: Flag -Id: MasterFlag -Title: "NHS England Patient Master Flag Profile" +Id: PatientFlag +Title: "NHSE Patient Flag Profile" Description: "To record whether a Patient Flags exists" -* ^name = "MasterFlag" -* ^url = "https://fhir.nhs.uk/England/StructureDefinition/MasterFlag" +* ^name = "PatientFlag" +* ^url = "https://fhir.nhs.uk/England/StructureDefinition/PatientFlag" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" @@ -19,13 +19,13 @@ Description: "To record whether a Patient Flags exists" * extension[flagNotes].value[x] only Annotation * extension[flagNotes].valueAnnotation 1.. -* extension[flagDetail].valueReference only Reference(ProgrammeFlag or RA-Consent or RA-Provenance) +* extension[flagDetail].valueReference only Reference(ProgrammeFlag or FlagConsent or FlagProvenance) * contained ^slicing.discriminator.type = #profile * contained ^slicing.rules = #open * contained ^slicing.discriminator.path = "contained" * contained contains provenance 1..1 -* contained[provenance] only RA-Provenance +* contained[provenance] only FlagProvenance * category 1.. MS * category from $ValueSetPatientFlagCategory (required) diff --git a/input/fsh/profiles/ProgrammeFlag.fsh b/input/fsh/profiles/ProgrammeFlag.fsh index e941aa8..de54e3b 100644 --- a/input/fsh/profiles/ProgrammeFlag.fsh +++ b/input/fsh/profiles/ProgrammeFlag.fsh @@ -1,7 +1,7 @@ Profile: ProgrammeFlag Parent: Flag Id: ProgrammeFlag -Title: "NHS England Programme Flag Profile" +Title: "NHSE Programme Flag Profile" Description: "Record an individual flag for an NHS England programme." * ^name = "ProgrammeFlag" diff --git a/input/fsh/profiles/RA-Provenance.fsh b/input/fsh/profiles/RA-Provenance.fsh deleted file mode 100644 index dfa2d78..0000000 --- a/input/fsh/profiles/RA-Provenance.fsh +++ /dev/null @@ -1,19 +0,0 @@ -Profile: RA-Provenance -Parent: Provenance -Id: RA-Provenance -Title: "Reasonable Adjustments Provenance Profile" -Description: "To record details of the practitioner recording or removing an individual item (Consent, Adjustment or Impairment) within a Reasonable Adjustment Flag." - -* ^name = "ReasonableAdjustmentsProvenance" -* ^url = "https://fhir.nhs.uk/England/StructureDefinition/RA-Provenance" -* ^version = "0.1.0" -* ^status = #draft -* ^date = "2024-02-14" - -* insert NHSEngland-PublisherContactCopyright - -* target only Reference(Condition or RA-Consent or ProgrammeFlag or MasterFlag) -* agent.role from $ValueSetRAProvenanceRole (extensible) -* agent.who only Reference(Practitioner) -* agent.onBehalfOf only Reference(Organization) - diff --git a/input/fsh/searchparameter/FlagCategory.fsh b/input/fsh/searchparameter/FlagCategory.fsh index 741837d..7533169 100644 --- a/input/fsh/searchparameter/FlagCategory.fsh +++ b/input/fsh/searchparameter/FlagCategory.fsh @@ -1,6 +1,6 @@ Instance: FlagCategory InstanceOf: SearchParameter -Title: "SearchParameter for Category in Flag" +Title: "Search for Category in Flag" Usage: #definition Description: "Search by category in the Flag resource" diff --git a/input/fsh/searchparameter/FlagCode.fsh b/input/fsh/searchparameter/FlagCode.fsh index bd38fd2..643acb3 100644 --- a/input/fsh/searchparameter/FlagCode.fsh +++ b/input/fsh/searchparameter/FlagCode.fsh @@ -1,6 +1,6 @@ Instance: FlagCode InstanceOf: SearchParameter -Title: "SearchParameter for Code in Flag" +Title: "Search for Code in Flag" Usage: #definition Description: "Search by code in the Flag resource" diff --git a/input/fsh/searchparameter/FlagDetail.fsh b/input/fsh/searchparameter/FlagDetail.fsh index 297e9f6..180c33f 100644 --- a/input/fsh/searchparameter/FlagDetail.fsh +++ b/input/fsh/searchparameter/FlagDetail.fsh @@ -1,8 +1,8 @@ Instance: FlagDetail InstanceOf: SearchParameter -Title: "SearchParameter for flag-detail extension" +Title: "Search for flag-detail extension" Usage: #definition -Description: "Search for Condition, Flag or Consent resources using extension for flag detail extension in Flag resource" +Description: "Search for Condition, Flag or Consent resources referenced in flag detail extension" * name = "SearchParameterFlagDetailExtension" * url = "https://fhir.nhs.uk/England/SearchParameter/FlagDetail" diff --git a/input/fsh/valuesets/CPIS-FlagCode.fsh b/input/fsh/valuesets/CPIS-FlagCode.fsh index 442bf25..d3cc32e 100644 --- a/input/fsh/valuesets/CPIS-FlagCode.fsh +++ b/input/fsh/valuesets/CPIS-FlagCode.fsh @@ -1,7 +1,7 @@ ValueSet: CPIS-FlagCode Id: CPIS-FlagCode -Title: "Child Protection Information Sharing Flag Code" -Description: "A ValueSet containing flag codes for the CP-IS NHS England Programme" +Title: "CPIS Flag Code" +Description: "A ValueSet containing flag codes for the Child Protection Information Sharing NHS England Programme" * ^name = "CPISFlagCode" * ^url = "https://fhir.nhs.uk/England/ValueSet/CPIS-FlagCode" diff --git a/input/fsh/valuesets/FGM-FlagCode.fsh b/input/fsh/valuesets/FGM-FlagCode.fsh index afdef61..c5ee782 100644 --- a/input/fsh/valuesets/FGM-FlagCode.fsh +++ b/input/fsh/valuesets/FGM-FlagCode.fsh @@ -1,7 +1,7 @@ ValueSet: FGM-FlagCode Id: FGM-FlagCode -Title: "Female Genital Mutilation Flag Code" -Description: "A ValueSet containing flag codes for the FGM NHS England Programme" +Title: "FGM Flag Code" +Description: "A ValueSet containing flag codes for the Female Genital Mutilation NHS England Programme" * ^name = "FGMFlagCode" * ^url = "https://fhir.nhs.uk/England/ValueSet/FGM-FlagCode" diff --git a/input/fsh/valuesets/FlagConditionCategory.fsh b/input/fsh/valuesets/FlagConditionCategory.fsh index 4107d2e..0a3a74e 100644 --- a/input/fsh/valuesets/FlagConditionCategory.fsh +++ b/input/fsh/valuesets/FlagConditionCategory.fsh @@ -1,6 +1,6 @@ ValueSet: FlagConditionCategory Id: FlagConditionCategory -Title: "NHS England Flag Condition Category" +Title: "NHSE Flag Condition Category" Description: "A ValueSet to identify the category of a condition." * ^name = "ReasonableAdjustmentsConditionCategory" diff --git a/input/fsh/valuesets/FlagConditionCode.fsh b/input/fsh/valuesets/FlagConditionCode.fsh index bc9b6f1..19951ed 100644 --- a/input/fsh/valuesets/FlagConditionCode.fsh +++ b/input/fsh/valuesets/FlagConditionCode.fsh @@ -1,7 +1,7 @@ ValueSet: FlagConditionCode Id: FlagConditionCode -Title: "NHS England Flag Condition Code" -Description: "A ValueSet to identify the SNOMED-CT concept representing a condition code in a flag within NHS England" +Title: "NHSE Flag Condition Code" +Description: "A ValueSet to identify a condition." * ^name = "ReasonableAdjustmentsConditionCode" * ^url = "https://fhir.nhs.uk/England/ValueSet/FlagConditionCode" diff --git a/input/fsh/valuesets/FlagConsentPurpose.fsh b/input/fsh/valuesets/FlagConsentPurpose.fsh new file mode 100644 index 0000000..87169d2 --- /dev/null +++ b/input/fsh/valuesets/FlagConsentPurpose.fsh @@ -0,0 +1,26 @@ +ValueSet: FlagConsentPurpose +Id: FlagConsentPurpose +Title: "NHSE Flag Consent Purpose" +Description: "A ValueSet to identify the purpose of a consent given for an NHS England flag." + +* ^name = "FlagConsentPurpose" +* ^url = "https://fhir.nhs.uk/England/ValueSet/FlagConsentPurpose" +* ^version = "0.1.0" +* ^status = #draft +* ^date = "2024-02-14" +* ^experimental = false + +* insert NHSEngland-PublisherContactCopyright + +* ^expansion.timestamp = "2024-02-14T12:00:00+00:00" +* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConsentPurpose" +* ^expansion.contains[=].code = #RACONSENT +* ^expansion.contains[=].display = "Reasonable Adjustments - Consent to record Reasonable Adjustments" + +* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/CPIS-ConsentPurpose" +* ^expansion.contains[=].code = #CPISCONSENT +* ^expansion.contains[=].display = "CPIS - Consent to record CPIS flags" + +* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/FGM-ConsentPurpose" +* ^expansion.contains[=].code = #FGMCONSENT +* ^expansion.contains[=].display = "FGM - Consent to record FGM flags" diff --git a/input/fsh/valuesets/RA-ProxyRole.fsh b/input/fsh/valuesets/FlagProxyRole.fsh similarity index 78% rename from input/fsh/valuesets/RA-ProxyRole.fsh rename to input/fsh/valuesets/FlagProxyRole.fsh index aa6873c..6bee592 100644 --- a/input/fsh/valuesets/RA-ProxyRole.fsh +++ b/input/fsh/valuesets/FlagProxyRole.fsh @@ -1,10 +1,10 @@ -ValueSet: RA-ProxyRole -Id: RA-ProxyRole -Title: "Reasonable Adjustments Record Proxy Role" +ValueSet: FlagProxyRole +Id: FlagProxyRole +Title: "NHSE Flag Proxy Role" Description: "A ValueSet to identify the type/role of the proxy involved." -* ^name = "ReasonableAdjustmentsProxyRole" -* ^url = "https://fhir.nhs.uk/England/ValueSet/RA-ProxyRole" +* ^name = "FlagProxyRole" +* ^url = "https://fhir.nhs.uk/England/ValueSet/FlagProxyRole" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" @@ -13,15 +13,15 @@ Description: "A ValueSet to identify the type/role of the proxy involved." * insert NHSEngland-PublisherContactCopyright * ^expansion.timestamp = "2024-02-14T12:00:00+00:00" -* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ProxyRole" +* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/FlagProxyRole" * ^expansion.contains[=].code = #001 * ^expansion.contains[=].display = "Patient consent" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ProxyRole" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/FlagProxyRole" * ^expansion.contains[=].code = #002 * ^expansion.contains[=].display = "Best interest decision made on behalf of the patient (Mental Capacity Act 2005)" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ProxyRole" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/FlagProxyRole" * ^expansion.contains[=].code = #003 * ^expansion.contains[=].display = "Lasting power of attorney for health and welfare, or court-appointed deputy, or equivalent" -* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ProxyRole" +* ^expansion.contains[+].system = "https://fhir.nhs.uk/England/CodeSystem/FlagProxyRole" * ^expansion.contains[=].code = #004 * ^expansion.contains[=].display = "Other legitimate patient representative - parental responsibility" \ No newline at end of file diff --git a/input/fsh/valuesets/PatientFlagCategory.fsh b/input/fsh/valuesets/PatientFlagCategory.fsh index 32780ca..94f427e 100644 --- a/input/fsh/valuesets/PatientFlagCategory.fsh +++ b/input/fsh/valuesets/PatientFlagCategory.fsh @@ -1,7 +1,7 @@ ValueSet: PatientFlagCategory Id: PatientFlagCategory -Title: "NHS England Patient Flag Category" -Description: "A ValueSet to identify the type/category of Flag." +Title: "NHSE Patient Flag Category" +Description: "A ValueSet to identify the type/category of a flag." * ^name = "PatientFlagCategory" * ^url = "https://fhir.nhs.uk/England/ValueSet/PatientFlagCategory" diff --git a/input/fsh/valuesets/ProgrammeFlagCategory.fsh b/input/fsh/valuesets/ProgrammeFlagCategory.fsh index 428c5b4..d2b1ced 100644 --- a/input/fsh/valuesets/ProgrammeFlagCategory.fsh +++ b/input/fsh/valuesets/ProgrammeFlagCategory.fsh @@ -1,7 +1,7 @@ ValueSet: ProgrammeFlagCategory Id: ProgrammeFlagCategory -Title: "NHS England Programme Flag Category" -Description: "A ValueSet to identify the flag category of an NHS England programme" +Title: "NHSE Programme Flag Category" +Description: "A ValueSet to identify the flag category." * ^name = "ProgrammeFlagCategory" * ^url = "https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCategory" diff --git a/input/fsh/valuesets/ProgrammeFlagCode.fsh b/input/fsh/valuesets/ProgrammeFlagCode.fsh index 590f1bd..cc48dfc 100644 --- a/input/fsh/valuesets/ProgrammeFlagCode.fsh +++ b/input/fsh/valuesets/ProgrammeFlagCode.fsh @@ -1,7 +1,7 @@ ValueSet: ProgrammeFlagCode Id: ProgrammeFlagCode -Title: "NHS England Programme Flag Code" -Description: "A ValueSet containing flag codes for the NHS England Programmes" +Title: "NHSE Programme Flag Code" +Description: "A ValueSet containing flag codes for the NHS England Programmes." * ^name = "ProgrammeFlagCode" * ^url = "https://fhir.nhs.uk/England/ValueSet/ProgrammeFlagCode" diff --git a/input/fsh/valuesets/RA-ConsentPurpose.fsh b/input/fsh/valuesets/RA-ConsentPurpose.fsh deleted file mode 100644 index 6ff8eb9..0000000 --- a/input/fsh/valuesets/RA-ConsentPurpose.fsh +++ /dev/null @@ -1,18 +0,0 @@ -ValueSet: RA-ConsentPurpose -Id: RA-ConsentPurpose -Title: "Reasonable Adjustments Consent Purpose" -Description: "A ValueSet to identify the purpose of a consent given." - -* ^name = "ReasonableAdjustmentsConsentPurpose" -* ^url = "https://fhir.nhs.uk/England/ValueSet/RA-ConsentPurpose" -* ^version = "0.1.0" -* ^status = #draft -* ^date = "2024-02-14" -* ^experimental = false - -* insert NHSEngland-PublisherContactCopyright - -* ^expansion.timestamp = "2024-02-14T12:00:00+00:00" -* ^expansion.contains[0].system = "https://fhir.nhs.uk/England/CodeSystem/RA-ConsentPurpose" -* ^expansion.contains[=].code = #RACONSENT -* ^expansion.contains[=].display = "Reasonable Adjustments - Consent to record Reasonable Adjustments" diff --git a/input/fsh/valuesets/RA-FlagCode.fsh b/input/fsh/valuesets/RA-FlagCode.fsh index f870710..1ead9d6 100644 --- a/input/fsh/valuesets/RA-FlagCode.fsh +++ b/input/fsh/valuesets/RA-FlagCode.fsh @@ -1,7 +1,7 @@ ValueSet: RA-FlagCode Id: RA-FlagCode -Title: "Reasonable Adjustments Flag Code" -Description: "A ValueSet to identify codes representing Adjustments required for a patient" +Title: "RA Flag Code" +Description: "A ValueSet containing flag codes for the Reasonable Adjustments NHS England Programme" * ^name = "ReasonableAdjustmentsFlagCode" * ^url = "https://fhir.nhs.uk/England/ValueSet/RA-FlagCode" diff --git a/input/fsh/valuesets/RA-ProvenanceRole.fsh b/input/fsh/valuesets/RA-ProvenanceRole.fsh index aa618ed..01fbd10 100644 --- a/input/fsh/valuesets/RA-ProvenanceRole.fsh +++ b/input/fsh/valuesets/RA-ProvenanceRole.fsh @@ -1,10 +1,10 @@ -ValueSet: RA-ProvenanceRole -Id: RA-ProvenanceRole -Title: "Reasonable Adjustments Provenance Role" +ValueSet: FlagProvenanceRole +Id: FlagProvenanceRole +Title: "RA Provenance Role" Description: "A ValueSet to identify the role in which someone recording provenance is acting" * ^name = "ReasonableAdjustmentsProvenanceRole" -* ^url = "https://fhir.nhs.uk/England/ValueSet/RA-ProvenanceRole" +* ^url = "https://fhir.nhs.uk/England/ValueSet/FlagProvenanceRole" * ^version = "0.1.0" * ^status = #draft * ^date = "2024-02-14" diff --git a/input/images-source/add-record-sequence.plantuml b/input/images-source/add-record-sequence.plantuml index 9f82521..1f71510 100644 --- a/input/images-source/add-record-sequence.plantuml +++ b/input/images-source/add-record-sequence.plantuml @@ -6,7 +6,7 @@ actor "Practitioner" as pra actor "Patient" as pat participant "FHIR API" as api entity "Consent" as con -entity "Master Flag" as mas +entity "Patient Flag" as mas entity "Adjustment Flag" as adj entity "Condition" as cod diff --git a/input/images-source/consent-sequence.plantuml b/input/images-source/consent-sequence.plantuml index 5c3fcf9..1160d0c 100644 --- a/input/images-source/consent-sequence.plantuml +++ b/input/images-source/consent-sequence.plantuml @@ -7,7 +7,7 @@ actor "Patient" as pat actor "Patient Advocate" as pad participant "FHIR API" as api entity "Consent" as con -entity "Master Flag" as mas +entity "Patient Flag" as pfg entity "Adjustment Flag" as adj entity "Condition" as cod @@ -29,8 +29,8 @@ else Consent has not been given/been revoked pra -> api : Record consent was not given api -> con : Delete adjustment consent api <-- con : return - api -> mas : Delete adjustment master flag - api <-- mas : return + api -> pfg : Delete adjustment patient flag + api <-- pfg : return api -> adj : Delete adjustment flag(s) api <-- adj : return api -> cod : Delete condition flag(s) diff --git a/input/images-source/data-model.plantuml b/input/images-source/data-model.plantuml index f51c915..f67c264 100644 --- a/input/images-source/data-model.plantuml +++ b/input/images-source/data-model.plantuml @@ -19,7 +19,7 @@ entity "Condition" as cod { *contained : Provenance } -entity "Master Flag" as mas { +entity "Patient Flag" as pfg { *patient : Patient *code : CodeableConcept *category : CodeableConcept @@ -40,11 +40,11 @@ entity "Provenance" as pro { pat ||..|| con : provides pat ||--o{ cod : has -pat ||--o| mas : "has" +pat ||--o| pfg : "has" pat ||--o{ adj : has con ||--|| pro : contains cod ||--|| pro : contains -mas ||--|| pro : contains +pfg ||--|| pro : contains adj ||--|| pro : contains @enduml diff --git a/input/pagecontent/add-reasonable-adjustment-record.md b/input/pagecontent/add-reasonable-adjustment-record.md index e012f9c..66f6f33 100644 --- a/input/pagecontent/add-reasonable-adjustment-record.md +++ b/input/pagecontent/add-reasonable-adjustment-record.md @@ -11,7 +11,7 @@ Key purposes of the Reasonable Adjustment Flag include: ### Usecase -After obtaining consent from a patient, an adjustment flag may be created. A condition may also optionally be recorded. If an adjustment flag exists, there must be an additional flag created, designated as the master flag, to indicate that there are reasonable adjustments recorded for the patient. +After obtaining consent from a patient, an adjustment flag may be created. A condition may also optionally be recorded. If an adjustment flag exists, there must be an additional flag created, designated as the patient flag, to indicate that there are reasonable adjustments recorded for the patient.
@@ -25,22 +25,22 @@ After obtaining consent from a patient, an adjustment flag may be created. A co Given a practitioner has received consent from a patient And the consent is for reasonable adjustments When a practioner adds an adjustment flag -Then an additional flag designated as a master flag will be created +Then an additional flag designated as a patient flag will be created Given a practitioner has received consent from a patient And the consent is for reasonable adjustments -When a practioner adds an master flag -Then the details of who created the master flag will be recorded +When a practioner adds an patient flag +Then the details of who created the patient flag will be recorded And the flag will be linked to the patient Given a practitioner has received consent from a patient And the consent is for reasonable adjustments -When a practioner adds an master flag +When a practioner adds an patient flag Then the category of the flag will indicate that it is reasonable adjustments Given a practitioner has received consent from a patient And the consent is for reasonable adjustments -When a practioner adds an master flag +When a practioner adds an patient flag Then the code of the flag will indicate that it is reasonable adjustments Given a practitioner has received consent from a patient @@ -103,19 +103,19 @@ The practioner decides to record a condition with the patients consent. This co * [Patient example](Patient-PatientExample1.html) -The following set of examples constitute the individual associated resources with the intial addition of a flag for Reasonable Adjustment. This includes the Consent resource where the patient has agreed to share information. Also a master Flag resource, the adjustment Flag resource and the associated Condition resource. All resources have contained provenances. +The following set of examples constitute the individual associated resources with the intial addition of a flag for Reasonable Adjustment. This includes the Consent resource where the patient has agreed to share information. Also a patient Flag resource, the adjustment Flag resource and the associated Condition resource. All resources have contained provenances. A transaction Bundle is also given that allows these resources (plus the patient) to be entered in an atomic traction. It uses PUTs, where in the case of an intial update, it may be done as a [conditional update](https://www.hl7.org/fhir/http.html#cond-update) * [Consent](Consent-RAConsentExample1.html) -* [Master flag](Flag-RAMasterFlagExample1.html) -* [Adjustment flag 1](Flag-RAFlagExample1.html) +* [Patient flag](Flag-RAPatientFlagExample1.html) +* [Reasonable Adjustment flag 1](Flag-RAFlagExample1.html) * [Condition 1](Condition-RAConditionExample1.html) * [Transaction Bundle 1](Bundle-AddRARecordTransactionExample1.html) The following set of examples are for the same patient, and constitute an addition flag and condition. The transaction Bundle here illustates an idempotent update by simply adding the new resources to the first transaction Bundle. -* [Adjustment flag 2](Flag-RAFlagExample2.html) +* [Reasonable Adjustment flag 2](Flag-RAFlagExample2.html) * [Condition 2](Condition-RAConditionExample2.html) * [Transaction Bundle 2](Bundle-AddRARecordTransactionExample2.html) diff --git a/input/pagecontent/consent-to-share-information.md b/input/pagecontent/consent-to-share-information.md index cf8e459..c2d38cd 100644 --- a/input/pagecontent/consent-to-share-information.md +++ b/input/pagecontent/consent-to-share-information.md @@ -62,7 +62,7 @@ If consent is not given, then this will be recorded. If there was previous cons If consent is given either by the patient or the patient advocate, then this should be recorded. A record of who obtained the consent must also be embedded in the Consent resource. This will done using a provenance resource. If consent has not been previously given, then this means the Consent resource must be created. If consent is removed, then the Consent resource should be deleted. The absence of a Consent resource implies patient dissent. -If consent is removed, then all previous adjustment records must be deleted, including the master flag and all adjustment flags and conditions. +If consent is removed, then all previous adjustment records must be deleted, including the patient flag and all adjustment flags and conditions.
diff --git a/input/pagecontent/data-model.md b/input/pagecontent/data-model.md index 113972d..9e5f153 100644 --- a/input/pagecontent/data-model.md +++ b/input/pagecontent/data-model.md @@ -13,12 +13,12 @@ erDiagram Patient ||..|| Consent : provides Patient ||--o{ Condition : has - Patient ||--o| "Master Flag" : "has" + Patient ||--o| "Patient Flag" : "has" Patient ||--o{ "Adjustment Flag" : has Consent ||--|| Provenance : contains Condition ||--|| Provenance : contains - "Master Flag" ||--|| Provenance : contains + "Patient Flag" ||--|| Provenance : contains "Adjustment Flag" ||--|| Provenance : contains
diff --git a/input/pagecontent/server-examples.md b/input/pagecontent/server-examples.md index 95582aa..5c5165f 100644 --- a/input/pagecontent/server-examples.md +++ b/input/pagecontent/server-examples.md @@ -52,7 +52,7 @@ The first example [Bundle transaction](Bundle-AddRARecordTransactionExample1.htm * a Patient resource * a Consent resource -* a (master) Flag resource (is this really needed?) +* a (patient) Flag resource (is this really needed?) * a Condition resource (associated with the following Flag) * a Flag resource (associated with the Condition) From f3cf341479e1725e7fe707763ac9b8c9361866dc Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Thu, 7 Mar 2024 18:33:32 +0000 Subject: [PATCH 07/14] examples validating against profiles --- input/fsh/examples/0017-RAConditionExample1.fsh | 3 ++- input/fsh/examples/0019-RAConditionExample2.fsh | 3 ++- input/fsh/profiles/PatientFlag.fsh | 1 + input/fsh/profiles/ProgrammeFlag.fsh | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/input/fsh/examples/0017-RAConditionExample1.fsh b/input/fsh/examples/0017-RAConditionExample1.fsh index c6dcff1..7d3d42c 100644 --- a/input/fsh/examples/0017-RAConditionExample1.fsh +++ b/input/fsh/examples/0017-RAConditionExample1.fsh @@ -5,7 +5,8 @@ Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" * clinicalStatus = $condition-clinical#active -* category = RA-ConditionCategory#issue "Issue" +* category[0] = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" +* category[+] = RA-ConditionCategory#issue "Issue" * code = RA-ConditionCode#5 "Learning or understanding or concentrating" * subject = Reference(Patient/PatientExample1) diff --git a/input/fsh/examples/0019-RAConditionExample2.fsh b/input/fsh/examples/0019-RAConditionExample2.fsh index 8948daa..e8de6f6 100644 --- a/input/fsh/examples/0019-RAConditionExample2.fsh +++ b/input/fsh/examples/0019-RAConditionExample2.fsh @@ -5,7 +5,8 @@ Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" * clinicalStatus = $condition-clinical#active -* category = RA-ConditionCategory#issue "Issue" +* category[0] = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" +* category[+] = RA-ConditionCategory#issue "Issue" * code = RA-ConditionCode#9 "Social or behavioural (for example associated with autism spectrum disorder (ASD) which includes Asperger’s, or attention deficit hyperactivity disorder (ADHD))" * subject = Reference(Patient/PatientExample1) diff --git a/input/fsh/profiles/PatientFlag.fsh b/input/fsh/profiles/PatientFlag.fsh index 326fd65..e2b9d4a 100644 --- a/input/fsh/profiles/PatientFlag.fsh +++ b/input/fsh/profiles/PatientFlag.fsh @@ -24,6 +24,7 @@ Description: "To record whether a Patient Flags exists" * contained ^slicing.discriminator.type = #profile * contained ^slicing.rules = #open * contained ^slicing.discriminator.path = "contained" + * contained contains provenance 1..1 * contained[provenance] only FlagProvenance diff --git a/input/fsh/profiles/ProgrammeFlag.fsh b/input/fsh/profiles/ProgrammeFlag.fsh index de54e3b..453e93d 100644 --- a/input/fsh/profiles/ProgrammeFlag.fsh +++ b/input/fsh/profiles/ProgrammeFlag.fsh @@ -18,9 +18,9 @@ Description: "Record an individual flag for an NHS England programme." * extension[flagNotes].value[x] only Annotation * extension[flagNotes].valueAnnotation 1.. -* category ^slicing.discriminator.type = #type +* category ^slicing.discriminator.type = #pattern * category ^slicing.rules = #open -* category ^slicing.discriminator.path = "system" +* category ^slicing.discriminator.path = "$this" * category contains patientFlag 1.. MS * category[patientFlag] from $ValueSetPatientFlagCategory (required) From 4049562dd94078d39ba7992838cf7d4a8f324a9f Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Fri, 8 Mar 2024 11:16:49 +0000 Subject: [PATCH 08/14] cpis and fgm examples, all validating --- ...-AddRARecordTransactionExample1-bundle.fsh | 2 +- ...-AddRARecordTransactionExample2-bundle.fsh | 2 +- input/fsh/examples/0013-RAConsentExample1.fsh | 4 +-- .../examples/0015-RAPatientFlagExample1.fsh | 4 +-- input/fsh/examples/0016-RAFlagExample1.fsh | 4 +-- .../fsh/examples/0017-RAConditionExample1.fsh | 4 +-- input/fsh/examples/0018-RAFlagExample2.fsh | 4 +-- .../fsh/examples/0019-RAConditionExample2.fsh | 4 +-- .../fsh/examples/0020-CPISConsentExample.fsh | 28 +++++++++++++++++++ .../examples/0021-CPISPatientFlagExample1.fsh | 21 ++++++++++++++ input/fsh/examples/0022-CPISFlagExample1.fsh | 23 +++++++++++++++ .../examples/0023-CPISConditionExample1.fsh | 20 +++++++++++++ ...ddCPISRecordTransactionExample1-bundle.fsh | 25 +++++++++++++++++ input/fsh/examples/0025-FGMConsentExample.fsh | 28 +++++++++++++++++++ .../examples/0026-FGMPatientFlagExample1.fsh | 21 ++++++++++++++ input/fsh/examples/0027-FGMFlagExample1.fsh | 23 +++++++++++++++ .../examples/0028-FGMConditionExample1.fsh | 20 +++++++++++++ ...AddFGMRecordTransactionExample1-bundle.fsh | 25 +++++++++++++++++ input/fsh/profiles/FlagConsent.fsh | 2 +- input/fsh/profiles/FlagProvenance.fsh | 2 +- input/fsh/profiles/PatientFlag.fsh | 6 ++-- input/pagecontent/additional-examples.md | 19 +++++++++++++ 22 files changed, 271 insertions(+), 20 deletions(-) create mode 100644 input/fsh/examples/0020-CPISConsentExample.fsh create mode 100644 input/fsh/examples/0021-CPISPatientFlagExample1.fsh create mode 100644 input/fsh/examples/0022-CPISFlagExample1.fsh create mode 100644 input/fsh/examples/0023-CPISConditionExample1.fsh create mode 100644 input/fsh/examples/0024-AddCPISRecordTransactionExample1-bundle.fsh create mode 100644 input/fsh/examples/0025-FGMConsentExample.fsh create mode 100644 input/fsh/examples/0026-FGMPatientFlagExample1.fsh create mode 100644 input/fsh/examples/0027-FGMFlagExample1.fsh create mode 100644 input/fsh/examples/0028-FGMConditionExample1.fsh create mode 100644 input/fsh/examples/0029-AddFGMRecordTransactionExample1-bundle.fsh create mode 100644 input/pagecontent/additional-examples.md diff --git a/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh b/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh index 2e140b0..1cfc9bf 100644 --- a/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh +++ b/input/fsh/examples/0003-AddRARecordTransactionExample1-bundle.fsh @@ -1,6 +1,6 @@ Instance: AddRARecordTransactionExample1 InstanceOf: Bundle -Title: "RA Example of adding an RA record with a Transaction" +Title: "RA Example of adding a record with a Transaction" Usage: #example * type = #transaction * entry[0].fullUrl = "urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" diff --git a/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh b/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh index 131121d..a00e0b5 100644 --- a/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh +++ b/input/fsh/examples/0004-AddRARecordTransactionExample2-bundle.fsh @@ -1,6 +1,6 @@ Instance: AddRARecordTransactionExample2 InstanceOf: Bundle -Title: "RA Example of idempotent update of an RA record with a Transaction" +Title: "RA Example of idempotent update of a record with a Transaction" Usage: #example * type = #transaction * entry[0].fullUrl = "urn:uuid:6253c43b-5cc8-4645-93b1-38e41be82a77" diff --git a/input/fsh/examples/0013-RAConsentExample1.fsh b/input/fsh/examples/0013-RAConsentExample1.fsh index 63e7d93..16e0295 100644 --- a/input/fsh/examples/0013-RAConsentExample1.fsh +++ b/input/fsh/examples/0013-RAConsentExample1.fsh @@ -1,6 +1,6 @@ Instance: RAConsentExample1 InstanceOf: Consent -Title: "RA Example of Consent resource for Reasonable Adjustments" +Title: "RA example of Consent resource." Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagConsent" @@ -12,7 +12,7 @@ Usage: #example * status = #active * scope = $consentscope#patient-privacy * category = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" -* provision.purpose = $sct#370856009 "Limiting access to confidential patient information" +* provision.purpose = RA-ConsentPurpose#RACONSENT "Reasonable Adjustments - Consent to record Reasonable Adjustments" * patient = Reference(Patient/PatientExample1) * policy.authority = "https://www.gov.uk/" * policy.uri = "https://www.gov.uk/government/uploads/system/uploads/attachment_data/file/535024/data-security-review.pdf" diff --git a/input/fsh/examples/0015-RAPatientFlagExample1.fsh b/input/fsh/examples/0015-RAPatientFlagExample1.fsh index f89561e..da622f4 100644 --- a/input/fsh/examples/0015-RAPatientFlagExample1.fsh +++ b/input/fsh/examples/0015-RAPatientFlagExample1.fsh @@ -1,6 +1,6 @@ Instance: RAPatientFlagExample1 InstanceOf: Flag -Title: "RA Example of a patient Flag resource for Reasonable Adjustments" +Title: "RA example of a patient Flag resource." Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/PatientFlag" @@ -12,7 +12,7 @@ Usage: #example * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" -* contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" +* contained.id = "c4e2e862-3bf4-4176-a186-9f1732938260" * contained.target.reference = "#" * contained.recorded = "2024-01-01T11:00:00+00:00" * contained.activity = $v3-DataOperation#CREATE "create" diff --git a/input/fsh/examples/0016-RAFlagExample1.fsh b/input/fsh/examples/0016-RAFlagExample1.fsh index d078a65..ec06890 100644 --- a/input/fsh/examples/0016-RAFlagExample1.fsh +++ b/input/fsh/examples/0016-RAFlagExample1.fsh @@ -1,6 +1,6 @@ Instance: RAFlagExample1 InstanceOf: Flag -Title: "RA Example 1 of a Flag resource for Reasonable Adjustments" +Title: "RA example 1 of a Flag resource." Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/ProgrammeFlag" @@ -14,7 +14,7 @@ Usage: #example * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" -* contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" +* contained.id = "873a38eb-0f9c-4a66-a4e9-8e4be2350d6b" * contained.target.reference = "#" * contained.recorded = "2024-01-01T11:00:00+00:00" * contained.activity = $v3-DataOperation#CREATE "create" diff --git a/input/fsh/examples/0017-RAConditionExample1.fsh b/input/fsh/examples/0017-RAConditionExample1.fsh index 7d3d42c..212b115 100644 --- a/input/fsh/examples/0017-RAConditionExample1.fsh +++ b/input/fsh/examples/0017-RAConditionExample1.fsh @@ -1,6 +1,6 @@ Instance: RAConditionExample1 InstanceOf: Condition -Title: "RA Example 1 of a Condition resource for Reasonable Adjustments" +Title: "RA example 1 of a Condition resource." Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" @@ -11,7 +11,7 @@ Usage: #example * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" -* contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" +* contained.id = "6a6b18a7-c077-49da-929f-a8dd38468f79" * contained.target.reference = "#" * contained.recorded = "2024-01-01T11:00:00+00:00" * contained.activity = $v3-DataOperation#CREATE "create" diff --git a/input/fsh/examples/0018-RAFlagExample2.fsh b/input/fsh/examples/0018-RAFlagExample2.fsh index 4c75272..4f6bf59 100644 --- a/input/fsh/examples/0018-RAFlagExample2.fsh +++ b/input/fsh/examples/0018-RAFlagExample2.fsh @@ -1,6 +1,6 @@ Instance: RAFlagExample2 InstanceOf: Flag -Title: "RA Example 2 of a Flag resource for Reasonable Adjustments" +Title: "RA example 2 of a Flag resource." Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/ProgrammeFlag" @@ -14,7 +14,7 @@ Usage: #example * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" -* contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" +* contained.id = "71f8bcda-242d-4401-a59c-6924a6cb1c0e" * contained.target.reference = "#" * contained.recorded = "2024-01-01T11:00:00+00:00" * contained.activity = $v3-DataOperation#CREATE "create" diff --git a/input/fsh/examples/0019-RAConditionExample2.fsh b/input/fsh/examples/0019-RAConditionExample2.fsh index e8de6f6..f800707 100644 --- a/input/fsh/examples/0019-RAConditionExample2.fsh +++ b/input/fsh/examples/0019-RAConditionExample2.fsh @@ -1,6 +1,6 @@ Instance: RAConditionExample2 InstanceOf: Condition -Title: "RA Example 2 of a Condition resource for Reasonable Adjustments" +Title: "RA example 2 of a Condition resource." Usage: #example * meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" @@ -11,7 +11,7 @@ Usage: #example * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" -* contained.id = "4c75ce1f-1ad7-4391-b5f6-104754c7e904" +* contained.id = "f55e1edc-8ac7-4e06-b322-25fd34e62249" * contained.target.reference = "#" * contained.recorded = "2024-01-01T11:00:00+00:00" * contained.activity = $v3-DataOperation#CREATE "create" diff --git a/input/fsh/examples/0020-CPISConsentExample.fsh b/input/fsh/examples/0020-CPISConsentExample.fsh new file mode 100644 index 0000000..d4bfdda --- /dev/null +++ b/input/fsh/examples/0020-CPISConsentExample.fsh @@ -0,0 +1,28 @@ +Instance: CPISConsentExample1 +InstanceOf: Consent +Title: "CPIS example of Consent resource" +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagConsent" + +* extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-ConsentCreateSummary" +* extension[=].valueAnnotation.text = "Example of consent create summary extension text" +* extension[+].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-ConsentRemoveSummary" +* extension[=].valueAnnotation.text = "Example of consent remove summary extension text" + +* status = #active +* scope = $consentscope#patient-privacy +* category = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" +* provision.purpose = CPIS-ConsentPurpose#CPISCONSENT "CPIS - Consent to record CPIS flags" +* patient = Reference(Patient/PatientExample1) +* policy.authority = "https://www.gov.uk/" +* policy.uri = "https://www.gov.uk/government/uploads/system/uploads/attachment_data/file/535024/data-security-review.pdf" +* policyRule = FlagProxyRole#001 + +* contained.resourceType = "Provenance" +* contained.id = "51a731b3-1c46-47ba-abad-04209bd264e6" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" diff --git a/input/fsh/examples/0021-CPISPatientFlagExample1.fsh b/input/fsh/examples/0021-CPISPatientFlagExample1.fsh new file mode 100644 index 0000000..968377b --- /dev/null +++ b/input/fsh/examples/0021-CPISPatientFlagExample1.fsh @@ -0,0 +1,21 @@ +Instance: CPISPatientFlagExample1 +InstanceOf: Flag +Title: "CPIS example of a patient Flag resource" +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/PatientFlag" + +* extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" +* extension[=].valueAnnotation.text = "Example of flag notes extension text in patient flag" + +* status = #active +* code = PatientFlagCategory#CP-IS "Child Protection - Information Sharing Flag" +* subject = Reference(Patient/PatientExample1) + +* contained.resourceType = "Provenance" +* contained.id = "42b9f285-0f1b-435a-ba6e-c72762d6502e" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" \ No newline at end of file diff --git a/input/fsh/examples/0022-CPISFlagExample1.fsh b/input/fsh/examples/0022-CPISFlagExample1.fsh new file mode 100644 index 0000000..0498ef6 --- /dev/null +++ b/input/fsh/examples/0022-CPISFlagExample1.fsh @@ -0,0 +1,23 @@ +Instance: CPISFlagExample1 +InstanceOf: Flag +Title: "CPIS example of a Flag resource" +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/ProgrammeFlag" + +* extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" +* extension[=].valueAnnotation.text = "Example of flag notes extension text in adjustment flag" + +* status = #active +* category[0] = PatientFlagCategory#CP-IS "Child Protection - Information Sharing Flag" +* category[+] = CPIS-FlagCategory#001 "Example CPIS category" +* code = $sct#1082681000000103 "Requires support for receptive communication needs" +* subject = Reference(Patient/PatientExample1) + +* contained.resourceType = "Provenance" +* contained.id = "ea77b434-585a-48b9-a789-eac610f0363e" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" \ No newline at end of file diff --git a/input/fsh/examples/0023-CPISConditionExample1.fsh b/input/fsh/examples/0023-CPISConditionExample1.fsh new file mode 100644 index 0000000..40dd175 --- /dev/null +++ b/input/fsh/examples/0023-CPISConditionExample1.fsh @@ -0,0 +1,20 @@ +Instance: CPISConditionExample1 +InstanceOf: Condition +Title: "CPIS example of a Condition resource." +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" + +* clinicalStatus = $condition-clinical#active +* category[0] = PatientFlagCategory#CP-IS "Child Protection - Information Sharing Flag" +* category[+] = CPIS-ConditionCategory#cpis-example-condition-category "CPIS example condition category" +* code = CPIS-ConditionCode#1 "CPIS example condition code" +* subject = Reference(Patient/PatientExample1) + +* contained.resourceType = "Provenance" +* contained.id = "482155c0-9ed3-4b22-b7b8-009f265606cc" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" \ No newline at end of file diff --git a/input/fsh/examples/0024-AddCPISRecordTransactionExample1-bundle.fsh b/input/fsh/examples/0024-AddCPISRecordTransactionExample1-bundle.fsh new file mode 100644 index 0000000..f602479 --- /dev/null +++ b/input/fsh/examples/0024-AddCPISRecordTransactionExample1-bundle.fsh @@ -0,0 +1,25 @@ +Instance: AddCPISRecordTransactionExample1 +InstanceOf: Bundle +Title: "CPIS Example of adding a record with a Transaction" +Usage: #example +* type = #transaction +* entry[0].fullUrl = "urn:uuid:f7898b1c-4314-4331-9477-cca32861e858" +* entry[=].resource = PatientExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Patient?identifier=9912003888" +* entry[+].fullUrl = "urn:uuid:921cd5d5-e1e9-4986-bf8e-5826832db2ff" +* entry[=].resource = CPISConsentExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Consent?patient=urn:uuid:f7898b1c-4314-4331-9477-cca32861e858" +* entry[+].fullUrl = "urn:uuid:7dd8fe1e-e782-42c6-9ef4-1bebce3a43cc" +* entry[=].resource = CPISConditionExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Condition?patient=urn:uuid:f7898b1c-4314-4331-9477-cca32861e858" +* entry[+].fullUrl = "urn:uuid:066fbb4b-2a8d-471e-8732-42e85ab1de1a" +* entry[=].resource = CPISPatientFlagExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Flag/066fbb4b-2a8d-471e-8732-42e85ab1de1a" +* entry[+].fullUrl = "urn:uuid:621c9e76-19e1-4aa0-adb0-8d79979ea27c" +* entry[=].resource = CPISFlagExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Flag/066fbb4b-2a8d-471e-8732-42e85ab1de1a" diff --git a/input/fsh/examples/0025-FGMConsentExample.fsh b/input/fsh/examples/0025-FGMConsentExample.fsh new file mode 100644 index 0000000..113ce47 --- /dev/null +++ b/input/fsh/examples/0025-FGMConsentExample.fsh @@ -0,0 +1,28 @@ +Instance: FGMConsentExample1 +InstanceOf: Consent +Title: "FGM example of Consent resource" +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagConsent" + +* extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-ConsentCreateSummary" +* extension[=].valueAnnotation.text = "Example of consent create summary extension text" +* extension[+].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-ConsentRemoveSummary" +* extension[=].valueAnnotation.text = "Example of consent remove summary extension text" + +* status = #active +* scope = $consentscope#patient-privacy +* category = PatientFlagCategory#FGM "Female Genital Mutilation Flag" +* provision.purpose = FGM-ConsentPurpose#FGMCONSENT "FGM - Consent to record FGM flags" +* patient = Reference(Patient/PatientExample1) +* policy.authority = "https://www.gov.uk/" +* policy.uri = "https://www.gov.uk/government/uploads/system/uploads/attachment_data/file/535024/data-security-review.pdf" +* policyRule = FlagProxyRole#001 + +* contained.resourceType = "Provenance" +* contained.id = "bc0dbfb1-7432-46fa-b1b8-0e3648827754" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" diff --git a/input/fsh/examples/0026-FGMPatientFlagExample1.fsh b/input/fsh/examples/0026-FGMPatientFlagExample1.fsh new file mode 100644 index 0000000..2fa4efa --- /dev/null +++ b/input/fsh/examples/0026-FGMPatientFlagExample1.fsh @@ -0,0 +1,21 @@ +Instance: FGMPatientFlagExample1 +InstanceOf: Flag +Title: "FGM example of a patient Flag resource" +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/PatientFlag" + +* extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" +* extension[=].valueAnnotation.text = "Example of flag notes extension text in patient flag" + +* status = #active +* code = PatientFlagCategory#FGM "Female Genital Mutilation Flag" +* subject = Reference(Patient/PatientExample1) + +* contained.resourceType = "Provenance" +* contained.id = "3fc83fd8-4a6d-48e4-91ab-12bb10a4a834" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" \ No newline at end of file diff --git a/input/fsh/examples/0027-FGMFlagExample1.fsh b/input/fsh/examples/0027-FGMFlagExample1.fsh new file mode 100644 index 0000000..c5f0039 --- /dev/null +++ b/input/fsh/examples/0027-FGMFlagExample1.fsh @@ -0,0 +1,23 @@ +Instance: FGMFlagExample1 +InstanceOf: Flag +Title: "FGM example of a Flag resource" +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/ProgrammeFlag" + +* extension[0].url = "https://fhir.nhs.uk/England/StructureDefinition/Extension-FlagNotes" +* extension[=].valueAnnotation.text = "Example of flag notes extension text in adjustment flag" + +* status = #active +* category[0] = PatientFlagCategory#FGM "Female Genital Mutilation Flag" +* category[+] = FGM-FlagCategory#001 "Example FGM category" +* code = $sct#1082681000000103 "Requires support for receptive communication needs" +* subject = Reference(Patient/PatientExample1) + +* contained.resourceType = "Provenance" +* contained.id = "9b5f2d1b-8175-407f-a49d-b4f04c9d4300" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" \ No newline at end of file diff --git a/input/fsh/examples/0028-FGMConditionExample1.fsh b/input/fsh/examples/0028-FGMConditionExample1.fsh new file mode 100644 index 0000000..077c1dc --- /dev/null +++ b/input/fsh/examples/0028-FGMConditionExample1.fsh @@ -0,0 +1,20 @@ +Instance: FGMConditionExample1 +InstanceOf: Condition +Title: "FGM example of a Condition resource." +Usage: #example +* meta.profile = "https://fhir.nhs.uk/England/StructureDefinition/FlagCondition" + +* clinicalStatus = $condition-clinical#active +* category[0] = PatientFlagCategory#FGM "Female Genital Mutilation Flag" +* category[+] = FGM-ConditionCategory#fgm-example-condition-category "FGM example condition category" +* code = FGM-ConditionCode#1 "FGM example condition code" +* subject = Reference(Patient/PatientExample1) + +* contained.resourceType = "Provenance" +* contained.id = "e78b78b2-31f9-453d-b278-6d5720001073" +* contained.target.reference = "#" +* contained.recorded = "2024-01-01T11:00:00+00:00" +* contained.activity = $v3-DataOperation#CREATE "create" +* contained.agent.role = $CareConnect-SDSJobRoleName-1#R0260 "General Medical Practitioner" +* contained.agent.who.reference = "https://sds.spineservices.nhs.uk/STU3/Practitioner/2ee4tr6a9" +* contained.agent.onBehalfOf.reference = "https://directory.spineservices.nhs.uk/STU3/Organization/a3e5i7" \ No newline at end of file diff --git a/input/fsh/examples/0029-AddFGMRecordTransactionExample1-bundle.fsh b/input/fsh/examples/0029-AddFGMRecordTransactionExample1-bundle.fsh new file mode 100644 index 0000000..f2eb909 --- /dev/null +++ b/input/fsh/examples/0029-AddFGMRecordTransactionExample1-bundle.fsh @@ -0,0 +1,25 @@ +Instance: AddFGMRecordTransactionExample1 +InstanceOf: Bundle +Title: "FGM Example of adding a record with a Transaction" +Usage: #example +* type = #transaction +* entry[0].fullUrl = "urn:uuid:9580a1de-f418-432b-85da-eba186b7cfa5" +* entry[=].resource = PatientExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Patient?identifier=9912003888" +* entry[+].fullUrl = "urn:uuid:cd1de51b-2007-4409-8a96-cfcc1e0a0b6b" +* entry[=].resource = FGMConsentExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Consent?patient=urn:uuid:9580a1de-f418-432b-85da-eba186b7cfa5" +* entry[+].fullUrl = "urn:uuid:7dd8fe1e-e782-42c6-9ef4-1bebce3a43cc" +* entry[=].resource = FGMConditionExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Condition?patient=urn:uuid:9580a1de-f418-432b-85da-eba186b7cfa5" +* entry[+].fullUrl = "urn:uuid:97c6d9be-1431-4112-b99c-5cecd318ede0" +* entry[=].resource = FGMPatientFlagExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Flag/97c6d9be-1431-4112-b99c-5cecd318ede0" +* entry[+].fullUrl = "urn:uuid:38f67aa3-5ea8-4a29-9cd5-54ba7acf79a8" +* entry[=].resource = FGMFlagExample1 +* entry[=].request.method = #PUT +* entry[=].request.url = "Flag/38f67aa3-5ea8-4a29-9cd5-54ba7acf79a8" diff --git a/input/fsh/profiles/FlagConsent.fsh b/input/fsh/profiles/FlagConsent.fsh index 578e227..728514f 100644 --- a/input/fsh/profiles/FlagConsent.fsh +++ b/input/fsh/profiles/FlagConsent.fsh @@ -2,7 +2,7 @@ Profile: FlagConsent Parent: Consent Id: FlagConsent Title: "NHSE Flag Consent Profile" -Description: "To record consent to capture information for NHS England flags" +Description: "Record consent to capture information for NHS England flags" * ^name = "FlagConsent" * ^url = "https://fhir.nhs.uk/England/StructureDefinition/FlagConsent" diff --git a/input/fsh/profiles/FlagProvenance.fsh b/input/fsh/profiles/FlagProvenance.fsh index 3a5dbf6..3ca7e6b 100644 --- a/input/fsh/profiles/FlagProvenance.fsh +++ b/input/fsh/profiles/FlagProvenance.fsh @@ -2,7 +2,7 @@ Profile: FlagProvenance Parent: Provenance Id: FlagProvenance Title: "NHSE Flag Provenance Profile" -Description: "To record details of the practitioner recording or removing an individual Flag." +Description: "Record details of the practitioner recording or removing an individual Flag." * ^name = "FlagProvenance" * ^url = "https://fhir.nhs.uk/England/StructureDefinition/FlagProvenance" diff --git a/input/fsh/profiles/PatientFlag.fsh b/input/fsh/profiles/PatientFlag.fsh index e2b9d4a..c7e4a09 100644 --- a/input/fsh/profiles/PatientFlag.fsh +++ b/input/fsh/profiles/PatientFlag.fsh @@ -2,7 +2,7 @@ Profile: PatientFlag Parent: Flag Id: PatientFlag Title: "NHSE Patient Flag Profile" -Description: "To record whether a Patient Flags exists" +Description: "Record whether a Patient Flags exists" * ^name = "PatientFlag" * ^url = "https://fhir.nhs.uk/England/StructureDefinition/PatientFlag" @@ -28,7 +28,5 @@ Description: "To record whether a Patient Flags exists" * contained contains provenance 1..1 * contained[provenance] only FlagProvenance -* category 1.. MS -* category from $ValueSetPatientFlagCategory (required) * code MS -* code from $ValueSetRAFlagCode (extensible) +* code from $ValueSetPatientFlagCategory (required) diff --git a/input/pagecontent/additional-examples.md b/input/pagecontent/additional-examples.md new file mode 100644 index 0000000..9e55ee1 --- /dev/null +++ b/input/pagecontent/additional-examples.md @@ -0,0 +1,19 @@ +### Overview + +Basic examples for CPIS and FGM to demo use of same profiles. + +### CPIS + +* [Consent](Consent-CPISConsentExample1.html) +* [Patient flag](Flag-CPISPatientFlagExample1.html) +* [CPIS flag](Flag-CPISFlagExample1.html) +* [Condition](Condition-CPISConditionExample1.html) +* [Transaction Bundle](Bundle-AddCPISRecordTransactionExample1.html) + +### FGM + +* [Consent](Consent-FGMConsentExample1.html) +* [Patient flag](Flag-FGMPatientFlagExample1.html) +* [FGM flag](Flag-FGMFlagExample1.html) +* [Condition](Condition-FGMConditionExample1.html) +* [Transaction Bundle](Bundle-AddFGMRecordTransactionExample1.html) \ No newline at end of file From 5fc8dd667b69545366ddbc50e6039cfed5a473db Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Fri, 8 Mar 2024 13:22:14 +0000 Subject: [PATCH 09/14] addtional example pages added --- sushi-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sushi-config.yaml b/sushi-config.yaml index e2dba0e..45aca45 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -83,6 +83,7 @@ menu: Add Reasonable Adjustment Record: add-reasonable-adjustment-record.html Retrieve Reasonable Adjustment Record: retrieve-ra-record.html Remove Reasonable Adjustment Record: remove-ra-record.html + Additional Examples: additional-examples.html Server Examples: server-examples.html Artifacts: artifacts.html Contact Us: todo.html From e85b41d60998914de409ff24f5f58be8afbc74ea Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Fri, 8 Mar 2024 13:34:25 +0000 Subject: [PATCH 10/14] fix cpis consent category example --- input/fsh/examples/0020-CPISConsentExample.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/fsh/examples/0020-CPISConsentExample.fsh b/input/fsh/examples/0020-CPISConsentExample.fsh index d4bfdda..ccc6db6 100644 --- a/input/fsh/examples/0020-CPISConsentExample.fsh +++ b/input/fsh/examples/0020-CPISConsentExample.fsh @@ -11,7 +11,7 @@ Usage: #example * status = #active * scope = $consentscope#patient-privacy -* category = PatientFlagCategory#NRAF "National Reasonable Adjustments Flag" +* category = PatientFlagCategory#CP-IS "Child Protection - Information Sharing Flag" * provision.purpose = CPIS-ConsentPurpose#CPISCONSENT "CPIS - Consent to record CPIS flags" * patient = Reference(Patient/PatientExample1) * policy.authority = "https://www.gov.uk/" From a4463380df735fc413db2136a32a67f1e461167e Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Fri, 8 Mar 2024 13:39:16 +0000 Subject: [PATCH 11/14] fix flag code for cpis and fgm --- input/fsh/examples/0022-CPISFlagExample1.fsh | 2 +- input/fsh/examples/0027-FGMFlagExample1.fsh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input/fsh/examples/0022-CPISFlagExample1.fsh b/input/fsh/examples/0022-CPISFlagExample1.fsh index 0498ef6..db240d6 100644 --- a/input/fsh/examples/0022-CPISFlagExample1.fsh +++ b/input/fsh/examples/0022-CPISFlagExample1.fsh @@ -10,7 +10,7 @@ Usage: #example * status = #active * category[0] = PatientFlagCategory#CP-IS "Child Protection - Information Sharing Flag" * category[+] = CPIS-FlagCategory#001 "Example CPIS category" -* code = $sct#1082681000000103 "Requires support for receptive communication needs" +* code = $sct#224353004 "Child protection finding (finding)" * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" diff --git a/input/fsh/examples/0027-FGMFlagExample1.fsh b/input/fsh/examples/0027-FGMFlagExample1.fsh index c5f0039..415b0d7 100644 --- a/input/fsh/examples/0027-FGMFlagExample1.fsh +++ b/input/fsh/examples/0027-FGMFlagExample1.fsh @@ -10,7 +10,7 @@ Usage: #example * status = #active * category[0] = PatientFlagCategory#FGM "Female Genital Mutilation Flag" * category[+] = FGM-FlagCategory#001 "Example FGM category" -* code = $sct#1082681000000103 "Requires support for receptive communication needs" +* code = $sct#902961000000107 "Family history of female genital mutilation (situation)" * subject = Reference(Patient/PatientExample1) * contained.resourceType = "Provenance" From 77689534193792589b7a090a84db33c7f52769c2 Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Sun, 10 Mar 2024 12:39:46 +0000 Subject: [PATCH 12/14] added careconnect deps, tidy diagrams, include contact via yml --- .../fsh/codesystem/CPIS-ConditionCategory.fsh | 2 +- input/fsh/codesystem/CPIS-ConditionCode.fsh | 2 +- input/fsh/codesystem/CPIS-ConsentPurpose.fsh | 2 +- input/fsh/codesystem/CPIS-FlagCategory.fsh | 2 +- .../fsh/codesystem/FGM-ConditionCategory.fsh | 2 +- input/fsh/codesystem/FGM-ConditionCode.fsh | 2 +- input/fsh/codesystem/FGM-ConsentPurpose.fsh | 2 +- input/fsh/codesystem/FGM-FlagCategory.fsh | 2 +- input/fsh/codesystem/FlagProxyRole.fsh | 2 +- input/fsh/codesystem/PatientFlagCategory.fsh | 2 +- input/fsh/codesystem/RA-ConditionCategory.fsh | 2 +- input/fsh/codesystem/RA-ConditionCode.fsh | 2 +- input/fsh/codesystem/RA-ConsentPurpose.fsh | 2 +- input/fsh/codesystem/RA-FlagCategory.fsh | 2 +- input/fsh/examples/0014-PatientExample1.fsh | 4 +- .../extensions/Extension-AdjustmentNotes.fsh | 2 +- .../Extension-ConsentCreateSummary.fsh | 2 +- .../Extension-RemoveCreateSummary.fsh | 2 +- input/fsh/profiles/FlagCondition.fsh | 2 +- input/fsh/profiles/FlagConsent.fsh | 2 +- input/fsh/profiles/FlagProvenance.fsh | 2 +- input/fsh/profiles/PatientFlag.fsh | 2 +- input/fsh/profiles/ProgrammeFlag.fsh | 2 +- ...Copyright.fsh => NHSEngland-Copyright.fsh} | 18 +- input/fsh/searchparameter/FlagCategory.fsh | 2 - input/fsh/searchparameter/FlagCode.fsh | 2 - input/fsh/searchparameter/FlagDetail.fsh | 2 - input/fsh/valuesets/CPIS-FlagCode.fsh | 2 +- input/fsh/valuesets/FGM-FlagCode.fsh | 2 +- input/fsh/valuesets/FlagConditionCategory.fsh | 2 +- input/fsh/valuesets/FlagConditionCode.fsh | 2 +- input/fsh/valuesets/FlagConsentPurpose.fsh | 2 +- input/fsh/valuesets/FlagProxyRole.fsh | 2 +- input/fsh/valuesets/PatientFlagCategory.fsh | 2 +- input/fsh/valuesets/ProgrammeFlagCategory.fsh | 2 +- input/fsh/valuesets/ProgrammeFlagCode.fsh | 2 +- input/fsh/valuesets/RA-FlagCode.fsh | 2 +- input/fsh/valuesets/RA-ProvenanceRole.fsh | 2 +- .../add-record-sequence.plantuml | 32 +- input/images-source/consent-sequence.plantuml | 7 +- input/images-source/data-model.plantuml | 8 +- input/pagecontent/data-model.md | 50 +- input/pagecontent/index.md | 19 +- .../CareConnect-SDSJobRoleName-1.json | 1593 ----------------- sushi-config.yaml | 31 +- 45 files changed, 127 insertions(+), 1707 deletions(-) rename input/fsh/rulesets/{NHSEngland-PublisherContactCopyright.fsh => NHSEngland-Copyright.fsh} (52%) delete mode 100644 input/resources/CareConnect-SDSJobRoleName-1.json diff --git a/input/fsh/codesystem/CPIS-ConditionCategory.fsh b/input/fsh/codesystem/CPIS-ConditionCategory.fsh index 3c111d2..44a20d0 100644 --- 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 index 4ca3d13..6755f74 100644 --- 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 index f0427cc..f8b4601 100644 --- 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 index cf7f1c9..b0b475d 100644 --- 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 index 62df01a..6b4fcec 100644 --- 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 index e7115f3..6e635e9 100644 --- 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 index 9d5ef38..a0a2b94 100644 --- 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 index c0f72bb..166b8d5 100644 --- 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 index 44016a5..a0a8a10 100644 --- 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 index a5d1f1b..42f532f 100644 --- 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 index de8932d..8138785 100644 --- 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 index 403edfe..ae01516 100644 --- 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 index 79bc92c..3bff03b 100644 --- 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 index 1a005f1..7c6d86e 100644 --- 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 index 05da70b..0f6dbc7 100644 --- 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 index 483dec6..0eb63f9 100644 --- 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 \ No newline at end of file diff --git a/input/fsh/extensions/Extension-ConsentCreateSummary.fsh b/input/fsh/extensions/Extension-ConsentCreateSummary.fsh index 0ac7feb..066fbf2 100644 --- 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 \ No newline at end of file diff --git a/input/fsh/extensions/Extension-RemoveCreateSummary.fsh b/input/fsh/extensions/Extension-RemoveCreateSummary.fsh index c49c48b..be3d3bd 100644 --- 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 \ No newline at end of file diff --git a/input/fsh/profiles/FlagCondition.fsh b/input/fsh/profiles/FlagCondition.fsh index 243b11e..a0315c5 100644 --- 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 index 728514f..1610ab9 100644 --- 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 index 3ca7e6b..20bb3ce 100644 --- 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 index c7e4a09..1575008 100644 --- 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 index 453e93d..c3a73ab 100644 --- 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/input/fsh/rulesets/NHSEngland-PublisherContactCopyright.fsh b/input/fsh/rulesets/NHSEngland-Copyright.fsh similarity index 52% rename from input/fsh/rulesets/NHSEngland-PublisherContactCopyright.fsh rename to input/fsh/rulesets/NHSEngland-Copyright.fsh index 670fd0d..4934041 100644 --- a/input/fsh/rulesets/NHSEngland-PublisherContactCopyright.fsh +++ b/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 = "interoperabilityteam@nhs.net" -* ^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 = "interoperabilityteam@nhs.net" -* 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 index 7533169..bcef7e0 100644 --- 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 index 643acb3..32051d7 100644 --- 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 index 180c33f..106dea3 100644 --- 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 index d3cc32e..c36b4c5 100644 --- 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 index c5ee782..f327cca 100644 --- 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 index 0a3a74e..dc5b4a9 100644 --- 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 index 19951ed..a9686a2 100644 --- 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 index 87169d2..b1c49f3 100644 --- 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 index 6bee592..9b422c0 100644 --- 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 index 94f427e..16ea52a 100644 --- 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 index d2b1ced..c657675 100644 --- 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 index cc48dfc..370d188 100644 --- 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 index 1ead9d6..4457d7a 100644 --- 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 index 01fbd10..62e5283 100644 --- 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" diff --git a/input/images-source/add-record-sequence.plantuml b/input/images-source/add-record-sequence.plantuml index 1f71510..c51a76a 100644 --- a/input/images-source/add-record-sequence.plantuml +++ b/input/images-source/add-record-sequence.plantuml @@ -6,7 +6,7 @@ actor "Practitioner" as pra actor "Patient" as pat participant "FHIR API" as api entity "Consent" as con -entity "Patient Flag" as mas +entity "Patient Flag" as flg entity "Adjustment Flag" as adj entity "Condition" as cod @@ -14,45 +14,37 @@ pra -> pat : Examine patient pra -> pat : Suggest adjustments pra <-- pat : Provide consent\nto share information -pra -> api : Record adjustment record +pra -> api : Record adjustment record (transaction Bundle) api -> con : Create/update resource con -> con : Validate -alt Validation failed api <-- con : return -api <- api : rollback -api -> pra : OperationOutcome indicating failure +alt Validation failed + api -> api : rollback end -api <-- con : return -api -> mas : Create/update resource -mas -> mas : Validate +api -> flg : Create/update resource +flg -> flg : Validate +api <-- flg : return alt Validation failed -api <-- mas : return -api <- api : rollback -api -> pra : OperationOutcome indicating failure + api -> api : rollback end api -> adj : Create/update resource adj -> adj : Validate -alt Validation failed api <-- adj : return -api <- api : rollback -api -> pra : OperationOutcome indicating failure +alt Validation failed + api -> api : rollback end alt Condition also to be recorded api -> cod : Create/update resource cod -> cod : Validate -alt Validation failed api <-- cod : return -api <- api : rollback -api -> pra : OperationOutcome indicating failure +alt Validation failed + api -> api : rollback end -api <-- cod : return pra <-- api : OperationOutcome -end - @enduml diff --git a/input/images-source/consent-sequence.plantuml b/input/images-source/consent-sequence.plantuml index 1160d0c..ac68d29 100644 --- a/input/images-source/consent-sequence.plantuml +++ b/input/images-source/consent-sequence.plantuml @@ -24,17 +24,16 @@ alt Consent has been given api -> con : Create/update resource con -> con : Validate api <-- con : return + alt Validation failed + api -> api : rollback + end pra <-- api : OperationOutcome else Consent has not been given/been revoked pra -> api : Record consent was not given api -> con : Delete adjustment consent - api <-- con : return api -> pfg : Delete adjustment patient flag - api <-- pfg : return api -> adj : Delete adjustment flag(s) - api <-- adj : return api -> cod : Delete condition flag(s) - api <-- cod : return pra <-- api : OperationOutcome end diff --git a/input/images-source/data-model.plantuml b/input/images-source/data-model.plantuml index f67c264..0b67f6a 100644 --- a/input/images-source/data-model.plantuml +++ b/input/images-source/data-model.plantuml @@ -9,28 +9,28 @@ entity "Patient" as pat { entity "Consent" as con { *patient : Patient *category : CodeableConcept - *contained : Provenance + *contained : Provenance (Contained) } entity "Condition" as cod { *patient : Patient *code : CodeableConcept *category : CodeableConcept - *contained : Provenance + *contained : Provenance (Contained) } entity "Patient Flag" as pfg { *patient : Patient *code : CodeableConcept *category : CodeableConcept - *contained : Provenance + *contained : Provenance (Contained) } entity "Adjustment Flag" as adj { *patient : Patient *code : CodeableConcept *category : CodeableConcept - *contained : Provenance + *contained : Provenance (Contained) } entity "Provenance" as pro { diff --git a/input/pagecontent/data-model.md b/input/pagecontent/data-model.md index 9e5f153..272ef15 100644 --- a/input/pagecontent/data-model.md +++ b/input/pagecontent/data-model.md @@ -1,29 +1,49 @@ ### Summary -The RA record is made up of Consent, Condition, Flag and Provenances resources. The Consent, Condition and Flag resources are linked via a Patient resource. The Provenace resource is only scoped to a sinle Flag and has no lifetime outside of the Flag (specific version) resource. +The RA record is made up of Consent, Condition, Flag and Provenances resources. The Consent, Condition and Flag resources are linked via a Patient resource. Provenance of all resources that make up an RA record must be stored. This is modelled here as a contained resource, and as such has no lifetime outside of the constituent RA record resources. ### Data Model -
- RA Record Data Model -
-
erDiagram + Patient { + NHS-number identifier + } + Consent { + patient Patient + category CodeableConcept + contained Provenance + } + Condition { + patient Patient + code CodeableConcept + category CodeableConcept + contained Provenance + } + PatientFlag { + patient Patient + code CodeableConcept + category CodeableConcept + contained Provenance + } + ProgrammeFlag { + patient Patient + code CodeableConcept + category CodeableConcept + contained Provenance + } + Provenance { + recorded DateTime + agent Agent + } Patient ||..|| Consent : provides Patient ||--o{ Condition : has - Patient ||--o| "Patient Flag" : "has" - Patient ||--o{ "Adjustment Flag" : has + Patient ||--o| PatientFlag : has + Patient ||--o{ ProgrammeFlag : has Consent ||--|| Provenance : contains Condition ||--|| Provenance : contains - "Patient Flag" ||--|| Provenance : contains - "Adjustment Flag" ||--|| Provenance : contains -
- -
- -{%include data-model.svg%} - + PatientFlag ||--|| Provenance : contains + ProgrammeFlag ||--|| Provenance : contains
\ No newline at end of file diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md index 731086a..5b740af 100644 --- a/input/pagecontent/index.md +++ b/input/pagecontent/index.md @@ -19,4 +19,21 @@ It will also eventually be available to screening services. It can indicate the Licensing and Publisher
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.
Developed and authored by NHS England Interoperability Team. -
\ No newline at end of file + + + +### Dependencies + +{% include dependency-table.xhtml %} + +### Cross Version Analysis + +{% include cross-version-analysis.xhtml %} + +### Global Profiles + +{% include globals-table.xhtml %} + +### IP statements + +{% include ip-statements.xhtml %} \ No newline at end of file diff --git a/input/resources/CareConnect-SDSJobRoleName-1.json b/input/resources/CareConnect-SDSJobRoleName-1.json deleted file mode 100644 index 48d2bc9..0000000 --- a/input/resources/CareConnect-SDSJobRoleName-1.json +++ /dev/null @@ -1,1593 +0,0 @@ -{ - "resourceType" : "CodeSystem", - "id" : "CareConnect-SDSJobRoleName-1", - "text" : { - "status" : "generated", - "div" : "

This code system https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-SDSJobRoleName-1 defines the following codes:

CodeDisplay
R0010 Medical Director
R0020 Clinical Director - Medical
R0210 Director of Public Health
R0030 Professor
R0040 Senior Lecturer
R0050 Consultant
R0060 Special Salary Scale in Public Health Medicine
R0070 Associate Specialist
R0080 Staff Grade
R0090 Hospital Practitioner
R0100 Clinical Assistant
R0110 Specialist Registrar
R0120 Senior Registrar (Closed)
R0130 Registrar (Closed)
R0140 Senior House Officer
R0150 House Officer - Pre Registration
R0160 House Officer - Post Registration
R0170 Trust Grade Doctor - House Officer level
R0180 Trust Grade Doctor - SHO level
R0190 Trust Grade Doctor - Specialist Registrar level
R0200 Trust Grade Doctor - Career Grade level
R0260 General Medical Practitioner
R0270 Salaried General Practitioner
R1981 Psychiatrist
R1984 Health Records Administrator
R6200 GP Registrar
R6300 Sessional GP
R7140 ODP
R7150 SODP
R9100 A&E Staff Nurse (Temporary) London Cluster Only
R9101 A&E Manager (Temporary) London Cluster Only
R9102 A&E Doctor (Temporary) London Cluster only
R9103 A&E Student (Temporary) London Cluster Only
R9104 A&E Clerk (Temporary) London Cluster Only
R0215 Assistant Clinical Medical Officer
R0220 Clinical Medical Officer
R0230 Senior Clinical Medical Officer
R0240 Other Community Health Service
R0243 Other Community Health Service - Social Care Worker
R0247 Other Community Health Service - Admin Clerk
R0055 Dental Surgeon acting as Hospital Consultant
R0250 General Dental Practitioner
R0280 Regional Dental Officer
R0290 Dental Clinical Director - Dental
R0295 Dental Assistant Clinical Director
R0300 Dental Officer
R0310 Senior Dental Officer
R0320 Salaried Dental Practitioner
R0006 Student Community Practitioner
R0330 Student Nurse - Adult Branch
R0340 Student Nurse - Child Branch
R0350 Student Nurse - Mental Health Branch
R0360 Student Nurse - Learning Disabilities Branch
R0370 Student Midwife
R0380 Student Health Visitor
R0390 Student District Nurse
R0400 Student School Nurse
R0410 Student Practice Nurse
R0420 Student Occupational Health Nurse
R0430 Student Community Paediatric Nurse
R0440 Student Community Mental Health Nurse
R0450 Student Community Learning Disabilities Nurse
R0460 Student Chiropodist
R0470 Student Dietitian
R0480 Student Occupational Therapist
R0490 Student Orthoptist
R0500 Student Physiotherapist
R0510 Student Radiographer - Diagnostic
R0520 Student Radiographer - Therapeutic
R0530 Student Speech & Language Therapist
R0540 Art, Music & Drama Student
R0550 Student Psychotherapist
R6400 Medical Student
R0560 Director of Nursing
R0580 Nurse Manager
R0610 Sister/Charge Nurse
R1976 Community Team Manager
R0570 Nurse Consultant
R0600 Specialist Nurse Practitioner
R0620 Staff Nurse
R0630 Enrolled Nurse
R0690 Community Practitioner
R0700 Community Nurse
R1974 Community Learning Disabilities Nurse
R1975 Community Mental Health Nurse
R0590 Modern Matron
R1972 Clinical Team Manager
R0640 Midwife - Consultant
R0650 Midwife - Specialist Practitioner
R0660 Midwife - Manager
R0670 Midwife - Sister/Charge Nurse
R0680 Midwife
R0018 Audiologist
R0750 Chiropodist/Podiatrist
R0760 Chiropodist/Podiatrist Consultant
R0770 Chiropodist/Podiatrist Manager
R0780 Chiropodist/Podiatrist Specialist Practitioner
R0790 Dietitian
R0800 Dietitian Consultant
R0810 Dietitian Manager
R0820 Dietitian Specialist Practitioner
R0950 Occupational Therapist
R0960 Occupational Therapist Consultant
R0970 Occupational Therapist Manager
R0980 Occupational Therapy Specialist Practitioner
R0990 Orthoptist
R1000 Orthoptist Consultant
R1010 Orthoptist Manager
R1020 Orthoptist Specialist Practitioner
R1110 Physiotherapist
R1120 Physiotherapist Consultant
R1130 Physiotherapist Manager
R1140 Physiotherapist Specialist Practitioner
R1070 Paramedic
R1080 Paramedic Consultant
R1090 Paramedic Manager
R1100 Paramedic Specialist Practitioner
R0003 Clinical Application Administrator
R0012 Radiographer
R0013 Student Radiographer
R0014 Radiologist
R0015 PACS Administrator
R0016 Reporting Radiographer
R0017 Assistant Practitioner
R1190 Radiographer - Diagnostic
R1200 Radiographer - Diagnostic, Consultant
R1210 Radiographer - Diagnostic, Manager
R1220 Radiographer - Diagnostic, Specialist Practitioner
R1230 Radiographer - Therapeutic
R1240 Radiographer - Therapeutic, Consultant
R1250 Radiographer - Therapeutic, Manager
R1260 Radiographer - Therapeutic, Specialist Practitioner
R1030 Orthotist
R1040 Orthotist Consultant
R1050 Orthotist Manager
R1060 Orthotist Specialist Practitioner
R1150 Prosthetist
R1160 Prosthetist Consultant
R1170 Prosthetist Manager
R1180 Prosthetist Specialist Practitioner
R0710 Art Therapist
R0720 Art Therapist Consultant
R0730 Art Therapist Manager
R0740 Art Therapist Specialist Practitioner
R0830 Drama Therapist
R0840 Drama Therapist Consultant
R0850 Drama Therapist Manager
R0860 Drama Therapist Specialist Practitioner
R0870 Multi Therapist
R0880 Multi Therapist Consultant
R0890 Multi Therapist Manager
R0900 Multi Therapist Specialist Practitioner
R0910 Music Therapist
R0920 Music Therapist Consultant
R0930 Music Therapist Manager
R0940 Music Therapist Specialist Practitioner
R0955 Speech & Language Therapist
R0965 Speech & Language Therapist Consultant
R0975 Speech & Language Therapist Manager
R0985 Speech & Language Therapist Specialist Practitioner
R9500 Social Services Senior Management
R9505 Social Services Policy and Planning
R9510 Social Services Information Manager
R9515 Social Work Team Manager (Children)
R9520 Senior Social Worker (Children)
R9525 Social Services Care Manager (Children)
R9530 Social Work Assistant (Children)
R9535 Child Protection Worker
R9540 Family Placement Worker
R9545 Community Worker (Children)
R9550 Occupational Therapist
R9555 Occupational Therapist Assistant
R9560 Occupational Therapy Team Manager
R9565 Social Work Team Manager (Adults)
R9570 Senior Social Worker (Adults)
R9575 Social Services Care Manager (Adults)
R9580 Social Work Assistant (Adults)
R9585 Social Work Team Manager (Mental Health)
R9590 Senior Social Worker (Mental Health)
R9595 Social Services Care Manager (Mental Health)
R9600 Social Work Assistant (Mental Health)
R9605 Emergency Duty Social Worker
R9615 Social Services Driver
R9620 Home Care Organiser
R9625 Home Care Administrator
R9630 Home Help
R9635 Warden
R9640 Meals on Wheels Organiser
R9645 Meals Delivery
R9650 Day Centre Manager
R9655 Day Centre Deputy
R9660 Day Centre Officer
R9665 Day Centre Care Staff
R9670 Family Centre Manager
R9675 Family Centre Deputy
R9680 Family Centre Worker
R9685 Nursery Manager
R9690 Nursery Deputy
R9695 Nursery Worker
R9700 Playgroup Leader
R9705 Playgroup Assistant
R9710 Residential Manager
R9715 Residential Deputy
R9720 Residential Worker
R9725 Residential Care Staff
R9730 Intermediate Care Manager
R9735 Intermediate Care Deputy
R9740 Intermediate Care Worker
R9745 Intermediate Care Staff
R9750 Social Care SAP User
R9755 Social Care SAP Manager
R1270 Clinical Director
R1280 Optometrist
R1290 Pharmacist
R1979 Medical Technical Officer - Pharmacy
R1300 Psychotherapist
R1310 Clinical Psychologist
R1320 Chaplain
R1330 Social Worker
R1340 Approved Social Worker
R1350 Youth Worker
R1360 Specialist Practitioner
R1370 Practitioner
R0011 Dispenser
R1380 Technician - PS&T
R1390 Osteopath
R1400 Healthcare Scientist
R1410 Consultant Healthcare Scientist
R1420 Biomedical Scientist
R0019 Medical Technical Officer
R1430 Technician - Healthcare Scientists
R1440 Therapist
R1540 Associate Practitioner
R1543 Associate Practitioner - Nurse
R1547 Associate Practitioner - General Practitioner
R1560 Helper/Assistant
R1600 Cytoscreener
R1570 Dental Surgery Assistant
R1450 Health Care Support Worker
R1580 Medical Laboratory Assistant
R1550 Counsellor
R0002 Porter
R1690 Call Operator
R1700 Gateway Worker
R1710 Support, Time, Recovery Worker
R1480 Healthcare Assistant
R1490 Nursery Nurse
R1590 Phlebotomist
R1460 Social Care Support Worker
R1470 Home Help
R1520 Technician - Additional Clinical Services
R1530 Technical Instructor
R1980 Patient Welfare Officer
R1500 Play Therapist
R1510 Play Specialist
R1610 Student Technician
R1620 Trainee Scientist
R1630 Trainee Practitioner
R1640 Nursing Cadet
R1650 Healthcare Cadet
R1660 Pre-reg Pharmacist
R1670 Assistant Psychologist
R1680 Assistant Psychotherapist
R0007 ERS SDS Organisation Reporting Analyst
R0008 Demographic Supervisor
R0021 DSA NHS Number Manager (Temporary)
R0022 DSA National Clinical Supervisor (Temporary)
R0023 DSA National Clinical Administrator (Temporary)
R1720 Clerical Worker
R1730 Receptionist
R1740 Secretary
R1750 Personal Assistant
R1751 Demographic Administrator (Sensitive Records) Temporary
R1760 Medical Secretary
R1770 Officer
R1971 Map of Medicine Administrator
R1973 Community Administrator
R1977 ECC/CPA Administrator
R1978 Information Officer
R1985 Health Records Clerk
R1995 End Point Approver
R5010 Network Technician
R5040 Desktop Support Administrator
R5090 Registration Authority Agent
R5110 Demographic Administrator
R5120 ISP Administrator
R5130 Technical Codes Administrator
R5140 OSS Administrator
R5170 End Point Administrator
R5175 End Point Viewer
R5181 RTS Dashboard User
R5183 RTS BT Dashboard User
R5186 ERS BT Customer SLA User
R5188 ERS BT Supplier SLA User
R5189 ERS LogicaCMG SLA User
R5190 Content Creator
R5195 Content Publisher
R5210 User Details Administrator
R5250 EBS Administrator
R6010 Appointments Clerk
R6030 Ward Clerk
R6050 Clinical Coder
R6060 Medical Records Clerk
R6080 Waiting List Clerk
R7100 Trainer
R7110 Training Manager
R7120 Directory of Services Coordinator
R9756 ETP System Administrator
R1780 Manager
R1790 Senior Manager
R1910 Chair
R1920 Chief Executive
R1930 Finance Director
R1940 Other Executive Director
R1950 Board Level Director
R1960 Non Executive Director
R1970 Childcare Co-ordinator
R1982 Senior Administrator
R1983 Ward Manager
R1986 Workgroup Administrator
R1987 National RBAC Attribute Administrator
R1988 National RBAC Baseline Policy Administrator
R1989 Complaints Coordinator
R1990 Complaints Investigator
R1996 End Point DNS Administrator
R1997 End Point Spine Administrator
R1998 End Point Super User
R1999 End Point Service Administrator
R5000 Network Administrator
R5003 Cluster System Administrator
R5007 System Administrator
R5020 Helpdesk Administrator
R5060 Security Policy Controller
R5070 Senior Security Manager
R5072 Root Registration Authority Manager
R5080 Registration Authority Manager
R5100 Audit Manager
R5105 Caldicott Guardian
R5180 NASP Service Manager
R5182 ERS ETP System Administrator
R5184 ERS Spine SLA Manager
R5185 ERS BT Customer SLA Manager
R5187 ERS BT Supplier SLA Manager
R5191 ERS Support Administrator
R5192 ECS Administrator
R5300 Portal Administrator
R5310 LiquidLogic Administrator
R5320 i.EPR Administrator
R5330 Synergy Administrator
R5340 SystmOne Administrator
R6020 Outpatient Manager
R6040 Bed Manager
R6070 Medical Records Manager
R6090 Waiting List Manager
R6100 Mental Health Act Administrator
R6160 Ad-hoc Report Manager
R7130 PAS Manager
R1800 Technician - Admin & Clerical
R1810 Accountant
R1820 Librarian
R1830 Interpreter
R1840 Analyst
R1850 Adviser
R1860 Researcher
R1870 Control Assistant
R1880 Architect
R1890 Lawyer
R1900 Surveyor
R5030 Helpdesk Technician
R5050 Desktop Support Technician
R5150 System Worker
R5400 Availability Monitor
R8000 Clinical Practitioner Access Role
R8001 Nurse Access Role
R8002 Nurse Manager Access Role
R8003 Health Professional Access Role
R8004 Healthcare Student Access Role
R8016 Midwife Access Role
R8017 Midwife Manager Access Role
R8024 Bank Access Role
R8005 Biomedical Scientist Access Role
R8006 Medical Secretary Access Role
R8007 Clinical Coder Access Role
R8008 Admin/Clinical Support Access Role
R8015 Systems Support Access Role
R0001 Privacy Officer
R8009 Receptionist Access Role
R8010 Clerical Access Role
R8011 Clerical Manager Access Role
R8012 Information Officer Access Role
R8013 Health Records Manager Access Role
R8014 Social Worker Access Role
" - }, - "url" : "https://fhir.hl7.org.uk/STU3/CodeSystem/CareConnect-SDSJobRoleName-1", - "version" : "0.1.0", - "name" : "Care Connect SDS Job Role Name", - "status" : "draft", - "date" : "2018-11-01T00:00:00+00:00", - "publisher" : "Interweave Publisher", - "contact" : [{ - "name" : "Interweave Publisher", - "telecom" : [{ - "system" : "url", - "value" : "https://fhir.yhcr.nhs.uk/yhcr-publisher" - }] - }], - "description" : "A CodeSystem that identifies the job role associated with the person on the smart card. This consists of a set of Role Based Access Control (RBAC) codes. This code list is externally maintained.", - "copyright" : "Copyright © 2016 HL7 UK", - "caseSensitive" : true, - "content" : "complete", - "concept" : [{ - "code" : "R0010", - "display" : "Medical Director" - }, - { - "code" : "R0020", - "display" : "Clinical Director - Medical" - }, - { - "code" : "R0210", - "display" : "Director of Public Health" - }, - { - "code" : "R0030", - "display" : "Professor" - }, - { - "code" : "R0040", - "display" : "Senior Lecturer" - }, - { - "code" : "R0050", - "display" : "Consultant" - }, - { - "code" : "R0060", - "display" : "Special Salary Scale in Public Health Medicine" - }, - { - "code" : "R0070", - "display" : "Associate Specialist" - }, - { - "code" : "R0080", - "display" : "Staff Grade" - }, - { - "code" : "R0090", - "display" : "Hospital Practitioner" - }, - { - "code" : "R0100", - "display" : "Clinical Assistant" - }, - { - "code" : "R0110", - "display" : "Specialist Registrar" - }, - { - "code" : "R0120", - "display" : "Senior Registrar (Closed)" - }, - { - "code" : "R0130", - "display" : "Registrar (Closed)" - }, - { - "code" : "R0140", - "display" : "Senior House Officer" - }, - { - "code" : "R0150", - "display" : "House Officer - Pre Registration" - }, - { - "code" : "R0160", - "display" : "House Officer - Post Registration" - }, - { - "code" : "R0170", - "display" : "Trust Grade Doctor - House Officer level" - }, - { - "code" : "R0180", - "display" : "Trust Grade Doctor - SHO level" - }, - { - "code" : "R0190", - "display" : "Trust Grade Doctor - Specialist Registrar level" - }, - { - "code" : "R0200", - "display" : "Trust Grade Doctor - Career Grade level" - }, - { - "code" : "R0260", - "display" : "General Medical Practitioner" - }, - { - "code" : "R0270", - "display" : "Salaried General Practitioner" - }, - { - "code" : "R1981", - "display" : "Psychiatrist" - }, - { - "code" : "R1984", - "display" : "Health Records Administrator" - }, - { - "code" : "R6200", - "display" : "GP Registrar" - }, - { - "code" : "R6300", - "display" : "Sessional GP" - }, - { - "code" : "R7140", - "display" : "ODP" - }, - { - "code" : "R7150", - "display" : "SODP" - }, - { - "code" : "R9100", - "display" : "A&E Staff Nurse (Temporary) London Cluster Only" - }, - { - "code" : "R9101", - "display" : "A&E Manager (Temporary) London Cluster Only" - }, - { - "code" : "R9102", - "display" : "A&E Doctor (Temporary) London Cluster only" - }, - { - "code" : "R9103", - "display" : "A&E Student (Temporary) London Cluster Only" - }, - { - "code" : "R9104", - "display" : "A&E Clerk (Temporary) London Cluster Only" - }, - { - "code" : "R0215", - "display" : "Assistant Clinical Medical Officer" - }, - { - "code" : "R0220", - "display" : "Clinical Medical Officer" - }, - { - "code" : "R0230", - "display" : "Senior Clinical Medical Officer" - }, - { - "code" : "R0240", - "display" : "Other Community Health Service" - }, - { - "code" : "R0243", - "display" : "Other Community Health Service - Social Care Worker" - }, - { - "code" : "R0247", - "display" : "Other Community Health Service - Admin Clerk" - }, - { - "code" : "R0055", - "display" : "Dental Surgeon acting as Hospital Consultant" - }, - { - "code" : "R0250", - "display" : "General Dental Practitioner" - }, - { - "code" : "R0280", - "display" : "Regional Dental Officer" - }, - { - "code" : "R0290", - "display" : "Dental Clinical Director - Dental" - }, - { - "code" : "R0295", - "display" : "Dental Assistant Clinical Director" - }, - { - "code" : "R0300", - "display" : "Dental Officer" - }, - { - "code" : "R0310", - "display" : "Senior Dental Officer" - }, - { - "code" : "R0320", - "display" : "Salaried Dental Practitioner" - }, - { - "code" : "R0006", - "display" : "Student Community Practitioner" - }, - { - "code" : "R0330", - "display" : "Student Nurse - Adult Branch" - }, - { - "code" : "R0340", - "display" : "Student Nurse - Child Branch" - }, - { - "code" : "R0350", - "display" : "Student Nurse - Mental Health Branch" - }, - { - "code" : "R0360", - "display" : "Student Nurse - Learning Disabilities Branch" - }, - { - "code" : "R0370", - "display" : "Student Midwife" - }, - { - "code" : "R0380", - "display" : "Student Health Visitor" - }, - { - "code" : "R0390", - "display" : "Student District Nurse" - }, - { - "code" : "R0400", - "display" : "Student School Nurse" - }, - { - "code" : "R0410", - "display" : "Student Practice Nurse" - }, - { - "code" : "R0420", - "display" : "Student Occupational Health Nurse" - }, - { - "code" : "R0430", - "display" : "Student Community Paediatric Nurse" - }, - { - "code" : "R0440", - "display" : "Student Community Mental Health Nurse" - }, - { - "code" : "R0450", - "display" : "Student Community Learning Disabilities Nurse" - }, - { - "code" : "R0460", - "display" : "Student Chiropodist" - }, - { - "code" : "R0470", - "display" : "Student Dietitian" - }, - { - "code" : "R0480", - "display" : "Student Occupational Therapist" - }, - { - "code" : "R0490", - "display" : "Student Orthoptist" - }, - { - "code" : "R0500", - "display" : "Student Physiotherapist" - }, - { - "code" : "R0510", - "display" : "Student Radiographer - Diagnostic" - }, - { - "code" : "R0520", - "display" : "Student Radiographer - Therapeutic" - }, - { - "code" : "R0530", - "display" : "Student Speech & Language Therapist" - }, - { - "code" : "R0540", - "display" : "Art, Music & Drama Student" - }, - { - "code" : "R0550", - "display" : "Student Psychotherapist" - }, - { - "code" : "R6400", - "display" : "Medical Student" - }, - { - "code" : "R0560", - "display" : "Director of Nursing" - }, - { - "code" : "R0580", - "display" : "Nurse Manager" - }, - { - "code" : "R0610", - "display" : "Sister/Charge Nurse" - }, - { - "code" : "R1976", - "display" : "Community Team Manager" - }, - { - "code" : "R0570", - "display" : "Nurse Consultant" - }, - { - "code" : "R0600", - "display" : "Specialist Nurse Practitioner" - }, - { - "code" : "R0620", - "display" : "Staff Nurse" - }, - { - "code" : "R0630", - "display" : "Enrolled Nurse" - }, - { - "code" : "R0690", - "display" : "Community Practitioner" - }, - { - "code" : "R0700", - "display" : "Community Nurse" - }, - { - "code" : "R1974", - "display" : "Community Learning Disabilities Nurse" - }, - { - "code" : "R1975", - "display" : "Community Mental Health Nurse" - }, - { - "code" : "R0590", - "display" : "Modern Matron" - }, - { - "code" : "R1972", - "display" : "Clinical Team Manager" - }, - { - "code" : "R0640", - "display" : "Midwife - Consultant" - }, - { - "code" : "R0650", - "display" : "Midwife - Specialist Practitioner" - }, - { - "code" : "R0660", - "display" : "Midwife - Manager" - }, - { - "code" : "R0670", - "display" : "Midwife - Sister/Charge Nurse" - }, - { - "code" : "R0680", - "display" : "Midwife" - }, - { - "code" : "R0018", - "display" : "Audiologist" - }, - { - "code" : "R0750", - "display" : "Chiropodist/Podiatrist" - }, - { - "code" : "R0760", - "display" : "Chiropodist/Podiatrist Consultant" - }, - { - "code" : "R0770", - "display" : "Chiropodist/Podiatrist Manager" - }, - { - "code" : "R0780", - "display" : "Chiropodist/Podiatrist Specialist Practitioner" - }, - { - "code" : "R0790", - "display" : "Dietitian" - }, - { - "code" : "R0800", - "display" : "Dietitian Consultant" - }, - { - "code" : "R0810", - "display" : "Dietitian Manager" - }, - { - "code" : "R0820", - "display" : "Dietitian Specialist Practitioner" - }, - { - "code" : "R0950", - "display" : "Occupational Therapist" - }, - { - "code" : "R0960", - "display" : "Occupational Therapist Consultant" - }, - { - "code" : "R0970", - "display" : "Occupational Therapist Manager" - }, - { - "code" : "R0980", - "display" : "Occupational Therapy Specialist Practitioner" - }, - { - "code" : "R0990", - "display" : "Orthoptist" - }, - { - "code" : "R1000", - "display" : "Orthoptist Consultant" - }, - { - "code" : "R1010", - "display" : "Orthoptist Manager" - }, - { - "code" : "R1020", - "display" : "Orthoptist Specialist Practitioner" - }, - { - "code" : "R1110", - "display" : "Physiotherapist" - }, - { - "code" : "R1120", - "display" : "Physiotherapist Consultant" - }, - { - "code" : "R1130", - "display" : "Physiotherapist Manager" - }, - { - "code" : "R1140", - "display" : "Physiotherapist Specialist Practitioner" - }, - { - "code" : "R1070", - "display" : "Paramedic" - }, - { - "code" : "R1080", - "display" : "Paramedic Consultant" - }, - { - "code" : "R1090", - "display" : "Paramedic Manager" - }, - { - "code" : "R1100", - "display" : "Paramedic Specialist Practitioner" - }, - { - "code" : "R0003", - "display" : "Clinical Application Administrator" - }, - { - "code" : "R0012", - "display" : "Radiographer" - }, - { - "code" : "R0013", - "display" : "Student Radiographer" - }, - { - "code" : "R0014", - "display" : "Radiologist" - }, - { - "code" : "R0015", - "display" : "PACS Administrator" - }, - { - "code" : "R0016", - "display" : "Reporting Radiographer" - }, - { - "code" : "R0017", - "display" : "Assistant Practitioner" - }, - { - "code" : "R1190", - "display" : "Radiographer - Diagnostic" - }, - { - "code" : "R1200", - "display" : "Radiographer - Diagnostic, Consultant" - }, - { - "code" : "R1210", - "display" : "Radiographer - Diagnostic, Manager" - }, - { - "code" : "R1220", - "display" : "Radiographer - Diagnostic, Specialist Practitioner" - }, - { - "code" : "R1230", - "display" : "Radiographer - Therapeutic" - }, - { - "code" : "R1240", - "display" : "Radiographer - Therapeutic, Consultant" - }, - { - "code" : "R1250", - "display" : "Radiographer - Therapeutic, Manager" - }, - { - "code" : "R1260", - "display" : "Radiographer - Therapeutic, Specialist Practitioner" - }, - { - "code" : "R1030", - "display" : "Orthotist" - }, - { - "code" : "R1040", - "display" : "Orthotist Consultant" - }, - { - "code" : "R1050", - "display" : "Orthotist Manager" - }, - { - "code" : "R1060", - "display" : "Orthotist Specialist Practitioner" - }, - { - "code" : "R1150", - "display" : "Prosthetist" - }, - { - "code" : "R1160", - "display" : "Prosthetist Consultant" - }, - { - "code" : "R1170", - "display" : "Prosthetist Manager" - }, - { - "code" : "R1180", - "display" : "Prosthetist Specialist Practitioner" - }, - { - "code" : "R0710", - "display" : "Art Therapist" - }, - { - "code" : "R0720", - "display" : "Art Therapist Consultant" - }, - { - "code" : "R0730", - "display" : "Art Therapist Manager" - }, - { - "code" : "R0740", - "display" : "Art Therapist Specialist Practitioner" - }, - { - "code" : "R0830", - "display" : "Drama Therapist" - }, - { - "code" : "R0840", - "display" : "Drama Therapist Consultant" - }, - { - "code" : "R0850", - "display" : "Drama Therapist Manager" - }, - { - "code" : "R0860", - "display" : "Drama Therapist Specialist Practitioner" - }, - { - "code" : "R0870", - "display" : "Multi Therapist" - }, - { - "code" : "R0880", - "display" : "Multi Therapist Consultant" - }, - { - "code" : "R0890", - "display" : "Multi Therapist Manager" - }, - { - "code" : "R0900", - "display" : "Multi Therapist Specialist Practitioner" - }, - { - "code" : "R0910", - "display" : "Music Therapist" - }, - { - "code" : "R0920", - "display" : "Music Therapist Consultant" - }, - { - "code" : "R0930", - "display" : "Music Therapist Manager" - }, - { - "code" : "R0940", - "display" : "Music Therapist Specialist Practitioner" - }, - { - "code" : "R0955", - "display" : "Speech & Language Therapist" - }, - { - "code" : "R0965", - "display" : "Speech & Language Therapist Consultant" - }, - { - "code" : "R0975", - "display" : "Speech & Language Therapist Manager" - }, - { - "code" : "R0985", - "display" : "Speech & Language Therapist Specialist Practitioner" - }, - { - "code" : "R9500", - "display" : "Social Services Senior Management" - }, - { - "code" : "R9505", - "display" : "Social Services Policy and Planning" - }, - { - "code" : "R9510", - "display" : "Social Services Information Manager" - }, - { - "code" : "R9515", - "display" : "Social Work Team Manager (Children)" - }, - { - "code" : "R9520", - "display" : "Senior Social Worker (Children)" - }, - { - "code" : "R9525", - "display" : "Social Services Care Manager (Children)" - }, - { - "code" : "R9530", - "display" : "Social Work Assistant (Children)" - }, - { - "code" : "R9535", - "display" : "Child Protection Worker" - }, - { - "code" : "R9540", - "display" : "Family Placement Worker" - }, - { - "code" : "R9545", - "display" : "Community Worker (Children)" - }, - { - "code" : "R9550", - "display" : "Occupational Therapist" - }, - { - "code" : "R9555", - "display" : "Occupational Therapist Assistant" - }, - { - "code" : "R9560", - "display" : "Occupational Therapy Team Manager" - }, - { - "code" : "R9565", - "display" : "Social Work Team Manager (Adults)" - }, - { - "code" : "R9570", - "display" : "Senior Social Worker (Adults)" - }, - { - "code" : "R9575", - "display" : "Social Services Care Manager (Adults)" - }, - { - "code" : "R9580", - "display" : "Social Work Assistant (Adults)" - }, - { - "code" : "R9585", - "display" : "Social Work Team Manager (Mental Health)" - }, - { - "code" : "R9590", - "display" : "Senior Social Worker (Mental Health)" - }, - { - "code" : "R9595", - "display" : "Social Services Care Manager (Mental Health)" - }, - { - "code" : "R9600", - "display" : "Social Work Assistant (Mental Health)" - }, - { - "code" : "R9605", - "display" : "Emergency Duty Social Worker" - }, - { - "code" : "R9615", - "display" : "Social Services Driver" - }, - { - "code" : "R9620", - "display" : "Home Care Organiser" - }, - { - "code" : "R9625", - "display" : "Home Care Administrator" - }, - { - "code" : "R9630", - "display" : "Home Help" - }, - { - "code" : "R9635", - "display" : "Warden" - }, - { - "code" : "R9640", - "display" : "Meals on Wheels Organiser" - }, - { - "code" : "R9645", - "display" : "Meals Delivery" - }, - { - "code" : "R9650", - "display" : "Day Centre Manager" - }, - { - "code" : "R9655", - "display" : "Day Centre Deputy" - }, - { - "code" : "R9660", - "display" : "Day Centre Officer" - }, - { - "code" : "R9665", - "display" : "Day Centre Care Staff" - }, - { - "code" : "R9670", - "display" : "Family Centre Manager" - }, - { - "code" : "R9675", - "display" : "Family Centre Deputy" - }, - { - "code" : "R9680", - "display" : "Family Centre Worker" - }, - { - "code" : "R9685", - "display" : "Nursery Manager" - }, - { - "code" : "R9690", - "display" : "Nursery Deputy" - }, - { - "code" : "R9695", - "display" : "Nursery Worker" - }, - { - "code" : "R9700", - "display" : "Playgroup Leader" - }, - { - "code" : "R9705", - "display" : "Playgroup Assistant" - }, - { - "code" : "R9710", - "display" : "Residential Manager" - }, - { - "code" : "R9715", - "display" : "Residential Deputy" - }, - { - "code" : "R9720", - "display" : "Residential Worker" - }, - { - "code" : "R9725", - "display" : "Residential Care Staff" - }, - { - "code" : "R9730", - "display" : "Intermediate Care Manager" - }, - { - "code" : "R9735", - "display" : "Intermediate Care Deputy" - }, - { - "code" : "R9740", - "display" : "Intermediate Care Worker" - }, - { - "code" : "R9745", - "display" : "Intermediate Care Staff" - }, - { - "code" : "R9750", - "display" : "Social Care SAP User" - }, - { - "code" : "R9755", - "display" : "Social Care SAP Manager" - }, - { - "code" : "R1270", - "display" : "Clinical Director" - }, - { - "code" : "R1280", - "display" : "Optometrist" - }, - { - "code" : "R1290", - "display" : "Pharmacist" - }, - { - "code" : "R1979", - "display" : "Medical Technical Officer - Pharmacy" - }, - { - "code" : "R1300", - "display" : "Psychotherapist" - }, - { - "code" : "R1310", - "display" : "Clinical Psychologist" - }, - { - "code" : "R1320", - "display" : "Chaplain" - }, - { - "code" : "R1330", - "display" : "Social Worker" - }, - { - "code" : "R1340", - "display" : "Approved Social Worker" - }, - { - "code" : "R1350", - "display" : "Youth Worker" - }, - { - "code" : "R1360", - "display" : "Specialist Practitioner" - }, - { - "code" : "R1370", - "display" : "Practitioner" - }, - { - "code" : "R0011", - "display" : "Dispenser" - }, - { - "code" : "R1380", - "display" : "Technician - PS&T" - }, - { - "code" : "R1390", - "display" : "Osteopath" - }, - { - "code" : "R1400", - "display" : "Healthcare Scientist" - }, - { - "code" : "R1410", - "display" : "Consultant Healthcare Scientist" - }, - { - "code" : "R1420", - "display" : "Biomedical Scientist" - }, - { - "code" : "R0019", - "display" : "Medical Technical Officer" - }, - { - "code" : "R1430", - "display" : "Technician - Healthcare Scientists" - }, - { - "code" : "R1440", - "display" : "Therapist" - }, - { - "code" : "R1540", - "display" : "Associate Practitioner" - }, - { - "code" : "R1543", - "display" : "Associate Practitioner - Nurse" - }, - { - "code" : "R1547", - "display" : "Associate Practitioner - General Practitioner" - }, - { - "code" : "R1560", - "display" : "Helper/Assistant" - }, - { - "code" : "R1600", - "display" : "Cytoscreener" - }, - { - "code" : "R1570", - "display" : "Dental Surgery Assistant" - }, - { - "code" : "R1450", - "display" : "Health Care Support Worker" - }, - { - "code" : "R1580", - "display" : "Medical Laboratory Assistant" - }, - { - "code" : "R1550", - "display" : "Counsellor" - }, - { - "code" : "R0002", - "display" : "Porter" - }, - { - "code" : "R1690", - "display" : "Call Operator" - }, - { - "code" : "R1700", - "display" : "Gateway Worker" - }, - { - "code" : "R1710", - "display" : "Support, Time, Recovery Worker" - }, - { - "code" : "R1480", - "display" : "Healthcare Assistant" - }, - { - "code" : "R1490", - "display" : "Nursery Nurse" - }, - { - "code" : "R1590", - "display" : "Phlebotomist" - }, - { - "code" : "R1460", - "display" : "Social Care Support Worker" - }, - { - "code" : "R1470", - "display" : "Home Help" - }, - { - "code" : "R1520", - "display" : "Technician - Additional Clinical Services" - }, - { - "code" : "R1530", - "display" : "Technical Instructor" - }, - { - "code" : "R1980", - "display" : "Patient Welfare Officer" - }, - { - "code" : "R1500", - "display" : "Play Therapist" - }, - { - "code" : "R1510", - "display" : "Play Specialist" - }, - { - "code" : "R1610", - "display" : "Student Technician" - }, - { - "code" : "R1620", - "display" : "Trainee Scientist" - }, - { - "code" : "R1630", - "display" : "Trainee Practitioner" - }, - { - "code" : "R1640", - "display" : "Nursing Cadet" - }, - { - "code" : "R1650", - "display" : "Healthcare Cadet" - }, - { - "code" : "R1660", - "display" : "Pre-reg Pharmacist" - }, - { - "code" : "R1670", - "display" : "Assistant Psychologist" - }, - { - "code" : "R1680", - "display" : "Assistant Psychotherapist" - }, - { - "code" : "R0007", - "display" : "ERS SDS Organisation Reporting Analyst" - }, - { - "code" : "R0008", - "display" : "Demographic Supervisor" - }, - { - "code" : "R0021", - "display" : "DSA NHS Number Manager (Temporary)" - }, - { - "code" : "R0022", - "display" : "DSA National Clinical Supervisor (Temporary)" - }, - { - "code" : "R0023", - "display" : "DSA National Clinical Administrator (Temporary)" - }, - { - "code" : "R1720", - "display" : "Clerical Worker" - }, - { - "code" : "R1730", - "display" : "Receptionist" - }, - { - "code" : "R1740", - "display" : "Secretary" - }, - { - "code" : "R1750", - "display" : "Personal Assistant" - }, - { - "code" : "R1751", - "display" : "Demographic Administrator (Sensitive Records) Temporary" - }, - { - "code" : "R1760", - "display" : "Medical Secretary" - }, - { - "code" : "R1770", - "display" : "Officer" - }, - { - "code" : "R1971", - "display" : "Map of Medicine Administrator" - }, - { - "code" : "R1973", - "display" : "Community Administrator" - }, - { - "code" : "R1977", - "display" : "ECC/CPA Administrator" - }, - { - "code" : "R1978", - "display" : "Information Officer" - }, - { - "code" : "R1985", - "display" : "Health Records Clerk" - }, - { - "code" : "R1995", - "display" : "End Point Approver" - }, - { - "code" : "R5010", - "display" : "Network Technician" - }, - { - "code" : "R5040", - "display" : "Desktop Support Administrator" - }, - { - "code" : "R5090", - "display" : "Registration Authority Agent" - }, - { - "code" : "R5110", - "display" : "Demographic Administrator" - }, - { - "code" : "R5120", - "display" : "ISP Administrator" - }, - { - "code" : "R5130", - "display" : "Technical Codes Administrator" - }, - { - "code" : "R5140", - "display" : "OSS Administrator" - }, - { - "code" : "R5170", - "display" : "End Point Administrator" - }, - { - "code" : "R5175", - "display" : "End Point Viewer" - }, - { - "code" : "R5181", - "display" : "RTS Dashboard User" - }, - { - "code" : "R5183", - "display" : "RTS BT Dashboard User" - }, - { - "code" : "R5186", - "display" : "ERS BT Customer SLA User" - }, - { - "code" : "R5188", - "display" : "ERS BT Supplier SLA User" - }, - { - "code" : "R5189", - "display" : "ERS LogicaCMG SLA User" - }, - { - "code" : "R5190", - "display" : "Content Creator" - }, - { - "code" : "R5195", - "display" : "Content Publisher" - }, - { - "code" : "R5210", - "display" : "User Details Administrator" - }, - { - "code" : "R5250", - "display" : "EBS Administrator" - }, - { - "code" : "R6010", - "display" : "Appointments Clerk" - }, - { - "code" : "R6030", - "display" : "Ward Clerk" - }, - { - "code" : "R6050", - "display" : "Clinical Coder" - }, - { - "code" : "R6060", - "display" : "Medical Records Clerk" - }, - { - "code" : "R6080", - "display" : "Waiting List Clerk" - }, - { - "code" : "R7100", - "display" : "Trainer" - }, - { - "code" : "R7110", - "display" : "Training Manager" - }, - { - "code" : "R7120", - "display" : "Directory of Services Coordinator" - }, - { - "code" : "R9756", - "display" : "ETP System Administrator" - }, - { - "code" : "R1780", - "display" : "Manager" - }, - { - "code" : "R1790", - "display" : "Senior Manager" - }, - { - "code" : "R1910", - "display" : "Chair" - }, - { - "code" : "R1920", - "display" : "Chief Executive" - }, - { - "code" : "R1930", - "display" : "Finance Director" - }, - { - "code" : "R1940", - "display" : "Other Executive Director" - }, - { - "code" : "R1950", - "display" : "Board Level Director" - }, - { - "code" : "R1960", - "display" : "Non Executive Director" - }, - { - "code" : "R1970", - "display" : "Childcare Co-ordinator" - }, - { - "code" : "R1982", - "display" : "Senior Administrator" - }, - { - "code" : "R1983", - "display" : "Ward Manager" - }, - { - "code" : "R1986", - "display" : "Workgroup Administrator" - }, - { - "code" : "R1987", - "display" : "National RBAC Attribute Administrator" - }, - { - "code" : "R1988", - "display" : "National RBAC Baseline Policy Administrator" - }, - { - "code" : "R1989", - "display" : "Complaints Coordinator" - }, - { - "code" : "R1990", - "display" : "Complaints Investigator" - }, - { - "code" : "R1996", - "display" : "End Point DNS Administrator" - }, - { - "code" : "R1997", - "display" : "End Point Spine Administrator" - }, - { - "code" : "R1998", - "display" : "End Point Super User" - }, - { - "code" : "R1999", - "display" : "End Point Service Administrator" - }, - { - "code" : "R5000", - "display" : "Network Administrator" - }, - { - "code" : "R5003", - "display" : "Cluster System Administrator" - }, - { - "code" : "R5007", - "display" : "System Administrator" - }, - { - "code" : "R5020", - "display" : "Helpdesk Administrator" - }, - { - "code" : "R5060", - "display" : "Security Policy Controller" - }, - { - "code" : "R5070", - "display" : "Senior Security Manager" - }, - { - "code" : "R5072", - "display" : "Root Registration Authority Manager" - }, - { - "code" : "R5080", - "display" : "Registration Authority Manager" - }, - { - "code" : "R5100", - "display" : "Audit Manager" - }, - { - "code" : "R5105", - "display" : "Caldicott Guardian" - }, - { - "code" : "R5180", - "display" : "NASP Service Manager" - }, - { - "code" : "R5182", - "display" : "ERS ETP System Administrator" - }, - { - "code" : "R5184", - "display" : "ERS Spine SLA Manager" - }, - { - "code" : "R5185", - "display" : "ERS BT Customer SLA Manager" - }, - { - "code" : "R5187", - "display" : "ERS BT Supplier SLA Manager" - }, - { - "code" : "R5191", - "display" : "ERS Support Administrator" - }, - { - "code" : "R5192", - "display" : "ECS Administrator" - }, - { - "code" : "R5300", - "display" : "Portal Administrator" - }, - { - "code" : "R5310", - "display" : "LiquidLogic Administrator" - }, - { - "code" : "R5320", - "display" : "i.EPR Administrator" - }, - { - "code" : "R5330", - "display" : "Synergy Administrator" - }, - { - "code" : "R5340", - "display" : "SystmOne Administrator" - }, - { - "code" : "R6020", - "display" : "Outpatient Manager" - }, - { - "code" : "R6040", - "display" : "Bed Manager" - }, - { - "code" : "R6070", - "display" : "Medical Records Manager" - }, - { - "code" : "R6090", - "display" : "Waiting List Manager" - }, - { - "code" : "R6100", - "display" : "Mental Health Act Administrator" - }, - { - "code" : "R6160", - "display" : "Ad-hoc Report Manager" - }, - { - "code" : "R7130", - "display" : "PAS Manager" - }, - { - "code" : "R1800", - "display" : "Technician - Admin & Clerical" - }, - { - "code" : "R1810", - "display" : "Accountant" - }, - { - "code" : "R1820", - "display" : "Librarian" - }, - { - "code" : "R1830", - "display" : "Interpreter" - }, - { - "code" : "R1840", - "display" : "Analyst" - }, - { - "code" : "R1850", - "display" : "Adviser" - }, - { - "code" : "R1860", - "display" : "Researcher" - }, - { - "code" : "R1870", - "display" : "Control Assistant" - }, - { - "code" : "R1880", - "display" : "Architect" - }, - { - "code" : "R1890", - "display" : "Lawyer" - }, - { - "code" : "R1900", - "display" : "Surveyor" - }, - { - "code" : "R5030", - "display" : "Helpdesk Technician" - }, - { - "code" : "R5050", - "display" : "Desktop Support Technician" - }, - { - "code" : "R5150", - "display" : "System Worker" - }, - { - "code" : "R5400", - "display" : "Availability Monitor" - }, - { - "code" : "R8000", - "display" : "Clinical Practitioner Access Role" - }, - { - "code" : "R8001", - "display" : "Nurse Access Role" - }, - { - "code" : "R8002", - "display" : "Nurse Manager Access Role" - }, - { - "code" : "R8003", - "display" : "Health Professional Access Role" - }, - { - "code" : "R8004", - "display" : "Healthcare Student Access Role" - }, - { - "code" : "R8016", - "display" : "Midwife Access Role" - }, - { - "code" : "R8017", - "display" : "Midwife Manager Access Role" - }, - { - "code" : "R8024", - "display" : "Bank Access Role" - }, - { - "code" : "R8005", - "display" : "Biomedical Scientist Access Role" - }, - { - "code" : "R8006", - "display" : "Medical Secretary Access Role" - }, - { - "code" : "R8007", - "display" : "Clinical Coder Access Role" - }, - { - "code" : "R8008", - "display" : "Admin/Clinical Support Access Role" - }, - { - "code" : "R8015", - "display" : "Systems Support Access Role" - }, - { - "code" : "R0001", - "display" : "Privacy Officer" - }, - { - "code" : "R8009", - "display" : "Receptionist Access Role" - }, - { - "code" : "R8010", - "display" : "Clerical Access Role" - }, - { - "code" : "R8011", - "display" : "Clerical Manager Access Role" - }, - { - "code" : "R8012", - "display" : "Information Officer Access Role" - }, - { - "code" : "R8013", - "display" : "Health Records Manager Access Role" - }, - { - "code" : "R8014", - "display" : "Social Worker Access Role" - }] - } \ No newline at end of file diff --git a/sushi-config.yaml b/sushi-config.yaml index 45aca45..454cb46 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -11,21 +11,22 @@ title: Reasonable Adjustments - NHS England - Implementation Guide STU1 status: draft # draft | active | retired | unknown version: 0.3.7 fhirVersion: 4.0.1 # https://www.hl7.org/fhir/valueset-FHIR-version.html -copyrightYear: 2024+ +copyrightYear: 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. releaseLabel: ci-build # ci-build | draft | qa-preview | ballot | trial-use | release | update | normative+trial-use # license: CC0-1.0 # https://www.hl7.org/fhir/valueset-spdx-license.html # jurisdiction: urn:iso:std:iso:3166#US "United States of America" # https://www.hl7.org/fhir/valueset-jurisdiction.html -publisher: - name: NHS +publisher: + name: NHS England url: https://fhir.nhs.uk - # email: test@example.org + email: interoperabilityteam@nhs.net # The dependencies property corresponds to IG.dependsOn. The key is the # package id and the value is the version (or dev/current). For advanced # use cases, the value can be an object with keys for id, uri, and version. # -# dependencies: -# hl7.fhir.us.core: 3.1.0 +dependencies: + careconnect.stu3.03.00.00: 3.1.0 + fhir.r4.ukcore.stu2: 1.1.3 # hl7.fhir.us.mcode: # id: mcode # uri: http://hl7.org/fhir/us/mcode/ImplementationGuide/hl7.fhir.us.mcode @@ -76,19 +77,20 @@ publisher: # ╰────────────────────────────────────────────────────────────────────────────────────────────────╯ menu: Home: index.html - Sitemap: toc.html Data Model: data-model.html Use Cases: Consent to Share Information: consent-to-share-information.html Add Reasonable Adjustment Record: add-reasonable-adjustment-record.html Retrieve Reasonable Adjustment Record: retrieve-ra-record.html Remove Reasonable Adjustment Record: remove-ra-record.html - Additional Examples: additional-examples.html - Server Examples: server-examples.html + Additional Examples: + CPIS/FGM demo: additional-examples.html + Server Examples: server-examples.html Artifacts: artifacts.html - Contact Us: todo.html - Downloads: todo.html - Glossary: todo.html + About: + Downloads: todo.html + Contact: todo.html + Glossary: todo.html # ╭───────────────────────────Less Common Implementation Guide Properties──────────────────────────╮ # │ Uncomment the properties below to configure additional properties on the ImplementationGuide │ @@ -100,11 +102,12 @@ menu: # ContactDetail. # # contact: -# - name: Bob Smith +# - name: NHS England # telecom: # - system: email # phone | fax | email | pager | url | sms | other -# value: bobsmith@example.org +# value: interoperabilityteam@nhs.net # use: work +# rank: 1 # # # The global property corresponds to the IG.global property, but it From cc197b53bc5bd133d6e2ad3caff21813acc47b6c Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Sun, 10 Mar 2024 21:49:09 +0000 Subject: [PATCH 13/14] licence section removed, redundant if using ip-statements --- input/pagecontent/index.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md index 5b740af..6aa10be 100644 --- a/input/pagecontent/index.md +++ b/input/pagecontent/index.md @@ -12,16 +12,6 @@ NHS England, in partnership with patient and carer groups and other key stakehol It will also eventually be available to screening services. It can indicate the patient’s key impairments (as defined in the Equality Act 2010) across areas including learning, mobility, mental health, social or behavioural to make receiving organisations understand that the patient should be considered for adjustments to care. The flag can also indicate key potential reasonable adjustments such as the need for accessible information, carer involvement, priority appointments or other adjustments to care. -### Licence - - - - ### Dependencies {% include dependency-table.xhtml %} From ef0ed4dd63e8f7e70e1bb0a6f15f084706e990d5 Mon Sep 17 00:00:00 2001 From: Declan Kieran Date: Sun, 10 Mar 2024 21:59:20 +0000 Subject: [PATCH 14/14] slight mod to intro --- input/pagecontent/index.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/input/pagecontent/index.md b/input/pagecontent/index.md index 6aa10be..13f32d1 100644 --- a/input/pagecontent/index.md +++ b/input/pagecontent/index.md @@ -4,13 +4,11 @@ The FHIR® Reasonable Adjustments API has been developed by NHS England. The API The vision is to create a library of nationally defined HL7® FHIR® resources and interaction patterns that implementers can adopt to simplify integration and interoperability within UK health and social care. -Please click [here](toc.html) for conformance guidance for NHS England programmes, products and systems. - ### Programme Mission NHS England, in partnership with patient and carer groups and other key stakeholders are working to develop a national reasonable adjustment flag which will be available to organisations providing direct care to the patient. The flag will be visible from when the patient is referred, registers for care or presents in an emergency. -It will also eventually be available to screening services. It can indicate the patient’s key impairments (as defined in the Equality Act 2010) across areas including learning, mobility, mental health, social or behavioural to make receiving organisations understand that the patient should be considered for adjustments to care. The flag can also indicate key potential reasonable adjustments such as the need for accessible information, carer involvement, priority appointments or other adjustments to care. +It will also eventually be available to screening services. It can indicate the patient’s key impairments (as defined in the [Equality Act 2010](https://www.gov.uk/guidance/equality-act-2010-guidance)) across areas including learning, mobility, mental health, social or behavioural to make receiving organisations understand that the patient should be considered for adjustments to care. The flag can also indicate key potential reasonable adjustments such as the need for accessible information, carer involvement, priority appointments or other adjustments to care. ### Dependencies