diff --git a/input/fsh/instances/LabOrder-Composition.fsh b/input/fsh/instances/LabOrder-Composition.fsh index e148e444..813a979e 100644 --- a/input/fsh/instances/LabOrder-Composition.fsh +++ b/input/fsh/instances/LabOrder-Composition.fsh @@ -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" @@ -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 = "
\n Order-Referral-Form LabOrder\n
" +// +// // -- 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 = "
\n Order-Referral-Form LabOrder\n
" -* 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 = "
\n Order-Referral-Form\n
" +* section.entry[0] = Reference(LabOrder-form) +* section.entry[+] = Reference(LabOrder-QuestionnaireResponse) +* section.entry[+] = Reference(LabOrder-ServiceRequest) \ No newline at end of file diff --git a/input/fsh/instances/LabOrder-Document.fsh b/input/fsh/instances/LabOrder-Document.fsh index 166f648a..ab80ce79 100644 --- a/input/fsh/instances/LabOrder-Document.fsh +++ b/input/fsh/instances/LabOrder-Document.fsh @@ -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 @@ -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 diff --git a/input/fsh/instances/LabOrder-ServiceRequest-container.fsh b/input/fsh/instances/LabOrder-ServiceRequest-container.fsh new file mode 100644 index 00000000..f4ea985d --- /dev/null +++ b/input/fsh/instances/LabOrder-ServiceRequest-container.fsh @@ -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) \ No newline at end of file diff --git a/input/fsh/instances/LabOrder-ServiceRequest-hem.fsh b/input/fsh/instances/LabOrder-ServiceRequest-hem.fsh index a36daf65..d5c1fd50 100644 --- a/input/fsh/instances/LabOrder-ServiceRequest-hem.fsh +++ b/input/fsh/instances/LabOrder-ServiceRequest-hem.fsh @@ -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" diff --git a/input/fsh/instances/LabOrder-ServiceRequest.fsh b/input/fsh/instances/LabOrder-ServiceRequest.fsh index a2cfa58f..72eee4ee 100644 --- a/input/fsh/instances/LabOrder-ServiceRequest.fsh +++ b/input/fsh/instances/LabOrder-ServiceRequest.fsh @@ -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 diff --git a/input/fsh/instances/casestudies/6-histopath/6-histopath-Questionnaire.fsh b/input/fsh/instances/casestudies/6-histopath/6-histopath-Questionnaire.fsh index b87af911..56c2641b 100644 --- a/input/fsh/instances/casestudies/6-histopath/6-histopath-Questionnaire.fsh +++ b/input/fsh/instances/casestudies/6-histopath/6-histopath-Questionnaire.fsh @@ -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" diff --git a/input/fsh/instances/casestudies/6-histopath/6-histopath-mod-Questionnaire.fsh b/input/fsh/instances/casestudies/6-histopath/6-histopath-mod-Questionnaire.fsh deleted file mode 100644 index 72c8454a..00000000 --- a/input/fsh/instances/casestudies/6-histopath/6-histopath-mod-Questionnaire.fsh +++ /dev/null @@ -1,222 +0,0 @@ -Instance: 6-histopath-mod-Questionnaire -InstanceOf: ChOrfQuestionnaire -Title: "Questionnaire 6-histopath (modular version)" -Description: "Example for modular Questionnaire of Histopathology Examination" -Usage: #example -* id = "6-histopath-mod" - -* 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" -* meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire" -* meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-extr-smap" -* meta.profile[+] = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-pop-exp" -* extension[0].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-targetStructureMap" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/StructureMap/OrfQrToBundle" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceStructureMap" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/StructureMap/OrfPrepopBundleToQr" - -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext" -* extension[=].extension[0].url = "name" -* extension[=].extension[=].valueCoding.system = "http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext" -* extension[=].extension[=].valueCoding.code = #patient -* extension[=].extension[+].url = "type" -* extension[=].extension[=].valueCode = #Patient - -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext" -* extension[=].extension[0].url = "name" -* extension[=].extension[=].valueCoding = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext#user "User" -* extension[=].extension[+].url = "type" -* extension[=].extension[=].valueCode = #Practitioner -* extension[=].extension[+].url = "description" -* extension[=].extension[=].valueString = "The practitioner that is to be used to pre-populate the form" - -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-order|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-practitioner-nametel|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-receiver|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-address|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-patient|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-requestedencounter|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-coverage|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-sender|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-receivercopy|1.0.0" -* extension[+].url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-assembledFrom" -* extension[=].valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-appointment|1.0.0" - -* url = "http://fhir.ch/ig/ch-lab-order/Questionnaire/6-histopath-mod" -* version = "1.0.0-assembled" -* name = "LabOrderForm" -* title = "Lab Order Form 6-histopath assembled from modular version" -* status = #active -* subjectType = #Patient -* date = "2022-10-09" -* publisher = "HL7 Switzerland" -* contact.name = "Marcel Hanselmann" -* contact.telecom.system = #url -* contact.telecom.value = "https://www.hl7.ch" -* jurisdiction = urn:iso:std:iso:3166#CH -* copyright = "CC-BY-SA-4.0" - -// ---------- order (Auftrag) ---------- -* item[+].linkId = "order" -* item[=].text = "Auftrag" -* item[=].type = #group -* item[=].required = true - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-order|2.0.0" -* item[=].item.linkId = "order.1" -* item[=].item.text = "Unable to resolve 'order' sub-questionnaire" -* item[=].item.type = #display - -// ---------- Receiver: Person/organization who receives the document ---------- -* item[+].linkId = "receiver" -* item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:receiver" -* item[=].text = "Empfänger" -* item[=].type = #group - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-receiver|2.0.0" -* item[=].item.linkId = "receiver.1" -* item[=].item.text = "Unable to resolve 'receiver' sub-questionnaire" -* item[=].item.type = #display - -// ---------- Patient: The principle target of a particular Form Content is one patient ---------- -* item[+].linkId = "patient" -* item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.subject" -* item[=].text = "Patient" -* item[=].type = #group -* item[=].required = true - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-patient|2.0.0" -* item[=].item.linkId = "patient.1" -* item[=].item.text = "Unable to resolve 'patient' sub-questionnaire" -* item[=].item.type = #display - -// ---------- Encounter Class (Ambulant / Stationär / Notfall) ---------- -* item[+].linkId = "requestedEncounter" -* item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-servicerequest#ServiceRequest.extension:requestedEncounterDetails" -* item[=].text = "Patientenaufnahme" -* item[=].type = #group - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-requestedencounter|2.0.0" -* item[=].item.linkId = "requestedEncounter.1" -* item[=].item.text = "Unable to resolve 'requestedencounter' sub-questionnaire" -* item[=].item.type = #display - - -// ---------- Coverage (Kostenträger) ---------- -* item[+].linkId = "coverage" -* item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-servicerequest#ServiceRequest.insurance" -* item[=].text = "Kostenträger" -* item[=].type = #group - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-coverage|2.0.0" -* item[=].item.linkId = "coverage.1" -* item[=].item.text = "Unable to resolve 'coverage' sub-questionnaire" -* item[=].item.type = #display - -// ---------- sender (Absender) ---------- -* item[+].linkId = "sender" -* item[=].text = "Absender" -* item[=].type = #group -* item[=].required = true - -// ---------- Author: The person/organization responsible for Form Content ---------- -* item[=].item[+].linkId = "sender.author" -* item[=].item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.author" -* item[=].item[=].text = "Verantwortlicher" -* item[=].item[=].type = #group -* item[=].item[=].required = true - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-sender|2.0.0" -* item[=].item.linkId = "sender.1" -* item[=].item.text = "Unable to resolve 'sender' sub-questionnaire" -* item[=].item.type = #display - -// ---------- Copy Receiver (Copy of this order and all results therefrom) ---------- -* item[+].linkId = "receiverCopy" -* item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:copyReceiver" -* item[=].text = "Kopieempfänger (Kopie dieses Auftrags und aller daraus resultierenden Resultate)" -* item[=].type = #group - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-receivercopy|2.0.0" -* item[=].item.linkId = "receiverCopy.1" -* item[=].item.text = "Unable to resolve 'receivercopy' sub-questionnaire" -* item[=].item.type = #display - -// ------ Appointment ---------------------------- -* item[+].linkId = "appointment" -* item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-servicerequest#ServiceRequest.extension:locationAndTime" -* item[=].text = "Ort und Zeit der Durchführung der angeforderten Leistung" -* item[=].type = #group -* item[=].repeats = true - -* item[=].item.extension.url = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire" -* item[=].item.extension.valueCanonical = "http://fhir.ch/ig/ch-orf/Questionnaire/ch-orf-module-appointment|2.0.0" -* item[=].item.linkId = "appointment.1" -* item[=].item.text = "Unable to resolve 'appointment' sub-questionnaire" -* item[=].item.type = #display - -// -------- Service Request Notes ------ -* item[+].linkId = "note" -* item[=].text = "Bemerkungen" -* item[=].type = #group -* item[=].repeats = true - -* item[=].item[+].linkId = "note.text" -* item[=].item[=].definition = "http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-servicerequest#ServiceRequest.note.text" -* item[=].item[=].text = "Kommentar" -* item[=].item[=].type = #string -* item[=].item[=].required = true - -// ########### specific Part ###################### -// ------------Choice of Specialty----------------- -* item[+] - * linkId = "labSpecialties" - * text = "Labor Sparten" - * type = #group - - // Histopathology - * item[+] - * definition = LOINC#27898-6 "Pathology studies (set)" - * linkId = "labSpecialties.pathology" - * text = "Pathology" - * type = #boolean - - * item[+] - * linkId = "labSpecialties.pathology.panels" - * text = "Pathology Panels" - * type = #group - * enableWhen[+].question = "labSpecialties.pathology" - * enableWhen[=].operator = #= - * enableWhen[=].answerBoolean = true - * item[+] - * definition = LOINC#18743-5 "Autopsy report" - * linkId = "labSpecialties.pathology.panels.Autopsy" - * text = "Autopsy report" - * type = #boolean - * item[+] - * definition = LOINC#11526-1 "Pathology study" - * linkId = "labSpecialties.pathology.panels.PathologyStudy" - * text = "Pathology Study" - * type = #boolean - * item[+] - * definition = LOINC#11529-5 "Surgical pathology study" - * linkId = "labSpecialties.pathology.panels.SurgicalPathologyStudy" - * text = "Surgical pathology study" - * type = #boolean diff --git a/input/fsh/instances/casestudies/sample.html b/input/fsh/instances/casestudies/sample.html deleted file mode 100644 index 5d4ac0c6..00000000 --- a/input/fsh/instances/casestudies/sample.html +++ /dev/null @@ -1,2 +0,0 @@ -

