canql 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87171fd5abf69aee98a167172876bac2cb49bc71ce9d754544e407066fedb32e
-  data.tar.gz: b419dcc8fae8bea2b7f3e499037ef06552d082ec94527cba6cac14d44d175146
+  metadata.gz: 876c07af5b28f571465a44fd8093d648f5a0323e991a41a440428dd08d369eec
+  data.tar.gz: 4440b547119f18e7e815c76753695decd9ebe3f134f9bd3ff04fc099b70e913c
 SHA512:
-  metadata.gz: 8e9906dadb517f20d9b06dded4dc283c73485a6393088acb63b832c1897a640e97b4ec811d26f28d98dad027f2833c67b1cb616529fa7cc29f894264f7e2c406
-  data.tar.gz: 2f903fe2616f43b0c39900c002ccc76ef72159c00eca03f7cb8793602de907a20e20dd0be9eaa6a8d2fc8b575a0ba2727cfc79e6d1b20b6f1f3e3e9a300cce7e
+  metadata.gz: 3422683985fe7a7708d596638331e745dc11ec864dd38f188b939572f51de773097f0dc628003036304753273ae32015c8bf56153bd6f513b51bf3a53fe0a93f
+  data.tar.gz: b6ee6b275bca9282c72ad00e052e48842f5d112cd57aaa95df787939aa638e51450c6ae63865c95c81fab09f7debb130dead8ebb74a6ec1e6fee2860390c0aed

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 2.8.0 / 2019-04-09
+### Added
+* Added filtering by anomaly screening status (#25)
+* Added anomaly screening status to field existance list (#26)
+
 ## 2.7.0 / 2019-03-21
 ### Added
 * Added support for NIPT, RD_DEATH and UMUM batch types (#23)

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1c52e8012fa111fc6d07bd1b67b30b43bc0e5fd2
+    safe_revision: 6275607eaf61d9f767977c4e1984c57bb3080984
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: drewthorp
@@ -72,8 +72,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: timgentry
-    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
+    reviewed_by: josh.pencheon
+    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
   lib/canql/grammars/batch_types.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -100,7 +100,7 @@ file safety:
     comments: It is a known issue that this is potentially susceptible to certain
       kinds of DoS attack
     reviewed_by: josh.pencheon
-    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
+    safe_revision: 38369f1f26167f396d1705ec88611103d5262726
   lib/canql/grammars/perinatal_hospital.treetop:
     comments: 
     reviewed_by: josh.pencheon
@@ -129,8 +129,8 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   lib/canql/nodes/anomaly.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
+    reviewed_by: josh.pencheon
+    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
   lib/canql/nodes/batch_types.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -154,7 +154,7 @@ file safety:
   lib/canql/nodes/patient.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
+    safe_revision: 38369f1f26167f396d1705ec88611103d5262726
   lib/canql/nodes/perinatal_hospital.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -178,11 +178,11 @@ file safety:
   lib/canql/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1c52e8012fa111fc6d07bd1b67b30b43bc0e5fd2
+    safe_revision: 6275607eaf61d9f767977c4e1984c57bb3080984
   test/anomaly_test_helper.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 695cec7ee61f36a9ef054a4079f290421d814666
+    reviewed_by: josh.pencheon
+    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
   test/canql_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -197,8 +197,8 @@ file safety:
     safe_revision: 6932d590299ad4a9d2ba24b425b158c67142bf74
   test/nodes/anomaly_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: bf2fbe12794f8b53e30a1ace01677cf6f215dbca
+    reviewed_by: josh.pencheon
+    safe_revision: 73a7dac17b20fcc77bcbd9d38777c8aa4d524816
   test/nodes/code_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -222,7 +222,7 @@ file safety:
   test/nodes/patient_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 1b5795e8b5e20395f17277050f17ff0db6f0f556
+    safe_revision: 38369f1f26167f396d1705ec88611103d5262726
   test/nodes/perinatal_hospital_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/canql/grammars/anomaly.treetop

@@ -1,7 +1,7 @@
 module Canql
   grammar Anomaly
     rule anomalies
-      and_keyword? existance_modifier:anomalies_no_keyword? status_type:anomaly_status? natal_period:anomalies_natal_period? code_data:(space first:anomalies_icd_code rest:more_anomalies_icd_codes* word_break)? anomalies_keyword <Nodes::Anomaly::WithCondition>
+      and_keyword? existance_modifier:anomalies_no_keyword? status_type:anomaly_status? natal_period:anomalies_natal_period? screening_status_type:anomaly_screening_status? code_data:(space first:anomalies_icd_code rest:more_anomalies_icd_codes* word_break)? anomalies_keyword <Nodes::Anomaly::WithCondition>
     end
 
     rule anomalies_no_keyword
@@ -16,6 +16,16 @@ module Canql
       (suspected_keyword / confirmed_keyword / probable_keyword / diagnosed_keyword)
     end
 
+    rule anomaly_screening_status
+      space ('unscreened' / 'fa detected' / 'fapos' / 'combined detected' / 'ctpos' /
+       'quad detected' / 'qtpos' / 'fa undetected' / 'faneg' / 'combined undetected' /
+       'ctneg' / 'quad undetected' / 'qtneg' / 'nonwindow' / 'nws' / 'incomplete screen' /
+       '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
+    end
+
     rule anomalies_keyword
       space 'anomalies' word_break
     end

data/lib/canql/grammars/patient.treetop

@@ -36,7 +36,7 @@ module Canql
       patient_field_name:(
         'date of birth' / 'dob' / 'nhs number' / 'postcode' / 'birth weight' /
         'place of delivery' / 'sex' / 'outcome' / 'edd' /
-        'expected delivery date' / 'booking hospital'
+        'expected delivery date' / 'booking hospital' / 'screening status'
       )
     end
 

data/lib/canql/nodes/anomaly.rb

@@ -12,10 +12,17 @@ module Canql #:nodoc: all
           status_type.text_value.strip
         end
 
+        def anomaly_screening_status_type
+          screening_status_type.text_value.strip
+        end
+
         def to_anomaly
           anomaly_hash = { 'exists' => existance_filter }
           anomaly_hash['type'] = anomaly_type_filter if anomaly_type.present?
           anomaly_hash['status'] = anomaly_status_type_filter if anomaly_status_type.present?
+          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?
           anomaly_hash['code_groups'] = code_filter[:code_group]
@@ -34,6 +41,10 @@ module Canql #:nodoc: all
           { Canql::EQUALS => anomaly_status_type }
         end
 
+        def anomaly_screening_status_type_filter
+          { Canql::EQUALS => anomaly_screening_status_type }
+        end
+
         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?

data/lib/canql/nodes/patient.rb

@@ -33,7 +33,8 @@ module Canql #:nodoc: all
           'outcome':                { patient: 'outcome' },
           'edd':                    { patient: 'expecteddeliverydate' },
           'expected delivery date': { patient: 'expecteddeliverydate' },
-          'booking hospital':       { patient: 'booking_hospital' }
+          'booking hospital':       { patient: 'booking_hospital' },
+          'screening status':       { patient: 'screeningstatus' }
         }.freeze
 
         def meta_data_item

data/lib/canql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canql
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - PHE NDR Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic