diff --git a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
index ece38be5555..0cebd4b9763 100644
--- a/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
+++ b/src/main/resources/org/cbioportal/persistence/mybatisclickhouse/StudyViewFilterMapper.xml
@@ -272,6 +272,77 @@
+
+
+
+
+
+ AND
+
+
+
+
+
+
+ AND (
+
+
+
+ ) ILIKE #{dataFilterValue.value}
+
+
+
+ AND match(${attribute_value}, '^>?=?[-+]?[0-9]*[.,]?[0-9]+$')
+
+
+ AND match(${attribute_value}, '^<?=?[-+]?[0-9]*[.,]?[0-9]+$')
+
+
+ AND match(${attribute_value}, '^[-+]?[0-9]*[.,]?[0-9]+$')
+
+
+
+
+
+ AND abs(
+ minus(
+
+
+ ,
+ cast(#{dataFilterValue.start} as float)
+ )
+ ) < exp(-11)
+
+
+
+ AND
+
+
+ > cast(#{dataFilterValue.start} as float)
+
+
+ AND
+
+
+ <= cast(#{dataFilterValue.end} as float)
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -362,64 +433,14 @@
- SELECT ${unique_id}
- FROM ${table_name}
- WHERE attribute_name = #{clinicalDataFilter.attributeId} AND
- type='${type}'
-
-
-
- AND
-
-
-
-
-
- AND (
-
-
-
- ) ILIKE #{dataFilterValue.value}
-
-
- AND match(attribute_value, '^>?=?[-+]?[0-9]*[.,]?[0-9]+$')
-
-
- AND match(attribute_value, '^<?=?[-+]?[0-9]*[.,]?[0-9]+$')
-
-
- AND match(attribute_value, '^[-+]?[0-9]*[.,]?[0-9]+$')
-
-
-
-
- AND abs(
- minus(
-
-
- ,
- cast(#{dataFilterValue.start} as float)
- )
- ) < exp(-11)
-
-
-
- AND
-
-
- > cast(#{dataFilterValue.start} as float)
-
-
- AND
-
-
- <= cast(#{dataFilterValue.end} as float)
-
-
-
-
-
-
+ SELECT ${unique_id}
+ FROM ${table_name}
+ WHERE attribute_name = #{clinicalDataFilter.attributeId} AND
+ type='${type}'
+
+
+
+
)
@@ -501,47 +522,10 @@
SELECT DISTINCT sample_unique_id
FROM () AS genomic_numerical_query
WHERE
-
-
-
- AND match(alteration_value, '^>?=?[-+]?[0-9]*[.,]?[0-9]+$')
-
-
- AND match(alteration_value, '^<?=?[-+]?[0-9]*[.,]?[0-9]+$')
-
-
- AND match(alteration_value, '^[-+]?[0-9]*[.,]?[0-9]+$')
-
-
-
-
- AND abs(
- minus(
-
-
- ,
- cast(#{dataFilterValue.start} as float)
- )
- ) < exp(-11)
-
-
-
- AND
-
-
- > cast(#{dataFilterValue.start} as float)
-
-
- AND
-
-
- <= cast(#{dataFilterValue.end} as float)
-
-
-
-
-
-
+
+
+
+
@@ -603,53 +587,10 @@
!= 'NA'
-
-
-
- AND
-
-
-
-
-
- AND match(value, '^>?=?[-+]?[0-9]*[.,]?[0-9]+$')
-
-
- AND match(value, '^<?=?[-+]?[0-9]*[.,]?[0-9]+$')
-
-
- AND match(value, '^[-+]?[0-9]*[.,]?[0-9]+$')
-
-
-
-
- AND abs(
- minus(
-
-
- ,
- cast(#{dataFilterValue.start} as float)
- )
- ) < exp(-11)
-
-
-
- AND
-
-
- > cast(#{dataFilterValue.start} as float)
-
-
- AND
-
-
- <= cast(#{dataFilterValue.end} as float)
-
-
-
-
-
-
+
+
+
+