#31: Reduction min cardinality Specimen.type from 1 to 0

ahdis · Dec 20, 2024 · adb89fe · adb89fe
1 parent de8e22d
commit adb89fe
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 21 deletions.
diff --git a/input/.DS_Store b/input/.DS_Store
diff --git a/input/fsh/LogicalModel.fsh b/input/fsh/LogicalModel.fsh
@@ -70,19 +70,18 @@ Cardinalities:
 * TestResult.ExecutionDateTime 1..1 dateTime "Date (-time) of test"
 * TestResult.Type 1..1 Element "Type of test"
 * TestResult.Type.Code 1..1 code "Coded data"
-* TestResult.Type.CodeSystem 1..1 uri "Identity fo the terminolgy system"
+* TestResult.Type.CodeSystem 1..1 uri "Identity fo the terminology system"
 * TestResult.Specimen 1..1 Element "Test sample"
 * TestResult.Specimen.CollectionDateTime 1..1 dateTime "Date (-time) of sample collection"
 * TestResult.Specimen.Type 1..1 code "Collection material"
 * TestResult.Specimen.Type.Code 0..1 code "Coded data"
-* TestResult.Specimen.Type.CodeSystem 0..1 uri "Identity fo the terminolgy system"
-* TestResult.Specimen.Type.Text 0..1 string "Remark that material is declared by Observation.code or non-mandatory"
+* TestResult.Specimen.Type.CodeSystem 0..1 uri "Identity fo the terminology system"
 * TestResult.Value 1..1 Element "Acutal test result"
 * TestResult.Value.Code 1..1 code "Coded data"
-* TestResult.Value.CodeSystem 1..1 uri "Identity fo the terminolgy system"
+* TestResult.Value.CodeSystem 1..1 uri "Identity fo the terminology system"
 * TestResult.Interpretation 1..1 Element "Interpretation of the test result"
 * TestResult.Interpretation.Code 1..1 code "Coded data"
-* TestResult.Interpretation.CodeSystem 1..1 uri "Identity fo the terminolgy system (HL7 ObservationInterpretation)"
+* TestResult.Interpretation.CodeSystem 1..1 uri "Identity fo the terminology system (HL7 ObservationInterpretation)"
 
 
 
@@ -158,7 +157,6 @@ Target: "hl7.org/fhir/r4"
 * TestResult.Specimen.Type -> "Bundle.entry[0].resource.section.entry.resolve().specimen.resolve().type"
 * TestResult.Specimen.Type.Code -> "Bundle.entry[0].resource.section.entry.resolve().specimen.resolve().type.coding.where(system='http://snomed.info/sct').code"
 * TestResult.Specimen.Type.CodeSystem -> "Bundle.entry[0].resource.section.entry.resolve().specimen.resolve().type.coding.where(system='http://snomed.info/sct').system"
-* TestResult.Specimen.Type.Text -> "Bundle.entry[0].resource.section.entry.resolve().specimen.resolve().type.text"
 * TestResult.Value -> "Bundle.entry[0].resource.section.entry.resolve().value.coding.where(system='http://snomed.info/sct')"
 * TestResult.Value.Code -> "Bundle.entry[0].resource.section.entry.resolve().value.coding.where(system='http://snomed.info/sct').code"
 * TestResult.Value.CodeSystem -> "Bundle.entry[0].resource.section.entry.resolve().value.coding.where(system='http://snomed.info/sct').system"

diff --git a/input/fsh/examples/1-NeisseriaGonorrhoeae-Broker/1bSpec-NeisseriaGonorrhoeae.fsh b/input/fsh/examples/1-NeisseriaGonorrhoeae-Broker/1bSpec-NeisseriaGonorrhoeae.fsh
@@ -3,7 +3,6 @@ InstanceOf: ChElmSpecimen
 Usage: #example
 Title: "1bSpec - Neisseria Gonorrhoeae"
 Description: "Example for a CH ELM Specimen: Laboratory"
-* type.text = "Material declared by Observation.code or non-mandatory"
 * subject = Reference(Pat-001)
 * collection.collectedDateTime = "2023-07-10T14:10:00+02:00"
 
diff --git a/input/fsh/examples/1-NeisseriaGonorrhoeae/1Spec-NeisseriaGonorrhoeae.fsh b/input/fsh/examples/1-NeisseriaGonorrhoeae/1Spec-NeisseriaGonorrhoeae.fsh
@@ -3,7 +3,6 @@ InstanceOf: ChElmSpecimen
 Usage: #example
 Title: "1Spec - Neisseria Gonorrhoeae"
 Description: "Example for a CH ELM Specimen: Laboratory"
-* type.text = "Material declared by Observation.code or non-mandatory"
 * subject = Reference(Pat-001)
 * collection.collectedDateTime = "2023-07-01"
 
diff --git a/input/fsh/examples/3Doc-CPE.fsh b/input/fsh/examples/3Doc-CPE.fsh
@@ -77,7 +77,6 @@ Usage: #inline
 Instance: 3Spec-Specimen
 InstanceOf: ChElmSpecimen
 Usage: #inline
