Fix startDateExpresion and endDateExpresison replacements.

Fixes #170.
OHDSI · Jul 19, 2022 · 9974480 · 9974480
1 parent 4504aa2
commit 9974480
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/src/main/java/org/ohdsi/circe/cohortdefinition/builders/PayerPlanPeriodSqlBuilder.java b/src/main/java/org/ohdsi/circe/cohortdefinition/builders/PayerPlanPeriodSqlBuilder.java
@@ -34,12 +34,12 @@ public String getCriteriaSql(T criteria, BuilderOptions options) {
     String startDateExpression = (criteria.userDefinedPeriod != null && criteria.userDefinedPeriod.startDate != null)
             ? BuilderUtils.dateStringToSql(criteria.userDefinedPeriod.startDate)
             : "C.payer_plan_period_start_date";
-    StringUtils.replace(query, "@startDateExpression", startDateExpression);
+    query = StringUtils.replace(query, "@startDateExpression", startDateExpression);
 
     String endDateExpression = (criteria.userDefinedPeriod != null && criteria.userDefinedPeriod.endDate != null)
             ? BuilderUtils.dateStringToSql(criteria.userDefinedPeriod.endDate)
             : "C.payer_plan_period_end_date";
-    StringUtils.replace(query, "@endDateExpression", endDateExpression);
+    query = StringUtils.replace(query, "@endDateExpression", endDateExpression);
     return query;
   }
 

diff --git a/src/test/java/org/ohdsi/circe/cohortdefinition/CohortGeneration_5_0_0_Test.java b/src/test/java/org/ohdsi/circe/cohortdefinition/CohortGeneration_5_0_0_Test.java
@@ -140,9 +140,7 @@ public void allCriteriaTest() throws SQLException {
   /* first occurrence tests */
   private void setFirstOccurrenceCriteria(final Criteria c) throws Exception {
     final Field first = c.getClass().getDeclaredField("first");
-    final Field codesetId = c.getClass().getDeclaredField("codesetId");
     first.set(c, Boolean.valueOf(true));
-    codesetId.set(c, Integer.valueOf(0));
   }
 
   @Test
@@ -178,7 +176,8 @@ public void firstOccurrenceTest() throws Exception {
       new Observation(),
       new ProcedureOccurrence(),
       new Specimen(),
-      new VisitOccurrence()
+      new VisitOccurrence(),
+			new PayerPlanPeriod()
     };
 
     // create and execute cohort for each test criteria

diff --git a/src/test/resources/cohortgeneration/firstOccurrence/firstOccurrenceTest_PREP.json b/src/test/resources/cohortgeneration/firstOccurrence/firstOccurrenceTest_PREP.json
@@ -206,6 +206,26 @@
       "period_type_concept_id": 0
     }
   ],
+	"cdm.payer_plan_period": [
+		{
+      "payer_plan_period_id": 1,
+      "person_id":1,
+      "payer_plan_period_start_date":"2000-07-05",
+      "payer_plan_period_end_date":"2000-07-12"
+    },
+    {
+      "payer_plan_period_id": 2,
+      "person_id":1,
+      "payer_plan_period_start_date":"2000-09-01",
+      "payer_plan_period_end_date":"2000-09-02"
+    },
+    {
+      "payer_plan_period_id": 3,
+      "person_id":2,
+      "payer_plan_period_start_date":"2000-01-01",
+      "payer_plan_period_end_date":"2000-01-02"
+    }
+	],
   "cdm.procedure_occurrence": [
     {
       "procedure_occurrence_id": 1,

diff --git a/src/test/resources/cohortgeneration/firstOccurrence/firstOccurrenceTest_VERIFY.json b/src/test/resources/cohortgeneration/firstOccurrence/firstOccurrenceTest_VERIFY.json
@@ -59,6 +59,12 @@
       "subject_id":1,
       "cohort_start_date":"2000-07-05",
       "cohort_end_date":"2001-01-01"
-    }
+    },
+    {
+      "cohort_definition_id":11,
+      "subject_id":1,
+      "cohort_start_date":"2000-07-05",
+      "cohort_end_date":"2001-01-01"
+    }		
   ]
 }