Added dateAdjustment to Death criteria print friendly.

OHDSI · Jan 10, 2025 · a4609d7 · a4609d7
1 parent 6a191f7
commit a4609d7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/src/main/resources/resources/cohortdefinition/printfriendly/criteriaTypes.ftl b/src/main/resources/resources/cohortdefinition/printfriendly/criteriaTypes.ftl
@@ -63,6 +63,7 @@ c.CorrelatedCriteria??>; <@Group group=c.CorrelatedCriteria level=level indexLab
 <#macro Death c level isPlural=true countCriteria={} indexLabel="cohort entry"><#local attrs = []><#local attrs = []><#if countCriteria?has_content>
 <#local temp><@WindowCriteria countCriteria=countCriteria indexLabel=indexLabel/></#local><#if temp?has_content><#local attrs+=[temp]></#if></#if>
 <#local temp><@AgeGenderCriteria ageAtStart=c.age!{} gender=c.gender!{} genderCS=c.genderCS!{} /></#local><#if temp?has_content><#local attrs+=[temp]></#if>
+<#local temp><@inputTypes.DateAdjustment da=c.dateAdjustment!{} /></#local><#if temp?has_content><#local attrs+=[temp]></#if>
 <#local temp><@EventDateCriteria c.occurrenceStartDate!{} c.occurrenceEndDate!{} /></#local><#if temp?has_content><#local attrs+=[temp]></#if><#if 
 c.deathType??><#local temp>a death type that<#if c.deathTypeExclude!false> is not:<#else> is:</#if> <@inputTypes.ConceptList list=c.deathType/></#local><#local attrs+=[temp]></#if><#if 
 c.deathTypeCS??><#local temp>a death type concept <@inputTypes.ConceptSetSelection selection=c.deathTypeCS /> concept set</#local><#local attrs+=[temp]></#if>

diff --git a/src/test/resources/printfriendly/allAttributes.json b/src/test/resources/printfriendly/allAttributes.json
@@ -292,31 +292,6 @@
           ]
         }
       },
-      {
-        "ConditionOccurrence": {
-          "CodesetId": 1,
-          "OccurrenceStartDate": {
-            "Value": "2010-01-01",
-            "Op": "gte"
-          },
-          "First": true,
-          "GenderCS" : {
-            "CodesetId": 0
-          },
-          "ConditionTypeCS" : {
-            "CodesetId": 0
-          },
-          "ProviderSpecialtyCS" : {
-            "CodesetId": 0
-          },
-          "VisitTypeCS" : {
-            "CodesetId": 0
-          },
-          "ConditionStatusCS" : {
-            "CodesetId": 0
-          }
-        }
-      },
       {
         "ConditionOccurrence": {
           "CorrelatedCriteria": {
@@ -456,6 +431,31 @@
           }
         }
       },
+      {
+        "ConditionOccurrence": {
+          "CodesetId": 1,
+          "OccurrenceStartDate": {
+            "Value": "2010-01-01",
+            "Op": "gte"
+          },
+          "First": true,
+          "GenderCS" : {
+            "CodesetId": 0
+          },
+          "ConditionTypeCS" : {
+            "CodesetId": 0
+          },
+          "ProviderSpecialtyCS" : {
+            "CodesetId": 0
+          },
+          "VisitTypeCS" : {
+            "CodesetId": 0
+          },
+          "ConditionStatusCS" : {
+            "CodesetId": 0
+          }
+        }
+      },
       {
         "Death": {
           "CorrelatedCriteria": {