From 9034f428d8868e6e30cbbb0afdec8db9d34bb032 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Thu, 19 Sep 2024 15:27:51 +0100 Subject: [PATCH] NPA-3543: fixup erroneous FHIR schema elements --- .../validated-relationships-service-api.yaml | 65 ++++++++++--------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/specification/validated-relationships-service-api.yaml b/specification/validated-relationships-service-api.yaml index bec41ef..3c1a63e 100644 --- a/specification/validated-relationships-service-api.yaml +++ b/specification/validated-relationships-service-api.yaml @@ -1525,8 +1525,10 @@ components: type: string format: date generalPractitioner: - $ref: '#/components/schemas/Reference' - description: "Patient's nominated primary care provider" + type: array + description: Patient's nominated primary care provider, each a Reference(Organization | Practitioner | PractitionerRole). + items: + $ref: '#/components/schemas/Reference' Consent: type: object @@ -1574,16 +1576,19 @@ components: $ref: '#/components/schemas/Reference' description: "Individuals or organizations that agreed to the consent." policy: - type: object - description: Policies covered by this consent - properties: - authority: - type: string - description: Organization having regulatory accountability for enforcing policies pertaining to this Consent Directive. - uri: - type: string - format: uri - description: The reference to the National Proxy Service policy that are included in this consent scope. + type: array + description: The policies covered by this consent + items: + type: object + description: A policy covered by this consent + properties: + authority: + type: string + description: Organization having regulatory accountability for enforcing policies pertaining to this Consent Directive. + uri: + type: string + format: uri + description: The reference to the National Proxy Service policy that are included in this consent scope. verification: type: array description: Whether consent was verified with the patient, or another authorized person. @@ -1990,9 +1995,9 @@ components: status: active scope: coding: - - system: http://terminology.hl7.org/CodeSystem/consentscope" + - system: "http://terminology.hl7.org/CodeSystem/consentscope" code: patient-privacy - display: "Patient Privacy" + display: "Privacy Consent" text: "Patient Privacy Consent" category: - coding: @@ -2010,8 +2015,8 @@ components: system: "https://fhir.nhs.uk/Id/nhs-number" value: "9000000017" policy: - authority: "https://www.england.nhs.uk" - uri: "" + - authority: "https://www.england.nhs.uk" + uri: "" search: mode: match @@ -2039,7 +2044,7 @@ components: value: "9000000005" relationship: - coding: - - system: "http://terminology.hl7.org/CodeSystem/v3-RoleCode" + - system: "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalPersonRelationshipRole" code: Personal display: "Personal relationship with the patient" search: @@ -2079,9 +2084,9 @@ components: status: active scope: coding: - - system: http://terminology.hl7.org/CodeSystem/consentscope" + - system: "http://terminology.hl7.org/CodeSystem/consentscope" code: patient-privacy - display: "Patient Privacy" + display: "Privacy Consent" text: "Patient Privacy Consent" category: - coding: @@ -2099,8 +2104,8 @@ components: system: "https://fhir.nhs.uk/Id/nhs-number" value: "9000000010" policy: - authority: "https://www.england.nhs.uk" - uri: "" + - authority: "https://www.england.nhs.uk" + uri: "" verification: - verified: true verifiedWith: @@ -2181,9 +2186,9 @@ components: status: active scope: coding: - - system: http://terminology.hl7.org/CodeSystem/consentscope" + - system: "http://terminology.hl7.org/CodeSystem/consentscope" code: patient-privacy - display: "Patient Privacy" + display: "Privacy Consent" text: "Patient Privacy Consent" category: - coding: @@ -2201,8 +2206,8 @@ components: system: "https://fhir.nhs.uk/Id/nhs-number" value: "9000000017" policy: - authority: "https://www.england.nhs.uk" - uri: "" + - authority: "https://www.england.nhs.uk" + uri: "" search: mode: match - fullUrl: "https://api.service.nhs.uk/validated-relationships/FHIR/R4/RelatedPerson/RP974720" @@ -2221,7 +2226,7 @@ components: value: "9000000005" relationship: - coding: - - system: "http://terminology.hl7.org/CodeSystem/v3-RoleCode" + - system: "https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalPersonRelationshipRole" code: Personal display: "Personal relationship with the patient" search: @@ -2261,9 +2266,9 @@ components: status: active scope: coding: - - system: http://terminology.hl7.org/CodeSystem/consentscope" + - system: "http://terminology.hl7.org/CodeSystem/consentscope" code: patient-privacy - display: "Patient Privacy" + display: "Privacy Consent" text: "Patient Privacy Consent" category: - coding: @@ -2281,8 +2286,8 @@ components: system: "https://fhir.nhs.uk/Id/nhs-number" value: "9000000010" policy: - authority: "https://www.england.nhs.uk" - uri: "" + - authority: "https://www.england.nhs.uk" + uri: "" verification: - verified: true verifiedWith: