From 32d3f75a228e5d1ac22048c22ca3fc576a36e9a4 Mon Sep 17 00:00:00 2001 From: Kate Yang <150059882+kateyang1998@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:01:34 -0400 Subject: [PATCH 1/2] fix: fixed EChart -> Disease Registry's 404 error and css style; added missing struts config to fix the 'Resolve' tab --- src/main/webapp/WEB-INF/classes/struts.xml | 6 ++++++ .../webapp/oscarResearch/oscarDxResearch/dxResearch.jsp | 2 +- .../oscarDxResearch/dxResearchCustomization.jsp | 2 +- .../oscarDxResearch/dxResearchEditQuickList.jsp | 2 +- .../oscarDxResearch/dxResearchNewQuickList.jsp | 2 +- .../oscarDxResearch/dxResearchSelectAssociations.jsp | 4 ++-- .../oscarDxResearch/dxResearchSelectQuickList.jsp | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/classes/struts.xml b/src/main/webapp/WEB-INF/classes/struts.xml index b06861b2e75..7605ae523da 100644 --- a/src/main/webapp/WEB-INF/classes/struts.xml +++ b/src/main/webapp/WEB-INF/classes/struts.xml @@ -1462,6 +1462,9 @@ /oscarResearch/oscarDxResearch/dxResearch.jsp + + /oscarResearch/oscarDxResearch/dxResearch.jsp + /oscarResearch/oscarDxResearch/dxcodeSearch.do /oscarResearch/oscarDxResearch/setupDxResearch.do @@ -1473,6 +1476,9 @@ /oscarResearch/oscarDxResearch/setupDxResearch.do + + /oscarResearch/oscarDxResearch/setupDxResearch.do + /oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp index 7f413590c3d..b71f8c82fe0 100644 --- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp +++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearch.jsp @@ -97,7 +97,7 @@ href="${pageContext.servletContext.contextPath}/library/bootstrap/3.0.0/css/bootstrap.min.css"/> - + - + diff --git a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp index 24a4ec437bd..65ce3441e63 100644 --- a/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp +++ b/src/main/webapp/oscarResearch/oscarDxResearch/dxResearchSelectQuickList.jsp @@ -29,7 +29,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> - + From 7ea440243fead535126773586640940768040d26 Mon Sep 17 00:00:00 2001 From: Kate Yang <150059882+kateyang1998@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:56:20 -0400 Subject: [PATCH 2/2] fix: fixed tickler note saving issue --- .../casemgmt/web/CaseManagementEntry2Action.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java b/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java index 16bff21cb03..0cce277fe93 100644 --- a/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java +++ b/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java @@ -3292,10 +3292,17 @@ public static boolean determineNoteRole(CaseManagementNote note, String provider boolean programSet = false; if (note.getProgram_no() != null && note.getProgram_no().length() > 0 && !"null".equals(note.getProgram_no())) { - ProgramProvider pp = programProviderDao.getProgramProvider(note.getProviderNo(), Long.valueOf(note.getProgram_no())); - if (pp != null) { - note.setReporter_caisi_role(String.valueOf(pp.getRoleId())); - programSet = true; + try { + Long programId = Long.valueOf(note.getProgram_no()); + if (programId > 0) { + ProgramProvider pp = programProviderDao.getProgramProvider(note.getProviderNo(), programId); + if (pp != null) { + note.setReporter_caisi_role(String.valueOf(pp.getRoleId())); + programSet = true; + } + } + } catch (NumberFormatException e) { + // Invalid program number format, skip program provider lookup } }