canql 5.0.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a2f7ebbb5ae3c1cbdd8368b020f8eb7c54d969278db3bdd90277f113095ce9
-  data.tar.gz: fb4f6561d61cc9da30dd9a30562c7374a95e52d615b014bc16e5e282529c4975
+  metadata.gz: 6f1406cd4a6e0b0e9f66ef6386f0356b8b60e7c9ed6300ac8366a3e6b65aad4c
+  data.tar.gz: 6933617a2d3b293fa5c844d4885ee2e0b005cb5ba4596de4699fcaf3254faff5
 SHA512:
-  metadata.gz: 93cc26e76a35a5b47600368d7208f81c6cd6457c416f942be852536952d54b9a1bbcb49df7c17f95fb09b5bdaa4581fda91b70e36ad229aae5213914d9d7db39
-  data.tar.gz: 2a8bf966e8a0b93411117a09f790f20825c6b27850f1903cea53fd636855d920ec4fdc5dc9bb903b11ec0c2e34275af88ca2e49e4c09b3ea206a6ff2620d626b
+  metadata.gz: 458ad85cf4588bde403a34ec3721a5e6f22b2a7242029f9d21b4f9f4fa1264355c408e8ba84f8cb280023b5fff5ab480ba5a29d163e62030e7b2b3354d1b301d
+  data.tar.gz: dd916f281f0d531b84ac6e6ff696d28761d92915e70eca5266bfdd4c5ea3f93daaa1dbb246e9482e47b6e6a6b9907f6d1fdca8ac2e8e47f69ea1da1a1ff5b359

data/.github/workflows/test.yml

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

data/CHANGELOG.md

@@ -1,8 +1,27 @@
 ## [Unreleased]
-*no unreleased changes*
+* no relevant changes
 
-## 5.0.0 / 2021-01-19
+## 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

@@ -11,7 +11,7 @@ file safety:
   ".github/workflows/test.yml":
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 865fc970554fee9207f8e3cd0247133c6a849b24
+    safe_revision: a3f5265f1d20a6dcb8c45ab5f09207ca7d1e255c
   ".gitignore":
     comments: 
     reviewed_by: timgentry
@@ -27,7 +27,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: f84cb2190f46ee550db796a17455980ab00d3187
+    safe_revision: 154d287a89e13c77b34642ffb33eb4c07953aa1b
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -43,7 +43,7 @@ file safety:
   README.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8c07968aa84db92b6f1cc528180f73530ddc6ff5
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   Rakefile:
     comments: 
     reviewed_by: timgentry
@@ -71,7 +71,7 @@ file safety:
   lib/canql/grammars.rb:
     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,8 +80,8 @@ 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: josh.pencheon
-    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
+    reviewed_by: ollietulloch
+    safe_revision: b0b092613c94a8c2f04191dbe2a1a347c8e14d16
   lib/canql/grammars/batch_types.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -99,16 +99,20 @@ file safety:
     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: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
+    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: josh.pencheon
-    safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
+    reviewed_by: ollietulloch
+    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
   lib/canql/grammars/perinatal_hospital.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -130,19 +134,19 @@ file safety:
   lib/canql/grammars/test_result_group.treetop:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8ea906ca663b98edee2592fc5b0731881573f06b
+    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   lib/canql/nodes.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/age.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/anomaly.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
+    reviewed_by: ollietulloch
+    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   lib/canql/nodes/batch_types.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -159,14 +163,18 @@ file safety:
     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: 
     reviewed_by: josh.pencheon
-    safe_revision: c5f8f76b2c335a8554f39a14d6165bf5cd8f9b67
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   lib/canql/nodes/patient.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
+    reviewed_by: ollietulloch
+    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
   lib/canql/nodes/perinatal_hospital.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -182,7 +190,7 @@ file safety:
   lib/canql/nodes/test_result_group.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 42bb9bd177a761b9d04d728e53fcf0ebd0083ae4
+    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   lib/canql/parser.rb:
     comments: 
     reviewed_by: timgentry
