Skip to content

Commit 4408991

Browse files
kollilkollil
committed
Updated the query
1 parent 93fb97f commit 4408991

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎onprc_ehr/resources/queries/study/AlopeciaScoreMissingBehaviorCases.sql‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Show 1 year data.
55
66
Modified by Kollil 09/15/2025
77
Added date comparison to check only dates and ignore time
8+
9+
Modified by Kollil July 2026
10+
Showing only 1 week data, Refer to tkt # 14974
811
*/
912
SELECT
1013
mr.Id,
@@ -33,7 +36,7 @@ FROM (
3336
WHERE
3437
co2.Id = co.Id
3538
AND co2.category = 'Alopecia Score'
36-
AND co2.created >= TIMESTAMPADD(SQL_TSI_YEAR, -1, NOW())
39+
AND co2.created >= TIMESTAMPADD(SQL_TSI_DAY, -7, NOW())
3740
)
3841
) AS mr
3942
INNER JOIN study.demographics AS d ON mr.Id = d.Id
@@ -47,8 +50,6 @@ WHERE
4750
c.Id = mr.Id
4851
AND c.category = 'Behavior'
4952
AND c.allProblemCategories = 'Behavioral: Alopecia'
50-
-- AND c.date <= mr.date
51-
-- AND (c.enddate IS NULL OR c.enddate > mr.date)
5253
AND CAST(c.date AS DATE) <= CAST(mr.date AS DATE)
5354
AND (c.enddate IS NULL OR CAST(c.enddate AS DATE) >= CAST(mr.date AS DATE))
5455
)

‎onprc_ehr/src/org/labkey/onprc_ehr/notification/BehaviorNotification.java‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -351,31 +351,30 @@ private void assignmentsReleasedInPast1Day(final Container c, User u, final Stri
351351
final Map<FieldKey, ColumnInfo> colMap = QueryService.get().getColumns(ti, columns);
352352
TableSelector ts2 = new TableSelector(ti, colMap.values(), null, new Sort("Id"));
353353

354-
// msg.append("<hr><b>Assignments with new \"Release date\" added within the last 24hrs:</b><br><br>\n");
355-
msg.append("<table border=1 style='border-collapse: collapse;'>");
354+
msg.append("<table border=1 style='border-collapse: collapse; border: 1px solid black;'>");
356355
msg.append("<tr bgcolor = " + '"' + "#FFD700" + '"' + "style='font-weight: bold;'>");
357356
msg.append("<td>Id </td><td>Sex </td><td>Room </td><td>Cage </td><td>Project </td><td>Protocol </td><td>Title </td><td>Project Investigator </td><td>Assign Date </td><td>Release Date </td><td>Projected Release Date </td><td>Assignment Type </td><td>Assign Condition </td><td>Projected Release Condition </td><td>Condition At Release </td></tr>");
358357

359358
ts2.forEach(object -> {
360359
Results rs = new ResultsImpl(object, colMap);
361360
String url = getParticipantURL(c, rs.getString("Id"));
362361

363-
msg.append("<tr bgcolor = " + '"' + "#FFFACD" + '"' + ">");
364-
msg.append("<td><b> <a href='" + url + "'>" + PageFlowUtil.filter(rs.getString("Id")) + "</a> </b></td>\n");
365-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("Sex")) + "</td>");
366-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("Room")) + "</td>");
367-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("Cage")) + "</td>");
368-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("project")) + "</td>");
369-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("Protocol")) + "</td>");
370-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("Title")) + "</td>");
371-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("ProjectInvestigator")) + "</td>");
372-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("AssignDate")) + "</td>");
373-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("ReleaseDate")) + "</td>");
374-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("ProjectedReleaseDate")) + "</td>");
375-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("assignmentType")) + "</td>");
376-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("assignCondition")) + "</td>");
377-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("projectedReleaseCondition")) + "</td>");
378-
msg.append("<td>" + PageFlowUtil.filter(rs.getString("ConditionAtRelease")) + "</td>");
362+
msg.append("<tr>");
363+
msg.append("<td style='border: 1px solid black;'><b> <a href='" + url + "'>" + PageFlowUtil.filter(rs.getString("Id")) + "</a> </b></td>\n");
364+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("Sex")) + "</td>");
365+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("Room")) + "</td>");
366+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("Cage")) + "</td>");
367+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("project")) + "</td>");
368+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("Protocol")) + "</td>");
369+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("Title")) + "</td>");
370+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("ProjectInvestigator")) + "</td>");
371+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("AssignDate")) + "</td>");
372+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("ReleaseDate")) + "</td>");
373+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("ProjectedReleaseDate")) + "</td>");
374+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("assignmentType")) + "</td>");
375+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("assignCondition")) + "</td>");
376+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("projectedReleaseCondition")) + "</td>");
377+
msg.append("<td style='border: 1px solid black;'>" + PageFlowUtil.filter(rs.getString("ConditionAtRelease")) + "</td>");
379378
msg.append("</tr>");
380379
});
381380
msg.append("</table><br><hr>");
@@ -403,7 +402,7 @@ private void AlopeciaScoreAlert(final Container c, User u, final StringBuilder m
403402
msg.append("<a href='" + getExecuteQueryUrl(c, "study", "AlopeciaScoreMissingBehaviorCases", null) + "'>Click here to view them in a separate window</a>\n");
404403
msg.append("\n\n");
405404

406-
//CHnages made byKolli, July 2026, Refer to tkt # 14974
405+
//Changes made byKolli, July 2026, Refer to tkt # 14974
407406
//Display the daily report in the email
408407
Set<FieldKey> columns = new HashSet<>();
409408
columns.add(FieldKey.fromString("Id"));

0 commit comments

Comments
 (0)