Skip to content

Commit 55e114d

Browse files
committed
New diet to bypass the enddate is added to the meds order list
1 parent 0a2859f commit 55e114d

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

onprc_ehr/resources/queries/onprc_ehr/MedsEndDateAlert.sql

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
Added these two Diets to the list by Kollil on 4/15/25. Refer to tkt #12363
77
3. E-X0500 - Diet, L-Phyto (Low-phytoestrogen)
88
4. E-Y9750 - Diet, 5047 High Protein, Jumbo
9+
10+
Added Diet to the list by Kollil on 5/14/25. Refer to tkt #12506
11+
5. E-X1380 - Diet Daily (Non-standard), 5LOP (TAD)
912
*/
1013
SELECT
1114
Id,
@@ -27,5 +30,5 @@ SELECT
2730
category,
2831
taskid.rowid as TaskId
2932
FROM study.treatment_order
30-
WHERE code NOT IN ('E-85760', 'E-Y7735', 'E-X0500', 'E-Y9750')
33+
WHERE code NOT IN ('E-85760', 'E-Y7735', 'E-X0500', 'E-Y9750', 'E-X1380')
3134
AND enddate is null

onprc_ehr/resources/scripts/onprc_ehr/onprc_triggers.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,8 +1103,11 @@ exports.init = function(EHR){
11031103
3. E-X0500 - Diet, L-Phyto (Low-phytoestrogen)
11041104
4. E-Y9750 - Diet, 5047 High Protein, Jumbo
11051105
1106+
Added Diet to the list by Kollil on 5/14/25. Refer to tkt #12506
1107+
5. E-X1380 - Diet Daily (Non-standard), 5LOP (TAD)
1108+
11061109
*/
1107-
if (row.code != 'E-85760' && row.code != 'E-Y7735' && row.code != 'E-X0500' && row.code != 'E-Y9750'){
1110+
if (row.code != 'E-85760' && row.code != 'E-Y7735' && row.code != 'E-X0500' && row.code != 'E-Y9750' && row.code != 'E-X1380'){
11081111
if (!row.enddate) {
11091112
EHR.Server.Utils.addError(scriptErrors, 'enddate', 'Must enter enddate', 'WARN');
11101113
}

onprc_ehr/src/org/labkey/onprc_ehr/notification/AdminNotifications.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ private void MedsEndDateAlert(Container c, User u, final StringBuilder msg, fina
119119
TableSelector ts = new TableSelector(ti, null, new Sort("date"));
120120
long count = ts.getRowCount();
121121
if (count == 0) {
122-
//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>");
123-
msg.append("<b>No medication orders found with missing end date except the following approved list:" +
122+
msg.append("No medication orders found with missing end date except the following approved list:" +
124123
" <br>1. E-85760 (Medroxyprogesterone injectable 150mg/ml) " +
125124
" <br>2. E-Y7735 (Diet - Weekly Multivitamin)" +
126125
" <br>3. E-X0500 (Diet, L-Phyto (Low-phytoestrogen)) " +
127-
" <br>4. E-Y9750 (Diet, 5047 High Protein, Jumbo) </b><hr>");
126+
" <br>4. E-Y9750 (Diet, 5047 High Protein, Jumbo) " +
127+
" <br>5. E-X1380 (Diet Daily (Non-standard), 5LOP (TAD)) <hr>");
128128
}
129129
else if (count > 0)
130130
{

0 commit comments

Comments
 (0)