@@ -194,23 +202,27 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: cfe2f76a07880e268e1f29fbac5f6cd380202ce3
+    safe_revision: 154d287a89e13c77b34642ffb33eb4c07953aa1b
   test/anomaly_test_helper.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
+    reviewed_by: ollietulloch
+    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   test/canql_test.rb:
     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: 
     reviewed_by: timgentry
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/anomaly_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
+    reviewed_by: ollietulloch
+    safe_revision: b0b092613c94a8c2f04191dbe2a1a347c8e14d16
   test/nodes/case_age_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -221,8 +233,8 @@ file safety:
     safe_revision: 7490099869e368dcd5c26ded11eb90229baf4cae
   test/nodes/code_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b7778ca1d536022a807420cc9fe0f1c2df7f73ef
+    reviewed_by: ollietulloch
+    safe_revision: e549c0dcafdd6004ec279bd256fae8b9964c9629
   test/nodes/e_base_records_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -231,6 +243,10 @@ file safety:
     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: 
     reviewed_by: josh.pencheon
@@ -249,8 +265,8 @@ file safety:
     safe_revision: 511e4238f83eb5b32839c25d94ec2a59145539bb
   test/nodes/patient_test.rb:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: 43425805d9ad4a99e63eeb5d50495fa14eaa053b
+    reviewed_by: ollietulloch
+    safe_revision: 481194575c30b48987f957a9cc5535d604ea0117
   test/nodes/perinatal_hospital_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -262,7 +278,7 @@ file safety:
   test/nodes/test_result_groups_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 8ea906ca663b98edee2592fc5b0731881573f06b
+    safe_revision: 9bb663b220e76e78f3f0f48e4bc6334fe9451925
   test/nodes/test_results_test.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -270,7 +286,7 @@ file safety:
   test/parser_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 293248a17d087d7557a6aacdcb5bf3fbec946b87
+    safe_revision: 3ace8794c1c545b47898da1fbee49af8afdbf521
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

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/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
@@ -35,7 +35,7 @@ module Canql
     end
 
     rule anomalies_icd_code
-      (icd_code_name / code_group)
+      (fasp_rating  / icd_code_name / code_group)
     end
 
     rule icd_code_name
@@ -45,5 +45,9 @@ module Canql
     rule code_group
       ('fasp plus' / 'plus' / 'fasp' / 'structural' / 'trisomy') <Nodes::Anomaly::SingleCodeGroupNode>
     end
+
+    rule fasp_rating
+      ('fasp red and amber' / 'fasp amber and red' / 'fasp red' / 'fasp amber' / 'fasp green') <Nodes::Anomaly::SingleFaspRatingNode>
+    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
@@ -129,11 +130,12 @@ grammar Canql
 
   rule case_with_conditions
      anomalies / genetic_tests / test_results / perinatal_hospital /
-     case_field_existance / test_result_groups / mother_conditions /
-     action_or_ebr
+     case_field_existance / test_acceptance_existance / test_result_groups /
+     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

@@ -13,7 +13,12 @@ module Canql
     end
 
     rule category
-      space category:('eurocat amber and green' / 'eurocat red and amber' / 'eurocat red' / 'eurocat amber' / 'eurocat green' / 'eurocat') word_break <Nodes::Patient::CategoryNode>
+      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'
+      ) word_break <Nodes::Patient::CategoryNode>
     end
 
     rule expected_keyword

data/lib/canql/grammars/test_result_group.treetop

@@ -12,5 +12,17 @@ module Canql
     rule test_result_group_names
       space ('screening' / 'anomaly scan' / 'fetal medicine' / 'dating') word_break
     end
+
+    rule test_acceptance_existance
+      and_keyword? existance_modifier:test_acceptance_existance_keyword acceptance:test_acceptance_names <Nodes::TestAcceptanceExistamce::WithCondition>
+    end
+
+    rule test_acceptance_existance_keyword
+      space ('missing required' / 'missing' ) word_break
+    end
+
+    rule test_acceptance_names
+      space ('screening acceptance status' / 'anomaly scan acceptance status' ) word_break
+    end
   end
 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/nodes/anomaly.rb

