Skip to content

Feedback vws on care services page #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 15, 2025
Merged

Feedback vws on care services page #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a94ae2
part 1 feedback
bramwesselo Oct 13, 2025
c5b87f1
feedback, part 2
bramwesselo Oct 13, 2025
3996383
tekstuele aanpassingen uit gesprek
bramwesselo Oct 13, 2025
aa2e23a
example queries in sequence diagrams
bramwesselo Oct 14, 2025
1783544
Merge branch 'main' into feedback-vws-on-care-services-page
bramwesselo Oct 15, 2025
21f6c1e
removed commented code
bramwesselo Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions input/fsh/examples/admin-directory-org1.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ Usage: #example
Title: "Organization 1 - PractitionerRole Harry Arts"
* identifier[+].system = "http://cp1.example.org/HRM/assignments"
* identifier[=].value = "654321"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-2"
* practitioner = Reference(Practitioner/9a63e407-34af-4ae4-ad3c-f7107fbbc0cd)
* organization = Reference(Organization/4cb35b96-f021-4e15-bf71-d67a6d4bebec)
* code.coding = $uzi-rolcode#01.015 "Huisarts"
Expand All @@ -61,6 +59,8 @@ Usage: #example
Title: "Organization 1 - Practitioner Harry Arts"
* identifier[+].system = "http://cp1.example.org/HRM/employees"
* identifier[=].value = "5678"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-2"
* name.use = #official
* name.text = "Hary Arts"
* name.family = "Arts"
Expand Down
4 changes: 2 additions & 2 deletions input/fsh/examples/admin-directory-org2.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ Usage: #example
Title: "Organization 2 - PractitionerRole Cardioloog Caroline van Dijk at Organization 2"
* identifier[+].system = "http://cp2.example.org/HRM/assignments"
* identifier[=].value = "123456"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-1"
* practitioner = Reference(Practitioner/040b160a-6072-4244-adc0-2b786c4ef052)
* organization = Reference(Organization/cff921f3-c1c1-4a4c-8f0f-cafd0aa25067)
* code.coding = $uzi-rolcode#01.010 "Cardioloog"
Expand All @@ -178,6 +176,8 @@ Title: "Organization 2 - Practitioner Cardioloog Caroline van Dijk"
* meta.profile = "http://nictiz.nl/fhir/StructureDefinition/nl-core-HealthProfessional-Practitioner"
* identifier[+].system = "http://cp2.example.org/HRM/employees"
* identifier[=].value = "1234"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-1"
* name.use = #official
* name.text = "Caroline van Dijk"
* name.family = "van Dijk"
Expand Down
2 changes: 2 additions & 0 deletions input/fsh/examples/admin-directory-org3.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ InstanceOf: NlGfPractitioner
Usage: #example
Title: "Organization 3 - Practitioner John Doe"
* active = true
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-3"
* name.family = "Doe"
* name.given = "John"
* telecom[0].system = #phone
Expand Down
5 changes: 0 additions & 5 deletions input/fsh/examples/phi-org1.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,6 @@ Title: "CareTeam of Patient Jaantje Merkens"
* participant[=].member.identifier.system = "http://fhir.nl/fhir/NamingSystem/ura"
* participant[=].member.identifier.value = "22222222"

// * participant[+].period.start = "2024-08-27"
// * participant[=].member = Reference(https://fhir-org3.test.dataverloskunde.nl/fhir/Organization/3e799075-63a2-4a4c-913d-a91b8198463d)
// * participant[=].member.identifier.system = "http://fhir.nl/fhir/NamingSystem/ura"
// * participant[=].member.identifier.value = "33333333"



Instance: phi-org1
Expand Down
57 changes: 0 additions & 57 deletions input/fsh/examples/phi-org2.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,59 +70,6 @@ Title: "MedicationStatement Cisplatine"
* dosage[0].doseAndRate[0].doseQuantity.value = 250
* dosage[0].doseAndRate[0].doseQuantity.unit = "mg"

// Instance: org2-report-vascular-medicine
// InstanceOf: DiagnosticReport
// Usage: #inline
// * status = #final
// * basedOn = Reference(https://fhir-org1.test.dataverloskunde.nl/fhir/ServiceRequest/org1-vascular-medicine)
// * code = $sct#371530004 " klinisch consultverslag"
// * code.text = "Negative result, no abnormalities detected"
// * subject = Reference(Patient/27e58ece-409e-44f9-8cc1-b33495a0ef9d)
// * effectiveDateTime = "2025-02-19T10:00:00Z"
// * issued = "2025-02-19T10:05:00Z"
// * conclusionCode.coding = $sct#281900007 "No abnormality detected"
// * conclusion = "No significant findings. The test is negative."

// Instance: org2-report-neurology
// InstanceOf: DiagnosticReport
// Usage: #inline
// * status = #final
// * basedOn = Reference(https://fhir-org1.test.dataverloskunde.nl/fhir/ServiceRequest/org1-neurology)
// * code = $sct#10241000146105 "verslag van neurologische beoordeling"
// * code.text = "Negative result, no abnormalities detected"
// * subject = Reference(Patient/27e58ece-409e-44f9-8cc1-b33495a0ef9d)
// * effectiveDateTime = "2025-02-19T10:00:00Z"
// * issued = "2025-02-19T10:05:00Z"
// * conclusionCode.coding = $sct#281900007 "No abnormality detected"
// * conclusion = "No significant findings. The test is negative."


// Instance: org2-report-orthopedic-specialty
// InstanceOf: DiagnosticReport
// Usage: #inline
// * status = #final
// * basedOn = Reference(https://fhir-org1.test.dataverloskunde.nl/fhir/ServiceRequest/org1-orthopedic-specialty)
// * code = $sct#10301000146102 "hematologieverslag"
// * code.text = "Negative result, no abnormalities detected"
// * subject = Reference(Patient/27e58ece-409e-44f9-8cc1-b33495a0ef9d)
// * effectiveDateTime = "2025-02-19T10:00:00Z"
// * issued = "2025-02-19T10:05:00Z"
// * conclusionCode.coding = $sct#281900007 "No abnormality detected"
// * conclusion = "No significant findings. The test is negative."

// Instance: org2-report-internal-medicine
// InstanceOf: DiagnosticReport
// Usage: #inline
// * status = #final
// * basedOn = Reference(https://fhir-org1.test.dataverloskunde.nl/fhir/ServiceRequest/org1-internal-medicine)
// * code = $sct#10301000146102 "hematologieverslag"
// * code.text = "Negative result, no abnormalities detected"
// * subject = Reference(Patient/27e58ece-409e-44f9-8cc1-b33495a0ef9d)
// * effectiveDateTime = "2025-02-19T10:00:00Z"
// * issued = "2025-02-19T10:05:00Z"
// * conclusionCode.coding = $sct#281900007 "No abnormality detected"
// * conclusion = "No significant findings. The test is negative."


//4jr geleden: Vermindering energie en krachtsverlies in benen
Instance: 5a7f34e7-9b7b-4e5c-ba7c-890edbc4d757
Expand Down Expand Up @@ -157,9 +104,5 @@ Description: "This bundle contains all personal health information for Patient J
* insert BundleEntryPUT(Condition, 5a7f34e7-9b7b-4e5c-ba7c-890edbc4d757)
* insert BundleEntryPUT(Procedure, 6bc0f95c-f281-475e-a279-4ed6beb59024)
* insert BundleEntryPUT(MedicationRequest, 8c2d4009-4322-4d4a-8e29-3e70cd67d286)
// * insert BundleEntryPUT(DiagnosticReport, org2-report-vascular-medicine)
// * insert BundleEntryPUT(DiagnosticReport, org2-report-neurology)
// * insert BundleEntryPUT(DiagnosticReport, org2-report-orthopedic-specialty)
// * insert BundleEntryPUT(DiagnosticReport, org2-report-internal-medicine)
* insert BundleEntryPUT(MedicationStatement, e00a59fa-7d7e-422d-8505-ef3e645404e9)
* insert BundleEntryPUT(NlGfLocalizationDocumentReference, 52b792ba-11ae-42f3-bcc1-231f333f2317)
10 changes: 6 additions & 4 deletions input/fsh/examples/query-directory.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ Usage: #inline
* meta.source = "https://cp1-test.example.org/fhirr4/PractitionerRole/5fa4c91a-a12f-48ae-a4c7-92971dc7ab53"
* identifier[+].system = "http://cp1.example.org/HRM/assignments"
* identifier[=].value = "654321"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-2"
* practitioner = Reference(Practitioner/ad1-p1)
* organization = Reference(Organization/ad1-o1)
* code.coding = $uzi-rolcode#01.015 "Huisarts"
Expand All @@ -195,6 +193,8 @@ Usage: #inline
* meta.source = "https://cp1-test.example.org/fhirr4/Practitioner/9a63e407-34af-4ae4-ad3c-f7107fbbc0cd"
* identifier[+].system = "http://cp1.example.org/HRM/employees"
* identifier[=].value = "5678"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-2"
* name.use = #official
* name.text = "Hary Arts"
* name.family = "Arts"
Expand Down Expand Up @@ -366,8 +366,6 @@ Usage: #inline
* meta.source = "https://cp2-test.example.org/fhirr4/PractitionerRole/f051d3bd-26ff-4030-a5b6-fc4ef2be83ba"
* identifier[+].system = "http://cp2.example.org/HRM/assignments"
* identifier[=].value = "123456"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-1"
* practitioner = Reference(Practitioner/ad2-p1)
* organization = Reference(Organization/ad2-o1)
* code.coding = $uzi-rolcode#01.010 "Cardioloog"
Expand All @@ -382,6 +380,8 @@ Usage: #inline
* meta.source = "https://cp2-test.example.org/fhirr4/Practitioner/040b160a-6072-4244-adc0-2b786c4ef052"
* identifier[+].system = "http://cp2.example.org/HRM/employees"
* identifier[=].value = "1234"
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-1"
* name.use = #official
* name.text = "Caroline van Dijk"
* name.family = "van Dijk"
Expand Down Expand Up @@ -495,6 +495,8 @@ InstanceOf: NlGfPractitioner
Usage: #inline
* meta.source = "https://cp3-test.example.org/fhirr4/Practitioner/08630c28-5e2a-4b0c-b8ce-f08f533246b9"
* active = true
* identifier[+].system = "http://fhir.nl/fhir/NamingSystem/uzi"
* identifier[=].value = "UZI-3"
* name.family = "Doe"
* name.given = "John"
* telecom[0].system = #phone
Expand Down
8 changes: 5 additions & 3 deletions input/images-source/care-services-use-case-1.plantuml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ Doctor -> Doctor: diagnosis = torn ACL
activate EHR
Doctor -> EHR: use EHR's custom query tool \nsearch for orthopedic services, \nwithin 30km of Vera's home
activate CSD
EHR-> CSD: Find Matching Care Services request
CSD -> EHR: Find Matching Care Services response\ncontaining HealthcareServices list
EHR-> CSD: Find Matching Care Services request\n GET [base]/HealthcareService?\ntype=consultation\n&specialty=orthopedics
CSD -> EHR: response
EHR-> CSD: Get (parent) Organizations and Locations for HealthcareServices\n GET /Organization/[id], GET /Location/[id], etc
CSD -> EHR: response
EHR -> EHR: Filter results on distance to Vera's home
deactivate CSD
EHR -> EHR: Resolve References
EHR -> Doctor : Review results\nwith office address, hours of operation
Doctor -> Patient: Review and discuss options
deactivate Patient
Expand Down
6 changes: 3 additions & 3 deletions input/images-source/care-services-use-case-2.plantuml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ group create referral
Doctor -> EHR: create referral for Dr. East\n for Orthopedic department\n at Hospital East
end
activate CSD
EHR -> CSD: Find HealthcareService of Orthopedic department\n including Endpoints
EHR -> CSD: Find HealthcareService of Orthopedic department\n including Endpoints\n GET /HealthcareService/[id], GET /Endpoint/[id]
EHR -> EHR: Check Endpoints for 'Transfer of care' support
EHR -> CSD: If no endpoint found: find Organization of HealthcareService\n including Endpoint
EHR -> CSD: If no endpoint found: find Organization of HealthcareService\n including Endpoint\n GET /Organization/[id]?_include=Organization:endpoint
EHR -> EHR: Check Endpoints for 'Transfer of care' support
loop If no endpoint found and\nOrganization is part of parent Organization
EHR -> CSD: Find parent Organization of Organization\n including Endpoints
EHR -> CSD: Find parent Organization of Organization\n including Endpoints\n GET /Organization/[id]?_include=Organization:endpoint
EHR -> EHR: Check Endpoints for 'Transfer of care' support
end
deactivate CSD
Expand Down
Binary file modified input/images/careservices-datamodel.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified input/images/careservices-overview-transactions.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading