Open
Conversation
# Conflicts: # src/main/java/org/ohdsi/circe/check/checkers/Comparisons.java # src/main/java/org/ohdsi/circe/check/checkers/ExitCriteriaDaysOffsetCheck.java # src/main/java/org/ohdsi/circe/check/checkers/FirstTimeInHistoryCheck.java # src/main/java/org/ohdsi/circe/check/checkers/RangeCheck.java # src/main/java/org/ohdsi/circe/cohortdefinition/CohortExpressionQueryBuilder.java # src/main/java/org/ohdsi/circe/cohortdefinition/CollapseSettings.java # src/main/java/org/ohdsi/circe/cohortdefinition/CustomEraStrategy.java # src/main/java/org/ohdsi/circe/cohortdefinition/DateOffsetStrategy.java # src/main/java/org/ohdsi/circe/cohortdefinition/IntervalUnit.java # src/main/java/org/ohdsi/circe/cohortdefinition/Window.java # src/main/resources/resources/cohortdefinition/printfriendly/cohortExpression.ftl # src/main/resources/resources/cohortdefinition/printfriendly/criteriaTypes.ftl # src/main/resources/resources/cohortdefinition/printfriendly/inputTypes.ftl # src/main/resources/resources/cohortdefinition/sql/customEraStrategy.sql # src/main/resources/resources/cohortdefinition/sql/dateOffsetStrategy.sql # src/main/resources/resources/cohortdefinition/sql/generateCohort.sql # src/test/java/org/ohdsi/circe/check/checkers/CriteriaCheckValueTest.java # src/test/java/org/ohdsi/circe/check/checkers/DeathTimeWindowCheckTest.java # src/test/java/org/ohdsi/circe/cohortdefinition/builders/CriteriaUtils.java # src/test/java/org/ohdsi/circe/cohortdefinition/printfriendly/PrintFriendlyTest.java
Added dateAdjust to print friendly and other corrections.
# Conflicts: # src/main/resources/resources/cohortdefinition/printfriendly/cohortExpression.ftl
This reverts commit f819d5e.
# Conflicts: # src/main/java/org/ohdsi/circe/check/checkers/Comparisons.java # src/main/java/org/ohdsi/circe/check/checkers/ExitCriteriaDaysOffsetCheck.java # src/main/java/org/ohdsi/circe/check/checkers/FirstTimeInHistoryCheck.java # src/main/java/org/ohdsi/circe/check/checkers/RangeCheck.java # src/main/java/org/ohdsi/circe/cohortdefinition/CohortExpressionQueryBuilder.java # src/main/java/org/ohdsi/circe/cohortdefinition/CollapseSettings.java # src/main/java/org/ohdsi/circe/cohortdefinition/CustomEraStrategy.java # src/main/java/org/ohdsi/circe/cohortdefinition/DateOffsetStrategy.java # src/main/java/org/ohdsi/circe/cohortdefinition/IntervalUnit.java # src/main/java/org/ohdsi/circe/cohortdefinition/Window.java # src/main/resources/resources/cohortdefinition/printfriendly/cohortExpression.ftl # src/main/resources/resources/cohortdefinition/printfriendly/criteriaTypes.ftl # src/main/resources/resources/cohortdefinition/printfriendly/inputTypes.ftl # src/main/resources/resources/cohortdefinition/sql/customEraStrategy.sql # src/main/resources/resources/cohortdefinition/sql/dateOffsetStrategy.sql # src/main/resources/resources/cohortdefinition/sql/generateCohort.sql # src/test/java/org/ohdsi/circe/check/checkers/CriteriaCheckValueTest.java # src/test/java/org/ohdsi/circe/check/checkers/DeathTimeWindowCheckTest.java # src/test/java/org/ohdsi/circe/cohortdefinition/builders/CriteriaUtils.java # src/test/java/org/ohdsi/circe/cohortdefinition/printfriendly/PrintFriendlyTest.java
…le resolving the SELECT clause in SQL builders
…alues from Criteria are available in the result cohort table
…edure_datetime instead
…mented for experimental purposes
added 3 commits
August 7, 2024 15:41
# Conflicts: # src/main/resources/resources/cohortdefinition/sql/customEraStrategy.sql # src/main/resources/resources/cohortdefinition/sql/generateCohort.sql
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implementing a design idea: OHDSI/Atlas#2886
There were two new model elements introduced on the Cohort-level ("use datetime data for all Criteria in a Cohort") and on the Criteria-level ("use datetime data only for a Criteria where hours/minutes/seconds were explicitly chosen by a User")
When a flag is "true" on the Cohort-level there is an explicit logic activated so that all Criteria use the datetime columns when constructing the SELECT part of an SQL statement (by default this option should be 'false' so that all Cohorts designed without the datetime support option are not impacted)
When a flag is "false" on the Cohort-level it is possible that for some of the Criteria there will be an explicit datetime logic defined (there is a dropdown list on UI with the time units days/hours/minutes/seconds) resulting in two types of SQL statements by means of target columns selection (date or datetime)
To have the feature fully effective the result schema tables 'cohort' and 'cohort_cache' should be adjusted so that cohort_start_date and cohort_end_date are of a type which can store time information