canql 5.3.0 → 5.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae3a56f2f18e07ba44242415dba078f1a95b7b23f151964a7d4609df6fd1de6a
-  data.tar.gz: 4b3ed23c5649700c5ad282fa59bc08f5b74b1e57cff818ed776bfc4ce3c1b178
+  metadata.gz: 7b6c774649dcffa9c8948ce5635e0a383a5dbb3f909fbc58e2ae01e08f2e8ea2
+  data.tar.gz: 77da684a8fe7ccfc0a8736c468a9f4c2baa438467baf5578054714c77da75c47
 SHA512:
-  metadata.gz: cb9f4a4566ac1489921fa2e154abf67fdda5453f19572331e06829a7195204dd81376221ae7b44cce4fc4e6f16b817d40cb3259aa3e91626094432412f09e6f5
-  data.tar.gz: 8f4151afa3555cbfdcd168131c893924c1edadeb5fb8d017a3ea1725d65f006c9040c68e9438285bbf76fa7f4382d64d2326f11abeb013e61877b77b90102fa0
+  metadata.gz: 5d8464c8d1ebe51731ab9f3116fdb16e53f450a23a837a210d9b5cef6746c43c4b45095168bb9df7ce0e4c36ec4b27bf56feb594ff80699fa63c330aab2b7108
+  data.tar.gz: 718b15cc009ef0a0830670bfcd29566c80a1fba33ca1741a2274a7ccc7b46ba6b82f29de9216d59e0e275846cff79a8076df0109627986c21889dc5189beea57

data/.github/workflows/test.yml

@@ -1,6 +1,6 @@
 name: Test
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   test:

data/CHANGELOG.md

@@ -1,22 +1,33 @@
 ## [Unreleased]
