Skip to content

Housing clinical history fix #684

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

Open
labkey-martyp wants to merge 1 commit into
base: release26.3-SNAPSHOT
Choose a base branch
from
+8 −2
Open

Housing clinical history fix #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions nirc_ehr/src/org/labkey/nirc_ehr/history/DeathDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,14 @@ protected String getHtml(Container c, Results rs, boolean redacted) throws SQLEx
StringBuilder sb = new StringBuilder();

if(rs.hasColumn(FieldKey.fromString("reason/title")) && rs.getObject(FieldKey.fromString("reason/title")) != null)
{
sb.append(safeAppend(rs, "Disposition", "reason/title"));
}
else
{
sb.append("Disposition: Unknown");
sb.append("\n");
}

if(rs.hasColumn(FieldKey.fromString("remark")) && rs.getObject(FieldKey.fromString("remark")) != null)
sb.append(safeAppend(rs, "Remark", "remark"));
Expand Down
5 changes: 3 additions & 2 deletions nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCHousingDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public NIRCHousingDataSource(Module module)
@Override
protected Set<String> getColumnNames()
{
return PageFlowUtil.set("Id", "date", "cage/cage", "room/fullRoom");
return PageFlowUtil.set("Id", "date", "cage/cage", "room/fullRoom", "reason", "remark");
}

@Override
Expand All @@ -41,7 +41,8 @@ else if(rs.hasColumn(room) && rs.getObject(room) != null)
value = rs.getString(room);
}

sb.append(safeAppend(rs, "Moved to", value));
sb.append(PageFlowUtil.filter("Moved to : " + value));
sb.append("\n");
sb.append(safeAppend(rs, "Reason", "reason"));
sb.append(safeAppend(rs, "Remark", "remark"));

Expand Down
Loading