Skip to content

Commit

Permalink
Merge pull request #254 from NHSDigital/feature/ERSSUP-61102
Browse files Browse the repository at this point in the history
Merge of ERSSUP-58954, ERSSUP-60930, and ERSSUP-61102
  • Loading branch information
francisco-videira-nhs authored Mar 25, 2022
2 parents 194e2b0 + 65c458e commit 6283ca2
Show file tree
Hide file tree
Showing 102 changed files with 1,418 additions and 129 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-APIErrorCode-1",
"code": "PAS_RESPONDED_WITH_ERROR",
"display": "Error recieved from PAS"
"display": "Error received from PAS"
}
]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
]
},
"resourceType": "Parameters",
"parameter": [
{
"name": "cancellationReason",
"valueCoding": {
"system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
"code": "INTEND_PRIVATE"
}
}
]
}
21 changes: 21 additions & 0 deletions sandbox/src/mocks/cancelReferral/requests/NoLongerRequired.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
]
},
"resourceType": "Parameters",
"parameter": [
{
"name": "cancellationReason",
"valueCoding": {
"system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
"code": "TREATMENT_NO_LONGER_REQUIRED"
}
},
{
"name": "cancellationComments",
"valueString": "This is a cancellation reason comment"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
]
},
"resourceType": "Parameters",
"parameter": [
{
"name": "cancellationReason",
"valueCoding": {
"system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
"code": "PATIENT_REQUEST_CANCELLATION_OTHER"
}
},
{
"name": "cancellationComments",
"valueString": "This is a cancellation reason comment"
}
]
}
21 changes: 21 additions & 0 deletions sandbox/src/mocks/cancelReferral/requests/RaisedInError.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
]
},
"resourceType": "Parameters",
"parameter": [
{
"name": "cancellationReason",
"valueCoding": {
"system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
"code": "RAISED_IN_ERROR"
}
},
{
"name": "cancellationComments",
"valueString": "This is a cancellation reason comment"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Request-Parameters-1"
]
},
"resourceType": "Parameters",
"parameter": [
{
"name": "cancellationReason",
"valueCoding": {
"system": "_baseurl_/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
"code": "REFERRER_CANCELLATION"
}
},
{
"name": "cancellationComments",
"valueString": "This is a cancellation reason comment"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{
"name": "updatedReferralRequest",
"resource": {
"id": "000000070001",
"id": "000000070000",
"meta": {
"versionId": "4",
"profile": [
Expand All @@ -18,6 +18,12 @@
},
"resourceType": "ReferralRequest",
"extension": [
{
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Appointment-Reference-1",
"valueReference": {
"reference": "Appointment/70001"
}
},
{
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Appointment-1",
"valueReference": {
Expand Down Expand Up @@ -63,14 +69,14 @@
{
"url": "reason",
"valueCoding": {
"system": "_baseurl_/STU3/CodeSystem/REQUEST-CANCELLATION-REASON",
"code": "PATIENT_APPOINTMENT_CANCELLATION_OTHER",
"display": "Other"
"system": "_baseUrl_/FHIR/STU3/CodeSystem/REQUEST-CANCELLATION-REASON",
"code": "REFERRER_CANCELLATION",
"display": "Other - Referrer request cancellation"
}
},
{
"url": "comments",
"valueString": "Patient could not attend appointment due to them being ill."
"valueString": "This is a cancellation reason comment"
}
]
}
Expand All @@ -95,7 +101,7 @@
{
"name": "specialty",
"valueCoding": {
"system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
"system": "_baseUrl_/FHIR/STU3/CodeSystem/SPECIALTY",
"code": "CARDIOLOGY"
}
},
Expand Down Expand Up @@ -165,7 +171,7 @@
"created": "2021-05-06T11:21:45.652Z",
"incomingReferral": [
{
"reference": "ReferralRequest/000000070001/_history/4"
"reference": "ReferralRequest/000000070000/_history/4"
}
],
"participant": [
Expand Down Expand Up @@ -195,7 +201,7 @@
"specialty": {
"coding": [
{
"system": "_baseUrl_/STU3/CodeSystem/SPECIALTY",
"system": "_baseUrl_/FHIR/STU3/CodeSystem/SPECIALTY",
"code": "CARDIOLOGY",
"display": "Cardiology"
}
Expand Down Expand Up @@ -230,15 +236,15 @@
"reason": [
{
"coding": [{
"system": "_baseurl_/STU3/CodeSystem/APPOINTMENT-CANCELLATION-REASON",
"system": "_baseUrl_/FHIR/STU3/CodeSystem/APPOINTMENT-CANCELLATION-REASON",
"code": "PATIENT_APPOINTMENT_CANCELLATION_OTHER"
}]
}
],
"comment": "Intend Private Comment",
"incomingReferral": [
{
"reference": "ReferralRequest/000000070001/_history/4"
"reference": "ReferralRequest/000000070000/_history/4"
}
],
"participant": [
Expand All @@ -265,4 +271,4 @@
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
{
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-CancelReferral-Response-Parameters-1"
]
},
"resourceType": "Parameters",
"parameter": [
{
"name": "updatedReferralRequest",
"resource": {
"id": "000000070000",
"meta": {
"versionId": "4",
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-ReferralRequest-1"
]
},
"resourceType": "ReferralRequest",
"extension": [
{
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralPriority-1",
"valueCodeableConcept": {
"coding": [
{
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-Priority-1",
"code": "ROUTINE",
"display": "Routine"
}
]
}
},
{
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralShortlist-1",
"valueReference": {
"reference": "#shortlist"
}
},
{
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Commissioning-Rule-Org-1",
"valueIdentifier": {
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
"value": "R69"
}
},
{
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-ReferralState-1",
"extension": [
{
"url": "state",
"valueCoding": {
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ReferralState-1",
"code": "CANCELLED_REFERRAL",
"display": "Cancelled Referral"
}
},
{
"url": "reason",
"valueCoding": {
"system": "_baseUrl_/FHIR/STU3/CodeSystem/REFERRAL-CANCELLATION-REASON",
"code": "INTEND_PRIVATE",
"display": "Intend to go private"
}
}
]
}
],
"contained": [
{
"id": "serviceSearchCriteria",
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-ServiceSearchCriteria-Parameters-1"
]
},
"resourceType": "Parameters",
"parameter": [
{
"name": "priority",
"valueCoding": {
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-Priority-1",
"code": "ROUTINE"
}
},
{
"name": "specialty",
"valueCoding": {
"system": "_baseUrl_/FHIR/STU3/CodeSystem/SPECIALTY",
"code": "CARDIOLOGY"
}
},
{
"name": "clinicType",
"valueCoding": {
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-ClinicType-1",
"code": "HEART_FAILURE"
}
},
{
"name": "ageAndGenderAppropriate",
"valueBoolean": false
},
{
"name": "commissioningProvisioning",
"valueCoding": {
"system": "https://fhir.nhs.uk/STU3/CodeSystem/eRS-CommissioningProvisioning-1",
"code": "ALL_AVAILABLE_FOR_BOOKING"
}
}
]
},
{
"id": "shortlist",
"meta": {
"profile": [
"https://fhir.nhs.uk/STU3/StructureDefinition/eRS-Shortlist-List-1"
]
},
"resourceType": "List",
"extension": [
{
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-eRS-Shortlist-SearchCriteria-1",
"valueReference": {
"reference": "#serviceSearchCriteria"
}
}
],
"status": "current",
"mode": "snapshot",
"entry": [
{
"item": {
"identifier": {
"system": "http://fhir.nhs.net/Id/ers-service",
"value": "11004"
},
"display": "Cardiology Triage Business Service"
}
}
]
}
],
"status": "cancelled",
"specialty": {
"coding": [
{
"system": "_baseUrl_/FHIR/STU3/CodeSystem/SPECIALTY",
"code": "CARDIOLOGY",
"display": "Cardiology"
}
]
},
"subject": {
"identifier": {
"system": "http://fhir.nhs.net/Id/nhs-number",
"value": "9912003888"
}
},
"supportingInfo": [],
"intent": "plan"
}
}
]
}
Loading

0 comments on commit 6283ca2

Please sign in to comment.