Skip to content

Scope cage lookups to the EHR study container in housing tables #734

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
labkey-martyp merged 3 commits into from
Jul 29, 2026
Merged

Scope cage lookups to the EHR study container in housing tables #734

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf7ebf
Scope cage lookups to the EHR study container in housing tables
labkey-martyp Jul 29, 2026
2cf458b
Fall back to the current container when the EHR study container is unset
labkey-martyp Jul 29, 2026
064833c
Shorten the cage container-scoping comment
labkey-martyp Jul 29, 2026
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
20 changes: 11 additions & 9 deletions nirc_ehr/src/org/labkey/nirc_ehr/table/NIRC_EHRCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,15 +896,17 @@ private void ensureSortColumn(AbstractTableInfo ti, ColumnInfo baseColumn)

private void customizeHousingTable(AbstractTableInfo ti)
{
// ehr_lookups.cage is unique on (Container, Location), so the cage subqueries below must be container-scoped;
// a second EHR folder defining the same location would otherwise make them return multiple rows.
Container lookupContainer = EHRService.get().getEHRStudyContainer(ti.getUserSchema().getContainer());
if (lookupContainer == null)
lookupContainer = ti.getUserSchema().getContainer(); // as DefaultEHRCustomizer does

if (ti.getColumn("room") == null && ti.getColumn("cage") != null)
{
UserSchema us = getUserSchema(ti, "ehr_lookups");
if (us != null)
{
SQLFragment roomSql = new SQLFragment("(SELECT room FROM ehr_lookups.cage WHERE location = " + ExprColumn.STR_TABLE_ALIAS + ".cage)");
ExprColumn roomCol = new ExprColumn(ti, "room", roomSql, JdbcType.VARCHAR, ti.getColumn("cage"));
ti.addColumn(roomCol);
}
SQLFragment roomSql = new SQLFragment("(SELECT room FROM ehr_lookups.cage WHERE Container = ? AND location = " + ExprColumn.STR_TABLE_ALIAS + ".cage)", lookupContainer);
ExprColumn roomCol = new ExprColumn(ti, "room", roomSql, JdbcType.VARCHAR, ti.getColumn("cage"));
ti.addColumn(roomCol);

ensureSortColumn(ti, ti.getColumn("room"));
}
Expand All @@ -913,8 +915,8 @@ private void customizeHousingTable(AbstractTableInfo ti)
TableInfo realTable = getRealTable(ti);
if (realTable != null && realTable.getColumn("participantid") != null && realTable.getColumn("date") != null && realTable.getColumn("enddate") != null)
{
SQLFragment roomSql = new SQLFragment(realTable.getSqlDialect().getDateDiff(Calendar.DATE, "{fn curdate()}", "COALESCE((SELECT max(h2.enddate) as d FROM " + realTable.getSelectName() + " h2 LEFT JOIN ehr_lookups.cage cg ON h2.cage = cg.location " +
"WHERE h2.enddate IS NOT NULL AND h2.enddate <= " + ExprColumn.STR_TABLE_ALIAS + ".date AND h2.participantid = " + ExprColumn.STR_TABLE_ALIAS + ".participantid AND cg.room != (SELECT room FROM ehr_lookups.cage WHERE location = " + ExprColumn.STR_TABLE_ALIAS + ".cage)), " + ExprColumn.STR_TABLE_ALIAS + ".date)"));
SQLFragment roomSql = new SQLFragment(realTable.getSqlDialect().getDateDiff(Calendar.DATE, "{fn curdate()}", "COALESCE((SELECT max(h2.enddate) as d FROM " + realTable.getSelectName() + " h2 LEFT JOIN ehr_lookups.cage cg ON h2.cage = cg.location AND cg.Container = ? " +
"WHERE h2.enddate IS NOT NULL AND h2.enddate <= " + ExprColumn.STR_TABLE_ALIAS + ".date AND h2.participantid = " + ExprColumn.STR_TABLE_ALIAS + ".participantid AND cg.room != (SELECT room FROM ehr_lookups.cage WHERE Container = ? AND location = " + ExprColumn.STR_TABLE_ALIAS + ".cage)), " + ExprColumn.STR_TABLE_ALIAS + ".date)"), lookupContainer, lookupContainer);
ExprColumn roomCol = new ExprColumn(ti, "daysInRoom", roomSql, JdbcType.INTEGER, realTable.getColumn("participantid"), realTable.getColumn("date"), realTable.getColumn("enddate"));
roomCol.setLabel("Days In Room");
ti.addColumn(roomCol);
Expand Down