diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/ACCESS_DENIED.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/ACCESS_DENIED.json index 50fe8440f..ae73440a9 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/ACCESS_DENIED.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/ACCESS_DENIED.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "ACCESS_DENIED", "display": "#(display)" diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/ADDITIONAL_PROPERTIES.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/ADDITIONAL_PROPERTIES.json index ecc3d1d85..5f92d0cde 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/ADDITIONAL_PROPERTIES.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/ADDITIONAL_PROPERTIES.json @@ -7,7 +7,7 @@ { "code": "ADDITIONAL_PROPERTIES", "display": "Additional properties should not be included", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/FORBIDDEN_UPDATE.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/FORBIDDEN_UPDATE.json index 40537d08f..3f6cbdc1e 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/FORBIDDEN_UPDATE.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/FORBIDDEN_UPDATE.json @@ -7,7 +7,7 @@ { "code": "FORBIDDEN_UPDATE", "display": "Update is forbidden", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALIDATED_RESOURCE.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALIDATED_RESOURCE.json index 22b83d2be..1b5885bee 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALIDATED_RESOURCE.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALIDATED_RESOURCE.json @@ -7,7 +7,7 @@ { "code": "INVALIDATED_RESOURCE", "display": "Resource that has been marked as invalid was requested - invalid resources cannot be retrieved", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_CREATE.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_CREATE.json index 78d6501fd..be6c3b82c 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_CREATE.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_CREATE.json @@ -7,7 +7,7 @@ { "code": "INVALID_CREATE", "display": "Patient create data is invalid", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_METHOD.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_METHOD.json index f7c07a134..fcfec8a8b 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_METHOD.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_METHOD.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "INVALID_METHOD", "display": "#(display)" diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_RESOURCE_ID.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_RESOURCE_ID.json index 3ac8b63ea..7233f48d6 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_RESOURCE_ID.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_RESOURCE_ID.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "INVALID_RESOURCE_ID", "display": "Resource Id is invalid" diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_SEARCH_DATA.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_SEARCH_DATA.json index 82788c66e..3a48ec3eb 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_SEARCH_DATA.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_SEARCH_DATA.json @@ -7,7 +7,7 @@ { "code": "INVALID_SEARCH_DATA", "display": "Search data is invalid", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_UPDATE.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_UPDATE.json index 5a9f91407..3edaadd99 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_UPDATE.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_UPDATE.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "INVALID_UPDATE", "display": "Update is invalid" diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_VALUE.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_VALUE.json index 7d524cfc4..0cc776d84 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_VALUE.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/INVALID_VALUE.json @@ -7,7 +7,7 @@ { "code": "INVALID_VALUE", "display": "Provided value is invalid", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/MISSING_VALUE.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/MISSING_VALUE.json index cd7ebd98b..80c81760c 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/MISSING_VALUE.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/MISSING_VALUE.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "MISSING_VALUE", "display": "Required value is missing" diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/PRECONDITION_FAILED.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/PRECONDITION_FAILED.json index ebadaf8dd..d71bf4ec9 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/PRECONDITION_FAILED.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/PRECONDITION_FAILED.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "PRECONDITION_FAILED", "display": "Required condition was not fulfilled" diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_NOT_FOUND.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_NOT_FOUND.json index f36391111..905e83864 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_NOT_FOUND.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_NOT_FOUND.json @@ -7,7 +7,7 @@ { "code": "RESOURCE_NOT_FOUND", "display": "Resource not found", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_VERSION_MISMATCH.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_VERSION_MISMATCH.json index 7af996fa3..ea9d188c5 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_VERSION_MISMATCH.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/RESOURCE_VERSION_MISMATCH.json @@ -7,7 +7,7 @@ { "code": "RESOURCE_VERSION_MISMATCH", "display": "Resource version supplied does not match actual version", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/TOO_MANY_VALUES_SUBMITTED.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/TOO_MANY_VALUES_SUBMITTED.json index a245709e3..24dece061 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/TOO_MANY_VALUES_SUBMITTED.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/TOO_MANY_VALUES_SUBMITTED.json @@ -7,7 +7,7 @@ { "code": "TOO_MANY_VALUES_SUBMITTED", "display": "Too many values submitted", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/errorResponses/UNSUPPORTED_SERVICE.json b/karate-tests/src/test/java/mocks/stubs/errorResponses/UNSUPPORTED_SERVICE.json index 942b17517..6ce7f4575 100644 --- a/karate-tests/src/test/java/mocks/stubs/errorResponses/UNSUPPORTED_SERVICE.json +++ b/karate-tests/src/test/java/mocks/stubs/errorResponses/UNSUPPORTED_SERVICE.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "UNSUPPORTED_SERVICE", "display": "Unsupported Service" diff --git a/karate-tests/src/test/java/mocks/stubs/postPatientResponses/MULTIPLE_MATCHES_FOUND.json b/karate-tests/src/test/java/mocks/stubs/postPatientResponses/MULTIPLE_MATCHES_FOUND.json index 555e278b0..3f39d3bac 100644 --- a/karate-tests/src/test/java/mocks/stubs/postPatientResponses/MULTIPLE_MATCHES_FOUND.json +++ b/karate-tests/src/test/java/mocks/stubs/postPatientResponses/MULTIPLE_MATCHES_FOUND.json @@ -7,7 +7,7 @@ { "code": "MULTIPLE_MATCHES", "display": "Multiple matches found", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/postPatientResponses/SINGLE_MATCH_FOUND.json b/karate-tests/src/test/java/mocks/stubs/postPatientResponses/SINGLE_MATCH_FOUND.json index 7696b9326..1cf2cc119 100644 --- a/karate-tests/src/test/java/mocks/stubs/postPatientResponses/SINGLE_MATCH_FOUND.json +++ b/karate-tests/src/test/java/mocks/stubs/postPatientResponses/SINGLE_MATCH_FOUND.json @@ -7,7 +7,7 @@ { "code": "SINGLE_MATCH", "display": "Single match found", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000009.json b/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000009.json index 1aea8d306..93e3e50ae 100644 --- a/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000009.json +++ b/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000009.json @@ -60,11 +60,11 @@ ], "extension": [ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", "valueBoolean":true }, { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank", "valuePositiveInt": 1 }, { @@ -159,7 +159,7 @@ { "code": "Guardian", "display": "Guardian of patient", - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole" + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole" } ] } @@ -184,11 +184,11 @@ "active":true, "extension": [ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", "valueBoolean":true }, { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank", "valuePositiveInt": 1 }, { @@ -264,7 +264,7 @@ { "code": "Guardian", "display": "Guardian of patient", - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole" + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole" } ] } diff --git a/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000017.json b/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000017.json index 12d74033e..ff5224fca 100644 --- a/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000017.json +++ b/karate-tests/src/test/java/mocks/stubs/relatedPersonResponses/related_person_9000000017.json @@ -43,7 +43,7 @@ { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole", + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole", "code": "Guardian", "display": "Guardian of patient" } @@ -52,11 +52,11 @@ ], "extension": [ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", "valueBoolean": true }, { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank", "valuePositiveInt": 1 }, { diff --git a/karate-tests/src/test/java/mocks/stubs/searchResponses/TOO_MANY_MATCHES.json b/karate-tests/src/test/java/mocks/stubs/searchResponses/TOO_MANY_MATCHES.json index 105a2f9b8..7613ea4e7 100644 --- a/karate-tests/src/test/java/mocks/stubs/searchResponses/TOO_MANY_MATCHES.json +++ b/karate-tests/src/test/java/mocks/stubs/searchResponses/TOO_MANY_MATCHES.json @@ -7,7 +7,7 @@ { "code": "TOO_MANY_MATCHES", "display": "Too Many Matches", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ] diff --git a/karate-tests/src/test/java/patients/healthcareWorker/updatePatientDetails/oasExamples.feature b/karate-tests/src/test/java/patients/healthcareWorker/updatePatientDetails/oasExamples.feature index 89a72991e..3644532b9 100644 --- a/karate-tests/src/test/java/patients/healthcareWorker/updatePatientDetails/oasExamples.feature +++ b/karate-tests/src/test/java/patients/healthcareWorker/updatePatientDetails/oasExamples.feature @@ -109,12 +109,12 @@ Scenario: Healthcare worker can add communication extension * def extensionVal = """ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-NHSCommunication", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSCommunication", "extension": [{ "url": "language", "valueCodeableConcept": { "coding": [{ - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-HumanLanguage", + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage", "version": "1.0.0", "code": "q4", "display": "British Sign Language" @@ -146,12 +146,12 @@ Scenario: Healthcare worker can update communication extension * def extensionVal = """ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-NHSCommunication", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSCommunication", "extension": [{ "url": "language", "valueCodeableConcept": { "coding": [{ - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-HumanLanguage", + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage", "version": "1.0.0", "code": "q3", "display": "Australian Sign Language" @@ -186,7 +186,7 @@ Scenario: Healthcare worker can update communication single itesm "url": "language", "valueCodeableConcept": { "coding": [{ - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-HumanLanguage", + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage", "version": "1.0.0", "code": "q3", "display": "Australian Sign Language" @@ -210,7 +210,7 @@ Scenario: Healthcare worker can update communication single itesm Scenario: Healthcare worker can remove Remove Communication * def nhsNumber = '9000000009' - * def extensionURL = "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-NHSCommunication" + * def extensionURL = "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSCommunication" * path 'Patient', nhsNumber * request """ @@ -242,7 +242,7 @@ Scenario: Healthcare worker can replace a Single Contact Preference "coding": [{ "code": "3", "display": "Telephone", - "system": "https://fhir.nhs.uk/R4/ValueSet/UKCore-PreferredContactMethod" + "system": "https://fhir.hl7.org.uk/ValueSet/UKCore-PreferredContactMethod" } ] } @@ -271,7 +271,7 @@ Scenario: Healthcare worker can replace and remove Contact Preference * def extensionVal = """ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactPreference", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactPreference", "extension": [ { "url": "PreferredContactMethod", @@ -279,7 +279,7 @@ Scenario: Healthcare worker can replace and remove Contact Preference "coding": [{ "code": "7", "display": "Sign language", - "system": "https://fhir.nhs.uk/R4/ValueSet/UKCore-PreferredContactMethod" + "system": "https://fhir.hl7.org.uk/ValueSet/UKCore-PreferredContactMethod" } ] } diff --git a/postman/patient-demographics-sandbox.postman_collection.json b/postman/patient-demographics-sandbox.postman_collection.json index b3379426d..52e5ba8b9 100644 --- a/postman/patient-demographics-sandbox.postman_collection.json +++ b/postman/patient-demographics-sandbox.postman_collection.json @@ -2435,7 +2435,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"patches\": [\n { \n \"op\": \"add\",\n \"path\": \"/extension/-\",\n \"value\": {\n \"url\": \"https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-NHSCommunication\",\n \"extension\": [{\n \"url\": \"language\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"system\": \"https://fhir.nhs.uk/R4/CodeSystem/UKCore-HumanLanguage\",\n \"version\": \"1.0.0\",\n \"code\": \"q4\",\n \"display\": \"British Sign Language\"\n }\n ]\n }\n }, {\n \"url\": \"interpreterRequired\",\n \"valueBoolean\": true\n }\n ]\n}\n }\n ]\n}" + "raw": "{\n \"patches\": [\n { \n \"op\": \"add\",\n \"path\": \"/extension/-\",\n \"value\": {\n \"url\": \"https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSCommunication\",\n \"extension\": [{\n \"url\": \"language\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"system\": \"https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage\",\n \"version\": \"1.0.0\",\n \"code\": \"q4\",\n \"display\": \"British Sign Language\"\n }\n ]\n }\n }, {\n \"url\": \"interpreterRequired\",\n \"valueBoolean\": true\n }\n ]\n}\n }\n ]\n}" }, "url": { "raw": "{{base_url}}/Patient/9000000033", @@ -2547,7 +2547,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"patches\": [\n { \n \"op\": \"replace\",\n \"path\": \"/extension/4\",\n \"value\": {\n \"url\": \"https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-NHSCommunication\",\n \"extension\": [{\n \"url\": \"language\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"system\": \"https://fhir.nhs.uk/R4/CodeSystem/UKCore-HumanLanguage\",\n \"version\": \"1.0.0\",\n \"code\": \"q3\",\n \"display\": \"Australian Sign Language\"\n }\n ]\n }\n }, {\n \"url\": \"interpreterRequired\",\n \"valueBoolean\": false\n }\n ]\n}\n }\n ]\n}" + "raw": "{\n \"patches\": [\n { \n \"op\": \"replace\",\n \"path\": \"/extension/4\",\n \"value\": {\n \"url\": \"https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSCommunication\",\n \"extension\": [{\n \"url\": \"language\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"system\": \"https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage\",\n \"version\": \"1.0.0\",\n \"code\": \"q3\",\n \"display\": \"Australian Sign Language\"\n }\n ]\n }\n }, {\n \"url\": \"interpreterRequired\",\n \"valueBoolean\": false\n }\n ]\n}\n }\n ]\n}" }, "url": { "raw": "{{base_url}}/Patient/9000000009", @@ -2659,7 +2659,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"patches\": [\n { \n \"op\": \"replace\",\n \"path\": \"/extension/4/extension/0\",\n \"value\": {\n \"url\": \"language\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"system\": \"https://fhir.nhs.uk/R4/CodeSystem/UKCore-HumanLanguage\",\n \"version\": \"1.0.0\",\n \"code\": \"q3\",\n \"display\": \"Australian Sign Language\"\n }\n ]\n }\n }\n }\n ]\n}" + "raw": "{\n \"patches\": [\n { \n \"op\": \"replace\",\n \"path\": \"/extension/4/extension/0\",\n \"value\": {\n \"url\": \"language\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"system\": \"https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage\",\n \"version\": \"1.0.0\",\n \"code\": \"q3\",\n \"display\": \"Australian Sign Language\"\n }\n ]\n }\n }\n }\n ]\n}" }, "url": { "raw": "{{base_url}}/Patient/9000000009", @@ -2771,7 +2771,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"patches\": [\n { \n \"op\": \"test\",\n \"path\": \"/extension/4/url\",\n \"value\": \"https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-NHSCommunication\"\n },\n { \n \"op\": \"remove\",\n \"path\": \"/extension/4\"\n }\n ]\n}" + "raw": "{\n \"patches\": [\n { \n \"op\": \"test\",\n \"path\": \"/extension/4/url\",\n \"value\": \"https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSCommunication\"\n },\n { \n \"op\": \"remove\",\n \"path\": \"/extension/4\"\n }\n ]\n}" }, "url": { "raw": "{{base_url}}/Patient/9000000009", @@ -2830,7 +2830,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"patches\": [\n {\n \"op\": \"add\",\n \"path\": \"/extension/-\",\n \"value\": {\n \"url\": \"https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactPreference\",\n \"extension\": [{\n \"url\": \"PreferredContactMethod\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"code\": \"3\",\n \"display\": \"Telephone\",\n \"system\": \"https://fhir.nhs.uk/R4/ValueSet/UKCore-PreferredContactMethod\"\n }\n ]\n }\n },\n {\"url\": \"PreferredContactTimes\",\n \"valueString\": \"anytime after 6pm\"\n },\n {\n \"url\": \"PreferredWrittenCommunicationFormat\",\n \"valueCodeableConcept\": {\n \"coding\": [\n {\n \"code\": \"11\",\n \"display\": \"Large Print\",\n \"system\": \"https://fhir.nhs.uk/R4/CodeSystem/UKCore-PreferredWrittenCommunicationFormat\"\n }\n ]\n }\n }\n ]\n }\n }\n ]\n}" + "raw": "{\n \"patches\": [\n {\n \"op\": \"add\",\n \"path\": \"/extension/-\",\n \"value\": {\n \"url\": \"https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactPreference\",\n \"extension\": [{\n \"url\": \"PreferredContactMethod\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"code\": \"3\",\n \"display\": \"Telephone\",\n \"system\": \"https://fhir.hl7.org.uk/ValueSet/UKCore-PreferredContactMethod\"\n }\n ]\n }\n },\n {\"url\": \"PreferredContactTimes\",\n \"valueString\": \"anytime after 6pm\"\n },\n {\n \"url\": \"PreferredWrittenCommunicationFormat\",\n \"valueCodeableConcept\": {\n \"coding\": [\n {\n \"code\": \"11\",\n \"display\": \"Large Print\",\n \"system\": \"https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredWrittenCommunicationFormat\"\n }\n ]\n }\n }\n ]\n }\n }\n ]\n}" }, "url": { "raw": "{{base_url}}/Patient/9000000033", @@ -2884,7 +2884,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"patches\": [\n {\n \"op\": \"replace\",\n \"path\": \"/extension/5/extension/1\",\n \"value\": {\n \"url\": \"PreferredContactMethod\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"code\": \"3\",\n \"display\": \"Telephone\",\n \"system\": \"https://fhir.nhs.uk/R4/ValueSet/UKCore-PreferredContactMethod\"\n }\n ]\n }\n }\n }\n\n ]\n}" + "raw": "{\n \"patches\": [\n {\n \"op\": \"replace\",\n \"path\": \"/extension/5/extension/1\",\n \"value\": {\n \"url\": \"PreferredContactMethod\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"code\": \"3\",\n \"display\": \"Telephone\",\n \"system\": \"https://fhir.hl7.org.uk/ValueSet/UKCore-PreferredContactMethod\"\n }\n ]\n }\n }\n }\n\n ]\n}" }, "url": { "raw": "{{base_url}}/Patient/9000000009", @@ -2938,7 +2938,7 @@ ], "body": { "mode": "raw", - "raw": "{\n \"patches\": [\n {\n \"op\": \"replace\",\n \"path\": \"/extension/5\",\n \"value\": {\n \"url\": \"https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactPreference\",\n \"extension\": [\n {\n \"url\": \"PreferredContactMethod\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"code\": \"7\",\n \"display\": \"Sign language\",\n \"system\": \"https://fhir.nhs.uk/R4/ValueSet/UKCore-PreferredContactMethod\"\n }\n ]\n }\n },\n {\n \"url\": \"PreferredContactTimes\",\n \"valueString\": \"13:00\"\n }\n ]\n }\n }\n\n ]\n}" + "raw": "{\n \"patches\": [\n {\n \"op\": \"replace\",\n \"path\": \"/extension/5\",\n \"value\": {\n \"url\": \"https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactPreference\",\n \"extension\": [\n {\n \"url\": \"PreferredContactMethod\",\n \"valueCodeableConcept\": {\n \"coding\": [{\n \"code\": \"7\",\n \"display\": \"Sign language\",\n \"system\": \"https://fhir.hl7.org.uk/ValueSet/UKCore-PreferredContactMethod\"\n }\n ]\n }\n },\n {\n \"url\": \"PreferredContactTimes\",\n \"valueString\": \"13:00\"\n }\n ]\n }\n }\n\n ]\n}" }, "url": { "raw": "{{base_url}}/Patient/9000000009", diff --git a/proxies/live/apiproxy/policies/AssignMessage.Errors.CatchAllMessage.xml b/proxies/live/apiproxy/policies/AssignMessage.Errors.CatchAllMessage.xml index b72d93392..5d03acd40 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Errors.CatchAllMessage.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Errors.CatchAllMessage.xml @@ -11,7 +11,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "{pds.error.coding.code}", "display": "{pds.error.coding.display}" diff --git a/proxies/live/apiproxy/policies/AssignMessage.Errors.OAuthPolicyResponse.xml b/proxies/live/apiproxy/policies/AssignMessage.Errors.OAuthPolicyResponse.xml index e3e2804a1..d3b2aad63 100644 --- a/proxies/live/apiproxy/policies/AssignMessage.Errors.OAuthPolicyResponse.xml +++ b/proxies/live/apiproxy/policies/AssignMessage.Errors.OAuthPolicyResponse.xml @@ -11,7 +11,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "ACCESS_DENIED", "display": "Access Denied - Unauthorised" diff --git a/proxies/live/apiproxy/policies/RaiseFault.500UnknownError.xml b/proxies/live/apiproxy/policies/RaiseFault.500UnknownError.xml index 1115bcd84..bb6483b1d 100644 --- a/proxies/live/apiproxy/policies/RaiseFault.500UnknownError.xml +++ b/proxies/live/apiproxy/policies/RaiseFault.500UnknownError.xml @@ -13,7 +13,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "UNKNOWN_ERROR", "display": "Unknown Error" diff --git a/sandbox/mocks/Personal_Details_RelatedPersonBundle.json b/sandbox/mocks/Personal_Details_RelatedPersonBundle.json index 9e1f32d63..f5997ac65 100644 --- a/sandbox/mocks/Personal_Details_RelatedPersonBundle.json +++ b/sandbox/mocks/Personal_Details_RelatedPersonBundle.json @@ -38,7 +38,7 @@ { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole", + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole", "code": "Guardian", "display": "Guardian of patient" } @@ -47,11 +47,11 @@ ], "extension": [ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", "valueBoolean": true }, { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank", "valuePositiveInt": 1 }, { diff --git a/sandbox/mocks/Referenced_RelatedPersonBundle.json b/sandbox/mocks/Referenced_RelatedPersonBundle.json index 76408cd50..11508aeb1 100644 --- a/sandbox/mocks/Referenced_RelatedPersonBundle.json +++ b/sandbox/mocks/Referenced_RelatedPersonBundle.json @@ -24,7 +24,7 @@ { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole", + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole", "code": "Guardian", "display": "Guardian of patient" } @@ -33,11 +33,11 @@ ], "extension": [ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", "valueBoolean": true }, { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank", "valuePositiveInt": 1 }, { diff --git a/sandbox/mocks/RelatedPersonBundle.json b/sandbox/mocks/RelatedPersonBundle.json index af4980314..813fc36a4 100644 --- a/sandbox/mocks/RelatedPersonBundle.json +++ b/sandbox/mocks/RelatedPersonBundle.json @@ -43,7 +43,7 @@ { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole", + "system": "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole", "code": "Guardian", "display": "Guardian of patient" } @@ -52,11 +52,11 @@ ], "extension": [ { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator", "valueBoolean": true }, { - "url": "https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank", + "url": "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank", "valuePositiveInt": 1 }, { diff --git a/specification/components/paths/coverage-get.yaml b/specification/components/paths/coverage-get.yaml index 6dc5f1e91..c372ee8e2 100644 --- a/specification/components/paths/coverage-get.yaml +++ b/specification/components/paths/coverage-get.yaml @@ -86,7 +86,7 @@ responses: code: value details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: INVALID_SEARCH_DATA display: "Search data is invalid" diff --git a/specification/components/paths/coverage-post.yaml b/specification/components/paths/coverage-post.yaml index 1047aa4df..70869d241 100644 --- a/specification/components/paths/coverage-post.yaml +++ b/specification/components/paths/coverage-post.yaml @@ -109,7 +109,7 @@ responses: code: forbidden details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: ACCESS_DENIED display: Patient cannot perform this action @@ -136,7 +136,7 @@ responses: code: timeout details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: SERVICE_UNAVAILABLE display: Service unavailable diff --git a/specification/components/paths/patient-create.yaml b/specification/components/paths/patient-create.yaml index 76d1a7411..0b11f6947 100644 --- a/specification/components/paths/patient-create.yaml +++ b/specification/components/paths/patient-create.yaml @@ -90,7 +90,7 @@ responses: code: structure details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: MULTIPLE_MATCHES display: Multiple matches found @@ -131,7 +131,7 @@ responses: code: structure details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: INVALID_UPDATE display: Update is invalid @@ -156,7 +156,7 @@ responses: code: timeout details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: SERVICE_UNAVAILABLE display: Service unavailable diff --git a/specification/components/paths/patient-get.yaml b/specification/components/paths/patient-get.yaml index b584b2480..f24565b3e 100644 --- a/specification/components/paths/patient-get.yaml +++ b/specification/components/paths/patient-get.yaml @@ -81,7 +81,7 @@ responses: code: structure details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: MISSING_VALUE display: Required value is missing diff --git a/specification/components/paths/patient-patch.yaml b/specification/components/paths/patient-patch.yaml index 1bb7781a6..bd7adecbf 100644 --- a/specification/components/paths/patient-patch.yaml +++ b/specification/components/paths/patient-patch.yaml @@ -648,7 +648,7 @@ description: | * `/generalPractitioner/-` when adding a new general practice. There are a number of business rules that should be taken into account: - * only valid GP Practice codes may be used, see [Organisation Data Service FHIR API](https://developer.nhs.uk/apis/ods/) for more details on valid codes. + * only valid GP Practice codes may be used, see [Organisation Data Service FHIR API](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir) for more details on valid codes. * do not provide a period `end` date. * the general practice should only be updated by primary care systems, [NHAIS](https://digital.nhs.uk/services/nhais) or by the National Back Office. * removal of a general practice can only be done by [NHAIS](https://digital.nhs.uk/services/nhais) or by the National Back Office. @@ -661,7 +661,7 @@ description: | In a JSON Patch request the path should be `/managingOrganization`. The following business rules should be observed: - * only valid GP Practice codes may be used, see [Organisation Data Service FHIR API](https://developer.nhs.uk/apis/ods/) for more details on valid codes. + * only valid GP Practice codes may be used, see [Organisation Data Service FHIR API](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir) for more details on valid codes. * only a single general practice is supported; emergency, temporary and additional practices must be maintained in the local system only. ### Multiple birth order @@ -730,7 +730,7 @@ description: | There are a number of business rules that should be taken into account: * multiple pharmacies are allowed, however only one of each type * there are no effective date periods, only a single current instance of each type is supported - * only valid National Pharmacy codes may be used for the pharmacy identifier, see [Organisation Data Service FHIR API](https://developer.nhs.uk/apis/ods/) for more details on valid codes + * only valid National Pharmacy codes may be used for the pharmacy identifier, see [Organisation Data Service FHIR API](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir) for more details on valid codes ### Place of birth @@ -955,7 +955,7 @@ responses: code: structure details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: INVALID_UPDATE display: Update is invalid @@ -979,7 +979,7 @@ responses: code: timeout details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: SERVICE_UNAVAILABLE display: Service unavailable diff --git a/specification/components/paths/patient-search.yaml b/specification/components/paths/patient-search.yaml index fc1409fe4..97f842bfb 100644 --- a/specification/components/paths/patient-search.yaml +++ b/specification/components/paths/patient-search.yaml @@ -303,7 +303,7 @@ responses: code: value details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: INVALID_VALUE display: Provided value is invalid diff --git a/specification/components/paths/relatedpersons-get.yaml b/specification/components/paths/relatedpersons-get.yaml index 5dd5f0a79..24687d76e 100644 --- a/specification/components/paths/relatedpersons-get.yaml +++ b/specification/components/paths/relatedpersons-get.yaml @@ -74,7 +74,7 @@ responses: code: required details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: MISSING_VALUE display: Required value is missing diff --git a/specification/components/schemas/ErrorCode.yaml b/specification/components/schemas/ErrorCode.yaml index 10a5e3861..118b1cf81 100644 --- a/specification/components/schemas/ErrorCode.yaml +++ b/specification/components/schemas/ErrorCode.yaml @@ -9,7 +9,7 @@ properties: system: type: string description: URI of the coding system specification. - example: https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode + example: https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode version: type: string description: Version of the coding system in use. diff --git a/specification/components/schemas/GeneralPractitionerReference.yaml b/specification/components/schemas/GeneralPractitionerReference.yaml index 5f78331fa..aa61d1ebb 100644 --- a/specification/components/schemas/GeneralPractitionerReference.yaml +++ b/specification/components/schemas/GeneralPractitionerReference.yaml @@ -22,7 +22,7 @@ properties: type: string example: 'https://fhir.nhs.uk/Id/ods-organization-code' value: - description: Organisation code for the registered general practice, as held in the [Organisation Data Service](https://developer.nhs.uk/apis/ods/). + description: Organisation code for the registered general practice, as held in the [Organisation Data Service](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir). type: string pattern: ^[0-9A-Z]+$ example: Y12345 diff --git a/specification/components/schemas/ManagingOrganizationReference.yaml b/specification/components/schemas/ManagingOrganizationReference.yaml index 749adcc0b..e21978226 100644 --- a/specification/components/schemas/ManagingOrganizationReference.yaml +++ b/specification/components/schemas/ManagingOrganizationReference.yaml @@ -18,7 +18,7 @@ properties: type: string example: 'https://fhir.nhs.uk/Id/ods-organization-code' value: - description: Organisation code for the registered general practice, as held in the [Organisation Data Service](https://developer.nhs.uk/apis/ods/). + description: Organisation code for the registered general practice, as held in the [Organisation Data Service](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir). type: string pattern: ^[0-9A-Z]+$ example: Y12345 diff --git a/specification/components/schemas/codeable/Relationship.yaml b/specification/components/schemas/codeable/Relationship.yaml index 169410612..39b85d3fe 100644 --- a/specification/components/schemas/codeable/Relationship.yaml +++ b/specification/components/schemas/codeable/Relationship.yaml @@ -12,7 +12,7 @@ properties: The codes used can be found at: * http://hl7.org/fhir/ValueSet/relatedperson-relationshiptype - * https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole + * https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole The allowed values for `Role` are: * Agent - Agent of patient @@ -62,10 +62,10 @@ properties: type: string description: URI of the coding system specification. format: url - example: https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole + example: https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole enum: - http://hl7.org/fhir/ValueSet/relatedperson-relationshiptype - - https://fhir.nhs.uk/R4/CodeSystem/UKCore-AdditionalRelatedPersonRole + - https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalRelatedPersonRole code: type: string description: Symbol in syntax defined by the system. diff --git a/specification/components/schemas/extensions/ContactRank.yaml b/specification/components/schemas/extensions/ContactRank.yaml index 3f4435c65..799321c03 100644 --- a/specification/components/schemas/extensions/ContactRank.yaml +++ b/specification/components/schemas/extensions/ContactRank.yaml @@ -5,9 +5,9 @@ properties: type: string format: url description: URL to FHIR Extension Specification. - default: https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank + default: https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank enum: - - https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-ContactRank + - https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank valuePositiveInt: type: integer minimum: 1 diff --git a/specification/components/schemas/extensions/CopyCorrespondence.yaml b/specification/components/schemas/extensions/CopyCorrespondence.yaml index 0edac4ba4..477b8505a 100644 --- a/specification/components/schemas/extensions/CopyCorrespondence.yaml +++ b/specification/components/schemas/extensions/CopyCorrespondence.yaml @@ -6,9 +6,9 @@ properties: type: string format: url description: URL to FHIR Extension Specification. - default: https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator + default: https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator enum: - - https://fhir.nhs.uk/R4/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator + - https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator valueBoolean: type: boolean description: Flag indicating if this person should be copied in on correspondence. This will only be returned if the value is `true` otherwise it will not be returned and can be assumed `false` diff --git a/specification/components/schemas/extensions/DispensingDoctor.yaml b/specification/components/schemas/extensions/DispensingDoctor.yaml index d53a4e9d5..af53a5ed2 100644 --- a/specification/components/schemas/extensions/DispensingDoctor.yaml +++ b/specification/components/schemas/extensions/DispensingDoctor.yaml @@ -28,6 +28,6 @@ properties: default: https://fhir.nhs.uk/Id/ods-organization-code value: type: string - description: Organisation code for the dispensing doctor, as held in the [Organisation Data Service](https://developer.nhs.uk/apis/ods/). + description: Organisation code for the dispensing doctor, as held in the [Organisation Data Service](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir). pattern: '^[A-Za-z0-9]{3,10}$' example: Y23456 diff --git a/specification/components/schemas/extensions/MedicalApplianceSupplier.yaml b/specification/components/schemas/extensions/MedicalApplianceSupplier.yaml index 6c252bba5..08a40b384 100644 --- a/specification/components/schemas/extensions/MedicalApplianceSupplier.yaml +++ b/specification/components/schemas/extensions/MedicalApplianceSupplier.yaml @@ -28,6 +28,6 @@ properties: default: https://fhir.nhs.uk/Id/ods-organization-code value: type: string - description: Organisation code for the medical appliance supplier, as held in the [Organisation Data Service](https://developer.nhs.uk/apis/ods/). + description: Organisation code for the medical appliance supplier, as held in the [Organisation Data Service](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir). pattern: '^[A-Za-z0-9]{3,10}$' example: Y34567 diff --git a/specification/components/schemas/extensions/NominatedPharmacy.yaml b/specification/components/schemas/extensions/NominatedPharmacy.yaml index 783432ed2..beab64b51 100644 --- a/specification/components/schemas/extensions/NominatedPharmacy.yaml +++ b/specification/components/schemas/extensions/NominatedPharmacy.yaml @@ -28,6 +28,6 @@ properties: default: https://fhir.nhs.uk/Id/ods-organization-code value: type: string - description: Organisation code for the nominated pharmacy, as held in the [Organisation Data Service](https://developer.nhs.uk/apis/ods/). + description: Organisation code for the nominated pharmacy, as held in the [Organisation Data Service](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir). pattern: '^[A-Za-z0-9]{3,10}$' example: Y12345 diff --git a/specification/personal-demographics.yaml b/specification/personal-demographics.yaml index 8d76c70d4..f9c3339b5 100644 --- a/specification/personal-demographics.yaml +++ b/specification/personal-demographics.yaml @@ -275,7 +275,7 @@ info: Use [PDS Notifications - FHIR API](https://digital.nhs.uk/developer/api-catalogue/personal-demographics-service-notifications-fhir) to subscribe to be notified of a set of patient record changes, including any record update, birth, death, change of address and change of GP. ### Organisation Data Service FHIR API - Use [Organisation Data Service FHIR API](https://developer.nhs.uk/apis/ods/) to get full details for the organisations related to the patient, such as their registered GP or nominated pharmacy. + Use [Organisation Data Service FHIR API](https://digital.nhs.uk/developer/api-catalogue/organisation-data-service-fhir) to get full details for the organisations related to the patient, such as their registered GP or nominated pharmacy. ### Ordnance Survey (OS Places) API Use [Ordnance Survey (OS Places) API](https://digital.nhs.uk/developer/api-catalogue/ordnance-survey-places-api) to identify, look up and verify addresses prior to a PDS update. @@ -739,7 +739,7 @@ components: code: value details: coding: - - system: 'https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode' + - system: 'https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode' version: '1' code: INVALID_RESOURCE_ID display: Resource Id is invalid diff --git a/tests/functional/data/responses/empty_authorization_header.json b/tests/functional/data/responses/empty_authorization_header.json index 9692c35b3..482e06dc7 100644 --- a/tests/functional/data/responses/empty_authorization_header.json +++ b/tests/functional/data/responses/empty_authorization_header.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "ACCESS_DENIED", "display": "Access Denied - Unauthorised" diff --git a/tests/functional/data/responses/empty_x-request_id.json b/tests/functional/data/responses/empty_x-request_id.json index 1c33811fa..664a18895 100644 --- a/tests/functional/data/responses/empty_x-request_id.json +++ b/tests/functional/data/responses/empty_x-request_id.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "INVALID_VALUE", "display": "Provided value is invalid" diff --git a/tests/functional/data/responses/invalid_access_token.json b/tests/functional/data/responses/invalid_access_token.json index b7b7df65a..c0f64d5e7 100644 --- a/tests/functional/data/responses/invalid_access_token.json +++ b/tests/functional/data/responses/invalid_access_token.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "ACCESS_DENIED", "display": "Access Denied - Unauthorised" diff --git a/tests/functional/data/responses/invalid_urid_header.json b/tests/functional/data/responses/invalid_urid_header.json index a9f9a88f9..bf83fdd7f 100644 --- a/tests/functional/data/responses/invalid_urid_header.json +++ b/tests/functional/data/responses/invalid_urid_header.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "INVALID_VALUE", "display": "Provided value is invalid" diff --git a/tests/functional/data/responses/invalid_x-request_id.json b/tests/functional/data/responses/invalid_x-request_id.json index 8ef9d2b33..b87a96025 100644 --- a/tests/functional/data/responses/invalid_x-request_id.json +++ b/tests/functional/data/responses/invalid_x-request_id.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "INVALID_VALUE", "display": "Provided value is invalid" diff --git a/tests/functional/data/responses/missing_authorization_header.json b/tests/functional/data/responses/missing_authorization_header.json index 1ecea1c9c..4874ac887 100644 --- a/tests/functional/data/responses/missing_authorization_header.json +++ b/tests/functional/data/responses/missing_authorization_header.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "ACCESS_DENIED", "display": "Access Denied - Unauthorised" diff --git a/tests/functional/data/responses/missing_urid_header.json b/tests/functional/data/responses/missing_urid_header.json index e32264d3f..691b6a5a6 100644 --- a/tests/functional/data/responses/missing_urid_header.json +++ b/tests/functional/data/responses/missing_urid_header.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "INVALID_VALUE", "display": "Provided value is invalid" diff --git a/tests/functional/data/responses/missing_x-request_id.json b/tests/functional/data/responses/missing_x-request_id.json index 1213ff321..3b7344d8d 100644 --- a/tests/functional/data/responses/missing_x-request_id.json +++ b/tests/functional/data/responses/missing_x-request_id.json @@ -7,7 +7,7 @@ "details": { "coding": [ { - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1", "code": "MISSING_VALUE", "display": "Required value is missing" diff --git a/tests/functional/data/responses/too_many_matches.json b/tests/functional/data/responses/too_many_matches.json index 8f70daa3d..498fa29a6 100644 --- a/tests/functional/data/responses/too_many_matches.json +++ b/tests/functional/data/responses/too_many_matches.json @@ -7,7 +7,7 @@ { "code": "TOO_MANY_MATCHES", "display": "Too Many Matches", - "system": "https://fhir.nhs.uk/R4/CodeSystem/Spine-ErrorOrWarningCode", + "system": "https://fhir.hl7.org.uk/CodeSystem/Spine-ErrorOrWarningCode", "version": "1" } ]