@@ -23,13 +23,21 @@ module Canql #:nodoc: all
           if anomaly_screening_status_type.present?
             anomaly_hash['screening_status'] = anomaly_screening_status_type_filter
           end
-          anomaly_hash['icd_codes'] = code_filter[:icd_code] if code_filter[:icd_code].present?
-          return anomaly_hash if code_filter[:code_group].blank?
+          code_filters(anomaly_hash)
 
-          anomaly_hash['code_groups'] = code_filter[:code_group]
           anomaly_hash
         end
 
+        def code_filters(anomaly_hash)
+          anomaly_hash['icd_codes'] = code_filter[:icd_code] if code_filter[:icd_code].present?
+          if code_filter[:code_group].present?
+            anomaly_hash['code_groups'] = code_filter[:code_group]
+          end
+          return if code_filter[:fasp_rating].blank?
+
+          anomaly_hash['fasp_rating'] = code_filter[:fasp_rating]
+        end
+
         def existance_filter
           { Canql::EQUALS => existance_modifier.text_value.strip != 'no' }
         end
@@ -49,36 +57,50 @@ module Canql #:nodoc: all
         def code_type(code)
           return :icd_code if code.respond_to?(:to_code) && code.to_code.present?
           return :code_group if code.respond_to?(:to_code_group) && code.to_code_group.present?
+          return :fasp_rating if code.respond_to?(:to_fasp_rating) && code.to_fasp_rating.present?
 
           raise 'Unable to find code type'
         end
 
         def code_value(code)
           return code.to_code if :icd_code == code_type(code)
+          return code.to_code_group if :code_group == code_type(code)
 
-          code.to_code_group
+          code.to_fasp_rating
         end
 
         def prepare_code_filters(code_array)
-          code_array[:icd_code].flatten!
-          code_array[:icd_code].delete_if(&:blank?)
-          code_array[:code_group].flatten!
-          code_array[:code_group].delete_if(&:blank?)
+          clean_code_array(code_array)
 
           code_filters = {}
           if code_array[:icd_code].any?
             code_filters[:icd_code] = { Canql::BEGINS => code_array[:icd_code] }
           end
-          return code_filters if code_array[:code_group].blank?
 
-          code_filters[:code_group] = { Canql::EQUALS => code_array[:code_group] }
+          if code_array[:code_group].any?
+            code_filters[:code_group] = { Canql::EQUALS => code_array[:code_group] }
+          end
+
+          if code_array[:fasp_rating].any?
+            code_filters[:fasp_rating] = { Canql::EQUALS => code_array[:fasp_rating] }
+          end
+
           code_filters
         end
 
+        def clean_code_array(code_array)
+          code_array[:icd_code].flatten!
+          code_array[:icd_code].delete_if(&:blank?)
+          code_array[:code_group].flatten!
+          code_array[:code_group].delete_if(&:blank?)
+          code_array[:fasp_rating].flatten!
+          code_array[:fasp_rating].delete_if(&:blank?)
+        end
+
         def code_filter
           return {} if code_data.text_value.blank?
 
-          code_arrays = { icd_code: [], code_group: [] }
+          code_arrays = { icd_code: [], code_group: [], fasp_rating: [] }
           code_arrays[code_type(code_data.first)] << code_value(code_data.first)
           code_data.rest.elements.each do |code|
             code_arrays[code_type(code)] << code_value(code)
@@ -90,8 +112,9 @@ module Canql #:nodoc: all
       module AdditionalCodeNode
         def code_type
           return :icd_code if anomalies_icd_code.respond_to?(:to_code)
+          return :code_group if anomalies_icd_code.respond_to?(:to_code_group)
 
-          :code_group
+          :fasp_rating
         end
 
         def to_code
@@ -101,6 +124,10 @@ module Canql #:nodoc: all
         def to_code_group
           anomalies_icd_code.to_code_group if :code_group == code_type
         end
+
+        def to_fasp_rating
+          anomalies_icd_code.to_fasp_rating if :fasp_rating == code_type
+        end
       end
 
       module SingleIcdCodeNode
@@ -114,6 +141,14 @@ module Canql #:nodoc: all
           text_value.gsub(/( )/, '_').upcase
         end
       end
+
+      module SingleFaspRatingNode
+        def to_fasp_rating
+          text_value.gsub(/( )/, '_').upcase.split('_AND_').map do |value|
+            value.start_with?('FASP_') ? value : "FASP_#{value}"
+          end
+        end
+      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

@@ -29,27 +29,39 @@ module Canql #:nodoc: all
     module WithConditions
       def meta_data_item
         conditions = {}
-        anomalies = []
-        genetic_tests = []
-        test_results = []
-        test_result_groups = []
+        sub_clauses = build_sub_clauses
 
-        post.elements.each do |element|
-          anomalies << element.to_anomaly if element.respond_to?(:to_anomaly)
-          genetic_tests << element.to_genetic_test if element.respond_to?(:to_genetic_test)
-          test_results << element.to_test_result if element.respond_to?(:to_test_result)
-          if element.respond_to?(:to_test_result_group)
-            test_result_groups << element.to_test_result_group
+        %i[
+          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] }
           end
         end
+        conditions
+      end
 
-        conditions['anomalies'] = { Canql::ALL => anomalies } if anomalies.any?
-        conditions['genetic_tests'] = { Canql::ALL => genetic_tests } if genetic_tests.any?
-        conditions['test_results'] = { Canql::ALL => test_results } if test_results.any?
-        if test_result_groups.any?
-          conditions['test_result_groups'] = { Canql::ALL => test_result_groups }
+      def build_sub_clauses
+        sub_clauses = {}
+
+        post.elements.each do |element|
+          add_sub_clause(sub_clauses, element, :anomalies, :to_anomaly)
+          add_sub_clause(sub_clauses, element, :genetic_tests, :to_genetic_test)
+          add_sub_clause(sub_clauses, element, :test_results, :to_test_result)
+          add_sub_clause(
+            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
-        conditions
+        sub_clauses
+      end
+
+      def add_sub_clause(sub_clauses, element, key, condition)
+        return sub_clauses unless element.respond_to?(condition)
+
+        sub_clauses[key] ||= []
+        sub_clauses[key] << element.send(condition)
       end
     end
   end

data/lib/canql/nodes/patient.rb

@@ -27,11 +27,11 @@ module Canql #:nodoc: all
         end
 
         def clean_category
-          return 'eurocat_red' if 'eurocat red' == category.text_value
-          return 'eurocat_amber' if 'eurocat amber' == category.text_value
-          return 'eurocat_green' if 'eurocat green' == category.text_value
-          return 'eurocat_amber_green' if 'eurocat amber and green' == category.text_value
-          return 'eurocat_red_amber' if 'eurocat red and amber' == category.text_value
+          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'
+            return filter_value
+          end
 
           category.text_value
         end

data/lib/canql/nodes/test_result_group.rb

@@ -36,5 +36,40 @@ module Canql #:nodoc: all
         end
       end
     end
+
+    module TestAcceptanceExistamce
+      module WithCondition
+        def test_acceptance
+          acceptance.text_value.strip.parameterize.underscore
+        end
+
+        def to_test_acceptance
+          test_acceptance_hash = { 'exists' => existance_filter }
+          test_acceptance_hash['required'] = requirement_filter
+          test_acceptance_hash['acceptance'] = test_acceptance_filter if test_acceptance.present?
+          test_acceptance_hash
+        end
+
+        def existance_filter
+          {
+            Canql::EQUALS => ['supplied required', 'supplied'].include?(
+              existance_modifier.text_value.strip
+            )
+          }
+        end
+
+        def requirement_filter
+          {
+            Canql::EQUALS => ['supplied required', 'missing required'].include?(
+              existance_modifier.text_value.strip
+            )
+          }
+        end
+
+        def test_acceptance_filter
+          { Canql::EQUALS => test_acceptance }
+        end
+      end
+    end
   end
 end

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.5.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-03-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