-* type.text = "Material declared by Observation.code or non-mandatory"
 * subject = Reference(Pat-002)
 * collection.collectedDateTime = "2023-08-01"
 

diff --git a/input/fsh/examples/4Doc-Campylobacter.fsh b/input/fsh/examples/4Doc-Campylobacter.fsh
@@ -78,7 +78,6 @@ Usage: #inline
 Instance: 4Spec-Specimen
 InstanceOf: ChElmSpecimen
 Usage: #inline
-* type.text = "Material declared by Observation.code or non-mandatory"
 * subject = Reference(Pat-002)
 * collection.collectedDateTime = "2023-09-18"
 

diff --git a/input/fsh/examples/5Doc-TreponemaPallidum.fsh b/input/fsh/examples/5Doc-TreponemaPallidum.fsh
@@ -77,7 +77,6 @@ Usage: #inline
 Instance: 5Spec-Specimen
 InstanceOf: ChElmSpecimen
 Usage: #inline
-* type.text = "Material declared by Observation.code or non-mandatory"
 * subject = Reference(Pat-001)
 * collection.collectedDateTime = "2023-09-12"
 

diff --git a/input/fsh/examples/6Doc-Influenza.fsh b/input/fsh/examples/6Doc-Influenza.fsh
@@ -77,7 +77,6 @@ Usage: #inline
 Instance: 6Spec-Specimen
 InstanceOf: ChElmSpecimen
 Usage: #inline
-* type.text = "Material declared by Observation.code or non-mandatory"
 * subject = Reference(Pat-001)
 * collection.collectedDateTime = "2023-09-08"
 

diff --git a/input/fsh/examples/7Doc-SARSCoV2.fsh b/input/fsh/examples/7Doc-SARSCoV2.fsh
@@ -77,7 +77,6 @@ Usage: #inline
 Instance: 7Spec-Specimen
 InstanceOf: ChElmSpecimen
 Usage: #inline
-* type.text = "Material declared by Observation.code or non-mandatory"
 * subject = Reference(Pat-003)
 * collection.collectedDateTime = "2023-09-11"
 

diff --git a/input/fsh/profiles/Specimen.fsh b/input/fsh/profiles/Specimen.fsh
@@ -5,12 +5,10 @@ Title: "CH ELM Specimen: Laboratory"
 Description: "This CH ELM base profile constrains the Specimen resource for the purpose of laboratory test reports."
 * . ^short = "CH Lab Specimen: Laboratory"
 
-* type 1.. // Req. EU LAB
 * type ^short = "The mechanism to declare the collection material is described under 'Guidance - Laboratory Result'"
 * type.coding only ChElmCoding
 * type.coding from ChElmResultsCompleteSpec (required)
 * type.coding ..1
-* type.text = "Material declared by Observation.code or non-mandatory"
 
 * subject 1..
 * subject only Reference(ChElmPatient)

diff --git a/input/pagecontent/changelog.md b/input/pagecontent/changelog.md
@@ -4,7 +4,7 @@ All significant changes to this FHIR implementation guide will be documented on
 
 * additional publication examples
 * [#131](https://github.com/ahdis/ch-elm/issues/131) add check for ZSR number is valid
-
+* [#31](https://github.com/ahdis/ch-elm/issues/31) Reduction min cardinality Specimen.type from 1 to 0
 
 ### 1.7.0 2024/11/28
 

diff --git a/input/pagecontent/guidance.md b/input/pagecontent/guidance.md
@@ -54,8 +54,6 @@ The performed laboratory test is represented by a so called leading code from th
 * **Detection method**: organism specific culture
 * **Collection material**: urethra
 
-Note: The Specimen.type.text element in this case contains a fixed text as value: “Material declared by Observation.code or non-mandatory”.
-
 <span style="color:red;">Important note:</span>     
 The [ValueSet CH ELM Results Laboratory Observation](ValueSet-ch-elm-results-laboratory-observation.html) is a selection of LOINC or SNOMED codes related to notifiable diseases and their legal basis. The ValueSet can be adapted according to laboratory-specific needs - please contact the FOPH in this regard.
 

diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -26,11 +26,11 @@ contact:
         value: https://www.bag.admin.ch/bag/en/home/das-bag/kontakt-standort.html
 
 dependencies:
-  hl7.terminology: 5.4.0
+  hl7.terminology: 6.1.0
   hl7.fhir.eu.laboratory: 0.1.0
   hl7.fhir.uv.ips: 1.1.0
-  ch.fhir.ig.ch-lab-report: 1.0.0-ballot
-  ch.fhir.ig.ch-core: 5.0.0-ballot
+  ch.fhir.ig.ch-lab-report: 1.0.0
+  ch.fhir.ig.ch-core: 5.0.0
   hl7.fhir.uv.extensions.r4: 1.0.0
   hl7.fhir.extensions.r5: 4.0.1
 pages: