From 3f68b49fbe1ed8c2ebb7bbf861d3c49e42725b57 Mon Sep 17 00:00:00 2001
From: Kate Yang <150059882+kateyang1998@users.noreply.github.com>
Date: Wed, 16 Jul 2025 16:59:44 -0400
Subject: [PATCH] fix: fixed jsp compilation error

---
 src/main/webapp/renal/ckd_dsa_detail.jsp | 26 +++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/renal/ckd_dsa_detail.jsp b/src/main/webapp/renal/ckd_dsa_detail.jsp
index b6f7e548b95..87fcb603e36 100644
--- a/src/main/webapp/renal/ckd_dsa_detail.jsp
+++ b/src/main/webapp/renal/ckd_dsa_detail.jsp
@@ -158,13 +158,33 @@
     }
 
     if (screeningDx != null) {
-        message += "Screening complete - <a href=\"javascript:void(0)\" onClick=\"popupPage(580,900,'<%=request.getContextPath()%>/oscarResearch/oscarDxResearch/dxResearchUpdate.do?status=C&did=" + screeningDx.getId() + "&demographicNo=" + Integer.parseInt(demographicNo) + "&providerNo=" + loggedInInfo.getLoggedInProviderNo() + "');\">Click Here</a>.<br/>";
-        message += "Screening not appropriate - <a href=\"javascript:void(0)\" onClick=\"popupPage(580,900,'<%=request.getContextPath()%>/oscarResearch/oscarDxResearch/dxResearchUpdate.do?status=D&did=" + screeningDx.getId() + "&demographicNo=" + Integer.parseInt(demographicNo) + "&providerNo=" + loggedInInfo.getLoggedInProviderNo() + "');\">Click Here</a>.<br/>";
+        String baseUrl = request.getContextPath() + "/oscarResearch/oscarDxResearch/dxResearchUpdate.do";
+        String did = screeningDx.getId().toString();
+        String demo = Integer.toString(Integer.parseInt(demographicNo));
+        String provider = loggedInInfo.getLoggedInProviderNo();
+
+        String urlC = baseUrl + "?status=C&did=" + did + "&demographicNo=" + demo + "&providerNo=" + provider;
+        String urlD = baseUrl + "?status=D&did=" + did + "&demographicNo=" + demo + "&providerNo=" + provider;
+
+        message += "Screening complete - <a href=\"javascript:void(0)\" onclick=\"popupPage(580,900,'" + urlC + "');\">Click Here</a>.<br/>";
+        message += "Screening not appropriate - <a href=\"javascript:void(0)\" onclick=\"popupPage(580,900,'" + urlD + "');\">Click Here</a>.<br/>";
     }
 
     dxs = dxResearchDao.findByDemographicNoResearchCodeAndCodingSystem(Integer.parseInt(demographicNo), "585", "icd9");
     if (dxs.size() == 0) {
-        message += "<br/>Add 'Chronic Renal Failure' to Dx Registry, and prevent subsequent notifications - <a href=\"javascript:void(0);\" onClick=\"popupPage(580,900,'<%=request.getContextPath()%>/oscarResearch/oscarDxResearch/dxResearch.do?selectedCodingSystem=icd9&xml_research1=585&xml_research2=&xml_research3=&xml_research4=&xml_research5=&demographicNo=" + demographicNo + "&quickList=default&forward=');\">Click Here</a></br/>";
+        String popupUrl = request.getContextPath() + "/oscarResearch/oscarDxResearch/dxResearch.do"
+                        + "?selectedCodingSystem=icd9"
+                        + "&xml_research1=585"
+                        + "&xml_research2="
+                        + "&xml_research3="
+                        + "&xml_research4="
+                        + "&xml_research5="
+                        + "&demographicNo=" + demographicNo
+                        + "&quickList=default"
+                        + "&forward=";
+
+        message += "<br/>Add 'Chronic Renal Failure' to Dx Registry, and prevent subsequent notifications - "
+                + "<a href=\"javascript:void(0);\" onclick=\"popupPage(580,900,'" + popupUrl + "');\">Click Here</a><br/>";
     }
 %>
 <%=message %>