Skip to content

Commit 234f6b0

Browse files
author
alex-odysseus
committed
To reflect circe-be changes related to useDatetime Cohort Expression
1 parent 02a9c9f commit 234f6b0

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/java/org/ohdsi/webapi/feasibility/FeasibilityStudyQueryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private String getInclusionRuleInserts(FeasibilityStudy study)
7676
private String getInclusionRuleQuery(CriteriaGroup inclusionRule)
7777
{
7878
String resultSql = INCLUSION_RULE_QUERY_TEMPLATE;
79-
String additionalCriteriaQuery = "\nJOIN (\n" + cohortExpressionQueryBuilder.getCriteriaGroupQuery(inclusionRule, "#primary_events") + ") AC on AC.event_id = pe.event_id";
79+
String additionalCriteriaQuery = "\nJOIN (\n" + cohortExpressionQueryBuilder.getCriteriaGroupQuery(inclusionRule, "#primary_events", null) + ") AC on AC.event_id = pe.event_id";
8080
additionalCriteriaQuery = StringUtils.replace(additionalCriteriaQuery,"@indexId", "" + 0);
8181
resultSql = StringUtils.replace(resultSql, "@additionalCriteriaQuery", additionalCriteriaQuery);
8282
return resultSql;

src/main/java/org/ohdsi/webapi/ircalc/IRAnalysisQueryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public IRAnalysisQueryBuilder(ObjectMapper objectMapper) {
6666
private String getStrataQuery(CriteriaGroup strataCriteria)
6767
{
6868
String resultSql = STRATA_QUERY_TEMPLATE;
69-
String additionalCriteriaQuery = "\nJOIN (\n" + cohortExpressionQueryBuilder.getCriteriaGroupQuery(strataCriteria, "#analysis_events") + ") AC on AC.person_id = pe.person_id AND AC.event_id = pe.event_id";
69+
String additionalCriteriaQuery = "\nJOIN (\n" + cohortExpressionQueryBuilder.getCriteriaGroupQuery(strataCriteria, "#analysis_events", null) + ") AC on AC.person_id = pe.person_id AND AC.event_id = pe.event_id";
7070
additionalCriteriaQuery = StringUtils.replace(additionalCriteriaQuery,"@indexId", "" + 0);
7171
resultSql = StringUtils.replace(resultSql, "@additionalCriteriaQuery", additionalCriteriaQuery);
7272
return resultSql;

0 commit comments

Comments
 (0)