Merge branch 'develop'

hl7ch · Jun 22, 2023 · 00c93a1 · 00c93a1
2 parents 99be1ee + dcf24b2
commit 00c93a1
Show file tree

Hide file tree

Showing 70 changed files with 3,383 additions and 4,155 deletions.
diff --git a/input/fsh/ALIASES.fsh b/input/fsh/ALIASES.fsh
@@ -1,6 +1,6 @@
 // Terminologies, CodeSystems
 Alias:  $sct                           = http://snomed.info/sct
-Alias:  $lnc                           = http://loinc.org
+Alias:  $loinc                         = http://loinc.org
 Alias:  $v2-0203                       = http://terminology.hl7.org/CodeSystem/v2-0203
 Alias:  $v2-0371                       = http://terminology.hl7.org/CodeSystem/v2-0371
 Alias:  $v2-0373                       = http://terminology.hl7.org/CodeSystem/v2-0373
@@ -15,6 +15,7 @@ Alias:  $report-codes                  = http://hl7.org/fhir/ValueSet/report-cod
 Alias:  $launchContext                 = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext
 Alias:  $microbiol-procedures          = http://fhir.ch/ig/ch-lab-order/ValueSet/MicrobiolProcedures
 Alias:  $shareablevalueset             = http://hl7.org/fhir/StructureDefinition/shareablevalueset
+Alias:  $launchContext                 = http://hl7.org/fhir/uv/sdc/CodeSystem/launchContext
 // Alias:  $L-Forms                       = http://terminology.hl7.org/3.1.0/CodeSystem/forms-codes
 
 // ---- Patient

diff --git a/input/fsh/instances/LabOrder-Composition.fsh b/input/fsh/instances/LabOrder-Composition.fsh
@@ -33,7 +33,7 @@ Usage: #example
 * author = Reference(MarcMustermannArztpraxis)
 
 * section[orderReferral].title = "Order-Referral-Form LabOrder"
-* section[orderReferral].code = $lnc#93037-0 "Portable medical order form"
+* section[orderReferral].code = $loinc#93037-0 "Portable medical order form"
 * section[orderReferral].text.status = #generated
 * section[orderReferral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n Order-Referral-Form LabOrder\n </div>"
 * section[orderReferral].entry[Questionnaire] = Reference(LabOrder-form)

diff --git a/input/fsh/instances/LabOrder-ServiceRequest-cc.fsh b/input/fsh/instances/LabOrder-ServiceRequest-cc.fsh
@@ -15,8 +15,8 @@ Usage: #example
 // What is being ordered
 // * basedOn = Reference(SR-example)
 // ---- Clinical Chemistry Tests ----
-* code.coding[0] = $lnc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
-* code.coding[+] = $lnc#76485-2 "C reactive protein [Moles/volume] in Serum or Plasma"
+* code.coding[0] = $loinc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
+* code.coding[+] = $loinc#76485-2 "C reactive protein [Moles/volume] in Serum or Plasma"
 
 // orderDetails: Additional order information, codeableConcept
 

diff --git a/input/fsh/instances/LabOrder-ServiceRequest-coag.fsh b/input/fsh/instances/LabOrder-ServiceRequest-coag.fsh
@@ -12,8 +12,8 @@ Usage: #example
 * category = $servicerequest-categories#RequestForLabExam "Anforderung Laboruntersuchung"
 
 // ---- Coagulation Tests ----
-* code.coding[0] = $lnc#55398-2 "Short Fibrin D-dimer FEU and DDU panel - Platelet poor plasma"
-* code.coding[+] = $lnc#38875-1 "INR in Platelet poor plasma or Blood by Coagulation assay"
+* code.coding[0] = $loinc#55398-2 "Short Fibrin D-dimer FEU and DDU panel - Platelet poor plasma"
+* code.coding[+] = $loinc#38875-1 "INR in Platelet poor plasma or Blood by Coagulation assay"
 
 // orderDetails: Additional order information, codeableConcept
 

diff --git a/input/fsh/instances/LabOrder-ServiceRequest-hem.fsh b/input/fsh/instances/LabOrder-ServiceRequest-hem.fsh
@@ -15,19 +15,19 @@ Usage: #example
 // code has an array of codings
 
 // Hematology
-* code.coding[0] = $lnc#24360-0 "Hemoglobin and Hematocrit panel - Blood"
-* code.coding[+] = $lnc#43113-0 "Hemoglobin electrophoresis panel in Blood"
-// * code.coding[+] = $lnc#57021-8 "CBC W Auto Differential panel - Blood"
-// * code.coding[+] = $lnc#58410-2 "CBC panel - Blood by Automated count"
-// * code.coding[+] = $lnc#57023-4 "Auto Differential panel - Blood"
+* 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[+] = $loinc#58410-2 "CBC panel - Blood by Automated count"
+// * code.coding[+] = $loinc#57023-4 "Auto Differential panel - Blood"
 
 // Coagulation
-// * code.coding[+] = $lnc#55398-2 "Short Fibrin D-dimer FEU and DDU panel - Platelet poor plasma"
-// * code.coding[+] = $lnc#38875-1 "INR in Platelet poor plasma or Blood by Coagulation assay"
+// * code.coding[+] = $loinc#55398-2 "Short Fibrin D-dimer FEU and DDU panel - Platelet poor plasma"
+// * code.coding[+] = $loinc#38875-1 "INR in Platelet poor plasma or Blood by Coagulation assay"
 
 // Chemistry
-// * code.coding[+] = $lnc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
-// * code.coding[+] = $lnc#76485-2 "C reactive protein [Moles/volume] in Serum or Plasma"
+// * code.coding[+] = $loinc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
+// * code.coding[+] = $loinc#76485-2 "C reactive protein [Moles/volume] in Serum or Plasma"
 
 // orderDetails: Additional order information, codeableConcept
 

diff --git a/input/fsh/instances/LabOrder-ServiceRequest.fsh b/input/fsh/instances/LabOrder-ServiceRequest.fsh
@@ -18,8 +18,8 @@ Usage: #example
 // What is being ordered
 // * basedOn = Reference(SR-example)
 // ---- Clinical Chemistry Tests ----
-// * code.coding[0] = $lnc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
-// * code.coding[+] = $lnc#76485-2 "C reactive protein [Moles/volume] in Serum or Plasma"
+// * code.coding[0] = $loinc#1988-5 "C reactive protein [Mass/Volume] in Serum or Plasma"
+// * code.coding[+] = $loinc#76485-2 "C reactive protein [Moles/volume] in Serum or Plasma"
 
 // orderDetails: Additional order information, codeableConcept