diff --git a/.typos.toml b/.typos.toml new file mode 100644 index 0000000..23cb9ce --- /dev/null +++ b/.typos.toml @@ -0,0 +1,4 @@ +[files] +extend-exclude = [ + "examples/fhir/psa/poc_working_examples/*.json" +] diff --git a/examples/fhir/psa/poc_working_examples/rduh_order_servicerequest_0810.json b/examples/fhir/psa/poc_working_examples/rduh_order_servicerequest_0810.json new file mode 100644 index 0000000..d93580e --- /dev/null +++ b/examples/fhir/psa/poc_working_examples/rduh_order_servicerequest_0810.json @@ -0,0 +1,274 @@ +{ + "resourceType": "Bundle", + "type": "transaction", + "entry": [ + { + "request": { + "method": "POST", + "url": "Organization" + }, + "fullUrl": "urn:uuid:3be95115-cdb3-4093-964a-6ddd32528d86", + "resource": { + "resourceType": "Organization", + "identifier": [ + { + "value": "RDE" + } + ] + } + }, + { + "request": { + "method": "POST", + "url": "Organization" + }, + "fullUrl": "urn:uuid:73889367-0349-4c7b-9f29-73bb1cf5cb22", + "resource": { + "resourceType": "Organization", + "identifier": [ + { + "value": "NHS" + } + ] + } + }, + { + "request": { + "method": "POST", + "url": "Patient" + }, + "fullUrl": "urn:uuid:49d5b864-9a25-41f0-8011-926d12e9d9cf", + "resource": { + "resourceType": "Patient", + "address": [ + { + "country": "ENG" + } + ], + "birthDate": "1966-10-06", + "deceasedBoolean": false, + "gender": "male", + "identifier": [ + { + "assigner": { + "reference": "urn:uuid:3be95115-cdb3-4093-964a-6ddd32528d86" + }, + "extension": [ + { + "url": "http://intersystems.com/fhir/extn/sda3/lib/patient-number-i-s-o-assigning-authority", + "valueString": "RDE" + } + ], + "type": { + "coding": [ + { + "code": "MR", + "system": "http://terminology.hl7.org/CodeSystem/v2-0203" + } + ], + "text": "MRN" + }, + "value": "KB14733" + }, + { + "assigner": { + "reference": "urn:uuid:73889367-0349-4c7b-9f29-73bb1cf5cb22" + }, + "extension": [ + { + "url": "http://intersystems.com/fhir/extn/sda3/lib/patient-number-i-s-o-assigning-authority", + "valueString": "NHS" + } + ], + "type": { + "coding": [ + { + "code": "NH" + } + ], + "text": "NH" + }, + "value": "7496487841" + } + ], + "managingOrganization": { + "reference": "urn:uuid:3be95115-cdb3-4093-964a-6ddd32528d86" + }, + "name": [ + { + "family": "HOMETEST", + "given": [ + "PSA" + ], + "text": "PSA HOMETEST", + "use": "official" + } + ] + } + }, + { + "request": { + "method": "POST", + "url": "Practitioner" + }, + "fullUrl": "urn:uuid:fde1e02c-ca08-4a2c-8b2c-d3903f484332", + "resource": { + "resourceType": "Practitioner", + "extension": [ + { + "url": "http://intersystems.com/fhir/extn/sda3/lib/code-table-detail-care-provider-description", + "valueString": "(ANMD), ANAESTHETIC" + } + ], + "identifier": [ + { + "extension": [ + { + "url": "http://intersystems.com/fhir/extn/sda3/lib/code-table-detail-care-provider-s-d-a-coding-standard", + "valueString": "PROVID" + } + ], + "type": { + "coding": [ + { + "code": "PROVID" + } + ] + }, + "value": "107100" + } + ], + "name": [ + { + "family": "(ANMD)", + "given": [ + "ANAESTHETIC", + "CONSULTANT" + ], + "text": "ANAESTHETIC CONSULTANT (ANMD)" + } + ] + } + }, + { + "request": { + "method": "POST", + "url": "Specimen" + }, + "fullUrl": "urn:uuid:19f45c72-1a46-4944-bdaf-846d20cbdd4b", + "resource": { + "resourceType": "Specimen", + "collection": { + "bodySite": { + "coding": [ + { + "code": "122554006", + "display": "Blood, Capillary" + } + ] + }, + "quantity": { + "system": "http://www.intersystems.com/fhir/system" + } + }, + "subject": { + "reference": "urn:uuid:49d5b864-9a25-41f0-8011-926d12e9d9cf" + }, + "type": { + "coding": [ + { + "code": "119297000", + "display": "Blood", + "system": "http://snomed.info/sct" + } + ] + } + } + }, + { + "request": { + "method": "POST", + "url": "ServiceRequest" + }, + "fullUrl": "urn:uuid:e8395ba4-a624-40dc-9adf-d84f61e851a5", + "resource": { + "resourceType": "ServiceRequest", + "authoredOn": "2026-10-08T13:53:24+01:00", + "category": [ + { + "coding": [ + { + "code": "103693007", + "display": "Diagnostic procedure", + "system": "http://snomed.info/sct" + } + ], + "text": "Diagnostic procedure" + } + ], + "code": { + "coding": [ + { + "code": "63476009", + "display": "PSA HOMETEST", + "system": "http://snomed.info/sct" + } + ] + }, + "extension": [ + { + "url": "http://intersystems.com/fhir/extn/sda3/lib/lab-order-placer-assigning-authority", + "valueString": "EPC^^" + } + ], + "identifier": [ + { + "type": { + "coding": [ + { + "code": "FILL", + "display": "Filler Identifier", + "system": "http://terminology.hl7.org/CodeSystem/v2-0203" + } + ], + "text": "FillerId" + }, + "use": "official" + }, + { + "type": { + "coding": [ + { + "code": "PLAC", + "display": "Placer Identifier", + "system": "http://terminology.hl7.org/CodeSystem/v2-0203" + } + ], + "text": "PlacerId" + }, + "use": "official", + "value": "RH82822337" + } + ], + "intent": "order", + "note": [ + { + "text": "Test hometest interface" + } + ], + "requester": { + "reference": "urn:uuid:fde1e02c-ca08-4a2c-8b2c-d3903f484332" + }, + "specimen": [ + { + "reference": "urn:uuid:19f45c72-1a46-4944-bdaf-846d20cbdd4b" + } + ], + "status": "active", + "subject": { + "reference": "urn:uuid:49d5b864-9a25-41f0-8011-926d12e9d9cf" + } + } + } + ] +} diff --git a/examples/fhir/psa/poc_working_examples/rduh_order_servicerequest_ukcore_example.json b/examples/fhir/psa/poc_working_examples/rduh_order_servicerequest_ukcore_example.json index 75934ad..8f1b599 100644 --- a/examples/fhir/psa/poc_working_examples/rduh_order_servicerequest_ukcore_example.json +++ b/examples/fhir/psa/poc_working_examples/rduh_order_servicerequest_ukcore_example.json @@ -82,6 +82,17 @@ ] }, "status": "available", + "collection": { + "bodySite": { + "coding": [ + { + "code": "20982000", + "display": "Capillary", + "system": "http://snomed.info/sct" + } + ] + } + }, "subject": { "reference": "urn:uuid:a9d98321-bfd1-4abd-8180-017228ad8b53" }, diff --git a/schemas/supplier-api-spec-v2.yaml b/schemas/supplier-api-spec-v2.yaml index db1ee03..14bd649 100644 --- a/schemas/supplier-api-spec-v2.yaml +++ b/schemas/supplier-api-spec-v2.yaml @@ -174,6 +174,12 @@ paths: profile: - https://fhir.hl7.org.uk/StructureDefinition/UKCore-Specimen status: available + collection: + bodySite: + coding: + - code: "20982000" + display: Capillary + system: http://snomed.info/sct subject: reference: urn:uuid:a9d98321-bfd1-4abd-8180-017228ad8b53 type: @@ -878,7 +884,7 @@ components: enum: [Specimen] resource: type: object - required: [resourceType, meta, status, subject, type] + required: [resourceType, meta, subject, type] properties: resourceType: type: string @@ -896,6 +902,11 @@ components: status: type: string enum: [available, unavailable, unsatisfactory, entered-in-error] + collection: + type: object + properties: + bodySite: + $ref: '#/components/schemas/FHIRCodeableConcept' subject: $ref: '#/components/schemas/FHIRReference' type: