\n
@@ -26,7 +26,7 @@ Usage: #example
* extension.valuePeriod.end = "2022-12-31"
* identifier.use = #official
* identifier.system = "http://fhir.org"
-* identifier.value = "GantenbeinLabCompendium"
+* identifier.value = "GantenbeinLabCatalog"
* status = #preliminary
* type.text = "Catalog"
* category = http://terminology.hl7.org/CodeSystem/catalogType#protocol
diff --git a/input/fsh/instances/lab-compendium/Composition/Pipette-Catalog-Header.fsh b/input/fsh/instances/lab-compendium/Composition/Pipette-Catalog-Header.fsh
index 1d4719c8..5f7dc079 100644
--- a/input/fsh/instances/lab-compendium/Composition/Pipette-Catalog-Header.fsh
+++ b/input/fsh/instances/lab-compendium/Composition/Pipette-Catalog-Header.fsh
@@ -8,8 +8,8 @@ Usage: #example
* text.status = #additional
* text.div = "
\n
Additional Narrative:
\n
-
Laboratory compendium title: Labor Pipette - Directory of Diagnostic Services
\n
-
id: example-lab-compendium-header
\n
+
Laboratory catalog title: Labor Pipette - Directory of Diagnostic Services
\n
+
id: example-lab-catalog-header
\n
meta - profile: hl7.org/fhir/uv/order-catalog/StructureDefinition/CatalogHeader
\n
status: preliminary
\n
type: catalog
\n
@@ -26,7 +26,7 @@ Usage: #example
* extension.valuePeriod.end = "2022-12-31"
* identifier.use = #official
* identifier.system = "http://fhir.org"
-* identifier.value = "PipetteLabCompendium"
+* identifier.value = "PipetteLabCatalog"
* status = #preliminary
* type.text = "Catalog"
* category = http://terminology.hl7.org/CodeSystem/catalogType#protocol
diff --git a/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/clinical-focus-vitamin-d.fsh b/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/clinical-focus-vitamin-d.fsh
index bd5f6764..938c9b7b 100644
--- a/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/clinical-focus-vitamin-d.fsh
+++ b/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/clinical-focus-vitamin-d.fsh
@@ -1,6 +1,6 @@
ValueSet: ClinicalFocusVitaminD
Id: clinical-focus-vitamin-d
-Title: "All possible clinical contexts for vitamin D test"
+Title: "Vitamin D all possible clinical contexts for test"
Description: "Broadest value set that may be referenced by ObservationDefinition.validCodedValueSet"
* ^meta.lastUpdated = "2020-03-10T13:30:00.000+00:00"
* ^meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ObservationValueSet"
diff --git a/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/normal-contexts-vitamin-d.fsh b/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/normal-contexts-vitamin-d.fsh
index 06d9129d..b87b6a54 100644
--- a/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/normal-contexts-vitamin-d.fsh
+++ b/input/fsh/instances/lab-compendium/ObservationDefinition/ValueSet.fsh/normal-contexts-vitamin-d.fsh
@@ -1,10 +1,10 @@
ValueSet: NormalReasonsVitaminD
Id: normal-contexts-vitamin-d
-Title: "Contextes de remboursement du dosage de la vitamine D"
-Description: "Ce jeu de valeurs liste les réponses normales associées à la question \"contexte de prescription de l'examen dosage de la vitamine D\", autorisant le remboursement de cet examen (NABM 1139)."
+Title: "Kontexte für die Erstattung des Vitamin-D-Tests"
+Description: "Diese Valueset listet die Standardantworten auf die Frage \"Verordnungskontext für den Vitamin-D-Test\" auf, die eine Erstattung dieses Tests erlauben."
* ^meta.lastUpdated = "2020-03-10T07:30:00.000+00:00"
* ^meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ObservationValueSet"
-* ^language = #fr-FR
+* ^language = #de-CH
* ^url = "http://fhir.ch/ig/ch-lab-order/ValueSet/normal-contexts-vitamin-d"
* ^version = "0.1.0"
* ^status = #active
@@ -17,7 +17,15 @@ Description: "Ce jeu de valeurs liste les réponses normales associées à la qu
* ^immutable = false
* include codes from system SNOMED_CT where concept is-a #41345002 // Rickets (disorder) -- Rachitis
* include codes from system SNOMED_CT where concept is-a #4598005 // Osteomalacia (disorder)
-* include codes from system SNOMED_CT where concept is-a #737295003 // Transplanted kidney present (finding)
-* include codes from system SNOMED_CT where concept is-a #707206008 // Assessment for bariatric surgery (procedure)
+* include codes from system SNOMED_CT where concept is-a #312894000 // Osteopenia (disorder)
+* include codes from system SNOMED_CT where concept is-a #64859006 // Osteoporosis (disorder)
+* include codes from system SNOMED_CT where concept is-a #268029009 // Pathological fracture (disorder)
* include codes from system SNOMED_CT where concept is-a #443731004 // Assessment using falls risk assessment score for the elderly (procedure)
-* include codes from system SNOMED_CT where concept is-a #66999008 // Hyperparathyroidism (disorder) [not in orig file]
\ No newline at end of file
+* include codes from system SNOMED_CT where concept is-a #391040000 // At risk of osteoporotic fracture (finding)
+* include codes from system SNOMED_CT where concept is-a #90708001 // Kidney disease (disorder)
+* include codes from system SNOMED_CT where concept is-a #73132005 // Disorder of parathyroid gland (disorder)
+* include codes from system SNOMED_CT where concept is-a #119292006 //Disorder of gastrointestinal tract (disorder)
+* include codes from system SNOMED_CT where concept is-a #32230006 //Malabsorption syndrome (disorder)
+
+* include codes from system SNOMED_CT where concept is-a #235856003 // Disorder of liver (disorder)
+* include codes from system SNOMED_CT where concept is-a #182817000 // Drug prescription (situation)
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/ObservationDefinition/input-observation-context-for-vitamin-d.fsh b/input/fsh/instances/lab-compendium/ObservationDefinition/input-observation-context-for-vitamin-d.fsh
index 950a3f66..2cfc258c 100644
--- a/input/fsh/instances/lab-compendium/ObservationDefinition/input-observation-context-for-vitamin-d.fsh
+++ b/input/fsh/instances/lab-compendium/ObservationDefinition/input-observation-context-for-vitamin-d.fsh
@@ -3,9 +3,9 @@ InstanceOf: ObservationDefinition
Description: "Context des Vitamin-D Befundes"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/InputObservationDefinition"
-* language = #fr-FR
+* language = #de-CH
* text.status = #additional
-* text.div = "
\n
Additional Narrative - in French language | Vue narrative en français :
\n
Elément clinique pertinent "contexte clinique de la prescription du dosage de la vitamine D"
\n
Résultats multiples autorisés
\n
Types de résultats autorisés : concept codable (CodeableConcept)
\n
Valeurs autorisées : ValueSet/clinical-focus-vitamin-d
\n
Valeurs normales ouvrant droit à facturation : ValueSet/normal-contexts-vitamin-d
\n
"
+* text.div = "
\n
Additional Narrative - in French language | Vue narrative en français :
\n
Elément clinique pertinent "contexte clinique de la prescription du dosage de la vitamine D"
\n
Résultats multiples autorisés
\n
Types de résultats autorisés : concept codable (CodeableConcept)
\n
Valeurs autorisées : ValueSet/clinical-focus-vitamin-d
\n
Valeurs normales ouvrant droit à facturation : ValueSet/normal-contexts-vitamin-d
\n
"
* category = http://terminology.hl7.org/CodeSystem/observation-category#exam "Exam"
* code = $lnc#56820-4 "Problem context"
* permittedDataType = #CodeableConcept
diff --git a/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-duration.fsh b/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-duration.fsh
index d52e6105..b52d298f 100644
--- a/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-duration.fsh
+++ b/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-duration.fsh
@@ -1,6 +1,6 @@
Instance: observation-collection-duration
InstanceOf: ObservationDefinition
-Description: "Collection duration of specimen"
+Description: "Collection duration [h] of specimen"
Usage: #example
* meta.profile[0] = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/InputObservationDefinition"
* meta.profile[+] = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabObservationDefinition"
diff --git a/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-volume.fsh b/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-volume.fsh
index 2620deaf..625c8c2c 100644
--- a/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-volume.fsh
+++ b/input/fsh/instances/lab-compendium/ObservationDefinition/observation-collection-volume.fsh
@@ -1,6 +1,6 @@
Instance: observation-collection-volume
InstanceOf: ObservationDefinition
-Description: "Collection volume of specimen"
+Description: "Collection volume [mL] of specimen"
Usage: #example
* meta.profile[0] = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/InputObservationDefinition"
* meta.profile[+] = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabObservationDefinition"
diff --git a/input/fsh/instances/lab-compendium/ObservationDefinition/observation-vitamin-d.fsh b/input/fsh/instances/lab-compendium/ObservationDefinition/observation-vitamin-d.fsh
index f3d73c6d..bcdf20e1 100644
--- a/input/fsh/instances/lab-compendium/ObservationDefinition/observation-vitamin-d.fsh
+++ b/input/fsh/instances/lab-compendium/ObservationDefinition/observation-vitamin-d.fsh
@@ -3,9 +3,9 @@ InstanceOf: ObservationDefinition
Description: "Vitamin-D"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabObservationDefinition"
-* language = #fr-FR
+* language = #de-CH
* text.status = #additional
-* text.div = "
\n
Additional Narrative in French language | Vue narrative en français :
\n
Analyse de biologie médicale : dosage vitamine D dans sérum sanguin
\n
Catégorie : laboratoire
\n
Identification : 14635-7 |25-hydroxyvitamin D3 [Moles/volume] in Serum or Plasma| (http://loinc.org)
\n
Types de résultat autorisés : quantitatif, textuel
\n
Résultat multiples : non
\n
intitulé préféré sur compte rendu : Vitamine D
\n
Unité de mesure : pmol/L (http://unitsofmeasure.org)
\n
"
+* text.div = "
\n
Additional Narrative in French language | Vue narrative en français :
\n
Analyse de biologie médicale : dosage vitamine D dans sérum sanguin
\n
Catégorie : laboratoire
\n
Identification : 14635-7 |25-hydroxyvitamin D3 [Moles/volume] in Serum or Plasma| (http://loinc.org)
\n
Types de résultat autorisés : quantitatif, textuel
\n
Résultat multiples : non
\n
intitulé préféré sur compte rendu : Vitamine D
\n
Unité de mesure : pmol/L (http://unitsofmeasure.org)
\n
"
* category = http://terminology.hl7.org/CodeSystem/observation-category#laboratory "Laboratory"
* code = $lnc#14635-7 "25-hydroxyvitamin D3 [Moles/volume] in Serum or Plasma"
* permittedDataType[0] = #Quantity
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/Chloride-serum.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/Chloride-serum.fsh
index 3fdac9bc..8a597cc9 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/Chloride-serum.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/Chloride-serum.fsh
@@ -5,7 +5,7 @@ Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabServiceDefinition"
* language = #en-US
* extension[0].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/CatalogReference"
-* extension[=].valueReference = Reference(Composition/Pipette-Catalog-Header)
+* extension[=].valueReference = Reference(Composition/Gantenbein-Catalog-Header)
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode" // Analysen-Liste Code
* extension[=].valueCodeableConcept = http://www.ama-assn.org/go/cpt#CPTfakecode "Chloride, serum"
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode"
@@ -21,21 +21,21 @@ Usage: #example
* extension[=].valueString = "No specific limitation for this test"
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/RegulatorySummary"
* extension[=].valueString = "CLIA Law & Regulations apply"
-* url = "http://fhir.ch/ig/ch-lab-order/Catalog/PlanDefinition/chloride-serum"
+* url = "http://fhir.ch/ig/ch-lab-order/lab-compendium/PlanDefinition/chloride-serum"
* identifier.use = #official
* identifier.value = "Cl_serum_test"
* version = "0.1.0"
* name = "ChlorideSerumMeasurement"
* title = "Chloride measurement on in vitro blood serum"
* title.extension.extension[0].url = "lang"
-* title.extension.extension[=].valueCode = #fr-FR
+* title.extension.extension[=].valueCode = #de-CH
* title.extension.extension[+].url = "content"
* title.extension.extension[=].valueString = "Dosage du chloride sérique"
* title.extension.url = "http://hl7.org/fhir/StructureDefinition/translation"
* type = http://hl7.org/fhir/uv/order-catalog/CodeSystem/laboratory-service-definition-type#test "unitary measurement performed on an in vitro biologic specimen"
* status = #draft
* experimental = true
-* date = "2020-02-05T20:00:00+02:00"
+* date = "2023-06-05T20:00:00+02:00"
* contact.telecom.system = #url
* contact.telecom.value = "http://hl7.org/Special/committees/orders"
* description = "Chloride measurement on serum specimen"
@@ -51,9 +51,10 @@ Usage: #example
* relatedArtifact.url = "https://en.wikipedia.org/wiki/Chloride"
* action.extension.extension.extension.url = "Material"
* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-venous) "example-specimen-venous-serum-single-test"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-capillary) "example-specimen-capillary-serum-single-test"
* action.extension.extension.url = "ExclusiveGroup"
* action.extension.url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/SpecimenRequested"
* action.code.coding[0] = https://testdirectory.questdiagnostics.com/#733 "Chloride, Serum"
* action.code.coding[+] = $lnc#2075-0 "Chloride [Moles/volume] in Serum or Plasma"
* action.timingDuration = 30 'mn' "minutes"
-* action.definitionCanonical = "http://hl7.org/fhir/uv/order-catalog/ActivityDefinition/procedure-chloride-serum"
\ No newline at end of file
+* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-chloride-serum"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-Clearance.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-Clearance.fsh
index acecdc1d..8dbe5432 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-Clearance.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-Clearance.fsh
@@ -16,7 +16,7 @@ Usage: #example
* extension[=].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/BillingSummary"
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ScheduleSummary"
* extension[=].valueString = "Daily ; report on D0"
-* url = "http://fhir.ch/ig/ch-lab-order/Catalog/PlanDefinition/creatinine-clearance"
+* url = "http://fhir.ch/ig/ch-lab-order/lab-compendium/PlanDefinition/creatinine-clearance"
* version = "0.1.0"
* name = "UrineCreatinineClearancePanel"
* title = "24-hour urine creatinine clearance panel"
@@ -54,6 +54,6 @@ Usage: #example
* action.timingDuration = 2 'h' "hours"
* action.groupingBehavior = #logical-group
* action.selectionBehavior = #all
-* action.definitionCanonical = "http://hl7.org/fhir/uv/order-catalog/ActivityDefinition/procedure-urine24h-creatinine-clearance"
-* action.action[0].definitionCanonical = "http://hl7.org/fhir/uv/order-catalog/ActivityDefinition/procedure-serum-creatinine"
-* action.action[+].definitionCanonical = "http://hl7.org/fhir/uv/order-catalog/ActivityDefinition/procedure-urine24h-creatinine"
\ No newline at end of file
+* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine-clearance"
+* action.action[0].definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-serum-creatinine"
+* action.action[+].definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-serum.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-serum.fsh
index 056c776e..639519af 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-serum.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/Creatinine-serum.fsh
@@ -19,7 +19,7 @@ Usage: #example
* version = "0.1.0"
* name = "SerumCreatinineTest"
* title = "Serum creatinine test"
-* type = http://hl7.org/fhir/uv/order-catalog/CodeSystem/laboratory-service-definition-type#test
+* type = http://fhir.ch/ig/ch-lab-order/lab-compendium/CodeSystem/laboratory-service-definition-type#test
* status = #draft
* experimental = true
* date = "2020-02-12T19:00:00+01:00"
@@ -30,8 +30,8 @@ Usage: #example
* useContext.valueCodeableConcept = $v3ActCode#LABOE "laboratory test order entry task"
* useContext.valueCodeableConcept.text = "this panel is orderable"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
-* topic[0] = http://loinc.org#18719-5 "Chemistry studies (set)"
-* topic[+] = http://snomed.info/sct#166312007 "Blood chemistry"
+* topic[0] = $lnc#18719-5 "Chemistry studies (set)"
+* topic[+] = $sct#166312007 "Blood chemistry"
// * topic[+] = http://tools.cofrac.fr/documentation/SH-REF-08#BIOCHBM "Biochimie générale et spécialisée"
// * topic[+] = http://www.codage.ext.cnamts.fr/codif/nabm#13-01 "BIOCHIMIE - SANG"
* action.extension.extension[0].extension.url = "Material"
@@ -43,4 +43,4 @@ Usage: #example
* action.extension.url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/SpecimenRequested"
* action.code = $lnc#2160-0 "Creatinine [Mass/volume] in Serum or Plasma"
* action.timingDuration = 1 'h' "hour"
-* action.definitionCanonical = "http://hl7.org/fhir/uv/order-catalog/ActivityDefinition/procedure-serum-creatinine"
\ No newline at end of file
+* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-serum-creatinine"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/Panel-blood-electrolyte.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/Panel-blood-electrolyte.fsh
index cd7eb4e3..fe993307 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/Panel-blood-electrolyte.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/Panel-blood-electrolyte.fsh
@@ -21,11 +21,11 @@ Usage: #example
* extension[=].valueString = "Set up: Mon-Sat (Day shift or Night shift), Sun (Day shift); Report available: 1 day"
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LimitationSummary"
* extension[=].valueString = "No specific limitation for this panel"
-* url = "http://fhir.ch/ig/ch-lab-order/Catalog/PlanDefinition/panel-blood-electrolyte"
+* url = "http://fhir.ch/ig/ch-lab-order/lab-compendium/PlanDefinition/panel-blood-electrolyte"
* version = "0.1.0"
* name = "BloodElectrolytePanel"
* title = "Blood electrolyte panel (serum or plasma)"
-* type = http://hl7.org/fhir/uv/order-catalog/CodeSystem/laboratory-service-definition-type#panel "collection of tests and panels performed on one or more in vitro biologic specimens"
+* type = http://fhir.ch/ig/ch-lab-order/lab-compendium/CodeSystem/laboratory-service-definition-type#panel "collection of tests and panels performed on one or more in vitro biologic specimens"
* status = #draft
* experimental = true
* date = "2020-02-11T20:00:00+02:00"
@@ -35,14 +35,15 @@ Usage: #example
* useContext.code = http://terminology.hl7.org/CodeSystem/usage-context-type#task "Workflow Task"
* useContext.valueCodeableConcept = $v3ActCode#LABOE "laboratory test order entry task"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
-* topic[0] = http://loinc.org#18719-5 "Chemistry studies (set)"
-* topic[+] = http://snomed.info/sct#166312007 "Blood chemistry"
+* topic[0] = $lnc#18719-5 "Chemistry studies (set)"
+* topic[+] = $sct#166312007 "Blood chemistry"
// * topic[+] = http://tools.cofrac.fr/documentation/SH-REF-08#BIOCHBM "Biochimie générale et spécialisée"
// * topic[+] = http://www.codage.ext.cnamts.fr/codif/nabm#13-01 "BIOCHIMIE - SANG"
* action.extension.extension.extension.url = "Material"
-* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/Venous-Blood) "example-specimen-serum-plasma"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/specimen-serum-plasma) "Serum Plasma"
+
* action.extension.extension.url = "ExclusiveGroup"
* action.extension.url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/SpecimenRequested"
* action.code = $lnc#24326-1 "Electrolytes 1998 panel - Serum or Plasma"
* action.timingDuration = 30 'mn' "minutes"
-* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/Catalog/ActivityDefinition/procedure-blood-electrolyte"
\ No newline at end of file
+* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-blood-electrolyte"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/Panel-urine24h-creatinine.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/Panel-urine24h-creatinine.fsh
index 2be8f797..72640088 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/Panel-urine24h-creatinine.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/Panel-urine24h-creatinine.fsh
@@ -1,5 +1,6 @@
Instance: panel-urine24h-creatinine
InstanceOf: PlanDefinition
+Description: "Creatinine [Mass/time] 24 hour urine panel - 24 hour Urine"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabServiceDefinition"
* language = #en-US
@@ -37,9 +38,9 @@ Usage: #example
* topic[+] = $sct#409091002 "24 hour urine measurement (procedure)"
* action.extension.extension.extension.url = "Material"
-* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/example-specimen-urine-24h) "example-specimen-urine-24h"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/urine-24h) "example-specimen-urine-24h"
* action.extension.extension.url = "ExclusiveGroup"
* action.extension.url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/SpecimenRequested"
* action.code = $lnc#65634-8 "Creatinine 24 hour urine panel - 24 hour Urine"
* action.timingDuration = 2 'h' "hours"
-* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/Catalog/ActivityDefinition/procedure-urine24h-creatinine"
\ No newline at end of file
+* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-urine24h-creatinine"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/Potassium-serum.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/Potassium-serum.fsh
index a5fcaca4..e5753cbf 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/Potassium-serum.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/Potassium-serum.fsh
@@ -1,15 +1,15 @@
Instance: potassium-serum
InstanceOf: PlanDefinition
-Description: "Lab Service of Pipette Lab for Serum Potassium"
+Description: "Lab Service for Serum Potassium"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabServiceDefinition"
* language = #en-US
* extension[0].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/CatalogReference"
-* extension[=].valueReference = Reference(Composition/Pipette-Catalog-Header)
-* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode" // Analysen-Liste Code
+* extension[=].valueReference = Reference(Composition/Gantenbein-Catalog-Header)
+* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode"
* extension[=].valueCodeableConcept = http://www.ama-assn.org/go/cpt#CPTfakecode "Potassium, serum"
-* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode"
-* extension[=].valueCodeableConcept = https://medcodesearch.ch/de/AL/laboratory_analyses#1479.00 "Kalium Grosslabor"
+* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode" // Analysen-Liste Code
+* extension[=].valueCodeableConcept = https://medcodesearch.ch/de/AL/laboratory_analyses#1479.00
* extension[+].extension[0].url = "textualSummary"
* extension[=].extension[=].valueMarkdown = "no notable particularity for billing"
* extension[=].extension[+].url = "reimbursabilitySummary"
@@ -28,31 +28,32 @@ Usage: #example
* name = "PotassiumSerumMeasurement"
* title = "Potassium measurement on in vitro blood serum"
* title.extension.extension[0].url = "lang"
-* title.extension.extension[=].valueCode = #fr-FR
+* title.extension.extension[=].valueCode = #de-CH
* title.extension.extension[+].url = "content"
* title.extension.extension[=].valueString = "Dosage du potassium sérique"
* title.extension.url = "http://hl7.org/fhir/StructureDefinition/translation"
* type = http://hl7.org/fhir/uv/order-catalog/CodeSystem/laboratory-service-definition-type#test "unitary measurement performed on an in vitro biologic specimen"
* status = #draft
* experimental = true
-* date = "2020-02-05T20:00:00+02:00"
+* date = "2023-06-05T20:00:00+02:00"
* contact.telecom.system = #url
* contact.telecom.value = "http://hl7.org/Special/committees/orders"
* description = "Potassium measurement on serum specimen"
* useContext.code = http://terminology.hl7.org/CodeSystem/usage-context-type#task
* useContext.valueCodeableConcept = $v3ActCode#LABOE "laboratory test order entry task"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
-* topic[0] = http://loinc.org#18719-5 "Chemistry studies (set)"
-* topic[+] = http://snomed.info/sct#166312007 "Blood chemistry"
+* topic[0] = $lnc#18719-5 "Chemistry studies (set)"
+* topic[+] = $sct#166312007 "Blood chemistry"
// * topic[+] = http://tools.cofrac.fr/documentation/SH-REF-08#BIOCHBM "Biochimie générale et spécialisée"
// * topic[+] = http://www.codage.ext.cnamts.fr/codif/nabm#13-01 "BIOCHIMIE - SANG"
* relatedArtifact.type = #documentation
* relatedArtifact.citation = "Potassium (symbol K from Latin:kalium) is a key chemical element involved in neuron function and influencing osmotic balance between cells and interstitial fluid. Depletion in potassium levels results in deficient fluid and electrolyte balance in the body as well as various nervous and cardiac dysfunctions. Studies suggest diets high in potassium can reduce the risk of hypertension and possibly stroke. Foods rich in potassium include parsley, dried apricots, potatoes, bananas, avocados, soybeans, and bran, as well as most fruits, vegetables, meat and fish. Overall, clear cases of potassium deficiency are rare in healthy individuals."
* relatedArtifact.url = "https://en.wikipedia.org/wiki/Potassium"
* action.extension.extension.extension.url = "Material"
-* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/example-specimen-venous-serum-single-test) "example-specimen-venous-serum-single-test"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-venous) "example-specimen-venous-serum-single-test"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-capillary) "example-specimen-capillary-serum-single-test"
* action.extension.extension.url = "ExclusiveGroup"
* action.extension.url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/SpecimenRequested"
-* action.code.coding = http://loinc.org#2823-3 "Potassium [Moles/volume] in Serum or Plasma"
+* action.code.coding = $lnc#2823-3 "Potassium [Moles/volume] in Serum or Plasma"
* action.timingDuration = 30 'mn' "minutes"
-* action.definitionCanonical = "http://hl7.org/fhir/uv/order-catalog/ActivityDefinition/procedure-potassium-serum"
\ No newline at end of file
+* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-potassium-serum"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/Sodium-serum.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/Sodium-serum.fsh
index 4163f726..042a6f3c 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/Sodium-serum.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/Sodium-serum.fsh
@@ -5,7 +5,7 @@ Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabServiceDefinition"
* language = #en-US
* extension[0].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/CatalogReference"
-* extension[=].valueReference = Reference(Composition/Pipette-Catalog-Header)
+* extension[=].valueReference = Reference(Composition/Gantenbein-Catalog-Header)
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode" // Analysen-Liste Code
* extension[=].valueCodeableConcept = http://www.ama-assn.org/go/cpt#CPTfakecode "Sodium, serum"
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode"
@@ -28,14 +28,14 @@ Usage: #example
* name = "SodiumSerumMeasurement"
* title = "Sodium measurement on in vitro blood serum"
* title.extension.extension[0].url = "lang"
-* title.extension.extension[=].valueCode = #fr-FR
+* title.extension.extension[=].valueCode = #de-CH
* title.extension.extension[+].url = "content"
* title.extension.extension[=].valueString = "Dosage du sodium sérique"
* title.extension.url = "http://hl7.org/fhir/StructureDefinition/translation"
* type = http://hl7.org/fhir/uv/order-catalog/CodeSystem/laboratory-service-definition-type#test "unitary measurement performed on an in vitro biologic specimen"
* status = #draft
* experimental = true
-* date = "2020-02-05T20:00:00+02:00"
+* date = "2023-06-05T20:00:00+02:00"
* contact.telecom.system = #url
* contact.telecom.value = "http://hl7.org/Special/committees/orders"
* description = "Sodium measurement on serum specimen"
@@ -49,10 +49,11 @@ Usage: #example
* relatedArtifact.citation = "Sodium (Na) is a positively charged electrolyte and a mineral. Eighty-five percent of Na is located in the blood and lymph fluid. The hormone aldosterone that is secreted by the adrenal glands helps to regulate Na levels by signaling the kidneys to either retain or secrete it. Damage or disease to the kidneys can lead to dangerous fluctuations of sodium. Na plays a number of key roles in the homeostasis of the human body. It helps to maintain blood volume by osmotically pulling water into the blood vessels. Too much sodium in the blood may cause too much water to be brought into the blood vessels and lead to high blood pressure. Muscles and nerves conduct electrical impulses that require charged particles including Na. The electrical currents cause muscle cells to contract and nerve cells to relay electrical signals between them. Too little sodium can lead to muscle spasms, cramps, headache, irritability, restlessness, nausea and fatigue. Extreme hyponatremia can lead to confusion, hallucinations, decreased consciousness and coma. Conversely, hypernatremia can cause lethargy or restlessness, deep tendon reflexes, muscle spasticity and seizures."
* relatedArtifact.url = "https://loinc.org/2951-2/"
* action.extension.extension.extension.url = "Material"
-* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/example-specimen-venous-serum-single-test) "example-specimen-venous-serum-single-test"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-venous) "example-specimen-venous-serum-single-test"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-capillary) "example-specimen-capillary-serum-single-test"
* action.extension.extension.url = "ExclusiveGroup"
* action.extension.url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/SpecimenRequested"
* action.code.coding[0] = https://testdirectory.questdiagnostics.com/#733 "Sodium, Serum"
* action.code.coding[+] = $lnc#2951-2 "Sodium [Moles/volume] in Serum or Plasma"
* action.timingDuration = 30 'mn' "minutes"
-* action.definitionCanonical = "http://hl7.org/fhir/uv/order-catalog/ActivityDefinition/procedure-sodium-serum"
\ No newline at end of file
+* action.definitionCanonical = "http://fhir.ch/ig/ch-lab-order/lab-compendium/ActivityDefinition/procedure-sodium-serum"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/PlanDefinition/vitamin-d-serum.fsh b/input/fsh/instances/lab-compendium/PlanDefinition/vitamin-d-serum.fsh
index 857d3cae..8aa79d9e 100644
--- a/input/fsh/instances/lab-compendium/PlanDefinition/vitamin-d-serum.fsh
+++ b/input/fsh/instances/lab-compendium/PlanDefinition/vitamin-d-serum.fsh
@@ -2,9 +2,9 @@ Instance: vitamind-serum
InstanceOf: PlanDefinition
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabServiceDefinition"
-* language = #fr-FR
+* language = #de-CH
* text.status = #additional
-* text.div = "
\n
Additional Narrative in French language | Vue narrative en français :
\n
Examen de biologie médicale monoparamétrique :
\n
Dosage de la 25-(OH)-vitamine D (D2 + D3)
\n
description : Vitamine D dosée sur échantillon de sérum
\n
prescriptible : oui
\n
délai de rendu : 120 minutes
\n
"
+* text.div = "
\n
Additional Narrative in French language | Vue narrative en français :
\n
Examen de biologie médicale monoparamétrique :
\n
Dosage de la 25-(OH)-vitamine D (D2 + D3)
\n
description : Vitamine D dosée sur échantillon de sérum
\n
prescriptible : oui
\n
délai de rendu : 120 minutes
\n
"
* extension[0].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/CatalogReference"
* extension[=].valueReference = Reference(Composition/Pipette-Catalog-Header)
* extension[+].url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/ServiceBillingCode"
@@ -23,7 +23,7 @@ Usage: #example
* name = "VitaminDMeasurement"
* title = "Dosage de la vitamine D dans le sang"
* title.extension.extension[0].url = "lang"
-* title.extension.extension[=].valueCode = #fr-FR
+* title.extension.extension[=].valueCode = #de-CH
* title.extension.extension[+].url = "content"
* title.extension.extension[=].valueString = "Dosage de la 25-(OH)-vitamine D (D2 + D3)"
* title.extension.url = "http://hl7.org/fhir/StructureDefinition/translation"
@@ -37,12 +37,13 @@ Usage: #example
* useContext.code = http://terminology.hl7.org/CodeSystem/usage-context-type#task
* useContext.valueCodeableConcept = $v3ActCode#LABOE "laboratory test order entry task"
* jurisdiction = http://unstats.un.org/unsd/methods/m49/m49.htm#001
-* topic[0] = http://loinc.org#18719-5 "Chemistry studies (set)"
-* topic[+] = http://snomed.info/sct#166312007 "Blood chemistry"
+* topic[0] = $lnc#18719-5 "Chemistry studies (set)"
+* topic[+] = $sct#166312007 "Blood chemistry"
// * topic[+] = http://tools.cofrac.fr/documentation/SH-REF-08#BIOCHBM "Biochimie générale et spécialisée"
// * topic[+] = http://www.codage.ext.cnamts.fr/codif/nabm#12 "PROTEINES - MARQUEURS TUMORAUX - VITAMINES"
* action.extension.extension.extension.url = "Material"
-* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/Venous-Blood) "example-specimen-venous-serum-single-test"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-venous) "example-specimen-venous-serum-single-test"
+* action.extension.extension.extension.valueReference = Reference(SpecimenDefinition/single-test-serum-capillary) "example-specimen-capillary-serum-single-test"
* action.extension.extension.url = "ExclusiveGroup"
* action.extension.url = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/SpecimenRequested"
* action.code = $lnc#14635-7 "25-hydroxyvitamin D3 [Moles/volume] in Serum or Plasma"
diff --git a/input/fsh/instances/lab-compendium/SpecimenDefinition/single-test-serum-capillary-fasting.fsh b/input/fsh/instances/lab-compendium/SpecimenDefinition/single-test-serum-capillary-fasting.fsh
new file mode 100644
index 00000000..d2e2e575
--- /dev/null
+++ b/input/fsh/instances/lab-compendium/SpecimenDefinition/single-test-serum-capillary-fasting.fsh
@@ -0,0 +1,41 @@
+Instance: single-test-serum-capillary-fasting
+InstanceOf: SpecimenDefinition
+Description: "Capillary Blood, 12 h fasting"
+Usage: #example
+* typeCollected = $sct#122554006 "Capillary blood specimen"
+* patientPreparation[0].text = "12 hour fasting"
+* patientPreparation[+] = $sct#263678003 "At rest"
+* timeAspect = "preferrably morning time"
+* typeTested[0].type = $sct#122554006 "Capillary blood specimen"
+* typeTested[=].preference = #preferred
+* typeTested[=].container.material = $sct#61088005 "plastic"
+* typeTested[=].container.type = $sct#767384004 "Evacuated blood collection tube with clot activator"
+* typeTested[=].container.cap = http://terminology.hl7.org/CodeSystem/container-cap#red
+* typeTested[=].container.cap.text = "red cap"
+* typeTested[=].container.description = "red cap plastic tube 2 mL"
+* typeTested[=].container.capacity = 2 'mL' "milliliter"
+* typeTested[=].container.minimumVolumeQuantity = 0.5 'mL' "milliliter"
+* typeTested[=].handling[0].temperatureQualifier.text = "Ambient temperature"
+* typeTested[=].handling[=].temperatureRange.low = 15 'Cel' "°C"
+* typeTested[=].handling[=].temperatureRange.high = 25 'Cel' "°C"
+* typeTested[=].handling[=].maxDuration = 60 'min' "minute"
+* typeTested[=].handling[+].temperatureQualifier.text = "Refrigerated temperature"
+* typeTested[=].handling[=].temperatureRange.low = 2 'Cel' "°C"
+* typeTested[=].handling[=].temperatureRange.high = 8 'Cel' "°C"
+* typeTested[=].handling[=].maxDuration = 8 'h' "hour"
+* typeTested[+].type = $sct#119361006 "Plasma specimen"
+* typeTested[=].preference = #alternate
+* typeTested[=].container.material = $sct#32039001 "glass"
+* typeTested[=].container.type = $sct#767390000 "Evacuated blood collection tube with heparin lithium and gel separator"
+* typeTested[=].container.cap = $container-cap#green "green cap"
+* typeTested[=].container.minimumVolumeQuantity = 2 'mL' "ml"
+* typeTested[=].rejectionCriterion[0] = $rejection-criteria#insufficient "insufficient specimen volume"
+* typeTested[=].rejectionCriterion[+] = $rejection-criteria#hemolized "hemolized specimen"
+* typeTested[=].handling[0].temperatureQualifier.text = "Ambient temperature"
+* typeTested[=].handling[=].temperatureRange.low = 15 'Cel' "°C"
+* typeTested[=].handling[=].temperatureRange.high = 25 'Cel' "°C"
+* typeTested[=].handling[=].maxDuration = 60 'min' "minute"
+* typeTested[=].handling[+].temperatureQualifier.text = "Refrigerated temperature"
+* typeTested[=].handling[=].temperatureRange.low = 2 'Cel' "°C"
+* typeTested[=].handling[=].temperatureRange.high = 8 'Cel' "°C"
+* typeTested[=].handling[=].maxDuration = 8 'h' "hour"
\ No newline at end of file
diff --git a/input/fsh/instances/lab-compendium/SpecimenDefinition/Venous-Blood-Fasting.fsh b/input/fsh/instances/lab-compendium/SpecimenDefinition/single-test-serum-venous-fasting.fsh
similarity index 85%
rename from input/fsh/instances/lab-compendium/SpecimenDefinition/Venous-Blood-Fasting.fsh
rename to input/fsh/instances/lab-compendium/SpecimenDefinition/single-test-serum-venous-fasting.fsh
index 6627f93a..2b175638 100644
--- a/input/fsh/instances/lab-compendium/SpecimenDefinition/Venous-Blood-Fasting.fsh
+++ b/input/fsh/instances/lab-compendium/SpecimenDefinition/single-test-serum-venous-fasting.fsh
@@ -1,4 +1,7 @@
-Instance: Venous-Blood-Fasting
+Instance: single-test-serum-venous-fasting
+
+// ---- must be renamed with single-test-venous-fasting ----
+// ---- single-test-capillary-fasting should be added ----
InstanceOf: SpecimenDefinition
Description: "Venous Blood, 12 h fasting"
Usage: #example
@@ -26,8 +29,8 @@ Usage: #example
* typeTested[=].container.type = $sct#767390000 "Evacuated blood collection tube with heparin lithium and gel separator"
* typeTested[=].container.cap = $container-cap#green "green cap"
* typeTested[=].container.minimumVolumeQuantity = 2 'mL' "ml"
-* typeTested[=].rejectionCriterion[0] = $rejectionCriteria#insufficient "insufficient specimen volume"
-* typeTested[=].rejectionCriterion[+] = $rejectionCriteria#hemolized "hemolized specimen"
+* typeTested[=].rejectionCriterion[0] = $rejection-criteria#insufficient "insufficient specimen volume"
+* typeTested[=].rejectionCriterion[+] = $rejection-criteria#hemolized "hemolized specimen"
* typeTested[=].handling[0].temperatureQualifier.text = "Ambient temperature"
* typeTested[=].handling[=].temperatureRange.low = 15 'Cel' "°C"
* typeTested[=].handling[=].temperatureRange.high = 25 'Cel' "°C"
diff --git a/input/fsh/instances/lab-compendium/SpecimenDefinition/Venous-Blood.fsh b/input/fsh/instances/lab-compendium/SpecimenDefinition/specimen-serum-plasma.fsh
similarity index 69%
rename from input/fsh/instances/lab-compendium/SpecimenDefinition/Venous-Blood.fsh
rename to input/fsh/instances/lab-compendium/SpecimenDefinition/specimen-serum-plasma.fsh
index 24683f2a..4c4f935f 100644
--- a/input/fsh/instances/lab-compendium/SpecimenDefinition/Venous-Blood.fsh
+++ b/input/fsh/instances/lab-compendium/SpecimenDefinition/specimen-serum-plasma.fsh
@@ -1,42 +1,42 @@
-Instance: Venous-Blood
+Instance: specimen-serum-plasma
InstanceOf: SpecimenDefinition
-Description: "Venous blood"
+Description: "Serum Plasma"
Usage: #example
* meta.profile = "http://hl7.org/fhir/uv/order-catalog/StructureDefinition/LabSpecimenDefinition"
* language = #en-US
-* typeCollected = http://terminology.hl7.org/CodeSystem/v2-0487#BLDV "Blood venous"
+* typeCollected = $v2-0487#BLDV "Blood venous"
* collection = $sct#28520004 "Venipuncture for blood test"
-* typeTested[0].type = http://terminology.hl7.org/CodeSystem/v2-0487#SER "Serum"
+* typeTested[0].type = $v2-0487#SER "Serum"
* typeTested[=].preference = #preferred
* typeTested[=].container.material = $sct#61088005 "Plastic"
* typeTested[=].container.material.text = "plastic"
* typeTested[=].container.type = $sct#767384004 "Evacuated blood collection tube with clot activator"
-* typeTested[=].container.cap = http://terminology.hl7.org/CodeSystem/container-cap#red
+* typeTested[=].container.cap = $container-cap#red
* typeTested[=].container.cap.text = "red cap"
* typeTested[=].container.description = "red cap plastic tube 5 mL"
* typeTested[=].container.capacity = 10 'mL' "milliliter"
* typeTested[=].container.minimumVolumeQuantity = 5 'mL' "milliliter"
* typeTested[=].retentionTime = 24 'h' "hour"
-* typeTested[=].rejectionCriterion[0] = http://terminology.hl7.org/CodeSystem/rejection-criteria#hemolized
+* typeTested[=].rejectionCriterion[0] = $rejection-criteria#hemolized
* typeTested[=].rejectionCriterion[=].text = "blood specimen hemolized"
-* typeTested[=].rejectionCriterion[+] = http://terminology.hl7.org/CodeSystem/rejection-criteria#insufficient
+* typeTested[=].rejectionCriterion[+] = $rejection-criteria#insufficient
* typeTested[=].rejectionCriterion[=].text = "insufficient quantity of specimen"
* typeTested[=].handling[0].temperatureQualifier.text = "room temperature or refrigerated"
* typeTested[=].handling[=].maxDuration = 7 'd' "day"
* typeTested[=].handling[+].temperatureQualifier.text = "frozen"
* typeTested[=].handling[=].maxDuration = 28 'd' "day"
-* typeTested[+].type = http://terminology.hl7.org/CodeSystem/v2-0487#PLAS "Plasma"
+* typeTested[+].type = $v2-0487#PLAS "Plasma"
* typeTested[=].preference = #alternate
* typeTested[=].container.type = $sct#767390000 "Evacuated blood collection tube with heparin lithium and gel separator"
-* typeTested[=].container.cap = http://terminology.hl7.org/CodeSystem/container-cap#green
+* typeTested[=].container.cap = $container-cap#green
* typeTested[=].container.cap.text = "green cap"
* typeTested[=].container.description = "green cap plastic tube 5 mL"
* typeTested[=].container.capacity = 10 'mL' "milliliter"
* typeTested[=].container.minimumVolumeQuantity = 5 'mL' "milliliter"
* typeTested[=].retentionTime = 24 'h' "hour"
-* typeTested[=].rejectionCriterion[0] = http://terminology.hl7.org/CodeSystem/rejection-criteria#hemolized
+* typeTested[=].rejectionCriterion[0] = $rejection-criteria#hemolized
* typeTested[=].rejectionCriterion[=].text = "blood specimen hemolized"
-* typeTested[=].rejectionCriterion[+] = http://terminology.hl7.org/CodeSystem/rejection-criteria#insufficient
+* typeTested[=].rejectionCriterion[+] = $rejection-criteria#insufficient
* typeTested[=].rejectionCriterion[=].text = "insufficient quantity of specimen"
* typeTested[=].handling[0].temperatureQualifier.text = "room temperature or refrigerated"
* typeTested[=].handling[=].maxDuration = 7 'd' "day"
diff --git a/input/fsh/instances/lab-compendium/SpecimenDefinition/Urine-24h.fsh b/input/fsh/instances/lab-compendium/SpecimenDefinition/urine-24h.fsh
similarity index 100%
rename from input/fsh/instances/lab-compendium/SpecimenDefinition/Urine-24h.fsh
rename to input/fsh/instances/lab-compendium/SpecimenDefinition/urine-24h.fsh
diff --git a/input/fsh/instances/lab-compendium/SpecimenDefinition/Urine-MS.fsh b/input/fsh/instances/lab-compendium/SpecimenDefinition/urine-MS.fsh
similarity index 100%
rename from input/fsh/instances/lab-compendium/SpecimenDefinition/Urine-MS.fsh
rename to input/fsh/instances/lab-compendium/SpecimenDefinition/urine-MS.fsh
diff --git a/input/fsh/instances/lab-compendium/SpecimenDefinition/Urine-Spot.fsh b/input/fsh/instances/lab-compendium/SpecimenDefinition/urine-Spot.fsh
similarity index 100%
rename from input/fsh/instances/lab-compendium/SpecimenDefinition/Urine-Spot.fsh
rename to input/fsh/instances/lab-compendium/SpecimenDefinition/urine-Spot.fsh
diff --git a/input/fsh/instances/organization/LaborSchildknecht.fsh b/input/fsh/instances/organization/LaborSchildknecht.fsh
new file mode 100644
index 00000000..b3fc294e
--- /dev/null
+++ b/input/fsh/instances/organization/LaborSchildknecht.fsh
@@ -0,0 +1,21 @@
+Instance: LaborSchildknecht
+InstanceOf: CHCoreOrganization
+Title: "Labor Schildknecht"
+Description: "Laboratory Organization, refers to all Storyboards"
+Usage: #example
+* identifier.system = "urn:oid:2.51.1.3"
+* identifier.value = "7601055231222"
+* name = "Labor Schildknecht"
+* telecom[0].system = #phone
+* telecom[=].value = "+41223345222"
+* telecom[=].use = #work
+* telecom[+].system = #email
+* telecom[=].value = "info@labor-schildknecht.ch"
+* telecom[=].use = #work
+* telecom[+].system = #url
+* telecom[=].value = "http://www.labor-schildknecht.ch"
+* telecom[=].use = #work
+* address.line = "Rte des Alpes 44"
+* address.city = "Fribourg"
+* address.postalCode = "1700"
+* address.country = "CH"
\ No newline at end of file
diff --git a/input/fsh/instances/specimen/Lsac.fsh b/input/fsh/instances/specimen/Lsac.fsh
index 26b6fb9a..865286dc 100644
--- a/input/fsh/instances/specimen/Lsac.fsh
+++ b/input/fsh/instances/specimen/Lsac.fsh
@@ -9,7 +9,7 @@ Usage: #example
* type = $sct#258450006 "Cerebrospinal fluid sample"
* subject = Reference(Patient/FranzMuster)
* receivedTime = "2020-08-16T16:40:17Z"
-* request = Reference(Lab)
+* request = Reference(LabOrder-ServiceRequest-generic)
* collection.collector = Reference(Practitioner/MarcMustermann)
* collection.collectedDateTime = "2020-08-16T06:40:17Z"
* collection.method = $sct#277762005 "Lumbar puncture (procedure)"
diff --git a/input/fsh/instances/specimen/Throat-swab.fsh b/input/fsh/instances/specimen/Throat-swab.fsh
index 9e52a212..8c39e783 100644
--- a/input/fsh/instances/specimen/Throat-swab.fsh
+++ b/input/fsh/instances/specimen/Throat-swab.fsh
@@ -9,7 +9,7 @@ Usage: #example
* type = $sct#258529004 "Throat swab (specimen)"
* subject = Reference(Patient/FranzMuster)
* receivedTime = "2020-08-16T16:40:17Z"
-* request = Reference(Lab)
+* request = Reference(LabOrder-ServiceRequest-generic)
* collection.collector = Reference(Practitioner/MarcMustermann)
* collection.collectedDateTime = "2020-08-16T06:40:17Z"
* collection.method = $sct#418932006 "Oral swab (specimen)"
diff --git a/input/fsh/instances/specimen/Urine-24h.fsh b/input/fsh/instances/specimen/Urine-24h.fsh
index 0781e181..5eb62af1 100644
--- a/input/fsh/instances/specimen/Urine-24h.fsh
+++ b/input/fsh/instances/specimen/Urine-24h.fsh
@@ -9,7 +9,7 @@ Usage: #example
* type = $sct#122575003 "Urine sample"
* subject = Reference(Patient/FranzMuster)
* receivedTime = "2020-08-16T16:40:17Z"
-* request = Reference(Lab)
+* request = Reference(LabOrder-ServiceRequest-generic)
* collection.collector = Reference(Practitioner/MarcMustermann)
* collection.collectedDateTime = "2020-08-16T06:40:17Z"
* container.identifier.value = "4e88a-bc987-dd888-12345-urin"
diff --git a/input/fsh/instances/specimen/Urine.fsh b/input/fsh/instances/specimen/Urine.fsh
index 4d051c3d..4c291f25 100644
--- a/input/fsh/instances/specimen/Urine.fsh
+++ b/input/fsh/instances/specimen/Urine.fsh
@@ -9,7 +9,7 @@ Usage: #example
* type = $sct#122575003 "Urine sample"
* subject = Reference(Patient/FranzMuster)
* receivedTime = "2020-08-16T16:40:17Z"
-* request = Reference(Lab)
+* request = Reference(LabOrder-ServiceRequest-generic)
* collection.collector = Reference(Practitioner/MarcMustermann)
* collection.collectedDateTime = "2020-08-16T06:40:17Z"
* container.identifier.value = "4e88a-bc987-dd888-12345-urin"
diff --git a/input/fsh/maps/LabOrderQrToBundle.map b/input/fsh/maps/LabOrderQrToBundle.map
index 280039c1..e64262fc 100644
--- a/input/fsh/maps/LabOrderQrToBundle.map
+++ b/input/fsh/maps/LabOrderQrToBundle.map
@@ -52,13 +52,13 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// } "item.answer";
// }
-// group ReasonServiceItems(source src : BackboneElement, target serviceRequest: ServiceRequest) {
-// src.item as item where (linkId.value = 'reason.question' and answer.exists()) then {
-// item.answer as answer then {
-// answer.value: string as value -> serviceRequest.reasonCode as reasonCode, reasonCode.text = value "reason.question";
-// } "answer.valueString";
-// } "item.answer";
-// }
+group ReasonServiceItems(source src : BackboneElement, target serviceRequest: ServiceRequest) {
+ src.item as item where (linkId.value = 'reason.question' and answer.exists()) then {
+ item.answer as answer then {
+ answer.value: string as value -> serviceRequest.reasonCode as reasonCode, reasonCode.text = value "reason.question";
+ } "answer.valueString";
+ } "item.answer";
+}
// group ImagingServiceItems(source src : BackboneElement, target serviceRequest: ServiceRequest) {
// src.item as item where (linkId.value = 'imagingService.type' and answer.exists()) then {
@@ -174,7 +174,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '64779008',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Blood coagulation disorder (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -199,7 +199,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '723188008',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Renal insufficiency (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id) then {
@@ -227,7 +227,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '19887002',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Claustrophobia (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -277,7 +277,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '397578001',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Device in situ (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id),
@@ -303,7 +303,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '34486009',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Hyperthyroidism (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -328,7 +328,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '73211009',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Diabetes mellitus (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -353,7 +353,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '366321006',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Finding of gravida (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -378,7 +378,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '293637006',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Allergy to contrast media (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -403,7 +403,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// condition.code as code,
// code.coding as coding2,
// coding2.code = '182817000',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Drug prescription (situation)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id),
@@ -423,7 +423,7 @@ group LabOrderQrToServiceRequest(source qr : QuestionnaireResponse, target patie
// observation.code as code,
// code.coding as coding2,
// coding2.code = '723188008', // FIXME needs to be changed
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Renal insufficiency (disorder)',
// condition.evidence as evidence,
// evidence.detail as detail,
diff --git a/input/fsh/profiles/ChLabOrderSRLabtest.fsh b/input/fsh/profiles/ChLabOrderSRLabtest.fsh
index a5c102a7..12a93a85 100644
--- a/input/fsh/profiles/ChLabOrderSRLabtest.fsh
+++ b/input/fsh/profiles/ChLabOrderSRLabtest.fsh
@@ -36,10 +36,10 @@ Description: "Definition for ServiceRequests as lab tests in a ChLabOrderSRConta
// * code from http://hl7.org/fhir/ValueSet/report-codes or $microbiol-procedures
-// Includes all codes defined in http://loinc.org
+// Includes all codes defined in $lnc
// * code from $microbiol-procedures
// * code from $sct
-// error 'Found a reference to a CodeSystem (http://snomed.info/sct) where a ValueSet belongs'
+// error 'Found a reference to a CodeSystem ($sct) where a ValueSet belongs'
// * code from $sct (example)
// * code ^binding.extension[=].valueString = "LOINC_Code"
diff --git a/input/fsh/profiles/ChLabOrderSRcontainer.fsh b/input/fsh/profiles/ChLabOrderSRcontainer.fsh
index daee5a95..5dc27f64 100644
--- a/input/fsh/profiles/ChLabOrderSRcontainer.fsh
+++ b/input/fsh/profiles/ChLabOrderSRcontainer.fsh
@@ -23,7 +23,7 @@ Description: "Definition for ServiceRequest Container in the context of CH LAB-O
// ---- instantiates Canonical
* instantiatesCanonical 1.. MS
-// * Is based On ChLabOrderSRLabtest or other SRConainer
+// * Is based On ChLabOrderSRLabtest or other SRContainer
* basedOn MS
* basedOn only Reference(ChLabOrderSRLabtest or ChLabOrderSRContainer) // Labtest or Selfreferential
diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
index 4cead064..83749a98 100644
--- a/input/ignoreWarnings.txt
+++ b/input/ignoreWarnings.txt
@@ -19,17 +19,10 @@ Code System URI 'http://fhir.ch/ig/ch-lab-order/CodeSystem/ch-lab-order-servicer
The Implementation Guide contains no examples for this profile
-# Allow Swiss specific display value
+# Allow specific display value
Wrong Display Name 'Clinical presentation' for http://loinc.org#55108-5 - should be one of 27 choices: 'Clinical presentation Document, "Clinical presentation Doc", "临床文档型" (zh-CN), "临床文档" (zh-CN), "文档" (zh-CN), "文书" (zh-CN), "医疗文书" (zh-CN), "临床医疗文书 医疗服务对象" (zh-CN), "客户" (zh-CN), "病人" (zh-CN), "病患" (zh-CN), "病号" (zh-CN), "超系统 - 病人 发现是一个原子型临床观察指标，并不是作为印象的概括陈述。体格检查、病史、系统检查及其他此类观察指标的属性均为发现。它们的标尺对于编码型发现可能是名义型，而对于叙述型文本之中所报告的发现，则可能是叙述型。" (zh-CN), "发现物" (zh-CN), "所见" (zh-CN), "结果" (zh-CN), "结论 文档.其他" (zh-CN), "杂项类文档" (zh-CN), "其他文档 时刻" (zh-CN), "随机" (zh-CN), "随意" (zh-CN), "瞬间 杂项" (zh-CN), "杂项类" (zh-CN), "杂项试验" (zh-CN), "Documentazione miscellanea Miscellanea Osservazione paziente Punto nel tempo (episodio)" (it-IT), "Документ Точка во времени" (ru-RU), "Момент" (ru-RU)' for the language(s) '--' (from Tx-Server) for 'http://loinc.org#55108-5'
-# The Display Name *should be* valid
-
-# Build errors
-
-The link 'http://hl7.org/fhir/R4/snomed.html' for "SNOMED CT" cannot be resolved
-
-
# French CodeSystem for insurance
No valid Display Names found for http://terminology.hl7.org/CodeSystem/v3-ActCode#LABOE in the language laboratory test order entry task for 'http://terminology.hl7.org/CodeSystem/v3-ActCode#LABOE'
diff --git a/input/pagecontent/casestudies-french.md b/input/pagecontent/casestudies-french.md
index 16b34b18..7abe2b38 100644
--- a/input/pagecontent/casestudies-french.md
+++ b/input/pagecontent/casestudies-french.md
@@ -72,3 +72,13 @@ Les entreprises reçoivent de l'AMV une liste comprenant des étiquettes avec le
Questionnaire FHIR correspondant à cette spécification:
[5-biol-monit.xml](https://fhir.ch/ig/ch-lab-order/Questionnaire-5-biol-monit.xml.html)
[5-biol-monit.json](https://fhir.ch/ig/ch-lab-order/Questionnaire-5-biol-monit.json.html)
+
+### Étude de cas n° 6 : suspicion de mélanome, demande d'examen histopathologique
+
+Une patiente de 45 ans s'est présentée pour un examen régulier de la peau et cette lésion a été observée : Naevus de jonction composé d'une zone séborrhéique à l'extrémité supérieure et d'un réseau atypique constitué de nombreux points, structures, etc. distincts, suggérant une implication mélanocytaire. Excision. Joindre les images dermatoscopiques // TODO Spécimen : Ellipse cutanée de 29 x 11 x 5 mm Site corporel : Dos paralombaire gauche
+
+L'échantillon de peau, le formulaire de commande et l'image dermatoscopique sont envoyés au laboratoire.
+
+Questionnaire FHIR correspondant à cette spécification:
+[6-histopath-mod.xml](https://fhir.ch/ig/ch-lab-order/Questionnaire-6-histopath-mod.xml.html)
+[6-histopath-mod.json](https://fhir.ch/ig/ch-lab-order/Questionnaire-6-histopath-mod.json.html)
diff --git a/input/pagecontent/casestudies-german.md b/input/pagecontent/casestudies-german.md
index c5d39665..d9fe5d43 100644
--- a/input/pagecontent/casestudies-german.md
+++ b/input/pagecontent/casestudies-german.md
@@ -73,3 +73,13 @@ Die Betriebe erhalten von der AMV eine Liste inkl. Etiketten mit den betroffenen
Dazu passendes FHIR Formular, welches dieser Spezifikation entspricht:
[5-biol-monit.xml](https://fhir.ch/ig/ch-lab-order/Questionnaire-5-biol-monit.xml.html)
[5-biol-monit.json](https://fhir.ch/ig/ch-lab-order/Questionnaire-5-biol-monit.json.html)
+
+### Fallbeispiel 6: Verdacht auf Melanom, Anordnung einer histopathologischen Untersuchung
+
+Eine 45-jährige Patientin kam zu ihrer regelmäßigen Hautuntersuchung und es wurde diese Läsion festgestellt: Verbindungsnävi, bestehend aus einem seborrhoischen Bereich am oberen Ende und einem atypischen Netzwerk aus vielen einzelnen Punkten, Strukturen usw., was auf eine melanozytäre Beteiligung hindeutet. Exzision. Beifügung dermatoskopischer Bilder // TODO Präparat: 29 x 11 x 5 mm Hautellipse Körperstelle: Rücken paralumbar links
+
+Die Hautprobe wird zusammen mit dem Auftragsformular und dem dermatoskopischen Bild an das Labor gesandt.
+
+Passende FHIR-Formular, das dieser Spezifikation entspricht:
+[6-histopath-mod.xml](https://fhir.ch/ig/ch-lab-order/Questionnaire-6-histopath-mod.xml.html)
+[6-histopath-mod.json](https://fhir.ch/ig/ch-lab-order/Questionnaire-6-histopath-mod.json.html)
diff --git a/maps/LabOrderQrToBundle.map b/maps/LabOrderQrToBundle.map
index 0d7a8f51..e53d2928 100644
--- a/maps/LabOrderQrToBundle.map
+++ b/maps/LabOrderQrToBundle.map
@@ -172,7 +172,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '64779008',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Blood coagulation disorder (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -197,7 +197,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '723188008',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Renal insufficiency (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id) then {
@@ -225,7 +225,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '19887002',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Claustrophobia (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -250,7 +250,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '879862001',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Body piercing (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -275,7 +275,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '397578001',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Device in situ (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id),
@@ -301,7 +301,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '34486009',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Hyperthyroidism (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -326,7 +326,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '73211009',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Diabetes mellitus (disorder)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -351,7 +351,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '366321006',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Finding of gravida (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -376,7 +376,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '293637006',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Allergy to contrast media (finding)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id)
@@ -401,7 +401,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// condition.code as code,
// code.coding as coding2,
// coding2.code = '182817000',
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Drug prescription (situation)',
// condition.subject as subject,
// subject.reference = ('urn:uuid:'+patient.id),
@@ -421,7 +421,7 @@ group ReasonServiceItems(source src : BackboneElement, target serviceRequest: Se
// observation.code as code,
// code.coding as coding2,
// coding2.code = '723188008', // FIXME needs to be changed
-// coding2.system = 'http://snomed.info/sct',
+// coding2.system = '$sct',
// coding2.display = 'Renal insufficiency (disorder)',
// condition.evidence as evidence,
// evidence.detail as detail,