Fixes #121

Do not apply QualifiedLimitFilter when additional criteria is null.
OHDSI · Aug 17, 2016 · dcfcfe3 · dcfcfe3
1 parent e3cb494
commit dcfcfe3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortExpressionQueryBuilder.java b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortExpressionQueryBuilder.java
@@ -256,7 +256,8 @@ public String buildExpressionQuery(CohortExpression expression, BuildExpressionQ
 
     resultSql = StringUtils.replace(resultSql, "@QualifiedEventSort", (expression.qualifiedLimit.type != null && expression.qualifiedLimit.type.equalsIgnoreCase("LAST")) ? "DESC" : "ASC");
 
-    if (expression.qualifiedLimit.type != null && !expression.qualifiedLimit.type.equalsIgnoreCase("ALL"))
+    // Only apply qualified limit filter if additional criteria is specified.
+    if (expression.additionalCriteria != null && expression.qualifiedLimit.type != null && !expression.qualifiedLimit.type.equalsIgnoreCase("ALL"))
     {
       resultSql = StringUtils.replace(resultSql, "@QualifiedLimitFilter","WHERE QE.ordinal = 1");
     }