Skip to content

Diet addition with no end date #1355

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
kollil wants to merge 4 commits into
base: release24.11-SNAPSHOT
Choose a base branch
from
Open

Diet addition with no end date #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55e114d
New diet to bypass the enddate is added to the meds order list
kollil May 14, 2025
9bed473
Updated the headers
kollil May 27, 2025
8dab23e
Changed WARN to ERROR for enddate exception validation.
kollil May 27, 2025
15c699c
Added enddate field to the test case.
kollil May 30, 2025
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: 4 additions & 1 deletion onprc_ehr/resources/queries/onprc_ehr/MedsEndDateAlert.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
Added these two Diets to the list by Kollil on 4/15/25. Refer to tkt #12363
3. E-X0500 - Diet, L-Phyto (Low-phytoestrogen)
4. E-Y9750 - Diet, 5047 High Protein, Jumbo

Added Diet to the list by Kollil on 5/14/25. Refer to tkt #12506
5. E-X1380 - Diet Daily (Non-standard), 5LOP (TAD)
*/
SELECT
Id,
Expand All @@ -27,5 +30,5 @@ SELECT
category,
taskid.rowid as TaskId
FROM study.treatment_order
WHERE code NOT IN ('E-85760', 'E-Y7735', 'E-X0500', 'E-Y9750')
WHERE code NOT IN ('E-85760', 'E-Y7735', 'E-X0500', 'E-Y9750', 'E-X1380')
AND enddate is null
9 changes: 7 additions & 2 deletions onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,10 +1103,15 @@ exports.init = function(EHR){
3. E-X0500 - Diet, L-Phyto (Low-phytoestrogen)
4. E-Y9750 - Diet, 5047 High Protein, Jumbo

Added Diet to the list by Kollil on 5/14/25. Refer to tkt #12506
5. E-X1380 - Diet Daily (Non-standard), 5LOP (TAD)

*/
if (row.code != 'E-85760' && row.code != 'E-Y7735' && row.code != 'E-X0500' && row.code != 'E-Y9750'){
if (row.code != 'E-85760' && row.code != 'E-Y7735' && row.code != 'E-X0500' && row.code != 'E-Y9750' && row.code != 'E-X1380'){
if (!row.enddate) {
EHR.Server.Utils.addError(scriptErrors, 'enddate', 'Must enter enddate', 'WARN');
//Changed by Kollil on 5/28/25 - Changed the 'WARN' to 'ERROR' to tighten the end date validation.
//This will prevent the user to submit the med/diet data without passing the validation. The "Force Submit" button WILL NOT WORK with this setting.
EHR.Server.Utils.addError(scriptErrors, 'enddate', 'Must enter enddate', 'ERROR');
}
}
});
Expand Down
8 changes: 4 additions & 4 deletions onprc_ehr/src/org/labkey/onprc_ehr/notification/AdminNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,17 @@ private void MedsEndDateAlert(Container c, User u, final StringBuilder msg, fina
TableSelector ts = new TableSelector(ti, null, new Sort("date"));
long count = ts.getRowCount();
if (count == 0) {
//msg.append("<b>There are no meds ordered except E-85760 (Medroxyprogesterone injectable 150mg/ml) and E-Y7735 (Diet - Weekly Multivitamin) with missing end dates!</b><hr>");
msg.append("<b>No medication orders found with missing end date except the following approved list:" +
msg.append("No medication orders found with missing end date except the following approved list:" +
" <br>1. E-85760 (Medroxyprogesterone injectable 150mg/ml) " +
" <br>2. E-Y7735 (Diet - Weekly Multivitamin)" +
" <br>3. E-X0500 (Diet, L-Phyto (Low-phytoestrogen)) " +
" <br>4. E-Y9750 (Diet, 5047 High Protein, Jumbo) </b><hr>");
" <br>4. E-Y9750 (Diet, 5047 High Protein, Jumbo) " +
" <br>5. E-X1380 (Diet Daily (Non-standard), 5LOP (TAD)) <hr>");
}
else if (count > 0)
{
//Display the report link on the notification page
msg.append("<br><b>Meds with missing end date:</b><br><br>");
msg.append("<br><b>Medication orders with missing end date:</b><br><br>");
msg.append("<b>" + count + " meds found with missing end dates:</b>");
msg.append("<p><a href='" + getExecuteQueryUrl(c, "onprc_ehr", "MedsEndDateAlert", null) + "'>Click here to view the meds/diets</a></p>\n");
msg.append("<hr>");
Expand Down
3 changes: 3 additions & 0 deletions onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,9 @@ public void testExamEntry() throws Exception
Assert.assertEquals("mg/tablet", ordersGrid.getFieldValue(3, "conc_units"));
Assert.assertEquals(3L, ordersGrid.getFieldValue(3, "dosage"));
Assert.assertEquals("mg/kg", ordersGrid.getFieldValue(3, "dosage_units"));
//Added enddate by kollil
Date date_tr = DateUtils.truncate(new Date(), Calendar.DATE);
Assert.assertEquals(date_tr, ordersGrid.getDateFieldValue(3, "enddate"));

//note: amount calculation testing handled in surgery test

Expand Down