Skip to content

Added acquisition and disposition categories to demographics queries #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spamhurts merged 2 commits into from
Aug 6, 2020
Merged

Added acquisition and disposition categories to demographics queries #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3d829a
Added acquisition and disposition categories to demographics queries
spamhurts Aug 4, 2020
d87c648
Merge branch 'develop' into fb_demographicsCategories
spamhurts Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions snprc_ehr/resources/queries/study/demographicsArrival.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
query.description~eq=${MostRecentAcqDesc}&
</url>
</column>
<column columnName="MostRecentAcqCategory">
<url>/query/executeQuery.view?schemaName=ehr_lookups&amp;
query.queryName=acquisitionType&amp;
query.description~eq=${MostRecentAcqCategory}&amp;
</url>
</column>
<column columnName="EarliestAcq">
<url>/query/executeQuery.view?schemaName=study&amp;
query.queryName=arrival&amp;
Expand All @@ -45,6 +51,12 @@
query.description~eq=${MostRecentAcqDesc}&amp;
</url>
</column>
<column columnName="EarliestAcqCategory">
<url>/query/executeQuery.view?schemaName=ehr_lookups&amp;
query.queryName=acquisitionType&amp;
query.value~eq=${EarliestAcqCategory}&amp;
</url>
</column>
<column columnName="Center_Arrival">
<url>/query/executeQuery.view?schemaName=study&amp;
query.queryName=arrival&amp;
Expand Down
6 changes: 4 additions & 2 deletions snprc_ehr/resources/queries/study/demographicsArrival.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ SELECT
T1.date as MostRecentAcq,
T1.acquisitionType.value as MostRecentAcqType,
T1.acquisitionType.Description as MostRecentAcqDesc,
T1.acquisitionType.category as MostRecentAcqCategory,

T2.date as EarliestAcq,
T2.acquisitionType.value as EarliestAcqType,
T2.acquisitionType.Description as EarliestAcqDesc,
T2.acquisitionType.category as EarliestAcqCategory,

coalesce(T2.date, d.birth) as Center_Arrival,
coalesce(T2.date, d.birth) as Center_Arrival

FROM study.demographics d

Expand All @@ -29,4 +31,4 @@ LEFT JOIN study.arrival as t1 on t1.id = d.id and T1.qcstate.publicdata = true
--date of first arrival
LEFT JOIN study.arrival as t2 on t2.id = d.id and T2.qcstate.publicdata = true
and t2.date = (select min(c1.date) from study.arrival as c1
where t2.id = c1.id)
where t2.id = c1.id)
12 changes: 12 additions & 0 deletions snprc_ehr/resources/queries/study/demographicsMostRecentDeparture.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
query.description~eq=${MostRecentDispDesc}&amp;
</url>
</column>
<column columnName="MostRecentDispCategory">
<url>/query/executeQuery.view?schemaName=ehr_lookups&amp;
query.queryName=dispositionType&amp;
query.description~eq=${MostRecentDispCategory}&amp;
</url>
</column>
<column columnName="EarliestDisp">
<url>/query/executeQuery.view?schemaName=study&amp;
query.queryName=departure&amp;
Expand All @@ -45,6 +51,12 @@
query.description~eq=${MostRecentDispDesc}&amp;
</url>
</column>
<column columnName="EarliestDispCategory">
<url>/query/executeQuery.view?schemaName=ehr_lookups&amp;
query.queryName=dispositionType&amp;
query.description~eq=${EarliestDispCategory}&amp;
</url>
</column>
</columns>
<titleColumn>Dispositions</titleColumn>
</table>
Expand Down
6 changes: 4 additions & 2 deletions snprc_ehr/resources/queries/study/demographicsMostRecentDeparture.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ SELECT
T1.date as MostRecentDisp,
T1.dispositionType.value as MostRecentDispType,
T1.dispositionType.Description as MostRecentDispDesc,
T1.dispositionType.category as MostRecentDispCategory,

T2.date as EarliestDisp,
T2.dispositionType.value as EarliestDispType,
T2.dispositionType.Description as EarliestDispDesc
T2.dispositionType.Description as EarliestDispDesc,
T2.dispositionType.category as EarliestDispCategory

FROM study.demographics d

Expand All @@ -27,4 +29,4 @@ LEFT JOIN study.departure as t1 on t1.id = d.id and T1.qcstate.publicdata = true
--date of first disposition
LEFT JOIN study.departure as t2 on t2.id = d.id and T2.qcstate.publicdata = true
and t2.date = (select min(c1.date) from study.departure as c1
where t2.id = c1.id)
where t2.id = c1.id)