From ff179a74768cfb2bf9c96654fea7d6531ed8012a Mon Sep 17 00:00:00 2001 From: Kris Szlapa Date: Wed, 1 May 2024 12:43:39 +0000 Subject: [PATCH 1/4] Update OAS with 'ready to dispatch' and 'ready to dispatch - partial' statuses --- .../eps-prescription-status-update-api.yaml | 13 +++-- .../request-ready-to-dispatch-partial.json | 54 +++++++++++++++++++ ...ch.json => request-ready-to-dispatch.json} | 4 +- .../UpdatePrescriptionStatusTask.yaml | 5 +- 4 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 packages/specification/examples/request-ready-to-dispatch-partial.json rename packages/specification/examples/{request-ready-for-dispatch.json => request-ready-to-dispatch.json} (93%) diff --git a/packages/specification/eps-prescription-status-update-api.yaml b/packages/specification/eps-prescription-status-update-api.yaml index 79f08d161..b6f691d77 100755 --- a/packages/specification/eps-prescription-status-update-api.yaml +++ b/packages/specification/eps-prescription-status-update-api.yaml @@ -132,11 +132,16 @@ paths: schema: $ref: "#/components/schemas/UpdatePrescriptionStatusBundle" examples: - ready-for-dispatch: - summary: ready-for-dispatch - description: A request message contains tracking status `Ready for Dispatch`. + ready-to-dispatch: + summary: ready-to-dispatch + description: A request message contains tracking status `Ready to Dispatch`. value: - $ref: examples/request-ready-for-dispatch.json + $ref: examples/request-ready-to-dispatch.json + ready-to-dispatch-partial: + summary: ready-to-dispatch-partial + description: A request message contains tracking status `Ready to Dispatch`. + value: + $ref: examples/request-ready-to-dispatch-partial.json dispatched: summary: dispatched description: A request message contains tracking status `Dispatched``. diff --git a/packages/specification/examples/request-ready-to-dispatch-partial.json b/packages/specification/examples/request-ready-to-dispatch-partial.json new file mode 100644 index 000000000..45ff98f6c --- /dev/null +++ b/packages/specification/examples/request-ready-to-dispatch-partial.json @@ -0,0 +1,54 @@ +{ + "resourceType": "Bundle", + "type": "transaction", + "entry": [ + { + "fullUrl": "urn:uuid:4d70678c-81e4-4ff4-8c67-17596fd0aa46", + "resource": { + "resourceType": "Task", + "id": "4d70678c-81e4-4ff4-8c67-17596fd0aa46", + "basedOn": [ + { + "identifier": { + "system": "https://fhir.nhs.uk/Id/prescription-order-number", + "value": "076E17-A83008-01F564" + } + } + ], + "status": "in-progress", + "businessStatus": { + "coding": [ + { + "system": "https://fhir.nhs.uk/CodeSystem/task-businessStatus-nppt", + "code": "Ready to Dispatch - Partial" + } + ] + }, + "intent": "order", + "focus": { + "identifier": { + "system": "https://fhir.nhs.uk/Id/prescription-order-item-number", + "value": "6989b7bd-8db6-428c-a593-4022e3044c00" + } + }, + "for": { + "identifier": { + "system": "https://fhir.nhs.uk/Id/nhs-number", + "value": "9449304130" + } + }, + "lastModified": "2024-01-30T12:01:24Z", + "owner": { + "identifier": { + "system": "https://fhir.nhs.uk/Id/ods-organization-code", + "value": "C9Z1O" + } + } + }, + "request": { + "method": "POST", + "url": "Task" + } + } + ] +} diff --git a/packages/specification/examples/request-ready-for-dispatch.json b/packages/specification/examples/request-ready-to-dispatch.json similarity index 93% rename from packages/specification/examples/request-ready-for-dispatch.json rename to packages/specification/examples/request-ready-to-dispatch.json index 3f4b89648..0e9718cbd 100644 --- a/packages/specification/examples/request-ready-for-dispatch.json +++ b/packages/specification/examples/request-ready-to-dispatch.json @@ -11,7 +11,7 @@ { "identifier": { "system": "https://fhir.nhs.uk/Id/prescription-order-number", - "value": "24F5DA-A83008-7EFE6Z" + "value": "2FB9A1-A83008-160701" } } ], @@ -20,7 +20,7 @@ "coding": [ { "system": "https://fhir.nhs.uk/CodeSystem/task-businessStatus-nppt", - "code": "Ready for Dispatch" + "code": "Ready to Dispatch" } ] }, diff --git a/packages/specification/schemas/resources/UpdatePrescriptionStatusTask.yaml b/packages/specification/schemas/resources/UpdatePrescriptionStatusTask.yaml index 2a991775a..d69c1c33a 100644 --- a/packages/specification/schemas/resources/UpdatePrescriptionStatusTask.yaml +++ b/packages/specification/schemas/resources/UpdatePrescriptionStatusTask.yaml @@ -53,7 +53,8 @@ properties: - Collected - Dispatched - Not Dispensed - - Ready for Dispatch + - Ready to Dispatch + - Ready to Dispatch - Partial intent: type: string description: Order is the allowed value to indicate the update informs an actionable task. @@ -125,4 +126,4 @@ properties: valueInteger: type: integer minimum: 1 - maximum: 6 \ No newline at end of file + maximum: 6 From 627e6e96c07aa1540d362280389bda5a7cb1d788 Mon Sep 17 00:00:00 2001 From: Kris Szlapa Date: Wed, 1 May 2024 13:19:45 +0000 Subject: [PATCH 2/4] Upgrade package-lock file --- package-lock.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package-lock.json b/package-lock.json index 3bc71b934..5537c230e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3843,6 +3843,7 @@ }, "node_modules/ajv": { "version": "6.12.6", + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -5925,6 +5926,7 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", + "dev": true, "license": "MIT" }, "node_modules/fast-levenshtein": { @@ -7793,6 +7795,7 @@ }, "node_modules/json-schema-traverse": { "version": "0.4.1", + "dev": true, "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { From f58c2aa85f5cfeb11bdbe3431ac26bbed807e5d1 Mon Sep 17 00:00:00 2001 From: Kris Szlapa Date: Wed, 1 May 2024 13:28:17 +0000 Subject: [PATCH 3/4] Add 'ready to dispatch' and 'ready to dispatch - partial' to business statuses --- packages/updatePrescriptionStatus/src/validation/content.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/updatePrescriptionStatus/src/validation/content.ts b/packages/updatePrescriptionStatus/src/validation/content.ts index f5eea91e4..eac91a059 100644 --- a/packages/updatePrescriptionStatus/src/validation/content.ts +++ b/packages/updatePrescriptionStatus/src/validation/content.ts @@ -31,6 +31,8 @@ export const BUSINESS_STATUSES = [ "ready to collect", "ready to collect - partial", "collected", + "ready to dispatch", + "ready to dispatch - partial", "dispatched", "not dispensed" ] From 67af826b97321a0ceb66ef448786376e3aca901e Mon Sep 17 00:00:00 2001 From: Kris Szlapa Date: Wed, 1 May 2024 14:20:41 +0000 Subject: [PATCH 4/4] Amend 'ready to dispatch - partial' description --- packages/specification/eps-prescription-status-update-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/specification/eps-prescription-status-update-api.yaml b/packages/specification/eps-prescription-status-update-api.yaml index b6f691d77..48d423af0 100755 --- a/packages/specification/eps-prescription-status-update-api.yaml +++ b/packages/specification/eps-prescription-status-update-api.yaml @@ -139,7 +139,7 @@ paths: $ref: examples/request-ready-to-dispatch.json ready-to-dispatch-partial: summary: ready-to-dispatch-partial - description: A request message contains tracking status `Ready to Dispatch`. + description: A request message contains tracking status `Ready to Dispatch - Partial`. value: $ref: examples/request-ready-to-dispatch-partial.json dispatched: