Skip to content
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.

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

Develop #251

Merged
merged 4 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 33 additions & 17 deletions input/fsh/instances/LabOrder-Composition.fsh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Instance: LabOrder-Composition
InstanceOf: ChOrfComposition
InstanceOf: ChLabOrderComposition
Title: "LabOrder"
Description: "Composition: Storyboard for suspected deep Vein Thrombosis"
Description: "Composition for multiple SR"
Usage: #example
* id = "LabOrder"
* meta.versionId = "1"
Expand All @@ -24,23 +24,39 @@ Usage: #example
* extension[+].url = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-copyreceiver"
* extension[=].valueReference = Reference(Patient/HansGuggindieluft)

// * status = #final
// * title = "Laborauftrag"
// * category = $sct#721963009 "Order (record artifact)"
// * type = $sct#721965002 "Laboratory order (record artifact)"
// * subject = Reference(Patient/HansGuggindieluft)
// * date = "2019-03-31T11:46:09+02:00"
// * author = Reference(MarcMustermannArztpraxis)
//
// * section[orderReferral].title = "Order-Referral-Form LabOrder"
// * section[orderReferral].code = $loinc#93037-0 "Portable medical order form"
// * section[orderReferral].text.status = #generated
// * section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Order-Referral-Form LabOrder\n </div>"
//
// // -- Q
// * section[orderReferral].entry[Questionnaire] = Reference(LabOrder-form)
//
// // QR
// * section[orderReferral].entry[QuestionnaireResponse] = Reference(LabOrder-QuestionnaireResponse)
//
// // --- SR
// * section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest)

* status = #final
* title = "Laborauftrag"
* type = $sct#419891008 "Record artifact (record artifact)"
* category = $sct#721963009 "Order (record artifact)"
* type = $sct#721965002 "Laboratory order (record artifact)"
* subject = Reference(Patient/HansGuggindieluft)
* date = "2019-03-31T11:46:09+02:00"
* author = Reference(MarcMustermannArztpraxis)

* section[orderReferral].title = "Order-Referral-Form LabOrder"
* section[orderReferral].code = $loinc#93037-0 "Portable medical order form"
* section[orderReferral].text.status = #generated
* section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Order-Referral-Form LabOrder\n </div>"
* section[orderReferral].entry[Questionnaire] = Reference(LabOrder-form)
* section[orderReferral].entry[QuestionnaireResponse] = Reference(LabOrder-QuestionnaireResponse)

* section[orderReferral].entry[ServiceRequest][0] = Reference(LabOrder-ServiceRequest-hem)

* section[orderReferral].entry[ServiceRequest][+] = Reference(LabOrder-ServiceRequest-coag)

* section[orderReferral].entry[ServiceRequest][+] = Reference(LabOrder-ServiceRequest-cc)
* title = "Laborauftrag"
* section.title = "Auftrag für Laboruntersuchung"
* section.code = $loinc#93037-0 "Portable medical order form"
* section.text.status = #generated
* section.text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Order-Referral-Form\n </div>"
* section.entry[0] = Reference(LabOrder-form)
* section.entry[+] = Reference(LabOrder-QuestionnaireResponse)
* section.entry[+] = Reference(LabOrder-ServiceRequest)
20 changes: 10 additions & 10 deletions input/fsh/instances/LabOrder-Document.fsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Instance: LabOrder-Document
InstanceOf: ChOrfDocument
InstanceOf: ChLabOrderDocument
Title: "Referral LabOrder"
Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
Usage: #example
Expand Down Expand Up @@ -28,14 +28,14 @@ Usage: #example
* entry[=].resource = LabOrder-QuestionnaireResponse

// ---- SR for Hematology Tests ----
* entry[+].fullUrl = "http://example.com/fhir/ServiceRequest/LabOrder-hem"
* entry[=].resource = LabOrder-ServiceRequest-hem
* entry[+].fullUrl = "http://example.com/fhir/ServiceRequest/LabOrder-sr" // entry[7]
* entry[=].resource = LabOrder-ServiceRequest

// ---- SR for Coagulation Tests ----
* entry[+].fullUrl = "http://example.com/fhir/ServiceRequest/LabOrder-coag"
* entry[=].resource = LabOrder-ServiceRequest-coag

// ---- SR for Coagulation Tests ----
* entry[+].fullUrl = "http://example.com/fhir/ServiceRequest/LabOrder-cc"
* entry[=].resource = LabOrder-ServiceRequest-cc
// // ---- SR for Coagulation Tests ----
// * entry[+].fullUrl = "http://example.com/fhir/ServiceRequest/LabOrder-coag"
// * entry[=].resource = LabOrder-ServiceRequest-coag
//
// // ---- SR for Coagulation Tests ----
// * entry[+].fullUrl = "http://example.com/fhir/ServiceRequest/LabOrder-cc"
// * entry[=].resource = LabOrder-ServiceRequest-cc

29 changes: 29 additions & 0 deletions input/fsh/instances/LabOrder-ServiceRequest-container.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Instance: LabOrder-ServiceRequest-container
InstanceOf: ChOrfServiceRequest
Title: "LabOrder Service Request for multiple Lab Tests"
Description: "Example for Service Request as container for multiple Service Requests"
Usage: #example
* id = "LabOrder-container"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
* identifier[placerOrderIdentifier].system = "urn:oid:2.16.756.5.30"
* identifier[placerOrderIdentifier].value = "123"

// der SR referenziert auf 3 weitere SR
* basedOn[0] = Reference(LabOrder-ServiceRequest-hem)
* basedOn[+] = Reference(LabOrder-ServiceRequest-coag)
* basedOn[+] = Reference(LabOrder-ServiceRequest-cc)
* basedOn[+] = Reference(LabOrder-ServiceRequest-container)

* status = #active
* intent = #original-order
* category = $servicerequest-categories#RequestForLabExam "Anforderung Laboruntersuchung"


* priority = #urgent
* subject = Reference(Patient/HansGuggindieluft)
* requester = Reference(MarcMustermannArztpraxis)
* reasonCode = $sct#404223003
* reasonCode.text = "Deep venous thrombosis of lower extremity"
* insurance = Reference(HealthInsuranceCard)
* specimen[0] = Reference(Specimen/Serum) "Serum specimen"
// * specimen[+] = Reference(Specimen/Blood)
2 changes: 1 addition & 1 deletion input/fsh/instances/LabOrder-ServiceRequest-hem.fsh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-hem
InstanceOf: ChOrfServiceRequest
Title: "LabOrder Service Request for Hematology Tests"
Description: "Example for Service Request due to suspected deep vein thrombosis"
Description: "Example for Service Request Hematology Tests"
Usage: #example
* id = "LabOrder-hem"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
Expand Down
5 changes: 1 addition & 4 deletions input/fsh/instances/LabOrder-ServiceRequest.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ InstanceOf: ChOrfServiceRequest
Title: "LabOrder Service Request for Clinical Chemistry Tests"
Description: "Example for Service Request due to suspected deep vein thrombosis"
Usage: #example
* id = "LabOrder"
* id = "LabOrder-sr"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
* identifier[placerOrderIdentifier].system = "urn:oid:2.16.756.5.30"
* identifier[placerOrderIdentifier].value = "123"
* basedOn[0] = Reference(LabOrder-ServiceRequest-hem)
* basedOn[+] = Reference(LabOrder-ServiceRequest-coag)
* basedOn[+] = Reference(LabOrder-ServiceRequest-cc)

* status = #active
* intent = #original-order
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Title: "questionnaire 6-histopath"
Description: "Example for Questionnaire of Histopathology Examination"
Usage: #example
* id = "6-histopath"

* meta.versionId = "1"
* meta.lastUpdated = "2023-06-06T20:17:53.340+00:00"
* meta.profile[0] = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-questionnaire"
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions input/fsh/instances/casestudies/sample.html

This file was deleted.

3 changes: 0 additions & 3 deletions input/fsh/instances/casestudies/sample0.html

This file was deleted.

Loading