Merge pull request #131 from samply/fix/histo_typo

Fix/histo typo
samply · Apr 12, 2024 · 843e8c0 · 843e8c0
2 parents c177fc1 + 6648cdf
commit 843e8c0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -142,6 +142,7 @@ jobs:
       # build-platforms: "linux/amd64"
       # If your actions generate an artifact in a previous build step, you can tell this workflow to download it
       artifact-name: '*'
+      push-to: dockerhub
     # This passes the secrets from calling workflow to the called workflow
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

diff --git a/resources/cql/DKTK_STRAT_HISTOLOGY_STRATIFIER b/resources/cql/DKTK_STRAT_HISTOLOGY_STRATIFIER
@@ -1,5 +1,5 @@
 define Histo:
 if InInitialPopulation then [Observation] else {} as List <Observation>
 
-define function Histlogoy(histo FHIR.Observation):
+define function Histology(histo FHIR.Observation):
  if histo.code.coding.where(code = '59847-4').code.first() is null then 0 else 1
diff --git a/resources/cql/DKTK_STRAT_PRIMARY_DIAGNOSIS_NO_SORT_STRATIFIER b/resources/cql/DKTK_STRAT_PRIMARY_DIAGNOSIS_NO_SORT_STRATIFIER
@@ -0,0 +1,4 @@
+define PrimaryDiagnosis:
+First(
+from [Condition] C
+where C.extension.where(url='http://hl7.org/fhir/StructureDefinition/condition-related').empty())
diff --git a/resources/test/measure_report_dktk.json b/resources/test/measure_report_dktk.json
@@ -5363,7 +5363,7 @@
             {
               "code": [
                 {
-                  "text": "Histlogoies"
+                  "text": "Histologies"
                 }
               ],
               "stratum": [

diff --git a/src/util.rs b/src/util.rs
@@ -493,7 +493,7 @@ mod test {
         assert_eq!(replace_cql(decoded_library), expected_result);
 
         let decoded_library = "DKTK_STRAT_HISTOLOGY_STRATIFIER";
-        let expected_result = "define Histo:\nif InInitialPopulation then [Observation] else {} as List <Observation>\n\ndefine function Histlogoy(histo FHIR.Observation):\n if histo.code.coding.where(code = '59847-4').code.first() is null then 0 else 1\n";
+        let expected_result = "define Histo:\nif InInitialPopulation then [Observation] else {} as List <Observation>\n\ndefine function Histology(histo FHIR.Observation):\n if histo.code.coding.where(code = '59847-4').code.first() is null then 0 else 1\n";
         assert_eq!(replace_cql(decoded_library), expected_result);
 
         let decoded_library = "INVALID_KEY";