Merge pull request #163 from samply/feat/specimen_improved_search

Modify DKTK_Strat_SPECIMEN to improve the search more sample centric
samply · Jan 22, 2025 · ed0b9ac · ed0b9ac
2 parents 2972b61 + 9645dcd
commit ed0b9ac
Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/resources/cql/DKTK_REPLACE_HISTOLOGY_STRATIFIER b/resources/cql/DKTK_REPLACE_HISTOLOGY_STRATIFIER
@@ -0,0 +1,4 @@
+define Histo:
+if InInitialPopulation then [Observation] else {} as List <Observation>
+
+define function Histology(histo FHIR.Observation):
diff --git a/resources/cql/DKTK_REPLACE_SPECIMEN_STRATIFIER b/resources/cql/DKTK_REPLACE_SPECIMEN_STRATIFIER
@@ -0,0 +1,4 @@
+define function SampleType(specimen FHIR.Specimen):
+specimen.type.coding.where(system = 'https://fhir.bbmri.de/CodeSystem/SampleMaterialType').code.first()
+
+define Specimen:
diff --git a/resources/cql/DKTK_STRAT_SPECIMEN_STRATIFIER b/resources/cql/DKTK_STRAT_SPECIMEN_STRATIFIER
@@ -2,4 +2,4 @@ define Specimen:
 if InInitialPopulation then [Specimen] else {} as List<Specimen>
 
 define function SampleType(specimen FHIR.Specimen):
-specimen.type.coding.where(system = 'https://fhir.bbmri.de/CodeSystem/SampleMaterialType').code.first()
+specimen.type.coding.where(system = 'https://fhir.bbmri.de/CodeSystem/SampleMaterialType').code.first()