From 05ad254a90681c1ee2720b84822b65c34792ed3f Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 14:59:28 +0000 Subject: [PATCH 01/38] adding date-time string to validityperiod end dates --- .devcontainer/devcontainer.json | 14 +++++++------- .../DispenseNotificationMedicationRequest.yaml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ccf9b68aac..b7f793f5bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,13 +15,13 @@ ], "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" }, // Features to add to the dev container. More info: https://containers.dev/features. - "features": { - "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - "version": "latest", - "moby": "true", - "installDockerBuildx": "true" - } - }, + // "features": { + // "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { + // "version": "latest", + // "moby": "true", + // "installDockerBuildx": "true" + // } + // }, "customizations": { "vscode": { "extensions": [ diff --git a/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml index c826787848..7f793d3900 100644 --- a/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml @@ -160,8 +160,8 @@ properties: description: | End date of an issue; capped at 12 months and cannot exceed the prescription's end date. Overall validity of the drug. - format: date - example: "2022-10-21" + format: date-time + example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | From 56efa16110dbf8d42952563e2fedb0df81b2a0a2 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 15:58:02 +0000 Subject: [PATCH 02/38] adding date-time string to validityperiod end dates --- .../MedicationRequest/CancelRequestMedicationRequest.yaml | 4 ++++ .../components/MedicationRequest/MedicationRequest.yaml | 4 ++-- .../MedicationRequest/ReleaseMedicationRequest.yaml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml index a7a86ac9e2..e7904ec00b 100644 --- a/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml @@ -142,9 +142,13 @@ properties: start: type: string description: The start date of a prescription. + format: date + example: "2022-10-21" end: type: string description: For eRD prescriptions only. The end date of a prescription. + format: date-time + example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | diff --git a/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml index 009f232d4a..6d6dfe0d49 100644 --- a/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml @@ -156,8 +156,8 @@ properties: description: | End date of an issue; capped at 12 months and cannot exceed the prescription's end date. Overall validity of the drug. - format: date - example: "2022-10-21" + format: date-time + example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | diff --git a/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml index 6fe15ba4a7..6c5613c3f4 100644 --- a/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml @@ -153,8 +153,8 @@ properties: description: | End date of an issue; capped at 12 months and cannot exceed the prescription's end date. Overall validity of the drug. - format: date - example: "2022-10-21" + format: date-time + example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | From 87f143e750ca656fd1a25bbb73fc454ac57720f6 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:05:29 +0000 Subject: [PATCH 03/38] adding date-time string to validityperiod end dates --- .../responsible-party/din/1-Process-Request-Send-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json index 6d00b9d8bd..1483281752 100644 --- a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json @@ -279,7 +279,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From f991315e9793e6ed2380d61c585d2fd6a441fa6f Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:06:23 +0000 Subject: [PATCH 04/38] adding date-time string to validityperiod end dates --- .../gmc/responsible-party/din/1-Prepare-Request-200_OK.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Prepare-Request-200_OK.json b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Prepare-Request-200_OK.json index 66bc6796b3..7be46abaf1 100644 --- a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Prepare-Request-200_OK.json +++ b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Prepare-Request-200_OK.json @@ -156,7 +156,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -279,7 +279,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 5cd0b6fc773313b12974d7d394609013bfd35706 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:07:11 +0000 Subject: [PATCH 05/38] adding date-time string to validityperiod end dates --- .../responsible-party/din/1-Process-Request-Send-200_OK.json | 2 +- .../spurious-code/1-Prepare-Request-200_OK.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json index 1483281752..999695fdd9 100644 --- a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/din/1-Process-Request-Send-200_OK.json @@ -156,7 +156,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Prepare-Request-200_OK.json b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Prepare-Request-200_OK.json index 0b501c1e3e..2676d91071 100644 --- a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Prepare-Request-200_OK.json +++ b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Prepare-Request-200_OK.json @@ -153,7 +153,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -276,7 +276,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 58abf24d9d6e46953915f73f2f8089894847d66a Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:11:04 +0000 Subject: [PATCH 06/38] adding date-time string to validityperiod end dates --- .../spurious-code/1-Process-Request-Send-200_OK.json | 4 ++-- .../author/unknown/1-Prepare-Request-200_OK.json | 4 ++-- .../author/unknown/1-Process-Request-Send-200_OK.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Process-Request-Send-200_OK.json b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Process-Request-Send-200_OK.json index 3420062e8c..993e3f656c 100644 --- a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/spurious-code/1-Process-Request-Send-200_OK.json @@ -153,7 +153,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -276,7 +276,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Prepare-Request-200_OK.json b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Prepare-Request-200_OK.json index cd7b901587..b15b446fa8 100644 --- a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Prepare-Request-200_OK.json +++ b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Prepare-Request-200_OK.json @@ -153,7 +153,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -276,7 +276,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Process-Request-Send-200_OK.json b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Process-Request-Send-200_OK.json index 210a8a2691..e401189eaf 100644 --- a/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/no-nominated-pharmacy/medical-prescriber/author/unknown/1-Process-Request-Send-200_OK.json @@ -153,7 +153,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -276,7 +276,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From a64a90d8a975fd8b27c1ed9bb1f22d94e6d88e80 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:12:04 +0000 Subject: [PATCH 07/38] adding date-time string to validityperiod end dates --- ...s-Request-Multiple-DosageInstructions-Send_200_OK.json | 8 ++++---- .../cancellations/1-Process-Request-Cancel-200_OK.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/3-Process-Request-Multiple-DosageInstructions-Send_200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/3-Process-Request-Multiple-DosageInstructions-Send_200_OK.json index 22490ef9fc..eee6eb1825 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/3-Process-Request-Multiple-DosageInstructions-Send_200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/3-Process-Request-Multiple-DosageInstructions-Send_200_OK.json @@ -184,7 +184,7 @@ ], "validityPeriod": { "start": "2024-03-05", - "end": "2024-04-05" + "end": "2024-04-05T23:59:59Z" }, "quantity": { "value": 20, @@ -313,7 +313,7 @@ ], "validityPeriod": { "start": "2024-03-05", - "end": "2024-04-05" + "end": "2024-04-05T23:59:59Z" }, "quantity": { "value": 20, @@ -442,7 +442,7 @@ ], "validityPeriod": { "start": "2024-03-05", - "end": "2024-04-05" + "end": "2024-04-05T23:59:59Z" }, "quantity": { "value": 30, @@ -571,7 +571,7 @@ ], "validityPeriod": { "start": "2024-03-05", - "end": "2024-04-05" + "end": "2024-04-05T23:59:59Z" }, "quantity": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Cancel-200_OK.json index 12ff3f7e41..9618cc7cbd 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From d42ce4bcd3b66b3559e8162b8d7f2a6ece83088d Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:16:33 +0000 Subject: [PATCH 08/38] adding date-time string to validityperiod end dates --- .../cancellations/1-Process-Request-Send-200_OK.json | 2 +- .../cancellations/2-Process-Request-Send-200_OK.json | 2 +- .../cancellations/3-Process-Request-Cancel-200_OK.json | 2 +- .../cancellations/3-Process-Request-Send-200_OK.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Send-200_OK.json index 831a5b369f..64979630b4 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/1-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/2-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/2-Process-Request-Send-200_OK.json index b1117a48cf..70a91fc26d 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/2-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/2-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Cancel-200_OK.json index 52febc7b57..0a654aef5f 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Send-200_OK.json index db8598fe93..fcaa93a487 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/3-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From ab274cbc08e75efd5dfd8d8bca8b5f7282358c8f Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:17:52 +0000 Subject: [PATCH 09/38] adding date-time string to validityperiod end dates --- .../cancellations/4-Process-Request-Cancel-200_OK.json | 2 +- .../cancellations/4-Process-Request-Send-200_OK.json | 2 +- .../cancellations/5-Process-Request-Cancel-200_OK.json | 2 +- .../cancellations/5-Process-Request-Send-200_OK.json | 2 +- .../cancellations/6-Process-Request-Cancel-200_OK.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Cancel-200_OK.json index 1ceaba1cca..971348caf7 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Send-200_OK.json index 4c339cfd59..f231974819 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/4-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Cancel-200_OK.json index c6151fee83..48a3e33bfa 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Send-200_OK.json index 1e9ec072d9..ec57aa2d35 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/5-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Cancel-200_OK.json index 6580b5af45..2d0c7c9786 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 87ef32823ff3eb1439f3b1ddcaf2eb119659e204 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:20:16 +0000 Subject: [PATCH 10/38] adding date-time string to validityperiod end dates --- .../cancellations/6-Process-Request-Send-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Send-200_OK.json index 74da5ceeff..be50ffe687 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/6-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From fefef21f4332634606e9b1a9f47fa867fa7409d8 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:21:44 +0000 Subject: [PATCH 11/38] adding date-time string to validityperiod end dates --- .../cancellations/7-Process-Request-Cancel-200_OK.json | 2 +- .../cancellations/7-Process-Request-Send-200_OK.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Cancel-200_OK.json index fc7d079c6a..535715f438 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Send-200_OK.json index 4e3855534a..c530ea8a49 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/7-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 42a33b4c3444183c287536291e0129ae2b143072 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:22:27 +0000 Subject: [PATCH 12/38] adding date-time string to validityperiod end dates --- .../cancellations/8-Process-Request-Cancel-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Cancel-200_OK.json index 218402c5fd..7ae23dedd3 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 516b31d7a3d15c897f97594976c731f2e0af3c85 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:25:25 +0000 Subject: [PATCH 13/38] adding date-time string to validityperiod end dates --- .../cancellations/8-Process-Request-Send-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Send-200_OK.json index 9ea56659e8..809a4a51e7 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/8-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 50118b5be14813be7974377a3477e0779f392f00 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:26:09 +0000 Subject: [PATCH 14/38] adding date-time string to validityperiod end dates --- .../cancellations/9-Process-Request-Cancel-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Cancel-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Cancel-200_OK.json index 9a056da142..38a323fb2f 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Cancel-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Cancel-200_OK.json @@ -159,7 +159,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 3514d204bb4619a28fb49cbcc6c390656f6c5139 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:26:55 +0000 Subject: [PATCH 15/38] adding date-time string to validityperiod end dates --- .../cancellations/9-Process-Request-Send-200_OK.json | 2 +- .../medication-list/din/1-Prepare-Request-200_OK.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Send-200_OK.json b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Send-200_OK.json index 55dde4fb6b..50e39870b5 100644 --- a/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Send-200_OK.json +++ b/examples/primary-care/acute/nominated-pharmacy/medical-prescriber/cancellations/9-Process-Request-Send-200_OK.json @@ -150,7 +150,7 @@ ], "validityPeriod": { "start": "2021-04-20", - "end": "2021-05-18" + "end": "2021-05-18T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Prepare-Request-200_OK.json b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Prepare-Request-200_OK.json index 1aecc36f6c..11a162fd19 100644 --- a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Prepare-Request-200_OK.json +++ b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Prepare-Request-200_OK.json @@ -166,7 +166,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2022-02-19", - "end": "2022-03-19" + "end": "2022-03-19T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -305,7 +305,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2022-02-19", - "end": "2022-03-19" + "end": "2022-03-19T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 933c0f72d703885d44f0f294417e20533d79ea27 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:28:00 +0000 Subject: [PATCH 16/38] adding date-time string to validityperiod end dates --- .../medication-list/din/1-Process-Request-Send-200_OK.json | 4 ++-- .../medication-list/din/1-VerifySignature-Request-200_OK.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Process-Request-Send-200_OK.json b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Process-Request-Send-200_OK.json index 11d362302c..0755eef0c9 100644 --- a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Process-Request-Send-200_OK.json +++ b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-Process-Request-Send-200_OK.json @@ -166,7 +166,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2022-02-19", - "end": "2022-03-19" + "end": "2022-03-19T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -305,7 +305,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2022-02-19", - "end": "2022-03-19" + "end": "2022-03-19T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-VerifySignature-Request-200_OK.json b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-VerifySignature-Request-200_OK.json index 995f520371..9f1454497a 100644 --- a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-VerifySignature-Request-200_OK.json +++ b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/din/1-VerifySignature-Request-200_OK.json @@ -415,7 +415,7 @@ }, "validityPeriod": { "start": "2022-02-19", - "end": "2022-03-19" + "end": "2022-03-19T23:59:59Z" }, "expectedSupplyDuration": { "unit": "days", @@ -565,7 +565,7 @@ }, "validityPeriod": { "start": "2022-02-19", - "end": "2022-03-19" + "end": "2022-03-19T23:59:59Z" }, "expectedSupplyDuration": { "unit": "days", From 037da8d70ca184496a8fe138685f110ee87c252b Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:28:56 +0000 Subject: [PATCH 17/38] adding date-time string to validityperiod end dates --- .../spurious-code/1-Prepare-Request-200_OK.json | 4 ++-- .../spurious-code/1-Process-Request-Send-200_OK.json | 4 ++-- examples/sandbox/Release-Response-200_OK.json | 4 ++-- .../prescriber-endorsed/1-Prepare-Request-200_OK.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Prepare-Request-200_OK.json b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Prepare-Request-200_OK.json index c45f330360..863cf49733 100644 --- a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Prepare-Request-200_OK.json +++ b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Prepare-Request-200_OK.json @@ -166,7 +166,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -305,7 +305,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Process-Request-Send-200_OK.json b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Process-Request-Send-200_OK.json index f431ca588c..25e1053776 100644 --- a/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Process-Request-Send-200_OK.json +++ b/examples/primary-care/repeat-dispensing/nominated-pharmacy/medical-prescriber/author/gmc/responsible-party/medication-list/spurious-code/1-Process-Request-Send-200_OK.json @@ -166,7 +166,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -305,7 +305,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/sandbox/Release-Response-200_OK.json b/examples/sandbox/Release-Response-200_OK.json index 4ddd305919..dcdc9cabe2 100644 --- a/examples/sandbox/Release-Response-200_OK.json +++ b/examples/sandbox/Release-Response-200_OK.json @@ -723,7 +723,7 @@ }, "validityPeriod": { "start": "2022-02-17", - "end": "2022-03-17" + "end": "2022-03-17T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -853,7 +853,7 @@ }, "validityPeriod": { "start": "2022-02-17", - "end": "2022-03-17" + "end": "2022-03-17T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Prepare-Request-200_OK.json b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Prepare-Request-200_OK.json index bfe3327782..f65887a6b5 100644 --- a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Prepare-Request-200_OK.json +++ b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Prepare-Request-200_OK.json @@ -190,7 +190,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 1, From 8e75111182dd9e00697865244541f024f04408d2 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:31:11 +0000 Subject: [PATCH 18/38] adding date-time string to validityperiod end dates --- .../prescriber-endorsed/1-Process-Request-Send-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Process-Request-Send-200_OK.json b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Process-Request-Send-200_OK.json index ddfc9e8388..7408d392d4 100644 --- a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/1-Process-Request-Send-200_OK.json @@ -190,7 +190,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 1, From 808333798c68d02ce34074a7d2341433d4232a6f Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:31:41 +0000 Subject: [PATCH 19/38] adding date-time string to validityperiod end dates --- .../prescriber-endorsed/2-Prepare-Request-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Prepare-Request-200_OK.json b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Prepare-Request-200_OK.json index 4b690faa12..f545b9ff9f 100644 --- a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Prepare-Request-200_OK.json +++ b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Prepare-Request-200_OK.json @@ -202,7 +202,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 1, From b7a2d4f100a89dec8ed8098e53b4b8b5d028e99f Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:36:04 +0000 Subject: [PATCH 20/38] adding date-time string to validityperiod end dates --- .../prescriber-endorsed/2-Process-Request-Send-200_OK.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Process-Request-Send-200_OK.json b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Process-Request-Send-200_OK.json index 1ad2552d14..76e3da7867 100644 --- a/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/community/acute/nominated-pharmacy/pharmacist/prescriber-endorsed/2-Process-Request-Send-200_OK.json @@ -202,7 +202,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 1, From c6b0f95cc34c3ddcdcca0de25ed7a370b9086fcf Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:36:44 +0000 Subject: [PATCH 21/38] adding date-time string to validityperiod end dates --- .../non-prescriber-endorsed/1-Prepare-Request-200_OK.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Prepare-Request-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Prepare-Request-200_OK.json index 291789ffd4..f55f5987bd 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Prepare-Request-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Prepare-Request-200_OK.json @@ -187,7 +187,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -352,7 +352,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -517,7 +517,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -682,7 +682,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, From 70f29f1d4e247d68c4449f4c3b88b7b98247b140 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:37:23 +0000 Subject: [PATCH 22/38] adding date-time string to validityperiod end dates --- .../1-Process-Request-Send-200_OK.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Process-Request-Send-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Process-Request-Send-200_OK.json index 937c3222c6..478c4ce037 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/non-prescriber-endorsed/1-Process-Request-Send-200_OK.json @@ -187,7 +187,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -352,7 +352,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -517,7 +517,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -682,7 +682,7 @@ ], "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, From cb0bb6b9c4c1a1739094f0ef83659b72c42baf72 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:38:10 +0000 Subject: [PATCH 23/38] adding date-time string to validityperiod end dates --- .../prescriber-endorsed/1-Prepare-Request-200_OK.json | 8 ++++---- .../1-Process-Request-Dispense-200_OK.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Prepare-Request-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Prepare-Request-200_OK.json index cb42e0eda4..6fa3f28b74 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Prepare-Request-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Prepare-Request-200_OK.json @@ -200,7 +200,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -377,7 +377,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -554,7 +554,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -731,7 +731,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Dispense-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Dispense-200_OK.json index 45abb9a0cc..ddbe126e55 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Dispense-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Dispense-200_OK.json @@ -289,7 +289,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -650,7 +650,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -1002,7 +1002,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, @@ -1354,7 +1354,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, From 1bf37b2782abe1d1f46688000f9ce6b4b3569883 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:43:30 +0000 Subject: [PATCH 24/38] adding date-time string to validityperiod end dates --- .../1-Process-Request-Send-200_OK.json | 8 ++++---- .../1-Prepare-Request-200_OK.json | 2 +- .../1-Process-Request-Dispense-200_OK.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Send-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Send-200_OK.json index 12ec81863b..cd1909c903 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/multiple-medication-requests/prescriber-endorsed/1-Process-Request-Send-200_OK.json @@ -200,7 +200,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -377,7 +377,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -554,7 +554,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, @@ -731,7 +731,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-05-07", - "end": "2021-06-04" + "end": "2021-06-04T23:59:59Z" }, "quantity": { "value": 63, diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Prepare-Request-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Prepare-Request-200_OK.json index cd62f382c0..3636db439b 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Prepare-Request-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Prepare-Request-200_OK.json @@ -188,7 +188,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Dispense-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Dispense-200_OK.json index 51531a8b8b..a81b23b67c 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Dispense-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Dispense-200_OK.json @@ -254,7 +254,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, From 13b76f903beb409f58f6e1688c46eccb0519b5cf Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:45:47 +0000 Subject: [PATCH 25/38] adding date-time string to validityperiod end dates --- .../1-Process-Request-Send-200_OK.json | 2 +- .../1-VerifySignature-Request-200_OK.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Send-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Send-200_OK.json index 724ee0934e..0d9c5fef9d 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-Process-Request-Send-200_OK.json @@ -188,7 +188,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, diff --git a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-VerifySignature-Request-200_OK.json b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-VerifySignature-Request-200_OK.json index fef5326f3c..3b7b020bf2 100644 --- a/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-VerifySignature-Request-200_OK.json +++ b/examples/secondary-care/community/repeat-dispensing/nominated-pharmacy/clinical-practitioner/single-medication-request/1-VerifySignature-Request-200_OK.json @@ -340,7 +340,7 @@ }, "validityPeriod": { "start": "2022-02-17", - "end": "2022-03-17" + "end": "2022-03-17T23:59:59Z" }, "expectedSupplyDuration": { "unit": "days", From ac2079ce27d4602eefdf37b6ae5006009290ba0a Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:48:15 +0000 Subject: [PATCH 26/38] adding date-time string to validityperiod end dates --- .../1-Prepare-Request-200_OK.json | 2 +- .../1-Process-Request-Dispense-200_OK.json | 2 +- .../1-Process-Request-Send-200_OK.json | 2 +- .../1-Prepare-Request-200_OK.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Prepare-Request-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Prepare-Request-200_OK.json index ef5db111f1..42012e495c 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Prepare-Request-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Prepare-Request-200_OK.json @@ -232,7 +232,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json index 151ee3b9ca..b50eb05cc2 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json @@ -282,7 +282,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json index 0ae5ddd596..cba4d08ecf 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json @@ -232,7 +232,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Prepare-Request-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Prepare-Request-200_OK.json index ae16391b0b..515f9309f5 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Prepare-Request-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Prepare-Request-200_OK.json @@ -230,7 +230,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 21aa9d492a5e04670844c238dbe6b40fe9a6ce98 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:50:47 +0000 Subject: [PATCH 27/38] adding date-time string to validityperiod end dates --- .../1-Process-Request-Dispense-200_OK.json | 2 +- .../1-Process-Request-Send-200_OK.json | 2 +- .../1-Prepare-Request-200_OK.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json index 30f3455c09..7ec0a2e748 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Dispense-200_OK.json @@ -279,7 +279,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json index 46c7d8acff..c72bb6ec4f 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-and-concurrent-dosage-instructions/1-Process-Request-Send-200_OK.json @@ -230,7 +230,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Prepare-Request-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Prepare-Request-200_OK.json index 459cbaaf79..df25598079 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Prepare-Request-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Prepare-Request-200_OK.json @@ -359,7 +359,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From 6fd5a27bcc1709a20d4b85815a2963d1600b1585 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:51:44 +0000 Subject: [PATCH 28/38] adding date-time string to validityperiod end dates --- .../1-Process-Request-Dispense-200_OK.json | 2 +- .../1-Process-Request-Send-200_OK.json | 2 +- examples/spec/prepare/eRD-primary-example-req.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Dispense-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Dispense-200_OK.json index 1c0925818e..84685563cc 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Dispense-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Dispense-200_OK.json @@ -408,7 +408,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Send-200_OK.json b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Send-200_OK.json index 6d26fd2cc3..11b29f58ef 100644 --- a/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Send-200_OK.json +++ b/examples/secondary-care/homecare/acute/nominated-pharmacy/consecutive-dosage-instructions/1-Process-Request-Send-200_OK.json @@ -359,7 +359,7 @@ }, "validityPeriod": { "start": "2022-10-20", - "end": "2023-03-20" + "end": "2023-03-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/examples/spec/prepare/eRD-primary-example-req.json b/examples/spec/prepare/eRD-primary-example-req.json index 58b2704742..1fc0d34701 100644 --- a/examples/spec/prepare/eRD-primary-example-req.json +++ b/examples/spec/prepare/eRD-primary-example-req.json @@ -173,7 +173,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { @@ -313,7 +313,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { @@ -453,7 +453,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { @@ -593,7 +593,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { From fa24ab3a33c7902fe1bc9355d89400def0eb22c7 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:52:40 +0000 Subject: [PATCH 29/38] adding date-time string to validityperiod end dates --- .../prescription-order/eRD-primary-example-req.json | 8 ++++---- packages/bdd-tests/testData/epsDispense.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/spec/prescribing/prescription-order/eRD-primary-example-req.json b/examples/spec/prescribing/prescription-order/eRD-primary-example-req.json index 8736ee5491..f21439fdd0 100644 --- a/examples/spec/prescribing/prescription-order/eRD-primary-example-req.json +++ b/examples/spec/prescribing/prescription-order/eRD-primary-example-req.json @@ -173,7 +173,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { @@ -313,7 +313,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { @@ -453,7 +453,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { @@ -593,7 +593,7 @@ ], "validityPeriod": { "start": "2022-10-21", - "end": "2022-11-21" + "end": "2022-11-21T23:59:59Z" }, "numberOfRepeatsAllowed": 6, "quantity": { diff --git a/packages/bdd-tests/testData/epsDispense.json b/packages/bdd-tests/testData/epsDispense.json index 208e8efd42..3509482c4d 100644 --- a/packages/bdd-tests/testData/epsDispense.json +++ b/packages/bdd-tests/testData/epsDispense.json @@ -213,7 +213,7 @@ }, "validityPeriod":{ "start":"2023-02-16", - "end":"2023-11-20" + "end":"2023-11-20T23:59:59Z" }, "expectedSupplyDuration":{ "value":30, From 9636ff6bab31b5404b3f61799caad16e10c2f5ba Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:55:03 +0000 Subject: [PATCH 30/38] adding date-time string to validityperiod end dates --- packages/bdd-tests/testData/epsPrepare.json | 2 +- packages/bdd-tests/testData/medicationDispense.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/bdd-tests/testData/epsPrepare.json b/packages/bdd-tests/testData/epsPrepare.json index 60acca0bc9..e894c201ca 100644 --- a/packages/bdd-tests/testData/epsPrepare.json +++ b/packages/bdd-tests/testData/epsPrepare.json @@ -158,7 +158,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, diff --git a/packages/bdd-tests/testData/medicationDispense.json b/packages/bdd-tests/testData/medicationDispense.json index e66dbfc672..fc0cc5f28e 100644 --- a/packages/bdd-tests/testData/medicationDispense.json +++ b/packages/bdd-tests/testData/medicationDispense.json @@ -153,7 +153,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -419,7 +419,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -671,7 +671,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From eb2f30555ca9e28c89b4b2a12d90d127f511df19 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:55:53 +0000 Subject: [PATCH 31/38] adding date-time string to validityperiod end dates --- packages/bdd-tests/testData/medicationRequest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/bdd-tests/testData/medicationRequest.json b/packages/bdd-tests/testData/medicationRequest.json index 7bfdf3fbfb..76902f0788 100644 --- a/packages/bdd-tests/testData/medicationRequest.json +++ b/packages/bdd-tests/testData/medicationRequest.json @@ -110,7 +110,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -266,7 +266,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -396,7 +396,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, @@ -526,7 +526,7 @@ }, "validityPeriod": { "start": "2023-02-16", - "end": "2023-11-20" + "end": "2023-11-20T23:59:59Z" }, "expectedSupplyDuration": { "value": 30, From c8155140fdab2e9a15abd30adf0cca0d68860cf8 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 16:59:54 +0000 Subject: [PATCH 32/38] adding date-time string to validityperiod end dates --- .../test-data/fhir/dispensing/Process-Request-Dispense-eRD.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/coordinator/tests/resources/test-data/fhir/dispensing/Process-Request-Dispense-eRD.json b/packages/coordinator/tests/resources/test-data/fhir/dispensing/Process-Request-Dispense-eRD.json index c78a47d3a4..9498b7b2de 100644 --- a/packages/coordinator/tests/resources/test-data/fhir/dispensing/Process-Request-Dispense-eRD.json +++ b/packages/coordinator/tests/resources/test-data/fhir/dispensing/Process-Request-Dispense-eRD.json @@ -245,7 +245,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, From a279b491f56c926e1b4bde31aaa301dd09665722 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 17:01:24 +0000 Subject: [PATCH 33/38] adding date-time string to validityperiod end dates --- packages/tool/e2e-tests/messages/prescriptionOrder.json | 2 +- .../__snapshots__/createDispenseNotification.spec.ts.snap | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/tool/e2e-tests/messages/prescriptionOrder.json b/packages/tool/e2e-tests/messages/prescriptionOrder.json index c2db7b7c19..54f66280aa 100644 --- a/packages/tool/e2e-tests/messages/prescriptionOrder.json +++ b/packages/tool/e2e-tests/messages/prescriptionOrder.json @@ -208,7 +208,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, diff --git a/packages/tool/site/client/tests/components/dispense/__snapshots__/createDispenseNotification.spec.ts.snap b/packages/tool/site/client/tests/components/dispense/__snapshots__/createDispenseNotification.spec.ts.snap index a23928b4cf..f88214b7cd 100644 --- a/packages/tool/site/client/tests/components/dispense/__snapshots__/createDispenseNotification.spec.ts.snap +++ b/packages/tool/site/client/tests/components/dispense/__snapshots__/createDispenseNotification.spec.ts.snap @@ -167,7 +167,7 @@ exports[`Produces expected result when status full dispense is done on a partial "value": 63, }, "validityPeriod": { - "end": "2021-10-03", + "end": "2021-10-03T23:59:59Z", "start": "2021-09-03", }, }, @@ -689,7 +689,7 @@ exports[`Produces expected result when status fully dispensed 1`] = ` "value": 63, }, "validityPeriod": { - "end": "2021-10-03", + "end": "2021-10-03T23:59:59Z", "start": "2021-09-03", }, }, @@ -1211,7 +1211,7 @@ exports[`Produces expected result when status partial dispense is done on a part "value": 63, }, "validityPeriod": { - "end": "2021-10-03", + "end": "2021-10-03T23:59:59Z", "start": "2021-09-03", }, }, @@ -1733,7 +1733,7 @@ exports[`Produces expected result when status partially dispensed 1`] = ` "value": 63, }, "validityPeriod": { - "end": "2021-10-03", + "end": "2021-10-03T23:59:59Z", "start": "2021-09-03", }, }, From 56dcac9620812a2f17f147c6449f50ef2226afac Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Mon, 28 Oct 2024 17:02:52 +0000 Subject: [PATCH 34/38] adding date-time string to validityperiod end dates --- .../tool/site/client/tests/messages/dispenseNotification.json | 2 +- .../site/client/tests/messages/dispenseNotificationPartial.json | 2 +- packages/tool/site/client/tests/messages/prescriptionOrder.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/tool/site/client/tests/messages/dispenseNotification.json b/packages/tool/site/client/tests/messages/dispenseNotification.json index 7c90e7342c..9b562be357 100644 --- a/packages/tool/site/client/tests/messages/dispenseNotification.json +++ b/packages/tool/site/client/tests/messages/dispenseNotification.json @@ -216,7 +216,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, diff --git a/packages/tool/site/client/tests/messages/dispenseNotificationPartial.json b/packages/tool/site/client/tests/messages/dispenseNotificationPartial.json index f71ab763e9..87e9fa7276 100644 --- a/packages/tool/site/client/tests/messages/dispenseNotificationPartial.json +++ b/packages/tool/site/client/tests/messages/dispenseNotificationPartial.json @@ -214,7 +214,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, diff --git a/packages/tool/site/client/tests/messages/prescriptionOrder.json b/packages/tool/site/client/tests/messages/prescriptionOrder.json index c2db7b7c19..54f66280aa 100644 --- a/packages/tool/site/client/tests/messages/prescriptionOrder.json +++ b/packages/tool/site/client/tests/messages/prescriptionOrder.json @@ -208,7 +208,7 @@ "numberOfRepeatsAllowed": 5, "validityPeriod": { "start": "2021-09-03", - "end": "2021-10-03" + "end": "2021-10-03T23:59:59Z" }, "quantity": { "value": 63, From 2fe1dc45cee819991413e53434066a3769bc99fb Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Wed, 30 Oct 2024 13:34:05 +0000 Subject: [PATCH 35/38] recommented devcontainer feature --- .devcontainer/devcontainer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b7f793f5bd..ccf9b68aac 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,13 +15,13 @@ ], "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" }, // Features to add to the dev container. More info: https://containers.dev/features. - // "features": { - // "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - // "version": "latest", - // "moby": "true", - // "installDockerBuildx": "true" - // } - // }, + "features": { + "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { + "version": "latest", + "moby": "true", + "installDockerBuildx": "true" + } + }, "customizations": { "vscode": { "extensions": [ From 19bd5ab725f3771b5220bcac30fb6c96298d077c Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Wed, 13 Nov 2024 14:30:57 +0000 Subject: [PATCH 36/38] updated the descriptions --- .devcontainer/devcontainer.json | 14 +++++++------- .../CancelRequestMedicationRequest.yaml | 5 ++++- .../DispenseNotificationMedicationRequest.yaml | 5 +++-- .../MedicationRequest/MedicationRequest.yaml | 3 ++- .../ReleaseMedicationRequest.yaml | 3 ++- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ccf9b68aac..b7f793f5bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,13 +15,13 @@ ], "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" }, // Features to add to the dev container. More info: https://containers.dev/features. - "features": { - "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - "version": "latest", - "moby": "true", - "installDockerBuildx": "true" - } - }, + // "features": { + // "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { + // "version": "latest", + // "moby": "true", + // "installDockerBuildx": "true" + // } + // }, "customizations": { "vscode": { "extensions": [ diff --git a/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml index e7904ec00b..6f3e562780 100644 --- a/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/CancelRequestMedicationRequest.yaml @@ -146,7 +146,10 @@ properties: example: "2022-10-21" end: type: string - description: For eRD prescriptions only. The end date of a prescription. + description: | + For eRD prescriptions only. The end date of a prescription. + Must be in date-time format with the time set to 23:59:59 on the last valid day of the prescription, including for single-day prescriptions. + Example: "2022-10-21T23:59:59Z" format: date-time example: "2022-10-21T23:59:59Z" expectedSupplyDuration: diff --git a/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml index 7f793d3900..c21fdf475d 100644 --- a/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml @@ -160,8 +160,9 @@ properties: description: | End date of an issue; capped at 12 months and cannot exceed the prescription's end date. Overall validity of the drug. - format: date-time - example: "2022-10-21T23:59:59Z" + Must be in date-time format with the time set to 23:59:59 on the last valid day of the prescription, including for single-day prescriptions. + Example: "2022-10-21T23:59:59Z" + format: date-time expectedSupplyDuration: type: object description: | diff --git a/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml index 6d6dfe0d49..e8dbaa8156 100644 --- a/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml @@ -156,8 +156,9 @@ properties: description: | End date of an issue; capped at 12 months and cannot exceed the prescription's end date. Overall validity of the drug. + Must be in date-time format with the time set to 23:59:59 on the last valid day of the prescription, including for single-day prescriptions. + Example: "2022-10-21T23:59:59Z" format: date-time - example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | diff --git a/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml index 6c5613c3f4..fb8685b55f 100644 --- a/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml @@ -153,8 +153,9 @@ properties: description: | End date of an issue; capped at 12 months and cannot exceed the prescription's end date. Overall validity of the drug. + Must be in date-time format with the time set to 23:59:59 on the last valid day of the prescription, including for single-day prescriptions. + Example: "2022-10-21T23:59:59Z" format: date-time - example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | From dc877d00da9f924e4b170c45117ee13c5d0bf5c4 Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Wed, 13 Nov 2024 16:42:08 +0000 Subject: [PATCH 37/38] updated the descriptions --- .devcontainer/devcontainer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b7f793f5bd..ccf9b68aac 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -15,13 +15,13 @@ ], "remoteEnv": { "LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}" }, // Features to add to the dev container. More info: https://containers.dev/features. - // "features": { - // "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - // "version": "latest", - // "moby": "true", - // "installDockerBuildx": "true" - // } - // }, + "features": { + "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { + "version": "latest", + "moby": "true", + "installDockerBuildx": "true" + } + }, "customizations": { "vscode": { "extensions": [ From 32126d1743222fb36380d8119dfe564d666bf35b Mon Sep 17 00:00:00 2001 From: jonathanwelch1-nhs Date: Thu, 14 Nov 2024 14:31:05 +0000 Subject: [PATCH 38/38] added back the examples --- .../DispenseNotificationMedicationRequest.yaml | 3 ++- .../components/MedicationRequest/MedicationRequest.yaml | 1 + .../components/MedicationRequest/ReleaseMedicationRequest.yaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml index c21fdf475d..51a796a838 100644 --- a/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/DispenseNotificationMedicationRequest.yaml @@ -162,7 +162,8 @@ properties: Overall validity of the drug. Must be in date-time format with the time set to 23:59:59 on the last valid day of the prescription, including for single-day prescriptions. Example: "2022-10-21T23:59:59Z" - format: date-time + format: date-time + example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | diff --git a/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml index e8dbaa8156..7e2cff48d0 100644 --- a/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/MedicationRequest.yaml @@ -159,6 +159,7 @@ properties: Must be in date-time format with the time set to 23:59:59 on the last valid day of the prescription, including for single-day prescriptions. Example: "2022-10-21T23:59:59Z" format: date-time + example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: | diff --git a/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml b/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml index fb8685b55f..f793d067a2 100644 --- a/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml +++ b/packages/specification/schemas/components/MedicationRequest/ReleaseMedicationRequest.yaml @@ -156,6 +156,7 @@ properties: Must be in date-time format with the time set to 23:59:59 on the last valid day of the prescription, including for single-day prescriptions. Example: "2022-10-21T23:59:59Z" format: date-time + example: "2022-10-21T23:59:59Z" expectedSupplyDuration: type: object description: |