Case study 6: Suspected Melanoma, order for histopathology examination

A 45-year-old female patient came for her regular skin check and this lesion was noted: Junctions nevi consisting of seborrheic area top end and atypical network constructed of many seperate dots, structures , etc , suggesting melanocytic involvement. Excision. Attachement of dermatoscopic images // TODO Specimen: 29 x 11 x 5 mm skin ellipse Body Site: Back paralumbar left -

The skin sample, including the order form and the dermatoscopic image are sent to the laboratory.

Matching FHIR questionnaire that meets this specification: 6-histopath-mod.xml 6-histopath-mod.json

\ No newline at end of file diff --git a/input/fsh/instances/casestudies/sample0.html b/input/fsh/instances/casestudies/sample0.html deleted file mode 100644 index 22bad2ad..00000000 --- a/input/fsh/instances/casestudies/sample0.html +++ /dev/null @@ -1,3 +0,0 @@ -* text.div = "
Laboratory Order Composition
-

Sample Composition

-
" \ No newline at end of file diff --git a/input/fsh/profiles/ChLabOrderComposition.fsh b/input/fsh/profiles/ChLabOrderComposition.fsh index 19be7913..b21275c6 100644 --- a/input/fsh/profiles/ChLabOrderComposition.fsh +++ b/input/fsh/profiles/ChLabOrderComposition.fsh @@ -29,4 +29,4 @@ Description: "Definition for Composition resource in the context of CH LAB-Order // * section[orderReferral].entry[QuestionnaireResponse] ^type.targetProfile = Canonical(ChLabOrderQuestionnaireResponse) // ---------- Composition.section.entry:ServiceRequest ---------- -* section[orderReferral].entry[ServiceRequest] ^type.targetProfile = Canonical(ChLabOrderSRContainer) \ No newline at end of file +// * section[orderReferral].entry[ServiceRequest] ^type.targetProfile = Canonical(ChLabOrderSRContainer) \ No newline at end of file diff --git a/input/fsh/profiles/ChLabOrderDocument.fsh b/input/fsh/profiles/ChLabOrderDocument.fsh index ea8a7aff..9e4b72c5 100644 --- a/input/fsh/profiles/ChLabOrderDocument.fsh +++ b/input/fsh/profiles/ChLabOrderDocument.fsh @@ -6,9 +6,9 @@ Description: "Definition of the bundle for the lab order document" * . ^short = "CH Lab-Order Bundle" * . ^definition = "This IG follows the IHE Scheduled Workflow (SWF) Profile: An Order Filler accepts from an Order Placer a single Order that it equates to a Filler Order -(which is concept commonly used in HL7) or Imaging Service Request (Concept commonly used in DICOM). -Consequently one CH RAD-Order Document contains one CH RAD-Order ServiceRequest which depicts one Placer Order -equal one Filler Order equal one Imaging Service Request." +(which is concept commonly used in HL7) or Laboratory Service Request (Concept commonly used in DICOM). +Consequently one CH Lab-Order Document contains one CH Lab-Order ServiceRequest which depicts one Placer Order +equal one Filler Order equal one Laboratory Service Request." // * ^version = "0.1.0" // * ^experimental = false // @@ -35,4 +35,5 @@ equal one Filler Order equal one Imaging Service Request." // * entry[Composition].resource only ChLabOrderComposition // ---------- Bundle.entry:Composition ---------- -* entry[Composition].resource ^type.profile = Canonical(ChLabOrderComposition) +// * entry[Composition].resource ^type.profile = Canonical(ChLabOrderComposition) +* entry[Composition].resource only ChLabOrderComposition diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt index 43e54289..def29b07 100644 --- a/input/ignoreWarnings.txt +++ b/input/ignoreWarnings.txt @@ -1,5 +1,102 @@ == Suppressed Messages == -# missing examples: ==> ch-lab-order-composition, ch-lab-order-document +# Snapshot information concerns the parent profile CH Core Encounter (identifier:VisitNumber) +The repeating element has a pattern. The pattern will apply to all the repeats (this has not been clear to all users) -The Implementation Guide contains no examples for this profile +# Allow German display values or clearer descriptions for the questionnaire +Display Name for http://hl7.org/fhir/administrative-gender#female should be one of 'Female' instead of 'Weiblich' for 'http://hl7.org/fhir/administrative-gender#female' +Display Name for http://hl7.org/fhir/administrative-gender#male should be one of 'Male' instead of 'Männlich' for 'http://hl7.org/fhir/administrative-gender#male' +Display Name for http://hl7.org/fhir/administrative-gender#other should be one of 'Other' instead of 'Anderes' for 'http://hl7.org/fhir/administrative-gender#other' +Display Name for http://hl7.org/fhir/request-priority#routine should be one of 'Routine' instead of 'Die Anfrage hat normale Priorität.' for 'http://hl7.org/fhir/request-priority#routine' +Display Name for http://hl7.org/fhir/request-priority#urgent should be one of 'Urgent' instead of 'Die Anfrage sollte dringend bearbeitet werden - höhere Priorität als normal.' for 'http://hl7.org/fhir/request-priority#urgent' +Display Name for http://hl7.org/fhir/request-priority#asap should be one of 'ASAP' instead of 'Die Anfrage sollte so schnell wie möglich bearbeitet werden - höhere Priorität als dringend.' for 'http://hl7.org/fhir/request-priority#asap' +Display Name for http://hl7.org/fhir/request-priority#stat should be one of 'STAT' instead of 'Die Anfrage sollte sofort bearbeitet werden - höchstmögliche Priorität. Z.B. bei einem Notfall.' for 'http://hl7.org/fhir/request-priority#stat' +Display Name for http://hl7.org/fhir/appointmentstatus#proposed should be one of 'Proposed' instead of 'Wunsch des Patienten (vorgeschlagen)' for 'http://hl7.org/fhir/appointmentstatus#proposed' +Display Name for http://hl7.org/fhir/appointmentstatus#pending should be one of 'Pending' instead of 'Vom Patienten bestätigt, aber vom Leistungserbringer noch nicht (ausstehend)' for 'http://hl7.org/fhir/appointmentstatus#pending' +Display Name for http://hl7.org/fhir/appointmentstatus#booked should be one of 'Booked' instead of 'Vom Patienten und Leistungserbringer bestätigt (gebucht)' for 'http://hl7.org/fhir/appointmentstatus#booked' +Display Name for http://terminology.hl7.org/CodeSystem/v3-ActCode#AMB should be one of 'ambulatory' instead of 'Ambulant' for 'http://terminology.hl7.org/CodeSystem/v3-ActCode#AMB' +Display Name for http://terminology.hl7.org/CodeSystem/v3-ActCode#IMP should be one of 'inpatient encounter' instead of 'Stationär' for 'http://terminology.hl7.org/CodeSystem/v3-ActCode#IMP' +Display Name for http://terminology.hl7.org/CodeSystem/v3-ActCode#EMER should be one of 'emergency' instead of 'Notfall' for 'http://terminology.hl7.org/CodeSystem/v3-ActCode#EMER' + +# Only text is supported for Patient.contact.relationship (CodeableConcept) +No code provided, and a code should be provided from the value set 'Patient Contact Relationship ' (http://hl7.org/fhir/ValueSet/patient-contactrelationship) + +# See examples in IG CH RAD-Order +WARNING: StructureDefinition.where(url = 'http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-locationandtime'): The Implementation Guide contains no examples for this extension + +# Build Errors: + + +# Questionnaire Definition Elements do not resolve to fragment on html page #144 + +The link 'StructureDefinition-ch-orf-initiator.html#Extension.extension:ch-orf-personalrelation' for "Extension.extension:ch-orf-personalrelation" cannot be resolved (valid targets: 79 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:placerOrderIdentifier.value' for "ServiceRequest.identifier:placerOrderIdentifier.value" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:placerOrderIdentifier.system' for "ServiceRequest.identifier:placerOrderIdentifier.system" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:fillerOrderIdentifier.value' for "ServiceRequest.identifier:fillerOrderIdentifier.value" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:fillerOrderIdentifier.system' for "ServiceRequest.identifier:fillerOrderIdentifier.system" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:precedentDocument' for "Composition.extension:precedentDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:urgentNoficationContactForThisDocument' for "Composition.extension:urgentNoficationContactForThisDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:urgentNoficationContactForTheResponseToThisDocument' for "Composition.extension:urgentNoficationContactForTheResponseToThisDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-encounter.html#Encounter.extension:desiredAccommodation' for "Encounter.extension:desiredAccommodation" cannot be resolved (valid targets: 253 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:dataEnterer' for "Composition.extension:dataEnterer" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:receiver' for "Composition.extension:receiver" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.extension:requestedEncounterDetails' for "ServiceRequest.extension:requestedEncounterDetails" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:copyReceiver' for "Composition.extension:copyReceiver" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:antecedentEpisodeOfCare' for "Composition.extension:antecedentEpisodeOfCare" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-episodeofcare.html#EpisodeOfCare.Period.end' for "EpisodeOfCare.Period.end" cannot be resolved (valid targets: 129 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.extension:locationAndTime' for "ServiceRequest.extension:locationAndTime" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:patientConsent' for "Composition.extension:patientConsent" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:placerOrderIdentifier.value' for "ServiceRequest.identifier:placerOrderIdentifier.value" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:placerOrderIdentifier.system' for "ServiceRequest.identifier:placerOrderIdentifier.system" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:fillerOrderIdentifier.value' for "ServiceRequest.identifier:fillerOrderIdentifier.value" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:fillerOrderIdentifier.system' for "ServiceRequest.identifier:fillerOrderIdentifier.system" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:precedentDocument' for "Composition.extension:precedentDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:urgentNoficationContactForThisDocument' for "Composition.extension:urgentNoficationContactForThisDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:urgentNoficationContactForTheResponseToThisDocument' for "Composition.extension:urgentNoficationContactForTheResponseToThisDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:receiver' for "Composition.extension:receiver" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-initiator.html#Extension.extension:ch-orf-personalrelation' for "Extension.extension:ch-orf-personalrelation" cannot be resolved (valid targets: 79 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.extension:requestedEncounterDetails' for "ServiceRequest.extension:requestedEncounterDetails" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-encounter.html#Encounter.extension:desiredAccommodation' for "Encounter.extension:desiredAccommodation" cannot be resolved (valid targets: 253 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:dataEnterer' for "Composition.extension:dataEnterer" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:copyReceiver' for "Composition.extension:copyReceiver" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:antecedentEpisodeOfCare' for "Composition.extension:antecedentEpisodeOfCare" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-episodeofcare.html#EpisodeOfCare.Period.end' for "EpisodeOfCare.Period.end" cannot be resolved (valid targets: 129 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.extension:locationAndTime' for "ServiceRequest.extension:locationAndTime" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:patientConsent' for "Composition.extension:patientConsent" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:placerOrderIdentifier.value' for "ServiceRequest.identifier:placerOrderIdentifier.value" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:placerOrderIdentifier.system' for "ServiceRequest.identifier:placerOrderIdentifier.system" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:fillerOrderIdentifier.value' for "ServiceRequest.identifier:fillerOrderIdentifier.value" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.identifier:fillerOrderIdentifier.system' for "ServiceRequest.identifier:fillerOrderIdentifier.system" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:precedentDocument' for "Composition.extension:precedentDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:urgentNoficationContactForThisDocument' for "Composition.extension:urgentNoficationContactForThisDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:urgentNoficationContactForTheResponseToThisDocument' for "Composition.extension:urgentNoficationContactForTheResponseToThisDocument" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:receiver' for "Composition.extension:receiver" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-initiator.html#Extension.extension:ch-orf-personalrelation' for "Extension.extension:ch-orf-personalrelation" cannot be resolved (valid targets: 79 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.extension:requestedEncounterDetails' for "ServiceRequest.extension:requestedEncounterDetails" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-encounter.html#Encounter.extension:desiredAccommodation' for "Encounter.extension:desiredAccommodation" cannot be resolved (valid targets: 253 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:dataEnterer' for "Composition.extension:dataEnterer" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:copyReceiver' for "Composition.extension:copyReceiver" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:antecedentEpisodeOfCare' for "Composition.extension:antecedentEpisodeOfCare" cannot be resolved (valid targets: 378 targets) +The link 'StructureDefinition-ch-orf-episodeofcare.html#EpisodeOfCare.Period.end' for "EpisodeOfCare.Period.end" cannot be resolved (valid targets: 129 targets) +The link 'StructureDefinition-ch-orf-servicerequest.html#ServiceRequest.extension:locationAndTime' for "ServiceRequest.extension:locationAndTime" cannot be resolved (valid targets: 265 targets) +The link 'StructureDefinition-ch-orf-composition.html#Composition.extension:patientConsent' for "Composition.extension:patientConsent" cannot be resolved (valid targets: 378 targets) + + +The link 'OperationDefinition-Questionnaire-assemble.html' for "$assemble" cannot be resolved +The link 'StructureDefinition-sdc-questionnaire-subQuestionnaire.html' for "sub-questionnaire" cannot be resolved +The link 'OperationDefinition-Questionnaire-assemble.html' for "$assemble" cannot be resolved +The link 'StructureDefinition-sdc-questionnaire-subQuestionnaire.html' for "sub-questionnaire" cannot be resolved +The link 'http://hl7.org/fhir/uv/sdc/2019May/' for "SDC v2.7.0" cannot be resolved + +# Errors due to answerOption #145 +The link 'null#item.initiator.legalrelation' for "Answers: 2 options" cannot be resolved +The link 'null#item.initiator.personalrelation' for "Answers: 10 options" cannot be resolved +The link 'null#item.patient.gender' for "Answers: 3 options" cannot be resolved +The link 'null#item.patient.maritalStatus' for "Answers: 8 options" cannot be resolved +The link 'null#item.requestedEncounter.class' for "Answers: 3 options" cannot be resolved +The link 'null#item.order.priority' for "Answers: 4 options" cannot be resolved +The link 'null#item.patient.consent.statement' for "Answers: 2 options" cannot be resolved +The link 'null#item.appointment.status' for "Answers: 3 options" cannot be resolved +The link 'null#item.requestedEncounter.desiredAccommodation' for "Answers: 3 options" cannot be resolved + +# Errors due StructureMap validation errors #146 (cannot be suppressed currently) diff --git a/input/includes/menu.xml b/input/includes/menu.xml index 4e583fe2..6d903111 100644 --- a/input/includes/menu.xml +++ b/input/includes/menu.xml @@ -43,7 +43,7 @@
  • - Questionnaire from Catalog + Questionnaire
  • - Questionnaire + Questionnaire Case Studies