-* no relvent changes
+## 5.7.0 / 2021-09-16
+* Added new 'fasp' and 'fasp amber and green' case / patient / anomaly categoryfilters (#78)
+* Added new HES, BIOCHEM and USS unprocessed record filters (#79)
 
+## 5.6.0 / 2021-03-16
+### Added
+* Add new CA Death option to the unprocessed record filter (#75)
 
-## 5.3.0 / 2021-03-05
+## 5.5.0 / 2021-03-16
+### Added
+* Add HES event filter (#72)
 
+## 5.4.0 / 2021-03-08
+### Added
+* Add 'pending data' option to the anomaly screening status filter (#69)
+
+## 5.3.0 / 2021-03-05
+### Added
 * Added new FASP case RAG rating filters (#66)
 
 ## 5.2.0 / 2021-03-04
-
+### Added
 * Added new FASP anomaly RAG rating filters (#63)
 
 ## 5.1.0 / 2021-01-25
-
 ### Added
 * Added new filters for test acceptance requirments (#59)
 
 ## 5.0.0 / 2021-01-19
-
 ### Changed
 * Changed the values of registry to use registry name rather than codes and added new supra-region options (#54)
 

data/README.md

@@ -50,7 +50,7 @@ would output:
       and booking at hospital RGT01 and delivery at addenbrookes trust
 The parser is case insensitive. An example of an almost fully involved CANQL query is:
 
-> First 27 Male Liveborn Thames Primary Cases Due between 20/06/2015 and 25/06/2015 and Born on 22/06/2015 and that Died on 07/07/2015 with Suspected Prenatal Q20 Anomalies and Booking at hospital RGT01 and Delivery at addenbrookes trust and Postnatal Tests and Missing Postcode and Date of Birth and QA Action and Unprocessed paediatric records and Mother Born between 01/10/1990 and 10/01/1999 and who Died on 01/08/2015 with Populated Postcode and NHS Number
+> First 27 Male Liveborn Thames Primary Cases Due between 20/06/2015 and 25/06/2015 and Born on 22/06/2015 and that Died on 07/07/2015 with Suspected Prenatal Q20 Anomalies and Booking at hospital RGT01 and Delivery at addenbrookes trust and Postnatal Tests and Missing Postcode and Date of Birth and QA Action and Unprocessed paediatric records and hes records and Mother Born between 01/10/1990 and 10/01/1999 and who Died on 01/08/2015 with Populated Postcode and NHS Number
 
 Please see the tests for many more examples.
 

data/code_safety.yml

@@ -1,77 +1,77 @@
 ---
 file safety:
   ".github/CODEOWNERS":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: a964c47962d47724afd66ba59660589fc3c8b02c
   ".github/workflows/lint.yml":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 71f6a631758a5a38814d3eafec407e0fde30101f
   ".github/workflows/test.yml":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
-    safe_revision: 865fc970554fee9207f8e3cd0247133c6a849b24
+    safe_revision: a3f5265f1d20a6dcb8c45ab5f09207ca7d1e255c
   ".gitignore":
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: cbb48a04cbac04a6dce845110928f69492e152a1
   ".hound.yml":
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 0b34688f1198eace9310f47060aa8915f5b44985
   ".rubocop.yml":
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 146b255b240b0efc928d39dd1b70ab221ddc3138
   CHANGELOG.md:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 64a8f1007fe57afd5bd886e6b02b17b7a6e874c4
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 1f6f0da156ec3d26bfa9b77547646dae1c352b85
   CODE_OF_CONDUCT.md:
-    comments: 
+    comments:
     reviewed_by: drewthorp
     safe_revision: 6a666fcabe027056b1c774b2eabb3fdf686911d2
   Gemfile:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   LICENSE.txt:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: ee80c4bbd5e990d38b5fc954f4fd037177672db2
   README.md:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
-    safe_revision: 8c07968aa84db92b6f1cc528180f73530ddc6ff5
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   Rakefile:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   bin/console:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
   bin/setup:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6a666fcabe027056b1c774b2eabb3fdf686911d2
   canql.gemspec:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 146b255b240b0efc928d39dd1b70ab221ddc3138
   lib/canql.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/constants.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: d6f1ccac606735190d30c962b7681ed12aec374a
   lib/canql/grammars.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
-    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/grammars/age.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
@@ -80,41 +80,45 @@ file safety:
   lib/canql/grammars/anomaly.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: ollietulloch
-    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
+    reviewed_by: kenny.lee
+    safe_revision: 7580eb6b1196dec1fb778ee345d2bce50ef0f7c7
   lib/canql/grammars/batch_types.treetop:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 5bd6ccd1951140ab01b701583af94f414188b299
   lib/canql/grammars/dates.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: timgentry
     safe_revision: 2346abb4435bf95cbe9b4d8c124123b9fefe60d6
   lib/canql/grammars/e_base_records.treetop:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 4e26ac746098452b01dac88373e401e39f309b74
   lib/canql/grammars/genetic_test.treetop:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
+  lib/canql/grammars/hes_event.treetop:
+    comments:
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/grammars/main.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: josh.pencheon
-    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/grammars/patient.treetop:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
-    reviewed_by: ollietulloch
-    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
+    reviewed_by: kenny.lee
+    safe_revision: a69bbd63d71d5fb2ba46d6a84589915b1120763b
   lib/canql/grammars/perinatal_hospital.treetop:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
   lib/canql/grammars/provider.treetop:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
   lib/canql/grammars/registry.treetop:
@@ -128,150 +132,162 @@ file safety:
     reviewed_by: timgentry
     safe_revision: c39d24bb500719971969762e94545e82866bf92f
   lib/canql/grammars/test_result_group.treetop:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   lib/canql/nodes.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
-    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/age.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/anomaly.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   lib/canql/nodes/batch_types.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 1892161f3c300f3b199aa318b3fe23a54dd80829
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 49d17e254a95d50dea1448ca59fd45c44937d661
   lib/canql/nodes/dates.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/e_base_records.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
   lib/canql/nodes/genetic_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 526dbe8a3dc3334b4174928e6f51d07e48ed9247
+  lib/canql/nodes/hes_event.rb:
+    comments:
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/main.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
-    safe_revision: 361dea5dc6d64bdb7b03434dd2878f8c3b128c95
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/patient.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 49d17e254a95d50dea1448ca59fd45c44937d661
   lib/canql/nodes/perinatal_hospital.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: c431b8a476b84d077e9c39a2a13c2b17a296773d
   lib/canql/nodes/registry.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 4e26ac746098452b01dac88373e401e39f309b74
   lib/canql/nodes/test_result.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: c39d24bb500719971969762e94545e82866bf92f
   lib/canql/nodes/test_result_group.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   lib/canql/parser.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/treetop/extensions.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/version.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 64a8f1007fe57afd5bd886e6b02b17b7a6e874c4
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 1f6f0da156ec3d26bfa9b77547646dae1c352b85
   test/anomaly_test_helper.rb:
-    comments: 
+    comments:
     reviewed_by: ollietulloch
     safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   test/canql_test.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
+  test/hes_event_test_helper.rb:
+    comments:
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   test/minitest_helper.rb:
-    comments: 
+    comments:
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/anomaly_test.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    comments:
+    reviewed_by: ollietulloch
+    safe_revision: b0b092613c94a8c2f04191dbe2a1a347c8e14d16
   test/nodes/case_age_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/case_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
   test/nodes/code_test.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 7580eb6b1196dec1fb778ee345d2bce50ef0f7c7
   test/nodes/e_base_records_test.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 293248a17d087d7557a6aacdcb5bf3fbec946b87
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 5bd6ccd1951140ab01b701583af94f414188b299
   test/nodes/genetic_tests_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+  test/nodes/hes_event_test.rb:
+    comments:
+    reviewed_by: josh.pencheon
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   test/nodes/main_case_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/main_patient_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/mother_e_base_records_test.rb:
-    comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 4805609963f75639e2444df8f42d2d6d65005b7c
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: 99ef15c6610409a1562e6a03b015569d087b045f
   test/nodes/patient_age_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/patient_test.rb:
-    comments: 
-    reviewed_by: ollietulloch
-    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
+    comments:
+    reviewed_by: kenny.lee
+    safe_revision: a69bbd63d71d5fb2ba46d6a84589915b1120763b
   test/nodes/perinatal_hospital_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/registry_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 293248a17d087d7557a6aacdcb5bf3fbec946b87
   test/nodes/test_result_groups_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   test/nodes/test_results_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/parser_test.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
-    safe_revision: 293248a17d087d7557a6aacdcb5bf3fbec946b87
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   test/test_helper.rb:
-    comments: 
+    comments:
     reviewed_by: josh.pencheon
     safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4

data/lib/canql/grammars/anomaly.treetop

@@ -23,7 +23,7 @@ module Canql
        'ics' / 'ineligible unbooked' / 'inb' / 'early detected' / 'ied' /
        'screen declined' / 'sd' / 'ineligible early loss' / 'iefl' / 'ineligible top' /
        'itop' / 'missed screen' / 'ms' / 'excluded' / 'exc' / 'detected' /
-       'undetected' / 'ineligible') word_break
+       'undetected' / 'ineligible' / 'pending data') word_break
     end
 
     rule anomalies_keyword
@@ -47,7 +47,7 @@ module Canql
     end
 
     rule fasp_rating
-      ('fasp red and amber' / 'fasp amber and red' / 'fasp red' / 'fasp amber' / 'fasp green') <Nodes::Anomaly::SingleFaspRatingNode>
+      ('fasp amber and green' / 'fasp green and amber' / 'fasp red and amber' / 'fasp amber and red' / 'fasp red' / 'fasp amber' / 'fasp green') <Nodes::Anomaly::SingleFaspRatingNode>
     end
   end
 end

data/lib/canql/grammars/batch_types.treetop

@@ -1,7 +1,8 @@
 module Canql
   grammar BatchTypes
     rule batch_type
-      (paediatric / enote2 / badger / ucyto / nipt / rddeath / umum) <Nodes::BatchTypeNode>
+      (paediatric / enote2 / badger / ucyto / nipt / rddeath /
+      umum / ca_death / biochem / hes / uss) <Nodes::BatchTypeNode>
     end
 
     rule paediatric
@@ -24,12 +25,28 @@ module Canql
       'nipt' <Nodes::NiptNode>
     end
 
+    rule biochem
+      'biochem' <Nodes::BiochemNode>
+    end
+
+    rule hes
+      'hes' <Nodes::HesNode>
+    end
+
+    rule uss
+      ('uss' / 'ultrasound screening' ) <Nodes::UssNode>
+    end
+
     rule rddeath
-      ('rddeath' / 'rare disease death') <Nodes::RddeathNode>
+      ('rddeath' / 'rd death' / 'rare disease death') <Nodes::RddeathNode>
     end
 
     rule umum
       ('umum' / 'mum') <Nodes::UmumNode>
     end
+
+    rule ca_death
+     ('cadeath' / 'ca death' / 'congenital anomaly death') <Nodes::CADeathNode>
+    end
   end
 end

data/lib/canql/grammars/hes_event.treetop

@@ -0,0 +1,15 @@
+module Canql
+  grammar HesEvent
+    rule hes_events
+      and_keyword? existance_modifier:hes_no_keyword? hes_keyword <Nodes::HesEvent::WithCondition>
+    end
+
+    rule hes_no_keyword
+      space ('no' / 'some') word_break
+    end
+
+    rule hes_keyword
+      space ('hes events' / 'hes records') word_break
+    end
+  end
+end

data/lib/canql/grammars/main.treetop

@@ -6,6 +6,7 @@ grammar Canql
   include GeneticTest
   include TestResult
   include TestResultGroup
+  include HesEvent
   include Dates
   include EBaseRecords
   include BatchTypes
@@ -130,10 +131,11 @@ grammar Canql
   rule case_with_conditions
      anomalies / genetic_tests / test_results / perinatal_hospital /
      case_field_existance / test_acceptance_existance / test_result_groups /
-     mother_conditions / action_or_ebr
+     mother_conditions / action_or_ebr / hes_events
   end
 
   rule patient_with_conditions
-     anomalies / genetic_tests / test_results / patient_field_existance / action_or_ebr
+     anomalies / genetic_tests / test_results / patient_field_existance /
+     action_or_ebr / hes_events
   end
 end

data/lib/canql/grammars/patient.treetop

@@ -16,8 +16,9 @@ module Canql
       space category:('eurocat amber and green' /
         'eurocat red and amber' / 'eurocat red' / 'eurocat amber' /
         'eurocat green' / 'eurocat' /
-        'fasp red and amber' / 'fasp amber and red' / 'fasp red' /
-        'fasp amber' / 'fasp green' / 'fasp excluded'
+        'fasp red and amber' / 'fasp amber and red' /
+        'fasp amber and green' / 'fasp green and amber' / 'fasp red' /
+        'fasp amber' / 'fasp green' / 'fasp excluded' / 'fasp'
       ) word_break <Nodes::Patient::CategoryNode>
     end
 

data/lib/canql/grammars.rb

@@ -14,4 +14,5 @@ Treetop.load File.expand_path('grammars/patient', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/registry', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/provider', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/perinatal_hospital', File.dirname(__FILE__))
+Treetop.load File.expand_path('grammars/hes_event', File.dirname(__FILE__))
 Treetop.load File.expand_path('grammars/main', File.dirname(__FILE__))

data/lib/canql/nodes/batch_types.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module BatchTypeNode
       def to_type
@@ -39,6 +39,24 @@ module Canql #:nodoc: all
       end
     end
 
+    module BiochemNode
+      def normalise
+        'biochem'
+      end
+    end
+
+    module HesNode
+      def normalise
+        'hes'
+      end
+    end
+
+    module UssNode
+      def normalise
+        'uss'
+      end
+    end
+
     module RddeathNode
       def normalise
         'rd_death'
@@ -50,5 +68,11 @@ module Canql #:nodoc: all
         'umum'
       end
     end
+
+    module CADeathNode
+      def normalise
+        'ca_death'
+      end
+    end
   end
 end

data/lib/canql/nodes/hes_event.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Canql #:nodoc: all
+  module Nodes
+    module HesEvent
+      module WithCondition
+        def to_hes
+          { 'exists' => existance_filter }
+        end
+
+        def existance_filter
+          { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
+        end
+      end
+    end
+  end
+end

data/lib/canql/nodes/main.rb

@@ -32,7 +32,7 @@ module Canql #:nodoc: all
         sub_clauses = build_sub_clauses
 
         %i[
-          anomalies genetic_tests test_results test_result_groups test_acceptances
+          anomalies genetic_tests test_results test_result_groups test_acceptances hes_events
         ].each do |condition_key|
           if sub_clauses[condition_key].present?
             conditions[condition_key.to_s] = { Canql::ALL => sub_clauses[condition_key] }
@@ -52,6 +52,7 @@ module Canql #:nodoc: all
             sub_clauses, element, :test_result_groups, :to_test_result_group
           )
           add_sub_clause(sub_clauses, element, :test_acceptances, :to_test_acceptance)
+          add_sub_clause(sub_clauses, element, :hes_events, :to_hes)
         end
         sub_clauses
       end

data/lib/canql/nodes/patient.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Canql #:nodoc: all
+module Canql # :nodoc: all
   module Nodes
     module Patient
       module GenderNode
@@ -30,6 +30,7 @@ module Canql #:nodoc: all
           if category.text_value.start_with?('eurocat ') || category.text_value.start_with?('fasp ')
             filter_value = category.text_value.gsub(/( )/, '_').downcase.gsub(/(_and_)/, '_')
             filter_value = 'fasp_red_amber' if filter_value == 'fasp_amber_red'
+            filter_value = 'fasp_amber_green' if filter_value == 'fasp_green_amber'
             return filter_value
           end
 
@@ -40,16 +41,16 @@ module Canql #:nodoc: all
       module FieldExists
         FIELDS = {
           'date of birth': { patient: 'birthdate', mother: 'birthdate' },
-          'dob': { patient: 'birthdate', mother: 'birthdate' },
+          dob: { patient: 'birthdate', mother: 'birthdate' },
           'date of vital status': { patient: 'dateofvitalstatus', mother: 'dateofvitalstatus' },
           'delivery postcode': { patient: 'delivery_postcode' },
           'booking postcode': { patient: 'booking_postcode' },
           'nhs number': { patient: 'nhsnumber', mother: 'nhsnumber' },
           'birth weight': { patient: 'weight' },
           'place of delivery': { patient: 'placeofdelivery' },
-          'sex': { patient: 'sex' },
-          'outcome': { patient: 'outcome' },
-          'edd': { patient: 'expecteddeliverydate' },
+          sex: { patient: 'sex' },
+          outcome: { patient: 'outcome' },
+          edd: { patient: 'expecteddeliverydate' },
           'expected delivery date': { patient: 'expecteddeliverydate' },
           'booking hospital': { patient: 'booking_hospital' },
           'screening status': { patient: 'screeningstatus' },
@@ -65,7 +66,7 @@ module Canql #:nodoc: all
             patient_field_list.text_values_for_marker(:patient_field_name), subject.to_sym
           )
           modifer = field_existance_modifier.text_value.strip
-          existance = modifer != 'missing' ? 'fields_populated' : 'fields_missing'
+          existance = modifer == 'missing' ? 'fields_missing' : 'fields_populated'
           { "#{subject}.#{existance}" => { Canql::EQUALS => field_names } }
         end
 

data/lib/canql/nodes.rb

@@ -22,3 +22,4 @@ require 'canql/nodes/patient'
 require 'canql/nodes/main'
 require 'canql/nodes/registry'
 require 'canql/nodes/perinatal_hospital'
+require 'canql/nodes/hes_event'

data/lib/canql/version.rb

@@ -2,5 +2,5 @@
 
 # This stores the current version of the Canql gem
 module Canql
-  VERSION = '5.3.0'
+  VERSION = '5.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.7.0
 platform: ruby
 authors:
 - PHE NDR Development Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -235,6 +235,7 @@ files:
 - lib/canql/grammars/dates.treetop
 - lib/canql/grammars/e_base_records.treetop
 - lib/canql/grammars/genetic_test.treetop
+- lib/canql/grammars/hes_event.treetop
 - lib/canql/grammars/main.treetop
 - lib/canql/grammars/patient.treetop
 - lib/canql/grammars/perinatal_hospital.treetop
@@ -249,6 +250,7 @@ files:
 - lib/canql/nodes/dates.rb
 - lib/canql/nodes/e_base_records.rb
 - lib/canql/nodes/genetic_test.rb
+- lib/canql/nodes/hes_event.rb
 - lib/canql/nodes/main.rb
 - lib/canql/nodes/patient.rb
 - lib/canql/nodes/perinatal_hospital.rb
@@ -262,7 +264,7 @@ homepage: https://github.com/PublicHealthEngland/canql
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -277,8 +279,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Congenital Anomaly Natural Query Language
 test_files: []