diff --git a/_gencontinuous.bat b/_gencontinuous.bat
deleted file mode 100644
index ca2867a5..00000000
--- a/_gencontinuous.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-CALL ./_genonce.bat -watch
\ No newline at end of file
diff --git a/_genonce.bat b/_genonce.bat
deleted file mode 100644
index a9864ef1..00000000
--- a/_genonce.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-@ECHO OFF
-SET publisher_jar=publisher.jar
-SET input_cache_path=%CD%\input-cache
-
-ECHO Checking internet connection...
-PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
-ECHO We're offline...
-SET txoption=-tx n/a
-GOTO igpublish
-
-:isonline
-ECHO We're online
-SET txoption=
-
-:igpublish
-
-SET JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
-
-IF EXIST "%input_cache_path%\%publisher_jar%" (
- JAVA -jar "%input_cache_path%\%publisher_jar%" -ig . %txoption% %*
-) ELSE If exist "..\%publisher_jar%" (
- JAVA -jar "..\%publisher_jar%" -ig . %txoption% %*
-) ELSE (
- ECHO IG Publisher NOT FOUND in input-cache or parent folder. Please run _updatePublisher. Aborting...
-)
-
-PAUSE
diff --git a/_updatePublisher.bat b/_updatePublisher.bat
deleted file mode 100644
index 67aebf58..00000000
--- a/_updatePublisher.bat
+++ /dev/null
@@ -1,219 +0,0 @@
-@ECHO OFF
-
-SETLOCAL
-
-SET dlurl=https://github.com/HL7/fhir-ig-publisher/releases/latest/download/publisher.jar
-SET publisher_jar=publisher.jar
-SET input_cache_path=%CD%\input-cache\
-SET skipPrompts=false
-
-SET scriptdlroot=https://raw.githubusercontent.com/HL7/ig-publisher-scripts/main
-SET update_bat_url=%scriptdlroot%/_updatePublisher.bat
-SET gen_bat_url=%scriptdlroot%/_genonce.bat
-SET gencont_bat_url=%scriptdlroot%/_gencontinuous.bat
-SET gencont_sh_url=%scriptdlroot%/_gencontinuous.sh
-SET gen_sh_url=%scriptdlroot%/_genonce.sh
-SET update_sh_url=%scriptdlroot%/_updatePublisher.sh
-
-IF "%~1"=="/f" SET skipPrompts=y
-
-
-ECHO.
-ECHO Checking internet connection...
-PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline
-ECHO We're offline, nothing to do...
-GOTO end
-
-:isonline
-ECHO We're online
-
-
-:processflags
-SET ARG=%1
-IF DEFINED ARG (
- IF "%ARG%"=="-f" SET FORCE=true
- IF "%ARG%"=="--force" SET FORCE=true
- SHIFT
- GOTO processflags
-)
-
-FOR %%x IN ("%CD%") DO SET upper_path=%%~dpx
-
-ECHO.
-IF NOT EXIST "%input_cache_path%%publisher_jar%" (
- IF NOT EXIST "%upper_path%%publisher_jar%" (
- SET jarlocation="%input_cache_path%%publisher_jar%"
- SET jarlocationname=Input Cache
- ECHO IG Publisher is not yet in input-cache or parent folder.
- REM we don't use jarlocation below because it will be empty because we're in a bracketed if statement
- GOTO create
- ) ELSE (
- ECHO IG Publisher FOUND in parent folder
- SET jarlocation="%upper_path%%publisher_jar%"
- SET jarlocationname=Parent folder
- GOTO upgrade
- )
-) ELSE (
- ECHO IG Publisher FOUND in input-cache
- SET jarlocation="%input_cache_path%%publisher_jar%"
- SET jarlocationname=Input Cache
- GOTO upgrade
-)
-
-:create
-IF DEFINED FORCE (
- MKDIR "%input_cache_path%" 2> NUL
- GOTO download
-)
-
-IF "%skipPrompts%"=="y" (
- SET create=Y
-) ELSE (
- SET /p create="Ok? (Y/N) "
-)
-IF /I "%create%"=="Y" (
- ECHO Will place publisher jar here: %input_cache_path%%publisher_jar%
- MKDIR "%input_cache_path%" 2> NUL
- GOTO download
-)
-GOTO done
-
-:upgrade
-IF "%skipPrompts%"=="y" (
- SET overwrite=Y
-) ELSE (
- SET /p overwrite="Overwrite %jarlocation%? (Y/N) "
-)
-
-IF /I "%overwrite%"=="Y" (
- GOTO download
-)
-GOTO done
-
-:download
-ECHO Downloading most recent publisher to %jarlocationname% - it's ~100 MB, so this may take a bit
-
-FOR /f "tokens=4-5 delims=. " %%i IN ('ver') DO SET VERSION=%%i.%%j
-IF "%version%" == "10.0" GOTO win10
-IF "%version%" == "6.3" GOTO win8.1
-IF "%version%" == "6.2" GOTO win8
-IF "%version%" == "6.1" GOTO win7
-IF "%version%" == "6.0" GOTO vista
-
-ECHO Unrecognized version: %version%
-GOTO done
-
-:win10
-CALL POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%dlurl%\",\"%jarlocation%\") } else { Invoke-WebRequest -Uri "%dlurl%" -Outfile "%jarlocation%" }
-
-GOTO done
-
-:win7
-rem this may be triggering the antivirus - bitsadmin.exe is a known threat
-rem CALL bitsadmin /transfer GetPublisher /download /priority normal "%dlurl%" "%jarlocation%"
-
-rem this didn't work in win 10
-rem CALL Start-BitsTransfer /priority normal "%dlurl%" "%jarlocation%"
-
-rem this should work - untested
-call (New-Object Net.WebClient).DownloadFile('%dlurl%', '%jarlocation%')
-GOTO done
-
-:win8.1
-:win8
-:vista
-GOTO done
-
-
-
-:done
-
-
-
-
-ECHO.
-ECHO Updating scripts
-IF "%skipPrompts%"=="y" (
- SET updateScripts=Y
-) ELSE (
- SET /p updateScripts="Update scripts? (Y/N) "
-)
-IF /I "%updateScripts%"=="Y" (
- GOTO scripts
-)
-GOTO end
-
-
-:scripts
-
-REM Download all batch files (and this one with a new name)
-
-SETLOCAL DisableDelayedExpansion
-
-
-
-:dl_script_1
-ECHO Updating _updatePublisher.sh
-call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%update_sh_url%\",\"_updatePublisher.new.sh\") } else { Invoke-WebRequest -Uri "%update_sh_url%" -Outfile "_updatePublisher.new.sh" }
-if %ERRORLEVEL% == 0 goto upd_script_1
-echo "Errors encountered during download: %errorlevel%"
-goto dl_script_2
-:upd_script_1
-start copy /y "_updatePublisher.new.sh" "_updatePublisher.sh" ^&^& del "_updatePublisher.new.sh" ^&^& exit
-
-
-:dl_script_2
-ECHO Updating _genonce.bat
-call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gen_bat_url%\",\"_genonce.new.bat\") } else { Invoke-WebRequest -Uri "%gen_bat_url%" -Outfile "_genonce.bat" }
-if %ERRORLEVEL% == 0 goto upd_script_2
-echo "Errors encountered during download: %errorlevel%"
-goto dl_script_3
-:upd_script_2
-start copy /y "_genonce.new.bat" "_genonce.bat" ^&^& del "_genonce.new.bat" ^&^& exit
-
-:dl_script_3
-ECHO Updating _gencontinuous.bat
-call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gencont_bat_url%\",\"_gencontinuous.new.bat\") } else { Invoke-WebRequest -Uri "%gencont_bat_url%" -Outfile "_gencontinuous.bat" }
-if %ERRORLEVEL% == 0 goto upd_script_3
-echo "Errors encountered during download: %errorlevel%"
-goto dl_script_4
-:upd_script_3
-start copy /y "_gencontinuous.new.bat" "_gencontinuous.bat" ^&^& del "_gencontinuous.new.bat" ^&^& exit
-
-
-:dl_script_4
-ECHO Updating _genonce.sh
-call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gen_sh_url%\",\"_genonce.new.sh\") } else { Invoke-WebRequest -Uri "%gen_sh_url%" -Outfile "_genonce.sh" }
-if %ERRORLEVEL% == 0 goto upd_script_4
-echo "Errors encountered during download: %errorlevel%"
-goto dl_script_5
-:upd_script_4
-start copy /y "_genonce.new.sh" "_genonce.sh" ^&^& del "_genonce.new.sh" ^&^& exit
-
-:dl_script_5
-ECHO Updating _gencontinuous.sh
-call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%gencont_sh_url%\",\"_gencontinuous.new.sh\") } else { Invoke-WebRequest -Uri "%gencont_sh_url%" -Outfile "_gencontinuous.sh" }
-if %ERRORLEVEL% == 0 goto upd_script_5
-echo "Errors encountered during download: %errorlevel%"
-goto dl_script_6
-:upd_script_5
-start copy /y "_gencontinuous.new.sh" "_gencontinuous.sh" ^&^& del "_gencontinuous.new.sh" ^&^& exit
-
-
-
-:dl_script_6
-ECHO Updating _updatePublisher.bat
-call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%update_bat_url%\",\"_updatePublisher.new.bat\") } else { Invoke-WebRequest -Uri "%update_bat_url%" -Outfile "_updatePublisher.new.bat" }
-if %ERRORLEVEL% == 0 goto upd_script_6
-echo "Errors encountered during download: %errorlevel%"
-goto end
-:upd_script_6
-start copy /y "_updatePublisher.new.bat" "_updatePublisher.bat" ^&^& del "_updatePublisher.new.bat" ^&^& exit
-
-
-:end
-
-
-IF "%skipPrompts%"=="true" (
- PAUSE
-)
diff --git a/input/fsh/instances/CoverageFranzMuster.fsh b/input/fsh/instances/CoverageFranzMuster.fsh
index bca06491..8eeca1c2 100644
--- a/input/fsh/instances/CoverageFranzMuster.fsh
+++ b/input/fsh/instances/CoverageFranzMuster.fsh
@@ -1,6 +1,6 @@
Instance: CoverageFranzMuster
InstanceOf: CHCoreCoverage
-Title: "CoverageFranzMuster"
+Title: "Coverage: FranzMuster"
Description: "Example for Insurance Coverage"
Usage: #example
* meta.source = "https://www.ti.bfh.ch/de/bachelor/medizininformatik.html"
diff --git a/input/fsh/instances/DocumentReference.fsh b/input/fsh/instances/DocumentReference.fsh
index 6aeab507..ecac8576 100644
--- a/input/fsh/instances/DocumentReference.fsh
+++ b/input/fsh/instances/DocumentReference.fsh
@@ -1,5 +1,6 @@
Instance: example
InstanceOf: ChLabDocumentReference
+Title: "DocumentReference: Physical"
Usage: #example
// * contained = a2
* masterIdentifier.system = "urn:ietf:rfc:3986"
diff --git a/input/fsh/instances/HealthInsuranceCard.fsh b/input/fsh/instances/HealthInsuranceCard.fsh
index a56dd765..4a32fb4d 100644
--- a/input/fsh/instances/HealthInsuranceCard.fsh
+++ b/input/fsh/instances/HealthInsuranceCard.fsh
@@ -1,6 +1,6 @@
Instance: HealthInsuranceCard
InstanceOf: Coverage
-Title: "HealthInsuranceCard"
+Title: "Coverage: HealthInsuranceCard Franz Muster"
Description: "Example for Insurance"
Usage: #example
* identifier.system = "http://ehic.com/insurer/123456789/member"
diff --git a/input/fsh/instances/LabOrder-Composition.fsh b/input/fsh/instances/LabOrder-CompositionWithSR.fsh
similarity index 87%
rename from input/fsh/instances/LabOrder-Composition.fsh
rename to input/fsh/instances/LabOrder-CompositionWithSR.fsh
index ab283e94..2da5c70b 100644
--- a/input/fsh/instances/LabOrder-Composition.fsh
+++ b/input/fsh/instances/LabOrder-CompositionWithSR.fsh
@@ -1,9 +1,9 @@
-Instance: LabOrder-Composition
-InstanceOf: ChLabOrderComposition
-Title: "CH LAB-Order Composition by Service Request"
-Description: "Composition multiple SR whithout Questionnaire/Quse"
+Instance: LabOrder-CompositionWithSR
+InstanceOf: ChLabOrderCompositionWithSR
+Title: "CH LAB-Order Composition with Service Request"
+Description: "Composition multiple SR whithout Questionnaire/QuestionnaireResponse"
Usage: #example
-* id = "ch-lab-order-composition"
+* id = "ch-lab-order-composition-with-sr"
* meta.versionId = "1"
* meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
* text.status = #additional
@@ -36,4 +36,4 @@ Usage: #example
* section[orderReferral].text.status = #generated
* section[orderReferral].text.div = "\n Order-Referral-Form\n
"
-* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)
\ No newline at end of file
+* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)
diff --git a/input/fsh/instances/LabOrder-Composition-by-Form.fsh b/input/fsh/instances/LabOrder-CompositionWithSR_AndForm.fsh
similarity index 90%
rename from input/fsh/instances/LabOrder-Composition-by-Form.fsh
rename to input/fsh/instances/LabOrder-CompositionWithSR_AndForm.fsh
index eb0ab201..23f36c0e 100644
--- a/input/fsh/instances/LabOrder-Composition-by-Form.fsh
+++ b/input/fsh/instances/LabOrder-CompositionWithSR_AndForm.fsh
@@ -1,9 +1,9 @@
-Instance: LabOrder-Composition-by-Form
-InstanceOf: ChLabOrderCompositionByForm
-Title: "CH LAB-Order Composition by Form"
+Instance: LabOrder-CompositionWithSR_AndForm
+InstanceOf: ChLabOrderCompositionWithSR_AndForm
+Title: "CH LAB-Order Composition with ServiceRequest and Form"
Description: "Composition Questionnaire/QuestionnaireResponse and multiple SR"
Usage: #example
-* id = "ch-lab-order-composition-by-form"
+* id = "ch-lab-order-composition-with-sr-and-form"
* meta.versionId = "1"
* meta.lastUpdated = "2021-02-18T17:04:38.520+00:00"
* text.status = #additional
@@ -37,4 +37,4 @@ Usage: #example
* section[orderReferral].text.div = "\n Order-Referral-Form\n
"
* section[orderReferral].entry[Questionnaire] = Reference(LabOrder-form)
* section[orderReferral].entry[QuestionnaireResponse] = Reference(LabOrder-QuestionnaireResponse)
-* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)
\ No newline at end of file
+* section[orderReferral].entry[ServiceRequest] = Reference(LabOrder-ServiceRequest-potassium)
diff --git a/input/fsh/instances/LabOrder-Document-by-Form.fsh b/input/fsh/instances/LabOrder-Document-with-SR-and-Form.fsh
similarity index 88%
rename from input/fsh/instances/LabOrder-Document-by-Form.fsh
rename to input/fsh/instances/LabOrder-Document-with-SR-and-Form.fsh
index 606dd507..1b47b4ca 100644
--- a/input/fsh/instances/LabOrder-Document-by-Form.fsh
+++ b/input/fsh/instances/LabOrder-Document-with-SR-and-Form.fsh
@@ -1,9 +1,9 @@
-Instance: LabOrder-Document-by-Form
-InstanceOf: ChLabOrderDocumentByForm
-Title: "CH LAB-Order Document by Form"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Instance: LabOrder-Document-with-SR-and-Form
+InstanceOf: ChLabOrderDocumentWithSR_AndForm
+Title: "CH LAB-Order Document with ServiceRequest and Form"
+Description: "Document for referral/order due to suspected deep vein thrombosis"
Usage: #example
-* id = "ch-lab-order-by-form"
+* id = "ch-lab-order-with-sr-and-form"
* meta.versionId = "1"
* meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
* language = #en
@@ -12,8 +12,8 @@ Usage: #example
* type = #document
* timestamp = "2019-04-01T20:18:41.341+00:00"
-* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition-by-form"
-* entry[=].resource = LabOrder-Composition-by-Form
+* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition-with-sr-and-form"
+* entry[=].resource = LabOrder-CompositionWithSR_AndForm
* entry[+].fullUrl = "http://example.com/fhir/Patient/HansGuggindieluft"
* entry[=].resource = HansGuggindieluft
@@ -64,4 +64,3 @@ Usage: #example
// // ---- 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-Document.fsh b/input/fsh/instances/LabOrder-Document-with-SR.fsh
similarity index 89%
rename from input/fsh/instances/LabOrder-Document.fsh
rename to input/fsh/instances/LabOrder-Document-with-SR.fsh
index 96c9b853..7fd0dee1 100644
--- a/input/fsh/instances/LabOrder-Document.fsh
+++ b/input/fsh/instances/LabOrder-Document-with-SR.fsh
@@ -1,9 +1,9 @@
-Instance: LabOrder-Document
-InstanceOf: ChLabOrderDocument
-Title: "CH LAB-Order Document by Service Request"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Instance: LabOrder-DocumentWithSR
+InstanceOf: ChLabOrderDocumentWithSR
+Title: "CH LAB-Order Document with Service Request"
+Description: "Document for referral/order due to suspected deep vein thrombosis"
Usage: #example
-* id = "ch-lab-order-document"
+* id = "ch-lab-order-document-with-sr"
* meta.versionId = "1"
* meta.lastUpdated = "2019-04-01T20:18:41.341+00:00"
* language = #en
@@ -12,8 +12,8 @@ Usage: #example
* type = #document
* timestamp = "2019-04-01T20:18:41.341+00:00"
-* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition"
-* entry[=].resource = LabOrder-Composition
+* entry[0].fullUrl = "http://example.com/fhir/Composition/ch-lab-order-composition-with-sr"
+* entry[=].resource = LabOrder-CompositionWithSR
* entry[+].fullUrl = "http://example.com/fhir/Patient/HansGuggindieluft"
* entry[=].resource = HansGuggindieluft
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-chloride.fsh b/input/fsh/instances/LabOrder-ServiceRequest-chloride.fsh
index 7ada267c..a7e0efaf 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-chloride.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-chloride.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-chloride
InstanceOf: ChLabOrderSRSingletest
-Title: "CH LAB-Order example Service Request for Clinical Chemistry Tests"
-Description: "Example for Service Request of Chloride [Moles/volume] in Serum or Plasma"
+Title: "CH LAB Service Request for Chloride"
+Description: "Service Request for Chloride [Moles/volume] in Serum or Plasma"
Usage: #example
* id = "LabOrder-chloride"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-container-example.fsh b/input/fsh/instances/LabOrder-ServiceRequest-container-example.fsh
index 8ac7de07..d26d66bc 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-container-example.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-container-example.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-container-example
InstanceOf: ChLabOrderSRContainer
-Title: "CH LAB-Order example Service Request for Creatinine Clearance and Electrolytes in Serum"
-Description: "Example for Service Request as container for multiple Service Requests"
+Title: "CH LAB Service Request for Creatinine Clearance and Electrolytes in Serum"
+Description: "Service Request as container for multiple Service Requests"
Usage: #example
* id = "LabOrder-container-example"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-creatinine-clearance.fsh b/input/fsh/instances/LabOrder-ServiceRequest-creatinine-clearance.fsh
index e6771ea4..1a858108 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-creatinine-clearance.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-creatinine-clearance.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-creatinine-clearance
InstanceOf: ChLabOrderSRContainer
-Title: "CH LAB-Order example Service Request for Creatinine clearance"
-Description: "Example for Service Request of Creatinine [Moles/volume] and 24h Urin Creatinen"
+Title: "CH LAB Service Request for Creatinine clearance"
+Description: "Service Request for Creatinine [Moles/volume] and 24h Urin Creatinen"
Usage: #example
* id = "LabOrder-creatinine-clearance"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
@@ -37,14 +37,15 @@ Usage: #example
* reasonCode = $sct#90688005
* reasonCode.text = "Chronic renal failure syndrome (disorder)"
* insurance = Reference(HealthInsuranceCard)
-* supportingInfo[+] = Reference(MedicationStatement/Medication-diclofenac)
+* supportingInfo[+] = Reference(MedicationStatement/Diclofenac)
* supportingInfo[+] = Reference(Condition/Renal-insufficiency)
* specimen[0] = Reference(Specimen/Serum) "Serum specimen"
// * specimen[+] = Reference(Specimen/Blood)
-Instance: Medication-diclofenac
+Instance: Diclofenac
InstanceOf: MedicationStatement
-Description: "Example of medication record"
+Title: "MedicationStatement: Diclofenac Verordnung"
+Description: "Medication Record: Diclofenac"
Usage: #example
* status = #active
* medicationReference = Reference(Medication/Voltaren)
@@ -59,6 +60,7 @@ Usage: #example
Instance: Voltaren
InstanceOf: Medication
+Title: "Medication: Voltaren(product)"
Description: "Example of a medication product"
Usage: #example
* contained = sub01
@@ -76,13 +78,15 @@ Usage: #inline
Instance: Renal-insufficiency
InstanceOf: Condition
-Description: "Example of a Condition or Problem"
+Title: "Condition: Renal Insuffiency"
+Description: "Problem or Diagnosis from problem list: Renal Insuffiency"
Usage: #example
* identifier.value = "12345"
* clinicalStatus = $condition-clinical#active
* verificationStatus = $condition-ver-status#confirmed
-* category.coding[0] = $sct#55607006 "Problem"
-* category.coding[+] = $condition-category#problem-list-item
+// * category.coding[0] = $sct#55607006 "Problem"
+// * category.coding[+] = $condition-category#problem-list-item
+* category = $condition-category#problem-list-item
* severity = $sct#255604002 "Mild (qualifier value)"
* code = $sct#723190009 "Chronic renal insufficiency (disorder)"
* bodySite = $sct#181414000 "Entire kidney (body structure)"
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-creatinine.fsh b/input/fsh/instances/LabOrder-ServiceRequest-creatinine.fsh
index 022595f9..c0e5c1d2 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-creatinine.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-creatinine.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-creatinine
InstanceOf: ChLabOrderSRSingletest
-Title: "CH LAB-Order example Service Request for Serum Creatinine"
-Description: "Example for Service Request of Creatinine [Moles/volume] in Serum or Plasma"
+Title: "CH LAB Service Request for Serum Creatinine"
+Description: "Service Request for Creatinine [Moles/volume] in Serum or Plasma"
Usage: #example
* id = "LabOrder-creatinine"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-electrolytes.fsh b/input/fsh/instances/LabOrder-ServiceRequest-electrolytes.fsh
index a14f9ded..691687ca 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-electrolytes.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-electrolytes.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-electrolytes
InstanceOf: ChLabOrderSRContainer
-Title: "CH LAB-Order example Service Request for Electrolytes in Serum"
-Description: "Example for Service Request as container for multiple Service Requests"
+Title: "CH LAB Service Request for Electrolytes in Serum"
+Description: "Service Request as container for multiple Service Requests"
Usage: #example
* id = "LabOrder-electrolytes"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-generic.fsh b/input/fsh/instances/LabOrder-ServiceRequest-generic.fsh
index 90fc4568..b7ee62a1 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-generic.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-generic.fsh
@@ -1,6 +1,6 @@
Instance: LabOrder-ServiceRequest-generic
InstanceOf: ChLabOrderSRSingletest
-Title: "CH LAB-Order example Service Request some single test"
+Title: "CH LAB Service Request for some single test"
Description: "Example for Service Request single test"
Usage: #example
* id = "LabOrder-generic"
@@ -31,12 +31,13 @@ Usage: #example
* reasonCode = $sct#90688005
* reasonCode.text = "Chronic renal failure syndrome (disorder)"
* insurance = Reference(HealthInsuranceCard)
-* supportingInfo = Reference(MedicationStatement/Medication-aspirin)
+* supportingInfo = Reference(MedicationStatement/Acetylsalicylat)
* specimen[0] = Reference(Specimen/Blood) "Blood"
// * specimen[+] = Reference(Specimen/Blood)
-Instance: Medication-aspirin
+Instance: Acetylsalicylat
InstanceOf: MedicationStatement
+Title: "MedicationStatement: Acetylsalicylat Verordnung"
Description: "Example of Medication Record"
Usage: #example
* status = #active
@@ -52,6 +53,7 @@ Usage: #example
Instance: Aspirin
InstanceOf: Medication
+Title: "Medication: Aspirin"
Description: "Example of a Medication Product"
Usage: #example
* contained = sub02
@@ -63,6 +65,7 @@ Usage: #example
Instance: sub02
InstanceOf: Substance
+Title: "Substance: Aspirin Substanz"
Description: "Example of a medication substance"
Usage: #inline
* code = $sct#387458008 "Aspirin (substance)"
\ No newline at end of file
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-potassium.fsh b/input/fsh/instances/LabOrder-ServiceRequest-potassium.fsh
index e9227b6b..204a01d4 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-potassium.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-potassium.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-potassium
InstanceOf: ChLabOrderSRSingletest
-Title: "CH LAB-Order example Service Request for Clinical Chemistry Tests"
-Description: "Example for Service Request of Potassium [Moles/volume] in Serum or Plasma"
+Title: "CH LAB Service Request for Potassium"
+Description: "Service Request for Potassium [Moles/volume] in Serum or Plasma"
Usage: #example
* id = "LabOrder-potassium"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-sodium.fsh b/input/fsh/instances/LabOrder-ServiceRequest-sodium.fsh
index e09278c0..d074a795 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-sodium.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-sodium.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-sodium
InstanceOf: ChLabOrderSRSingletest
-Title: "CH LAB-Order example Service Request for Clinical Chemistry Tests"
-Description: "Example for Service Request of Sodium [Moles/volume] in Serum or Plasma"
+Title: "CH LAB Service Request for Sodium"
+Description: "Service Request for Sodium [Moles/volume] in Serum or Plasma"
Usage: #example
* id = "LabOrder-sodium"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
diff --git a/input/fsh/instances/LabOrder-ServiceRequest-urine24h-creatinine.fsh b/input/fsh/instances/LabOrder-ServiceRequest-urine24h-creatinine.fsh
index f2d74b16..167f59f7 100644
--- a/input/fsh/instances/LabOrder-ServiceRequest-urine24h-creatinine.fsh
+++ b/input/fsh/instances/LabOrder-ServiceRequest-urine24h-creatinine.fsh
@@ -1,7 +1,7 @@
Instance: LabOrder-ServiceRequest-urine24h-creatinine
InstanceOf: ChLabOrderSRSingletest
-Title: "CH LAB-Order example Service Request for Clinical Chemistry Tests"
-Description: "Example for Service Request of Creatinine [Moles/volume] in Urine"
+Title: "CH LAB Service Request for Creatinine in 24h Urine"
+Description: "Service Request for Creatinine [Moles/volume] in Urine"
Usage: #example
* id = "LabOrder-u24-creatinine"
* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
diff --git a/input/fsh/instances/LabOrder-form.fsh b/input/fsh/instances/LabOrder-form.fsh
index bf24c06a..611232fb 100644
--- a/input/fsh/instances/LabOrder-form.fsh
+++ b/input/fsh/instances/LabOrder-form.fsh
@@ -788,7 +788,7 @@ Usage: #example
// ---- E2 Blood electrolyte test ----
// =================================
* item[=].item[=].item[=].item[+].linkId = "lab-compendium.Gantenbein.labServices.Electrolyte" // item[9][0][0][3]
-* item[=].item[=].item[=].item[=].definition = "http://fhir.ch/ig/ch-lab-order/ActivityDefinition/procedure-blood-electrolyte"
+* item[=].item[=].item[=].item[=].definition = "http://fhir.ch/ig/ch-lab-order/ActivityDefinition/procedure-serum-electrolyte"
* item[=].item[=].item[=].item[=].text = "Analysen Labor Gantenbein Elektrolyte"
* item[=].item[=].item[=].item[=].code = $loinc#24326-1 "Electrolytes 1998 panel - Serum or Plasma"
* item[=].item[=].item[=].item[=].type = #boolean
diff --git a/input/fsh/instances/ResponseReceiverSabineMeier.fsh b/input/fsh/instances/ResponseReceiverSabineMeier.fsh
index d7011959..d9ff6b35 100644
--- a/input/fsh/instances/ResponseReceiverSabineMeier.fsh
+++ b/input/fsh/instances/ResponseReceiverSabineMeier.fsh
@@ -1,6 +1,6 @@
Instance: ResponseReceiverSabineMeier
InstanceOf: Practitioner
-Title: "Response Receiver Sabine Meier"
+Title: "Practitioner: Response Receiver Sabine Meier"
Description: "Practitioner, works in Kantonsspital"
Usage: #example
* name.use = #official
diff --git a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Composition.fsh b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Composition.fsh
index c5ad49de..acaa4043 100644
--- a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Composition.fsh
+++ b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Composition.fsh
@@ -1,7 +1,7 @@
Instance: 0-best-practice-Composition
-InstanceOf: ChLabOrderComposition
-Title: "Composition 0-best-practice"
-Description: "Composition: Storyboard for suspected deep Vein Thrombosis"
+InstanceOf: ChLabOrderCompositionWithSR
+Title: "Composition 0-best-practice whith Service Request"
+Description: "Composition: Storyboard for tibial plateau fracture"
Usage: #example
* id = "0-best-practice"
* meta.versionId = "1"
@@ -37,9 +37,5 @@ Usage: #example
* section[orderReferral].text.status = #generated
* section[orderReferral].text.div = "\n Laboratory Order by Service Request 0-best-practice\n
"
* section[orderReferral].entry[ServiceRequest][+] = Reference(0-best-practice-ServiceRequest-0)
-/*
-* section[orderReferral].entry[ServiceRequest][+] = Reference(0-best-practice-ServiceRequest-1)
-* section[orderReferral].entry[ServiceRequest][+] = Reference(0-best-practice-ServiceRequest-2)
-* section[orderReferral].entry[ServiceRequest][+] = Reference(0-best-practice-ServiceRequest-3)
-*/
+
diff --git a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Document.fsh b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Document.fsh
index 59ecd43f..b912d465 100644
--- a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Document.fsh
+++ b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-Document.fsh
@@ -1,7 +1,7 @@
Instance: BestPracticeDocument
-InstanceOf: ChLabOrderDocument
-Title: "CH LAB-Order best-practice"
-Description: "Example Bundle for laboratory order"
+InstanceOf: ChLabOrderDocumentWithSR
+Title: "CH LAB-Order document best-practice"
+Description: "Document whith Service Request in context of tibial plateau fracture"
Usage: #example
* id = "0-best-practice-document"
* meta.versionId = "1"
@@ -43,10 +43,10 @@ Usage: #example
* entry[+].fullUrl = "http://example.com/fhir/PractitionerRole/EvaErlenmeyerLaborPipette"
* entry[=].resource = EvaErlenmeyerLaborPipette
-//* entry[+].fullUrl = "http://example.com/fhir/Coverage/HealthInsuranceCardBirgitBlum" // entry[10]
-//* entry[=].resource = HealthInsuranceCardBirgitBlum
-* entry[+].fullUrl = "http://example.com/fhir/Condition/ConditionHeartDisorder"
-* entry[=].resource = ConditionHeartDisorder
+// * entry[+].fullUrl = "http://example.com/fhir/Coverage/HealthInsuranceCardBirgitBlum" // entry[10]
+// * entry[=].resource = HealthInsuranceCardBirgitBlum
+// * entry[+].fullUrl = "http://example.com/fhir/Condition/ConditionHeartDisorder"
+// * entry[=].resource = ConditionHeartDisorder
* entry[+].fullUrl = "http://example.com/fhir/Specimen/Serum-0-best-practice"
* entry[=].resource = Serum-0-best-practice
diff --git a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-ServiceRequest.fsh b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-ServiceRequest.fsh
index 1b05c9cd..d22fa4fa 100644
--- a/input/fsh/instances/casestudies/0-best-practice/0-best-practice-ServiceRequest.fsh
+++ b/input/fsh/instances/casestudies/0-best-practice/0-best-practice-ServiceRequest.fsh
@@ -22,7 +22,7 @@ Usage: #example
* encounter = Reference(FirstEncounter)
* requester = Reference(HansHauserKantonsspital)
// * insurance = Reference(HealthInsuranceCardBirgitBlum)
-* supportingInfo[+] = Reference(ConditionHeartDisorder)
+// * supportingInfo[+] = Reference(ConditionHeartDisorder)
* supportingInfo[+] = Reference(ConditionTibiaFracture)
* supportingInfo[+] = Reference(Liquemin)
@@ -103,7 +103,7 @@ Usage: #example
// ---- Patient --------
Instance: BirgitBlum
InstanceOf: CHCorePatient
-Title: "Birgit Blum"
+Title: "Patient: Birgit Blum"
Description: "CH-Core-Patient, refers to 0-best-practice"
Usage: #example
* text.status = #additional
@@ -155,6 +155,7 @@ Usage: #example
// ---- encounter -----
Instance: FirstEncounter
InstanceOf: Encounter
+Title: "Encounter: First Encounter"
Description: "Example for best-practice of laboratory order"
Usage: #example
* status = #in-progress
@@ -163,13 +164,14 @@ Usage: #example
Instance: Liquemin
InstanceOf: ChLabOrderMedication
+Title: "Medication: Liquemin"
Description: "Example for best-practice of laboratory order"
Usage: #example
/*A code (or set of codes) that specify this medication, or a textual description if no code is available. Usage note: This could be a standard medication code such as a code from RxNorm, SNOMED CT, IDMP etc. It could also be a national or local formulary code, optionally with translations to other code systems.*/
* code.coding[GTIN] = urn:oid:2.51.1.1#7680388470010 "LIQUEMIN 5000 IE/0.5ml s.c. (aH 06/23)"
-* code.coding[PHARMACODE] = urn:oid:2.16.756.5.30.2.6#6687498
+* code.coding[PHARMACODE] = urn:oid:2.16.756.5.30.2.6.1#6687498
* code.coding[ATC] = $atc#B01AB01 "Heparin"
* code = $sct#412201008 "Porcine heparin (substance)"
* code.text = "LIQUEMIN 5000 IE/0.5ml s.c. (aH 06/23)"
@@ -219,7 +221,7 @@ Usage: #example
Instance: Blood-coag-0-best-practice
InstanceOf: Specimen
-Title: "Blood Sample Coagulation"
+Title: "Blood Sample Coagulation, 0-best-practice"
Description: "Example for Specimen for haemostatic Examination"
Usage: #example
* identifier.value = "48736-55555-75465"
@@ -242,7 +244,7 @@ Usage: #example
Instance: Blood-0-best-practice
InstanceOf: Specimen
-Title: "Blood Sample"
+Title: "Blood Sample, 0-best-practice"
Description: "Example for Specimen for Haematological Examination"
Usage: #example
* identifier.value = "48736-55555-75465"
diff --git a/input/fsh/instances/casestudies/1-tvt-by-form/1-tvt-DocumentByForm.fsh b/input/fsh/instances/casestudies/1-tvt-by-form/1-tvt-DocumentByForm.fsh
index 87318da0..85b6a91e 100644
--- a/input/fsh/instances/casestudies/1-tvt-by-form/1-tvt-DocumentByForm.fsh
+++ b/input/fsh/instances/casestudies/1-tvt-by-form/1-tvt-DocumentByForm.fsh
@@ -1,7 +1,7 @@
Instance: 1-tvt-DocumentByForm
InstanceOf: ChOrfDocument
Title: "CH LAB-Order by Form 1-tvt"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Description: "Document for referral/order due to suspected deep vein thrombosis"
Usage: #example
* id = "1-tvt-document-by-form"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/1-tvt/1-tvt-Composition.fsh b/input/fsh/instances/casestudies/1-tvt/1-tvt-Composition.fsh
index 6789618d..2bfb6287 100644
--- a/input/fsh/instances/casestudies/1-tvt/1-tvt-Composition.fsh
+++ b/input/fsh/instances/casestudies/1-tvt/1-tvt-Composition.fsh
@@ -1,5 +1,5 @@
Instance: 1-tvt-Composition
-InstanceOf: ChLabOrderComposition
+InstanceOf: ChLabOrderCompositionWithSR
Title: "Composition 1-tvt"
Description: "Composition: Storyboard for suspected deep Vein Thrombosis"
Usage: #example
diff --git a/input/fsh/instances/casestudies/1-tvt/1-tvt-Document.fsh b/input/fsh/instances/casestudies/1-tvt/1-tvt-Document.fsh
index aef80309..348b5500 100644
--- a/input/fsh/instances/casestudies/1-tvt/1-tvt-Document.fsh
+++ b/input/fsh/instances/casestudies/1-tvt/1-tvt-Document.fsh
@@ -1,7 +1,7 @@
Instance: 1-tvt-Document
-InstanceOf: ChLabOrderDocument
+InstanceOf: ChLabOrderDocumentWithSR
Title: "CH LAB-Order 1-tvt"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Description: "Document for referral/order due to suspected deep vein thrombosis"
Usage: #example
* id = "1-tvt-document"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/1-tvt/1-tvt-ServiceRequest.fsh b/input/fsh/instances/casestudies/1-tvt/1-tvt-ServiceRequest.fsh
index f2fb7f4f..6fc1cb3a 100644
--- a/input/fsh/instances/casestudies/1-tvt/1-tvt-ServiceRequest.fsh
+++ b/input/fsh/instances/casestudies/1-tvt/1-tvt-ServiceRequest.fsh
@@ -14,9 +14,7 @@ Usage: #example
* category = $sct#721963009 "Order (record artifact)"
// code: what is being requested (procedure codes SNOMED CT, Test Codes LOINC)
-* code.coding[0] = $loinc#24360-0 "Hemoglobin and Hematocrit panel - Blood"
-* code.coding[+] = $loinc#43113-0 "Hemoglobin electrophoresis panel in Blood"
-* code.coding[+] = $loinc#57021-8 "CBC W Auto Differential panel - Blood"
+// * code.coding[0] = $loinc#24360-0 "Hemoglobin and Hematocrit panel - Blood"
* code.coding[+] = $loinc#58410-2 "CBC panel - Blood by Automated count"
* code.coding[+] = $loinc#57023-4 "Auto Differential panel - Blood"
* code.coding[+] = $loinc#55398-2 "Short Fibrin D-dimer FEU and DDU panel - Platelet poor plasma"
@@ -99,7 +97,7 @@ Usage: #example
// ---- Patient --------
Instance: TobiasTimmermann
InstanceOf: CHCorePatient
-Title: "Tobias Timmermann"
+Title: "Patient: Tobias Timmermann"
Description: "CH-Core-Patient, refers to 1-tvt"
Usage: #example
* text.status = #additional
@@ -167,7 +165,7 @@ Usage: #example
Instance: Blood-coag-1-tvt
InstanceOf: Specimen
-Title: "Blood Sample Coagulation"
+Title: "Blood Sample Coagulation, 1-tvt"
Description: "Example for Specimen for haemostatic Examination"
Usage: #example
* identifier.value = "48736-55555-75465"
@@ -188,7 +186,7 @@ Usage: #example
Instance: Blood-1-tvt
InstanceOf: Specimen
-Title: "Blood Sample"
+Title: "Blood Sample, 1-tvt"
Description: "Example for Specimen for Haematological Examination"
Usage: #example
* status = #available
diff --git a/input/fsh/instances/casestudies/2-pertussis-by-form/2-pertussis-DocumentByForm.fsh b/input/fsh/instances/casestudies/2-pertussis-by-form/2-pertussis-DocumentByForm.fsh
index 80778b82..6c86efec 100644
--- a/input/fsh/instances/casestudies/2-pertussis-by-form/2-pertussis-DocumentByForm.fsh
+++ b/input/fsh/instances/casestudies/2-pertussis-by-form/2-pertussis-DocumentByForm.fsh
@@ -1,7 +1,7 @@
Instance: 2-pertussis-DocumentByForm
InstanceOf: ChOrfDocument
Title: "CH LAB-Order by Form 2-pertussis"
-Description: "Example Bundle for referral/order for Pertussis investigation"
+Description: "Document for referral/order Pertussis investigation"
Usage: #example
* id = "2-pertussis-document-by-form"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Composition.fsh b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Composition.fsh
index 0c61d136..f982dd1d 100644
--- a/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Composition.fsh
+++ b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Composition.fsh
@@ -1,5 +1,5 @@
Instance: 2-pertussis-Composition
-InstanceOf: ChLabOrderComposition
+InstanceOf: ChLabOrderCompositionWithSR
Title: "Composition 2-pertussis"
Description: "Composition: Storyboard for Pertussis Investigation"
Usage: #example
diff --git a/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Document.fsh b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Document.fsh
index 3d0bc5be..43285ac2 100644
--- a/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Document.fsh
+++ b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-Document.fsh
@@ -1,7 +1,7 @@
Instance: 2-pertussis-Document
-InstanceOf: ChLabOrderDocument
+InstanceOf: ChLabOrderDocumentWithSR
Title: "CH LAB-Order 2-pertussis"
-Description: "Example Bundle for referral/order for Pertussis investigation"
+Description: "Document for referral/order for Pertussis investigation"
Usage: #example
* id = "2-pertussis-document"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/2-pertussis/2-pertussis-ServiceRequest-add-test.fsh b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-ServiceRequest-add-test.fsh
new file mode 100644
index 00000000..4cf63cab
--- /dev/null
+++ b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-ServiceRequest-add-test.fsh
@@ -0,0 +1,30 @@
+Instance: 2-pertussis-ServiceRequest-add-test
+InstanceOf: ChOrfServiceRequest
+Title: "CH LAB-Service Request 2-pertussis additional test"
+Description: "Service Requst for referral/order of Pertussis investigation, additional test"
+Usage: #example
+* id = "2-pertussis-service-request-add-test"
+* identifier[placerOrderIdentifier].type = $v2-0203#PLAC "Placer Identifier"
+* identifier[placerOrderIdentifier].system = "urn:oid:2.16.756.5.30"
+* identifier[placerOrderIdentifier].value = "123"
+// this ServiceRequest adds an examination of the throat-swab looking for pertussis
+* replaces = Reference(2-pertussis-ServiceRequest)
+* status = #active
+* intent = #original-order
+* category = $sct#721963009 "Order (record artifact)"
+// code: what is being requested (procedure codes SNOMED CT, Test Codes LOINC)
+* code.coding[0] = $loinc#58410-2 "CBC panel - Blood by Automated count"
+* code.coding[+] = $loinc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
+
+// adding an additional Test, 2-pertussis-ServiceRequest is replaced
+* code.coding[+] = $loinc#90441-7 "Bordetella pertussis and Bordetella parapertussis DNA panel - Nasopharynx"
+
+* priority = #urgent
+* subject = Reference(Patient/EmilKummer)
+* requester = Reference(PeterPrestoGruppenpraxis)
+* reasonCode = $sct#772146005
+* reasonCode.text = "Pertussis suspected (situation)"
+* insurance = Reference(HealthInsuranceCardEmilKummer)
+* specimen[0] = Reference(Specimen/Throat-swab-2-pertussis)
+* specimen[+] = Reference(Specimen/Blood-2-pertussis)
+* specimen[+] = Reference(Specimen/Serum-2-pertussis)
diff --git a/input/fsh/instances/casestudies/2-pertussis/2-pertussis-ServiceRequest.fsh b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-ServiceRequest.fsh
index 0499a660..98543583 100644
--- a/input/fsh/instances/casestudies/2-pertussis/2-pertussis-ServiceRequest.fsh
+++ b/input/fsh/instances/casestudies/2-pertussis/2-pertussis-ServiceRequest.fsh
@@ -1,6 +1,6 @@
Instance: 2-pertussis-ServiceRequest
InstanceOf: ChOrfServiceRequest
-Title: "laborder 2-pertussis"
+Title: "CH LAB-Service Request 2-pertussis"
Description: "Example for Service Request for Pertussis Investigation"
Usage: #example
* id = "2-pertussis-service-request"
@@ -11,10 +11,8 @@ Usage: #example
* intent = #original-order
* category = $sct#721963009 "Order (record artifact)"
// code: what is being requested (procedure codes SNOMED CT, Test Codes LOINC)
-* code.coding[0] = $loinc#24360-0 "Hemoglobin and Hematocrit panel - Blood"
-* code.coding[+] = $loinc#43113-0 "Hemoglobin electrophoresis panel in Blood"
-* code.coding[+] = $loinc#57021-8 "CBC W Auto Differential panel - Blood"
-// orderDetails: Additional order information
+* code.coding[0] = $loinc#58410-2 "CBC panel - Blood by Automated count"
+* code.coding[+] = $loinc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
* priority = #urgent
* subject = Reference(Patient/EmilKummer)
@@ -28,7 +26,7 @@ Usage: #example
Instance: EmilKummer
InstanceOf: CHCorePatient
-Title: "Emil Kummer"
+Title: "Patient: Emil Kummer"
Description: "CH-Core-Patient, refers to 2-pertussis"
Usage: #example
* text.status = #additional
@@ -58,7 +56,7 @@ Usage: #example
Instance: PeterPrestoGruppenpraxis
InstanceOf: CHCorePractitionerRole
-Title: "Peter Presto at Gruppenpraxis"
+Title: "PractitionerRole: Peter Presto at Gruppenpraxis"
Description: "PractitionerRole, refers to 2-pertussis"
Usage: #example
* practitioner = Reference(Practitioner/PeterPresto)
@@ -66,7 +64,7 @@ Usage: #example
Instance: PeterPresto
InstanceOf: CHCorePractitionerEPR
-Title: "Peter Presto"
+Title: "Practitioner: Peter Presto"
Description: "Practitioner, works at Gruppenpraxis, refers to 2-pertussis"
Usage: #example
* identifier[GLN].system = "urn:oid:2.51.1.3" //GLN
@@ -125,7 +123,7 @@ Usage: #example
Instance: Blood-2-pertussis
InstanceOf: Specimen
-Title: "Blood Sample"
+Title: "Blood Sample, 2-pertussis"
Description: "Example for Specimen for Haematological Examination"
Usage: #example
* status = #available
diff --git a/input/fsh/instances/casestudies/3-gyn-by-form/3-gyn-DocumentByForm.fsh b/input/fsh/instances/casestudies/3-gyn-by-form/3-gyn-DocumentByForm.fsh
index b759c43c..cfe7d950 100644
--- a/input/fsh/instances/casestudies/3-gyn-by-form/3-gyn-DocumentByForm.fsh
+++ b/input/fsh/instances/casestudies/3-gyn-by-form/3-gyn-DocumentByForm.fsh
@@ -1,7 +1,7 @@
Instance: 3-gyn-DocumentByForm
InstanceOf: ChOrfDocument
Title: "CH LAB-Order by Form 3-gyn"
-Description: "Example Bundle for referral/order for preventive gynaecological check-up"
+Description: "Document for referral/order preventive gynaecological check-up"
Usage: #example
* id = "3-gyn-document-by-form"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/3-gyn/3-gyn-Composition.fsh b/input/fsh/instances/casestudies/3-gyn/3-gyn-Composition.fsh
index c3a2d5c6..27a59cc7 100644
--- a/input/fsh/instances/casestudies/3-gyn/3-gyn-Composition.fsh
+++ b/input/fsh/instances/casestudies/3-gyn/3-gyn-Composition.fsh
@@ -1,5 +1,5 @@
Instance: 3-gyn-Composition
-InstanceOf: ChLabOrderComposition
+InstanceOf: ChLabOrderCompositionWithSR
Title: "Composition 3-gyn"
Description: "Composition: Storyboard for Preventive Gynaecological Check-up"
Usage: #example
diff --git a/input/fsh/instances/casestudies/3-gyn/3-gyn-Document.fsh b/input/fsh/instances/casestudies/3-gyn/3-gyn-Document.fsh
index 28a48ba8..ee2be1dc 100644
--- a/input/fsh/instances/casestudies/3-gyn/3-gyn-Document.fsh
+++ b/input/fsh/instances/casestudies/3-gyn/3-gyn-Document.fsh
@@ -1,7 +1,7 @@
Instance: 3-gyn-Document
-InstanceOf: ChLabOrderDocument
+InstanceOf: ChLabOrderDocumentWithSR
Title: "CH LAB-Order 3-gyn"
-Description: "Example Bundle for referral/order for preventive gynaecological check-up"
+Description: "Document for referral/order preventive gynaecological check-up"
Usage: #example
* id = "3-gyn-document"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/3-gyn/3-gyn-ServiceRequest.fsh b/input/fsh/instances/casestudies/3-gyn/3-gyn-ServiceRequest.fsh
index cdc3119f..5547c31b 100644
--- a/input/fsh/instances/casestudies/3-gyn/3-gyn-ServiceRequest.fsh
+++ b/input/fsh/instances/casestudies/3-gyn/3-gyn-ServiceRequest.fsh
@@ -29,7 +29,7 @@ Usage: #example
Instance: MarinaRubella
InstanceOf: CHCorePatient
-Title: "Marina Rubella"
+Title: "Patient: Marina Rubella"
Description: "CH-Core-Patient, refers to 3-gyn"
Usage: #example
* text.status = #additional
@@ -90,7 +90,7 @@ Usage: #example
Instance: PeterPapGruppenpraxis
InstanceOf: CHCorePractitionerRole
-Title: "Peter Pap Gruppenpraxis"
+Title: "PractitionerRole: Peter Pap Gruppenpraxis"
Description: "PractitionerRole, refers to 3-gyn"
Usage: #example
* practitioner = Reference(Practitioner/PeterPap)
@@ -98,7 +98,7 @@ Usage: #example
Instance: PeterPap
InstanceOf: CHCorePractitioner
-Title: "Peter Pap"
+Title: "Practitioner: Peter Pap"
Description: "Practitioner, works at Gruppenpraxis, refers to 3-gyn"
Usage: #example
* identifier[GLN].system = "urn:oid:2.51.1.3"
@@ -135,7 +135,7 @@ Usage: #example
Instance: Blood-gyn
InstanceOf: Specimen
-Title: "Blood Sample"
+Title: "Blood Sample, 3-gyn"
Description: "Example for Specimen for Haematological Examination"
Usage: #example
* status = #available
@@ -167,7 +167,7 @@ Usage: #example
Instance: Urine-gyn
InstanceOf: Specimen
-Title: "Urine Sample"
+Title: "Urine Sample, 3-gyn"
Description: "Example for Specimen of Urin"
Usage: #example
* identifier.value = "11111-15394-75465"
diff --git a/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-CompositionByForm.fsh b/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-CompositionByForm.fsh
index 1834e839..a9df2d64 100644
--- a/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-CompositionByForm.fsh
+++ b/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-CompositionByForm.fsh
@@ -1,6 +1,6 @@
Instance: 4-sepsis-CompositionByForm
InstanceOf: ChOrfComposition
-Title: "4-sepsis"
+Title: "Composition: 4-sepsis"
Description: "Composition: Storyboard for Sepsis Investigation"
Usage: #example
* id = "4-sepsis-composition-by-form"
diff --git a/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-DocumentByForm.fsh b/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-DocumentByForm.fsh
index 28a62571..40ca2f57 100644
--- a/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-DocumentByForm.fsh
+++ b/input/fsh/instances/casestudies/4-sepsis-by-form/4-sepsis-DocumentByForm.fsh
@@ -1,7 +1,7 @@
Instance: 4-sepsis-DocumentByForm
InstanceOf: ChOrfDocument
Title: "CH LAB-Order by Form 4-sepsis"
-Description: "Example Bundle for referral/order for Sepsis Investigation"
+Description: "Document for referral/order Sepsis Investigation"
Usage: #example
* id = "4-sepsis-document-by-form"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Composition.fsh b/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Composition.fsh
index c009f3db..0fc1b1d9 100644
--- a/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Composition.fsh
+++ b/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Composition.fsh
@@ -1,5 +1,5 @@
Instance: 4-sepsis-Composition
-InstanceOf: ChLabOrderComposition
+InstanceOf: ChLabOrderCompositionWithSR
Title: "Composition 4-sepsis"
Description: "Composition: Storyboard for Sepsis Investigation"
Usage: #example
diff --git a/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Document.fsh b/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Document.fsh
index d27f9920..8ac076aa 100644
--- a/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Document.fsh
+++ b/input/fsh/instances/casestudies/4-sepsis/4-sepsis-Document.fsh
@@ -1,7 +1,7 @@
Instance: 4-sepsis-Document
-InstanceOf: ChLabOrderDocument
+InstanceOf: ChLabOrderDocumentWithSR
Title: "CH LAB-Order 4-sepsis"
-Description: "Example Bundle for referral/order for Sepsis Investigation"
+Description: "Document for referral/order Sepsis Investigation"
Usage: #example
* id = "4-sepsis-document"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/4-sepsis/4-sepsis-ServiceRequest.fsh b/input/fsh/instances/casestudies/4-sepsis/4-sepsis-ServiceRequest.fsh
index 4499a736..3cf0ed4a 100644
--- a/input/fsh/instances/casestudies/4-sepsis/4-sepsis-ServiceRequest.fsh
+++ b/input/fsh/instances/casestudies/4-sepsis/4-sepsis-ServiceRequest.fsh
@@ -66,7 +66,7 @@ Usage: #example
Instance: HansHauserKantonsspital
InstanceOf: CHCorePractitionerRole
-Title: "Hans Hauser Kantonsspital"
+Title: "PractitionerRole: Hans Hauser Kantonsspital"
Description: "PractitionerRole"
Usage: #example
* practitioner = Reference(Practitioner/HansHauser)
@@ -74,7 +74,7 @@ Usage: #example
Instance: HansHauser
InstanceOf: CHCorePractitioner
-Title: "Hans Hauser"
+Title: "Practitioner: Hans Hauser"
Description: "Practitioner, Senior Physician at Kantonsspital, refers to 4-sepsis"
Usage: #example
* identifier[GLN].system = "urn:oid:2.51.1.3"
@@ -96,7 +96,7 @@ Usage: #example
Instance: Kantonsspital
InstanceOf: CHCoreOrganization
-Title: "Kantonsspital"
+Title: "Organization: Kantonsspital"
Description: "Example for Hospital"
Usage: #example
* identifier[GLN].system = "urn:oid:2.51.1.3"
@@ -122,7 +122,7 @@ Usage: #example
Instance: HealthInsuranceCardSaraSpeckmann
InstanceOf: Coverage
-Title: "HealthInsuranceCard"
+Title: "Coverage: HealthInsuranceCard Sarah Speckmann"
Description: "Example for Insurance"
Usage: #example
* identifier.system = "http://ehic.com/insurer/123456789/member"
@@ -137,7 +137,7 @@ Usage: #example
Instance: Blood-bactec-plus
InstanceOf: Specimen
-Title: "Blood Sample"
+Title: "Blood Sample, 4-sepsis bactec-plus"
Description: "Example for Specimen for Haematological Examination"
Usage: #example
* status = #available
@@ -152,7 +152,7 @@ Usage: #example
Instance: Blood-sepsis
InstanceOf: Specimen
-Title: "Blood Sample"
+Title: "Blood Sample, 4-sepsis"
Description: "Example for Specimen for Haematological Examination"
Usage: #example
* status = #available
@@ -167,7 +167,7 @@ Usage: #example
Instance: Urine-sepsis
InstanceOf: Specimen
-Title: "Urine Sample"
+Title: "Urine Sample, 4-sepsis"
Description: "Example for Specimen of Urin"
Usage: #example
* identifier.value = "11111-15394-75465"
diff --git a/input/fsh/instances/casestudies/5-biol-monit-by-form/5-biol-monit-DocumentByForm.fsh b/input/fsh/instances/casestudies/5-biol-monit-by-form/5-biol-monit-DocumentByForm.fsh
index 05811541..cf2b3755 100644
--- a/input/fsh/instances/casestudies/5-biol-monit-by-form/5-biol-monit-DocumentByForm.fsh
+++ b/input/fsh/instances/casestudies/5-biol-monit-by-form/5-biol-monit-DocumentByForm.fsh
@@ -1,7 +1,7 @@
Instance: 5-biol-monit-DocumentByForm
InstanceOf: ChOrfDocument
Title: "CH LAB-Order by Form 5-biol-monit"
-Description: "Example Bundle for referral/order for toxicological Monitoring"
+Description: "Document for referral/order toxicological Monitoring"
Usage: #example
* id = "5-biol-monit-document-by-form"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Composition.fsh b/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Composition.fsh
index a3a80c6a..2a278a9f 100644
--- a/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Composition.fsh
+++ b/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Composition.fsh
@@ -1,5 +1,5 @@
Instance: 5-biol-monit-Composition
-InstanceOf: ChLabOrderComposition
+InstanceOf: ChLabOrderCompositionWithSR
Title: "Composition 5-biol-monit"
Description: "Composition: Storyboard for Toxicological Monitoring"
Usage: #inline
diff --git a/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Document.fsh b/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Document.fsh
index a3dca8c3..3bec3053 100644
--- a/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Document.fsh
+++ b/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-Document.fsh
@@ -1,7 +1,7 @@
Instance: 5-biol-monit-Document
-InstanceOf: ChLabOrderDocument
+InstanceOf: ChLabOrderDocumentWithSR
Title: "CH LAB-Order 5-biol-monit"
-Description: "Example Bundle for referral/order for toxicological Monitoring"
+Description: "Document for referral/order toxicological Monitoring"
Usage: #example
* id = "5-biol-monit-document"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-ServiceRequest.fsh b/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-ServiceRequest.fsh
index 6ebf6a8d..84c494b4 100644
--- a/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-ServiceRequest.fsh
+++ b/input/fsh/instances/casestudies/5-biol-monit/5-biol-monit-ServiceRequest.fsh
@@ -34,7 +34,7 @@ Usage: #example
// ---- Patient --------
Instance: BeatBorer
InstanceOf: CHCorePatient
-Title: "Beat Borer"
+Title: "Patient: Beat Borer"
Description: "Example for CH-Core-Patient"
Usage: #example
* text.status = #additional
@@ -67,7 +67,7 @@ Usage: #example
// ---- PractitionerRole --------
Instance: PauloPorcelliniSuva
InstanceOf: CHCorePractitionerRole
-Title: "Paulo Porcellini Suva"
+Title: "PractitionerRole: Paulo Porcellini Suva"
Description: "PractitionerRole, refers to 5-biol-monit"
Usage: #example
* practitioner = Reference(Practitioner/PauloPorcellini)
@@ -75,7 +75,7 @@ Usage: #example
Instance: PauloPorcellini
InstanceOf: CHCorePractitionerEPR
-Title: "Paulo Porcellini"
+Title: "Practitioner: Paulo Porcellini"
Description: "Specialist for Occupational Medicine, works at SUVA, refers to 1-tvt"
Usage: #example
* identifier[GLN].system = "urn:oid:2.51.1.3"
@@ -97,7 +97,7 @@ Usage: #example
Instance: Suva
InstanceOf: CHCoreOrganization
-Title: "SUVA"
+Title: "Organization: SUVA"
Description: "Insurance for occupational medicine, refers to 5-biol-monit"
Usage: #example
* identifier.system = "urn:oid:2.16.756.5.45"
@@ -120,7 +120,7 @@ Usage: #example
// ---- PractitionerRole --------
Instance: WoodyWorkdocSpeiserRails
InstanceOf: CHCorePractitionerRole
-Title: "Woody Workdoc Speiser Rails"
+Title: "PractitionerRole: Woody Workdoc Speiser Rails"
Description: "PractitionerRole, refers to 5-biol-monit"
Usage: #example
* practitioner = Reference(Practitioner/WoodyWorkdoc)
@@ -128,7 +128,7 @@ Usage: #example
Instance: WoodyWorkdoc
InstanceOf: CHCorePractitionerEPR
-Title: "Woody Worksdoc"
+Title: "Practitioner: Woody Worksdoc"
Description: "Works doctor, works at SpeiserRails, refers to 5-biol-monit"
Usage: #example
* identifier[GLN].system = "urn:oid:2.51.1.3" //GLN
@@ -150,7 +150,7 @@ Usage: #example
Instance: SpeiserRails
InstanceOf: CHCoreOrganization
-Title: "Speiser Rails"
+Title: "Organization: Speiser Rails"
Description: "Example for Manufacturer, refers to 5-biol-monit"
Usage: #example
* identifier.system = "urn:oid:2.16.756.5.45" // BER (Business and Enterprise Register)
@@ -171,7 +171,7 @@ Usage: #example
Instance: HealthInsuranceCardBeatBorer
InstanceOf: Coverage
-Title: "HealthInsuranceCard"
+Title: "Coverage: HealthInsuranceCard Beat Borer"
Description: "Example for Insurance"
Usage: #example
* identifier.system = "http://ehic.com/insurer/123456789/member"
@@ -187,7 +187,7 @@ Usage: #example
// ---- Specimen ---------------
Instance: Blood-biol-monit
InstanceOf: Specimen
-Title: "Blood Sample"
+Title: "Blood Sample, 5-biol-monit"
Description: "Example for Specimen for Haematological Examination"
Usage: #example
* status = #available
@@ -202,7 +202,7 @@ Usage: #example
Instance: Urine-biol-monit
InstanceOf: Specimen
-Title: "Urine Sample"
+Title: "Urine Sample, 5-biol-monit"
Description: "Example for Specimen of Urin"
Usage: #example
* identifier.value = "11111-15394-75465"
diff --git a/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-DocumentByForm.fsh b/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-DocumentByForm.fsh
index 3eb4eba9..3291e55b 100644
--- a/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-DocumentByForm.fsh
+++ b/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-DocumentByForm.fsh
@@ -1,7 +1,7 @@
Instance: 6-histopath-DocumentByForm
InstanceOf: ChOrfDocument
Title: "CH LAB-Order by Form 6-histopath"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Description: "Document for referral/order due to suspected deep vein thrombosis"
Usage: #example
* id = "6-histopath-document-by-form"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-ServiceRequestByForm.fsh b/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-ServiceRequestByForm.fsh
index 7d65daac..0ddce589 100644
--- a/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-ServiceRequestByForm.fsh
+++ b/input/fsh/instances/casestudies/6-histopath-by-form/6-histopath-ServiceRequestByForm.fsh
@@ -1,6 +1,6 @@
Instance: 6-histopath-ServiceRequestByForm
InstanceOf: ChOrfServiceRequest
-Title: "laborder 0-generic"
+Title: "Service Requst: laborder 0-generic"
Description: "Example for Service Request due to suspected melanoma of skin"
Usage: #example
* id = "6-histopath-service-request-by-form"
diff --git a/input/fsh/instances/casestudies/6-histopath/6-histopath-Composition.fsh b/input/fsh/instances/casestudies/6-histopath/6-histopath-Composition.fsh
index 510686ad..0176744b 100644
--- a/input/fsh/instances/casestudies/6-histopath/6-histopath-Composition.fsh
+++ b/input/fsh/instances/casestudies/6-histopath/6-histopath-Composition.fsh
@@ -1,5 +1,5 @@
Instance: 6-histopath-Composition
-InstanceOf: ChLabOrderComposition
+InstanceOf: ChLabOrderCompositionWithSR
Title: "Composition 6-histopath"
Description: "Composition: Storyboard for suspected Melanoma of skin"
Usage: #example
diff --git a/input/fsh/instances/casestudies/6-histopath/6-histopath-Document.fsh b/input/fsh/instances/casestudies/6-histopath/6-histopath-Document.fsh
index 34b0143f..7288e7fb 100644
--- a/input/fsh/instances/casestudies/6-histopath/6-histopath-Document.fsh
+++ b/input/fsh/instances/casestudies/6-histopath/6-histopath-Document.fsh
@@ -1,7 +1,7 @@
Instance: 6-histopath-Document
-InstanceOf: ChLabOrderDocument
+InstanceOf: ChLabOrderDocumentWithSR
Title: "CH LAB-Order 6-histopath"
-Description: "Example Bundle for referral/order due to suspected deep vein thrombosis"
+Description: "Document for referral/order due to suspected skin melanoma"
Usage: #example
* id = "6-histopath-document"
* meta.versionId = "1"
diff --git a/input/fsh/instances/casestudies/6-histopath/6-histopath-ServiceRequest.fsh b/input/fsh/instances/casestudies/6-histopath/6-histopath-ServiceRequest.fsh
index eb2d54d6..bdda953f 100644
--- a/input/fsh/instances/casestudies/6-histopath/6-histopath-ServiceRequest.fsh
+++ b/input/fsh/instances/casestudies/6-histopath/6-histopath-ServiceRequest.fsh
@@ -29,7 +29,7 @@ Usage: #example
Instance: SimoneStuder
InstanceOf: CHCorePatient
-Title: "Marina Rubella"
+Title: "Patient: Marina Rubella"
Description: "CH-Core-Patient, refers to 6-histopath"
Usage: #example
* text.status = #additional
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-chloride-serum.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-chloride-serum.fsh
index ef55f365..040d3aad 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-chloride-serum.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-chloride-serum.fsh
@@ -1,6 +1,7 @@
Instance: procedure-chloride-serum
InstanceOf: ActivityDefinition
-Description: "Service Serum Chloride"
+Title: "ActivityDefinition: Chloride"
+Description: "Procedure Chloride [Moles/volume] in Serum or Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-creatinine-serum.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-creatinine-serum.fsh
index e9655067..e637a933 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-creatinine-serum.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-creatinine-serum.fsh
@@ -1,5 +1,7 @@
Instance: procedure-creatinine-serum
InstanceOf: ActivityDefinition
+Title: "ActivityDefinition: Serum Creatinine"
+Description: "Procedure Creatinine [Mass/volume] in Serum or Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-SI.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-SI.fsh
index 0da629d2..ad59e5f5 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-SI.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-SI.fsh
@@ -1,6 +1,7 @@
Instance: procedure-crp-SI
InstanceOf: ActivityDefinition
-Description: "Service CRP"
+Title: "ActivityDefinition: CRP SI"
+Description: "Procedure C reactive protein [Moles/volume] in Serum or Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens-SI.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens-SI.fsh
index 395563ab..74b39292 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens-SI.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens-SI.fsh
@@ -1,6 +1,7 @@
Instance: procedure-crp-highsens-SI
InstanceOf: ActivityDefinition
-Description: "Service CRP"
+Title: "ActivityDefinition: CRP highsens SI"
+Description: "Procedure C reactive protein [Moles/volume] in Serum or Plasma by High sensitivity method"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
@@ -15,7 +16,7 @@ Usage: #example
* date = "2020-01-24T14:00:00+02:00"
* contact.telecom.system = #url
* contact.telecom.value = "http://hl7.org/Special/committees/orders"
-* description = "Potassium measurement procedure on in-vitro serum specimen"
+* description = "C reactive protein [Moles/volume] in Serum or Plasma by High sensitivity method"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
* purpose = "This _ActivityDefinition_ specifies the input specimens and observations needed to perform potassium level test on serum, and the output observation. It is referenced by any _PlanDefinition_ representing a lab service focusing on this test."
* effectivePeriod.start = "2022-04-01"
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens.fsh
index 57d154d0..6c8f293a 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp-highsens.fsh
@@ -1,6 +1,7 @@
Instance: procedure-crp-highsens
InstanceOf: ActivityDefinition
-Description: "Service CRP"
+Title: "ActivityDefinition: CRP highsens"
+Description: "Procedure C reactive protein [Mass/volume] in Serum or Plasma by High sensitivity method"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
@@ -9,13 +10,13 @@ Usage: #example
* identifier.value = "CRP_test"
* version = "0.1.0"
* name = "CRPMeasurementProcedure"
-* title = "Procedure - CRP measurement on in vitro blood serum - SI-Units"
+* title = "Procedure - CRP measurement on in vitro blood serum"
* status = #draft
* experimental = true
* date = "2020-01-24T14:00:00+02:00"
* contact.telecom.system = #url
* contact.telecom.value = "http://hl7.org/Special/committees/orders"
-* description = "Potassium measurement procedure on in-vitro serum specimen"
+* description = "C reactive protein [Mass/volume] in Serum or Plasma by High sensitivity method"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
* purpose = "This _ActivityDefinition_ specifies the input specimens and observations needed to perform potassium level test on serum, and the output observation. It is referenced by any _PlanDefinition_ representing a lab service focusing on this test."
* effectivePeriod.start = "2020-04-01"
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp.fsh
index 511f844f..38d0c699 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-crp.fsh
@@ -1,6 +1,7 @@
Instance: procedure-crp
InstanceOf: ActivityDefinition
-Description: "Service CRP"
+Title: "ActivityDefinition: CRP"
+Description: "Procedure C reactive protein [Mass/volume] in Serum or Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
@@ -9,13 +10,13 @@ Usage: #example
* identifier.value = "CRP_test"
* version = "0.1.0"
* name = "CRPMeasurementProcedure"
-* title = "Procedure - CRP measurement on in vitro blood serum - SI-Units"
+* title = "Procedure - CRP measurement on in vitro blood serum"
* status = #draft
* experimental = true
* date = "2020-01-24T14:00:00+02:00"
* contact.telecom.system = #url
* contact.telecom.value = "http://hl7.org/Special/committees/orders"
-* description = "Potassium measurement procedure on in-vitro serum specimen"
+* description = "CRP measurement procedure on in-vitro serum specimen"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
* purpose = "This _ActivityDefinition_ specifies the input specimens and observations needed to perform potassium level test on serum, and the output observation. It is referenced by any _PlanDefinition_ representing a lab service focusing on this test."
* effectivePeriod.start = "2020-04-01"
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-d-dimer.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-d-dimer.fsh
index 1ebbfe90..09466ba4 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-d-dimer.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-d-dimer.fsh
@@ -1,6 +1,7 @@
Instance: procedure-d-dimer
InstanceOf: ActivityDefinition
-Description: "Service Short Fibrin D-dimer FEU and DDU panel"
+Title: "ActivityDefinition: D-Dimer"
+Description: "Procedure Short Fibrin D-dimer FEU and DDU panel"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-hemoglobin-panel.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-hb-ht-panel.fsh
similarity index 77%
rename from input/fsh/instances/lab-compendium/ActivityDefinition/procedure-hemoglobin-panel.fsh
rename to input/fsh/instances/lab-compendium/ActivityDefinition/procedure-hb-ht-panel.fsh
index aecc10ca..07861f3d 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-hemoglobin-panel.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-hb-ht-panel.fsh
@@ -1,12 +1,13 @@
-Instance: procedure-hemoglobin-panel
+Instance: procedure-hb-ht-panel
InstanceOf: ActivityDefinition
-Description: "Service Hemoglobin Panel"
+Title: "ActivityDefinition: Hb-Ht-panel"
+Description: "Procedure Hemoglobin-Hematocrit measurement procedure on in-vitro blood specimen"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
-* url = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-hemoglobin-panel"
+* url = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-hb-ht-panel"
* identifier.use = #official
-* identifier.value = "hemoglobin_panel"
+* identifier.value = "Hemoglobin and Hematocrit panel (Bld)" // LOINC display name
* version = "0.1.0"
* name = "HemoglobinPanelProcedure"
* title = "Procedure - Hemoglobin and Hematocrit panel - Blood"
@@ -15,7 +16,7 @@ Usage: #example
* date = "2020-01-24T14:00:00+02:00"
* contact.telecom.system = #url
* contact.telecom.value = "http://hl7.org/Special/committees/orders"
-* description = "Potassium measurement procedure on in-vitro serum specimen"
+* description = "Hemoglobin-Hematocrit measurement procedure on in-vitro blood specimen"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
* purpose = "This _ActivityDefinition_ specifies the input specimens and observations needed to perform potassium level test on serum, and the output observation. It is referenced by any _PlanDefinition_ representing a lab service focusing on this test."
* effectivePeriod.start = "2020-04-01"
@@ -26,7 +27,7 @@ Usage: #example
* topic[+] = $sct#441689006 "Measurement of total hemoglobin concentration (procedure)"
* kind = #ServiceRequest
-* code = $loinc#59260-0 "Hemoglobin [Moles/volume] in Blood"
+* code = $loinc#24360-0 "Hemoglobin and Hematocrit panel - Blood"
* priority = #routine
* timingDuration = 30 'mn' "minutes"
* specimenRequirement = Reference(SpecimenDefinition/specimen-blood-EDTA)
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-potassium-serum.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-potassium-serum.fsh
index 16631ce2..cc6f10e0 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-potassium-serum.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-potassium-serum.fsh
@@ -1,6 +1,7 @@
Instance: procedure-potassium-serum
InstanceOf: ActivityDefinition
-Description: "Service Serum Kalium"
+Title: "ActivityDefinition: Potassium"
+Description: "Procedure Potassium [Moles/volume] in Serum or Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-blood-electrolyte.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-serum-electrolyte.fsh
similarity index 89%
rename from input/fsh/instances/lab-compendium/ActivityDefinition/procedure-blood-electrolyte.fsh
rename to input/fsh/instances/lab-compendium/ActivityDefinition/procedure-serum-electrolyte.fsh
index 8aa81256..22f3cdff 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-blood-electrolyte.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-serum-electrolyte.fsh
@@ -1,9 +1,11 @@
-Instance: procedure-blood-electrolyte
+Instance: procedure-serum-electrolyte
InstanceOf: ActivityDefinition
+Title: "ActivityDefinition: Electrolytes"
+Description: "Procedure Electrolytes 1998 panel - Serum or Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
-* url = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-blood-electrolyte"
+* url = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-serum-electrolyte"
* version = "0.1.0"
* name = "BloodElectrolyteProcedure"
* title = "Procedure - blood electrolyte (serum or plasma)"
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-sodium-serum.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-sodium-serum.fsh
index 3a7774dd..4ad1abef 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-sodium-serum.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-sodium-serum.fsh
@@ -1,6 +1,7 @@
Instance: procedure-sodium-serum
InstanceOf: ActivityDefinition
-Description: "Service Serum Natrium"
+Title: "ActivityDefinition: Sodium"
+Description: "Procedure Sodium [Moles/volume] in Serum or Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine-clearance.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine-clearance.fsh
index 6eab6e0a..a9816c47 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine-clearance.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine-clearance.fsh
@@ -1,5 +1,6 @@
Instance: procedure-urine24h-creatinine-clearance
InstanceOf: ActivityDefinition
+Title: "ActivityDefinition: Creatinine Clearance"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine.fsh
index 31ff01bf..711f053b 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine.fsh
@@ -1,5 +1,7 @@
Instance: procedure-urine24h-creatinine
InstanceOf: ActivityDefinition
+Title: "ActivityDefinition: Creatinine 24h Urine"
+Description: "Procedure Creatinine 24 hour urine panel - 24 hour Urine"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #en-US
diff --git a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-vitamin-d-serum.fsh b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-vitamin-d-serum.fsh
index 71718f0c..17aadda0 100644
--- a/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-vitamin-d-serum.fsh
+++ b/input/fsh/instances/lab-compendium/ActivityDefinition/procedure-vitamin-d-serum.fsh
@@ -1,20 +1,21 @@
Instance: procedure-vitamin-d-serum
InstanceOf: ActivityDefinition
+Title: "ActivityDefinition: Vit. D3"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabProcedureDefinition"
* language = #de-CH
* text.status = #additional
-* text.div = "\n
Additional Narrative in French language | Vue narrative en français :
\n
Procédure de dosage de la vitamine D dans le sang
\n
Elément clinique pertinent requis en entrée : ObservationDefinition/input-observation-context-for-vitamin-d
\n
Résultat en sortie : ObservationDefinition/example-observation-vitamin-d
\n
\n
Additional Narrative in French language | Vue narrative en français :
\n
Procedure 25-hydroxyvitamin D3 [Moles/volume] in Serum or Plasma
\n
Elément clinique pertinent requis en entrée : ObservationDefinition/input-observation-context-for-vitamin-d
\n
Résultat en sortie : ObservationDefinition/example-observation-vitamin-d
\n
> {
+ roundCorner 12
+}
+sprite $bProcess jar:archimate/business-object
+sprite $aService jar:archimate/application-service
+
+rectangle "Order Placer\n\nPatient Record System" as OP <<$bProcess>><> #Application
+rectangle "Order Filler (OF)\n\nLIS or LAS" as OF <<$bProcess>><> #Application
+rectangle "Order Result\n Tracker" as RT <<$bProcess>><> #Application
+rectangle "Automation Manager (AM)\nLaboratory Device Manager" as AM <<$aService>><> #Business
+rectangle "Laboratory Device (LD)\nAnalyzer" as LD <<$aService>><> #Business
+
+OF <-left- OP : [LAB-1]: Placer Order Management
+OF -left-> OP : [LAB-2]: Filler Order Management
+OF -down-> RT : [LAB-3]:\nOrder Result\nManagement
+OF -down-> AM : [LAB-4]:\nWork Order\nManagement
+OF <-down- AM : [LAB-5]:\nTest Results\nManagement
+AM <-down- LD: [LAB-22]:\nQuery for\nWOS
+AM -down-> LD: [LAB-21]:\nWOS\nDownload
+AM <-down- LD: [LAB-23]:\nWOS\nStatus\nChange
+
+
+legend left
+Meaning of sprites in Rectangels
+====
+<$bProcess> : HIS, PIS, LIS, Result Repo
+====
+<$aService> : Laboratory Service
+
+endlegend
+@enduml
\ No newline at end of file
diff --git a/input/images-source/ResouceOverview.plantuml b/input/images-source/ResouceOverview.plantuml
new file mode 100644
index 00000000..175d548a
--- /dev/null
+++ b/input/images-source/ResouceOverview.plantuml
@@ -0,0 +1,66 @@
+@startuml Resource Overview
+skinparam rectangle<> {
+ roundCorner 12
+}
+sprite $bProcess jar:archimate/business-object
+sprite $aService jar:archimate/application-service
+
+rectangle "ServiceRequest(1):\nLaboratory Order" as SR1 <<$aService>><> #Application
+rectangle "PractitionerRole(1)\nPrimary Lab" as PR1 <<$bProcess>><> #Business
+rectangle "Organization(1)\nPrimary Lab" as O1 <<$bProcess>><> #Business
+rectangle "Practitioner(1)\nPrimary Lab" as P1 <<$bProcess>><> #Business
+
+rectangle "PractitionerRole(2)\nSecondary Lab" as PR2 <<$bProcess>><> #Business
+rectangle "Organization(2)\nSecondary Lab" as O2 <<$bProcess>><> #Business
+rectangle "Practitioner(2)\nSecondary Lab" as P2 <<$bProcess>><> #Business
+
+rectangle "PractitionerRole\nReporting Lab" as PR <<$bProcess>><> #Business
+rectangle "Organization\nReporting Lab" as O <<$bProcess>><> #Business
+rectangle "Practitioner\nReporting Lab" as P <<$bProcess>><> #Business
+rectangle "Composition:\nLaboratory Report" as C <<$bProcess>><> #Business
+rectangle "Patient" as PAT <<$bProcess>><> #Business
+rectangle "ObservationResult:\nLaboratory" as OR <<$bProcess>><> #Business
+rectangle "Specimen:\nLaboratory" as SP <<$bProcess>><> #Business
+rectangle "Diagnostc Report:\nLaboratory Report" as DR <<$bProcess>><> #Business
+rectangle "ServiceRequest:\nLaboratory Order" as SR <<$aService>><> #Application
+
+DR -right-> SP : 0..*
+DR -down-> C : extension:\ndiagnosticReportCompositionR5
+DR -up-> SR : 0..*\nbasedOn
+DR -up-> OR : 0..*
+DR -left-> PAT : 1..1\nsubject
+
+OR <-up- C : section.entry
+OR -right-> OR : hasMember
+OR -down-> SP : 0..1
+
+SR <-right- SR : basedOn
+SR -up-> SP : specimen
+
+PAT <-up- C : subject\n1..1
+PAT <-down- SR : subject\n1..1
+PAT <-right- OR : subject\n1..1
+PAT <-right- SP : subject
+
+C -left-> PR : author\n1..*
+PR -down-> O : organization
+PR -down-> P : practitioner
+
+PR1 <-up- SR1 : author\n1..*
+PR1 -down-> O1 : organization
+PR1 -down-> P1 : practitioner
+
+PR2 <-up- SR1 : requester\n0..*
+PR2 -down-> O2 : organization
+PR2 -down-> P2 : practitioner
+
+
+legend left
+Meaning of sprites in Rectangels
+====
+<$bProcess> : Other Resources
+====
+<$aService> : Resource ServiceRequest
+
+endlegend
+@enduml
\ No newline at end of file
diff --git a/input/images-source/ResourceObservation.plantuml b/input/images-source/ResourceObservation.plantuml
new file mode 100644
index 00000000..5114f0ea
--- /dev/null
+++ b/input/images-source/ResourceObservation.plantuml
@@ -0,0 +1,26 @@
+@startuml Resource Observation
+skinparam rectangle<> {
+ roundCorner 12
+}
+sprite $bProcess jar:archimate/business-object
+sprite $aService jar:archimate/application-service
+
+rectangle "Observation Results(R5)\nLaboratory" as OBS <<$aService>><> #Application
+rectangle "ObservationDefinition(R5)\nLaboratory" as OBSD <<$bProcess>><> #Business
+rectangle "DeviceDefinition(R5)\nLaboratory" as D <<$bProcess>><> #Business
+rectangle "Device(R5)\nLaboratory" as DD <<$bProcess>><> #Business
+
+OBSD <-left- OBS : instantiates[x]
+OBSD -down-> D
+OBSD -down-> DD
+
+
+legend left
+Meaning of sprites in Rectangels
+====
+<$bProcess> : Other Resources
+====
+<$aService> : Resource ServiceRequest
+
+endlegend
+@enduml
\ No newline at end of file
diff --git a/input/images-source/activityDiagram.plantuml b/input/images-source/activityDiagram.plantuml
new file mode 100644
index 00000000..b12e96c7
--- /dev/null
+++ b/input/images-source/activityDiagram.plantuml
@@ -0,0 +1,30 @@
+@startuml DiagnosticReport state Diagram
+
+(*) -> "Register Orders\n and Specimens"
+ --> if "successful?" then
+
+ -->[true] "process tests"
+
+ if "all tests verified" then
+ ->[true] "final Report" as a3
+ else
+ if "Other tests successful" then
+ -left-> "partial Report"
+ else
+ -->[false] "send partial test"
+ endif
+ endif
+
+else
+
+ ->[false] "order cancelled"
+
+endif
+
+a3 --> if "last test" then
+ --> "action 7"
+else
+ -> "action 8"
+endif
+
+@enduml
diff --git a/input/images-source/archimageDiagram.plantuml b/input/images-source/archimageDiagram.plantuml
new file mode 100644
index 00000000..cc20eb20
--- /dev/null
+++ b/input/images-source/archimageDiagram.plantuml
@@ -0,0 +1,135 @@
+@startuml keyword
+archimate #Technology "VPN Server" as vpnServerA <>
+
+rectangle GO #lightgreen
+rectangle STOP #red
+rectangle WAIT #orange
+@enduml
+
+
+@startuml junctions
+!define Junction_Or circle #black
+!define Junction_And circle #whitesmoke
+
+Junction_And JunctionAnd
+Junction_Or JunctionOr
+
+archimate #Technology "VPN Server" as vpnServerA <>
+
+rectangle GO #lightgreen
+rectangle STOP #red
+rectangle WAIT #orange
+GO -up-> JunctionOr
+STOP -up-> JunctionOr
+STOP -down-> JunctionAnd
+WAIT -down-> JunctionAnd
+@enduml
+
+@startuml Example Business
+skinparam rectangle<> {
+ roundCorner 12
+}
+sprite $bProcess jar:archimate/business-process
+sprite $aService jar:archimate/application-service
+sprite $aComponent jar:archimate/application-component
+
+rectangle "Handle claim" as HC <<$bProcess>><> #Business
+rectangle "Capture Information" as CI <<$bProcess>><> #Business
+rectangle "Notify\nAdditional Stakeholders" as NAS <<$bProcess>><> #Business
+rectangle "Validate" as V <<$bProcess>><> #Business
+rectangle "Investigate" as I <<$bProcess>><> #Business
+rectangle "Pay" as P <<$bProcess>><> #Business
+
+HC *-down- CI
+HC *-down- NAS
+HC *-down- V
+HC *-down- I
+HC *-down- P
+
+CI -right->> NAS
+NAS -right->> V
+V -right->> I
+I -right->> P
+
+rectangle "Scanning" as scanning <<$aService>><> #Application
+rectangle "Customer admnistration" as customerAdministration <<$aService>><> #Application
+rectangle "Claims admnistration" as claimsAdministration <<$aService>><> #Application
+rectangle Printing <<$aService>><> #Application
+rectangle Payment <<$aService>><> #Application
+
+scanning -up-> CI
+customerAdministration -up-> CI
+claimsAdministration -up-> NAS
+claimsAdministration -up-> V
+claimsAdministration -up-> I
+Payment -up-> P
+
+Printing -up-> V
+Printing -up-> P
+
+rectangle "Document\nManagement\nSystem" as DMS <<$aComponent>> #Application
+rectangle "General\nCRM\nSystem" as CRM <<$aComponent>> #Application
+rectangle "Home & Away\nPolicy\nAdministration" as HAPA <<$aComponent>> #Application
+rectangle "Home & Away\nFinancial\nAdministration" as HFPA <<$aComponent>> #Application
+
+DMS .up.|> scanning
+DMS .up.|> Printing
+CRM .up.|> customerAdministration
+HAPA .up.|> claimsAdministration
+HFPA .up.|> Payment
+
+legend left
+Example from the "Archisurance case study" (OpenGroup).
+See
+====
+<$bProcess> :business process
+====
+<$aService> : application service
+====
+<$aComponent> : application component
+endlegend
+@enduml
+
+@startuml BusinessProcess rectangle
+skinparam roundcorner 12
+rectangle "Capture Information" as CI <<$archimate/business-process>> #Business #LightPink
+@enduml
+
+@startuml List possible sprites
+listsprite
+@enduml
+
+@startuml Relationship left
+!include
+Motivation_Stakeholder(StakeholderElement, "Stakeholder Description")
+Business_Service(BService, "Business Service")
+Rel_Composition_Left(StakeholderElement, BService, "Description for the relationship")
+@enduml
+
+@startuml Relationship down
+!include
+Motivation_Stakeholder(StakeholderElement, "Stakeholder Description")
+Business_Service(BService, "Business Service")
+Rel_Composition_Down(StakeholderElement, BService, "Description for the relationship")
+@enduml
+
+@startuml Relation Typesg
+left to right direction
+skinparam nodesep 4
+!include
+Rel_Triggering(i15, j15, Triggering)
+Rel_Specialization(i14, j14, Specialization)
+Rel_Serving(i13, j13, Serving)
+Rel_Realization(i12, j12, Realization)
+Rel_Influence(i11, j11, Influence)
+Rel_Flow(i10, j10, Flow)
+Rel_Composition(i9, j9, Composition)
+Rel_Association_dir(i8, j8, Association_dir)
+Rel_Association(i7, j7, Association)
+Rel_Assignment(i6, j6, Assignment)
+Rel_Aggregation(i5, j5, Aggregation)
+Rel_Access_w(i4, j4, Access_w)
+Rel_Access_rw(i3, j3, Access_rw)
+Rel_Access_r(i2, j2, Access_r)
+Rel_Access(i1, j1, Access)
+@enduml
diff --git a/input/images-source/diag.plantuml b/input/images-source/diag.plantuml
new file mode 100644
index 00000000..157e10fb
--- /dev/null
+++ b/input/images-source/diag.plantuml
@@ -0,0 +1,26 @@
+@startuml my simple order Require
+
+actor "Web User" as WebUser
+participant "Front End" as Portal
+participant Gateway
+participant "Identity \nServer" as IdentityServer
+
+WebUser -> Portal ++: Orders Request
+group Step: Authentication
+ Portal -> Gateway ++: GET /api/v1/orders \nBaerer Token
+ Gateway -> IdentityServer ++: Authenticate Token
+ IdentityServer --> IdentityServer : Validate\nToken
+ IdentityServer -> Gateway : Success, Token Validated
+else Authentication Failed
+ IdentityServer -> Gateway --: Request failed!
+ Gateway -> Portal : Authentication failure!
+ Portal -> WebUser : Login again
+ else Authentication Failed 3
+ IdentityServer -> Gateway --: Request failed!
+ Gateway -> Portal : Authentication failure!
+ Portal -> WebUser : Login again
+ note right : Authentication has failed
+end
+Portal -> WebUser --: Response
+
+@enduml
\ No newline at end of file
diff --git a/input/images-source/plantuml-tutorial.txt b/input/images-source/plantuml-tutorial.txt
new file mode 100644
index 00000000..86f95672
--- /dev/null
+++ b/input/images-source/plantuml-tutorial.txt
@@ -0,0 +1,6 @@
+https://www.youtube.com/watch?v=JqJpbNxIK90
+
+https://plantuml.com
+
+Archimate Diagram:
+https://plantuml.com/archimate-diagram
diff --git a/input/images-source/sequenceDiagram.plantuml b/input/images-source/sequenceDiagram.plantuml
new file mode 100644
index 00000000..b1898322
--- /dev/null
+++ b/input/images-source/sequenceDiagram.plantuml
@@ -0,0 +1,18 @@
+@startuml observation
+title SequenceDiagram as example
+hide footbox
+participant "1st actor" as DocumentSource
+participant "2nd actor" as DocumentRecipient
+autonumber
+activate DocumentSource
+activate DocumentRecipient
+DocumentSource -> DocumentRecipient : Request to provide DocumentReference with embedded Document
+DocumentRecipient -> DocumentRecipient : Extract the document
+DocumentRecipient -> DocumentRecipient : Validate document
+DocumentRecipient -> DocumentRecipient : Queue document for processing
+DocumentRecipient --> DocumentSource : Document accepted and queued for processing
+DocumentSource -> DocumentRecipient : Check if document has been processed
+DocumentRecipient --> DocumentSource : DocumentReference either completed, failed or in-progress
+deactivate DocumentSource
+deactivate DocumentRecipient
+@enduml
\ No newline at end of file
diff --git a/input/images-source/test.plantuml b/input/images-source/test.plantuml
new file mode 100644
index 00000000..15063ffe
--- /dev/null
+++ b/input/images-source/test.plantuml
@@ -0,0 +1,33 @@
+@startuml test
+
+class MyClass {
+ int count
+ --
+ int publicNumber
+ .. [Strings] ..
+ String name
+ --
+ methodOne()
+ methodTwo()
+}
+
+class YourClass {
+ -int privateCount
+ #int publicNumber
+ .. [Strings] ..
+ +String name
+ --
+ ~methodPackageProtected()
+ methodTwo()
+}
+
+class SecondClass {
+ int aSecretField
+ void secretMethod()
+}
+note left : this class is\na secretClass
+
+MyClass <-- SecondClass
+MyClass <--right-- ThirdClass
+
+@enduml
\ No newline at end of file
diff --git a/input/images/LabOrderByForm.png b/input/images/LabOrderByForm.png
deleted file mode 100644
index 4e5ea43b..00000000
Binary files a/input/images/LabOrderByForm.png and /dev/null differ
diff --git a/input/images/LabOrderBySR.png b/input/images/LabOrderBySR.png
deleted file mode 100644
index ba626e83..00000000
Binary files a/input/images/LabOrderBySR.png and /dev/null differ
diff --git a/input/images/LabOrderWithSR.png b/input/images/LabOrderWithSR.png
new file mode 100644
index 00000000..b3169fa1
Binary files /dev/null and b/input/images/LabOrderWithSR.png differ
diff --git a/input/images/LabOrderWithSR_andForm.png b/input/images/LabOrderWithSR_andForm.png
new file mode 100644
index 00000000..a76962cf
Binary files /dev/null and b/input/images/LabOrderWithSR_andForm.png differ
diff --git a/input/images/LabOrderWorkflow.svg b/input/images/LabOrderWorkflow.svg
new file mode 100644
index 00000000..bee2eb25
--- /dev/null
+++ b/input/images/LabOrderWorkflow.svg
@@ -0,0 +1 @@
+Order Placer Patient Record System Order Filler (OF) LIS or LAS Order Result Tracker Automation Manager (AM) Laboratory Device Manager Laboratory Device (LD) Analyzer [LAB-1]: Placer Order Management [LAB-2]: Filler Order Management [LAB-3]: Order Result Management [LAB-4]: Work Order Management [LAB-5]: Test Results Management [LAB-22]: Query for WOS [LAB-21]: WOS Download [LAB-23]: WOS Status Change Meaning of sprites in Rectangels : HIS, PIS, LIS, Result Repo : Laboratory Service to structure the administrative data (data provider, contact for order-document, recipient, copy recipient, document type and document class, patient, author). The analyses that are requested are available as code and as text in the ServiceRequest resource. This resource contains further important information about the requester and performer, the reason for the order, the medication, the conditions (the clinical context), the insurance and the material sample. This specimen ressource, in turn, contains information about the collection, the processing details, any required additives, and the container type to be used, among other things. So all the necessary information for executing the laboratory order is available for the receiving laboratory, and there is no necessity for a Questionnaire and QuestionnaireResponse resource. This quite common use case primarily occurs in hospitals that operate their own medical laboratory.
+#### Laboratory Order with Service Request
+
+This is the HL7 Swiss FHIR Implementation Guide for Laboratory Orders. Electronic Medical Records (EMR) systems can send an electronic laboratory order to a Laboratory Information System (the order filler of a LIS). The analyses that are requested are available as code and as text in the ServiceRequest resource. This resource contains further important information about the requester and performer, the reason for the order, the medication, the conditions (the clinical context), the insurance and the material sample. This specimen ressource, in turn, contains information about the collection, the processing details, any required additives, and the container type to be used, among other things. So all the necessary information for executing the laboratory order is available for the receiving laboratory, and there is no necessity for a Questionnaire and QuestionnaireResponse resource. This quite common use case primarily occurs in hospitals that operate their own medical laboratory.
[CH Core (R4) profiles](https://fhir.ch/ig/ch-core/index.html) and [CH EPR Term](https://fhir.ch/ig/ch-epr-term/2.0.9/index.html) are used to take account of national requirements.
-#### Order by Form (optional)
+#### Laboratory Order with Service Request and Form
-There is another use case in which the commissioning laboratory provides the client with a form, similar to how laboratories used to serve clients with paper-based forms. This situation is implemented here by including the two resources Questionnaire (form) and QuestionnaireResponse (completed form) in the document in addition to the ServiceRequest resource. CH-ORF (R4) Implementation Guide is also used here, which in turn uses the FHIR Implementation Guide for Structured Data Capture (SDC) for creating user-friendly questionnaires [SDC](https://build.fhir.org/ig/HL7/sdc/index.html) to offer user-friendly forms with pre-filled fields and selectable ValueSets.
+There is another use case in which the commissioning laboratory provides the client with a form, similar to how laboratories forms are used to serve clients with paper-based forms. The lab order takes the form of a FHIR bundle resource of type 'document' and uses the CH ORF (R4), Order & Referral by Form - Implementation Guide to structure the administrative data (data provider, contact for order-document, recipient, copy recipient, document type and document class, patient, author).This situation is implemented here using CH ORF (R4), Order & Referral by Form - Implementation Guide to structure the administrative data (data provider, contact for order-document, recipient, copy recipient, document type and document class, patient, author). It includes the two resources Questionnaire (form) and QuestionnaireResponse (completed form) in the document in addition to the ServiceRequest resource. CH-ORF (R4) Implementation Guide uses the FHIR Implementation Guide for Structured Data Capture (SDC) for creating user-friendly questionnaires [SDC](https://build.fhir.org/ig/HL7/sdc/index.html) to offer forms with pre-filled fields and selectable ValueSets.
#### Download
@@ -22,11 +24,15 @@ You can download this Implementation Guide in [NPM-format](https://confluence.hl
### Foundation
-Applications claiming for conformance with the CH LAB-Order Implementation Guide shall:
--Render (and in case of the Questionnaire filler allow for data entry) all elements of a questionnaire in the user interface (e.g. on screen, in print).
+#### Laboratory order with Service Request
+
+This implementation Guide uses FHIR Resources. The complete laboratory order is a bundle resource of type document. The first entry is the composition containing the structured data of the order (status, type, category, subject, encounter, date, author, confidentiality, attester etc.). A section element has an entry with the Service request reference.
+
+The ServiceRequest may instantiate a ActivityDefinition, a coded procedure to execute a single laboratory test (e.g. Sodium concentration in Serum), or to execute an entire test panel (e.g. concentration of Electrolytes in Serum). Using a ServiceRequest Container we can reference to other ServiceRequest Containers or to Single Test Service Requests.
+
+#### Laboratory order with Service Request and Form
-For Clinical Information: Grouping of items and the order of items within shall be adequately reproduced according to the Questionnaire.
-
+The lab order can optionally and in addition to the ServiceRequest contain forms as resources, which in this context are called Questionnaire and QuestionnairResponse. The structure of these forms is [based on ORF](http://fhir.ch/ig/ch-orf/ImplementationGuide/ch.fhir.ig.ch-orf). This allows the data for the laboratory order to be placed in a structured form.
### Management Summary
diff --git a/input/pagecontent/profiles.md b/input/pagecontent/profiles.md
index ad717df3..6709483e 100644
--- a/input/pagecontent/profiles.md
+++ b/input/pagecontent/profiles.md
@@ -1 +1,46 @@
-{% include table-profiles.xhtml %}
+
+
+
+
+### Profiles for CH LAB-Order with Service Request
+
+* [CH LAB-Order Composition with SR](StructureDefinition-ch-lab-order-composition-with-sr.html)
+Profile for CH LAB-Order Compostion with Service Request
+* [CH LAB-Order Document with SR](StructureDefinition-ch-lab-order-document-with-sr.html)
+Profile for CH LAB-Order Document with Service Request
+
+### Profiles for CH LAB-Order with Service Request and Form
+
+* [CH LAB-Order Composition with SR and Form](StructureDefinition-ch-lab-order-composition-with-sr-and-form.html)
+Profile for Compostion with Service Request and Form
+* [CH LAB-Order Document with SR and Form](StructureDefinition-ch-lab-order-document-with-sr-and-form.html)
+Profile for CH LAB-Order Document with Service Request and Form
+
+### Profiles for Service Requests
+
+* [CH LAB-Order-SR](StructureDefinition-ch-lab-order-SR.html)
+Profile for CH LAB-Order Service Request
+* [CH LAB-Order-SR Container](StructureDefinition-ch-lab-order-SR-container.html)
+Profile for CH LAB-Order Service Request Container
+* [CH LAB-Order-SR Single-test](StructureDefinition-ch-lab-order-SR-singletest.html)
+Profile for CH LAB-Order Service Request Single-test
+
+### Profile for Document Reference
+
+* [CH Core DocumentReference](StructureDefinition-ch-lab-document-reference.html)
+Profile to describe how to provide a reference to a document to make it available to a healthcare system.
+
+### Profile for Diagnostic Report
+
+* [CH LAB-Order DiagnosticReport](StructureDefinition-ch-lab-order-diagnostic-report.html)
+Definition for the Diagnosic Report resource in the context of CH LAB-Order.
+
+### Profile for Diagnosis Condition
+
+* [CH LAB-Order DiagnosticReport](StructureDefinition-ch-lab-order-diagnosis-condition.html)
+Definition for the Diagnosis Condition resource in the context of CH LAB-Order.
+
+### Profile for Medication
+
+* [CH LAB-Order Medication](StructureDefinition-ChLabOrderMedication.html)
+Medication in Lab Order
diff --git a/input/pagecontent/usecases-english.md b/input/pagecontent/usecases-english.md
index 6e77dbc8..cc057b50 100644
--- a/input/pagecontent/usecases-english.md
+++ b/input/pagecontent/usecases-english.md
@@ -4,16 +4,21 @@
│ UC-english is original, german and french are dependent │
╰───────────────────────────────────────────────────────────╯
-->
-### Use Case 1: Lab Order
+### Use Case 1: Generate a Laboratory Order Document
-The customer (e.g. a doctor) requires various laboratory tests for further diagnostics. He creates an order document in his Electronic Medical Records (EMR) system, which contains the administrative data structured in accordance with the CH ORF implementation guide and whose contents are available in the EMR. From the analyses provided by the LIS, he can select those that help him with his question, and he can also determine the samples corresponding to the analyses. For example, he wants to have glucose analysed in the blood and cerebrospinal fluid. The laboratory system can store the information on the required containers and any additives in the system. The pre-analytical conditions are specified.
-The order document is sent to the laboratory information system (LIS).
+{% include img.html img="LabOrderWorkflow.svg" caption="Fig.: Laboratory Order and Testing Workflow" width="60%" %}
+
+#### Lab Order (Service Request only)
+
+The customer (e.g. a doctor) requires various laboratory tests to supplement the diagnostic process. He creates an order document in his Electronic Medical Records (EMR) system, which contains the administrative data structured in accordance with the CH Core implementation guide and whose contents are available in the EMR. From the analyses provided by the LIS, he can select those that help him with his question, and he can also determine the samples corresponding to the analyses. For example, he wants to have glucose analysed in the blood and cerebrospinal fluid. The laboratory system can store the information on the required specimen containers and any additives in the system. The pre-analytical conditions are specified.
-He can also add information about the clinical context to the laboratory order: problem list, current medication list, questions about the prescribed analyses
+He can also add information about the clinical context to the laboratory order: problem list, current medication list, questions about the prescribed analyses.
+
+The order document is sent to the laboratory information system (LIS).
-Example document: [CH LAB-Order 0-best-practice](Bundle-0-best-practice-document.html)
+Example order document by ServiceRequest: [CH LAB-Order 0-best-practice](Bundle-0-best-practice-document.html)
-### Use Case 2: Lab Order by Form
+#### Lab Order by Form
The client (e.g., physician) requires various laboratory tests for further diagnostics. For this purpose, he creates an order document in his practice information system with the necessary information on the patient, laboratory test, samples, etc. The necessary sample material (serum, urine, cerebrospinal fluid, etc.) is stored in the corresponding order documents. The necessary sample material (serum, urine, cerebrospinal fluid) is collected in appropriate containers and clearly assigned to the order document (Specimen.identifier, Specimen.container.identifier). Samples can be examined in the own laboratory, or they have to be sent via mail or courier to the external laboratory. There, the laboratory information system assigns them their own identifier (Specimen.accessionIdentifier).
@@ -43,21 +48,20 @@ A form (Questionnaire) is presented to the client, which contains the following
Outside of this use case: the results are then reported back to the client.
-Example document: [CH LAB-Order 1-tvt by Form](Bundle-1-tvt-document-by-form.html)
+Example order document by form: [CH LAB-Order 1-tvt by Form](Bundle-1-tvt-document-by-form.html)
-### Use Case 3: Requesting additional examinations of the same sample
+### Use Case 3: Requesting additional tests of the same sample
-It is not uncommon for the results of laboratory tests to lead to the request for additional tests on the same sample. In the example 1-tvt, venous thrombophilia may be suspected, so that further laboratory tests can detect hereditary causes such as factor V Leiden mutation, prothrombin gene mutation, antithrombin deficiency, etc.
+It is not uncommon for the results of laboratory tests to lead to the request for additional tests on the same sample. Or in-house laboratory analyses are supplemented by further tests that can only be carried out in an external laboratory.
-* Details of the requested service
- * ServiceRequest.category is RequestForAdditionalExam
- *
+In the 2-pertussis example, the in-house laboratory tests (automated blood count, CRP) are supplemented by a search for Bordetella pertussis and parapertussis DNA in the throat swab, carried out by an external contract laboratory, in order to rule out whooping cough.
-### Use Case 4: Requesting existing lab results and images (out of scope)
+* The 2-pertussis-ServiceRequest is replaced by the
+ * 2-pertussis-ServiceRequest-add-test, which requests the examination of the throat swab searching for pertussis or parapertussis DNA
-Sometimes the physician also wants information about previous laboratory tests, e.g., to assess the prostate-specific antigen (PSA) trend. It is not covered here.
+Example Service Request: [CH LAB-Order 2-pertussis additional test](ServiceRequest-2-pertussis-service-request-add-test.html)
-### Use Case 5: Collective request for toxicological testing (biological monitoring)
+### Use Case 4: Collective request for toxicological testing (biological monitoring)
This use case corresponds to example 5-biol-monit. In order to assess the exposure of workers to chemical substances, measurements at the workplace are supplemented by occupational health checkups. The toxic substances themselves or their metabolites in serum or urine can be determined. The order is initiated by the occupational physician of the company or the insurance company. The problem of employee fluctuations must be kept in mind.
@@ -69,35 +73,14 @@ Examples are:
* Food industry: investigation on employee hygiene (e.g. salmonella contamination)
* Police investigations
-Example document: [CH LAB-Order 5-biol-monit](Bundle-5-biol-monit-document.html). Work lists are processed, which last over a longer period of time (days/weeks). Generally, specific examinations are requested on multiple patients.
-
-### Use Case 6: Suggestion of additional or alternative examinations by the laboratory physician (order recipient, receiver)
-
-After the laboratory order has been received and processed, the situation may arise in which the laboratory physician wishes to make suggestions for additional or alternative examinations to the author of the order. He can use the received order document for this purpose, exchange the personal data of the sender and receiver through his information system, and send it back with the suggestions for further or alternative laboratory examinations.
-
-* ServiceRequest.category: ProposalForAdditionalExam
+Work lists are processed, which last over a longer period of time (days/weeks). Generally, specific examinations are requested on multiple patients.
-### Use Case 7: Findings and further data on the patient's health status
+Example order document by ServiceRequest: [CH LAB-Order 5-biol-monit](Bundle-5-biol-monit-document.html).
-If this is of particular interest for the interpretation of the prescribed examination, it must be possible to include further data on the patient's state of health in the laboratory order. These are existing findings, medical reports and documents.
+Example order document by Form: [CH LAB-Order 5-biol-monit-form](Bundle-5-biol-monit-document-by-form.html).
-* ServiceRequest.reasonCode ServiceRequest.reasonReference
+### Use Case 5: Suggestion of additional or alternative examinations by the laboratory physician (order recipient, receiver)
-### Use Case 8: Information on the sample, preanalytics
-
-For certain tests, the order and sample alone are not sufficient to determine the laboratory result. In such cases, observations on the sample collection must be supplied to the laboratory. An example of this is the determination of creatinine clearance in 24 h urine. For this purpose, the laboratory must know the amount of urine collected during a certain period of time. Therefore the ordering party provides the laboratory with the urine volume, as well as a sample of the urine and serum.
-
-* Collected urine quantity: Specimen.collection.quantity.
-
-* Start and end of urine collection: Specimen.collection.collected[collectedPeriod] - start - end
-
-Another example is the Synacthen(ACTH) function test, where a basal Blood sample is collected in the morning fasting, followed immediately by the Synacthen injection, and a second Blood sample is collected an hour later.
-
-* Basal serum sample fasting and administration of Synacthen(ACTH): Specimen.collection.collected[collectedDateTime], a second sample is collected 60 minutes later: Specimen.collection.collected[collectedDateTime]
-
-### Use Case 9: Additional information on the context of the sample
-
-For Blood gas analyses, the amount of oxygen administered to the patient is of concern
+After the laboratory order has been received and processed, the situation may arise in which the laboratory physician wishes to make suggestions for additional or alternative examinations to the author of the order. He can use the received order document for this purpose, exchange the personal data of the sender and receiver through his information system, and send it back with the suggestions for further or alternative laboratory examinations.
-* ServiceRequest.reasonReference (Condition | Observation | DiagnosticReport)
-* ServiceRequest.supportingInfo, e.g. O2 4 liters/min.
+* ServiceRequest.category: ProposalForAdditionalExam
diff --git a/sushi-config.yaml b/sushi-config.yaml
index a6e922cd..d3954827 100644
--- a/sushi-config.yaml
+++ b/sushi-config.yaml
@@ -38,10 +38,16 @@ pages:
title: Use Cases in German
usecases-french.md:
title: Use Cases in French
- document-lo-by-form.md:
- title: CH LAB-Order by form
- document-lo.md:
- title: CH LAB-Order by Service Request
+ case-studies-english.md:
+ title: Case Studies in English
+ case-studies-german.md:
+ title: Case Studies in German
+ case-studies-french.md:
+ title: Case Studies in French
+ document-lo-sr-and-form.md:
+ title: CH LAB-Order with ServiceRequest and Form
+ document-lo-sr.md:
+ title: CH LAB-Order with Service Request
profiles.md:
title: Profiles
terminology.md: