Index: ssts-web/src/main/webapp/openSystemMainPage.jsp =================================================================== diff -u -r16571 -r18405 --- ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 16571) +++ ssts-web/src/main/webapp/openSystemMainPage.jsp (.../openSystemMainPage.jsp) (revision 18405) @@ -4,6 +4,7 @@ <%@page import="com.forgon.systemsetting.service.HttpOptionManager,com.forgon.disinfectsystem.common.*"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.ipandorgunitmapping.service.IpAndOrgUnitMappingManager"%> <%@page import="com.forgon.disinfectsystem.biologymonitorwarning.service.BiologyMonitorWarningManager"%> +<%@page import="com.forgon.disinfectsystem.urgentgoodswarning.service.UrgentGoodsWarningManager"%> <%@page import="com.forgon.log.model.Log" %> <%@page import="java.util.List"%> <% @@ -44,9 +45,16 @@ session.setAttribute("sterilerGroupList", tem); if (loginUserData.getFirstSupplyRoomUser() != null -&& loginUserData.getFirstSupplyRoomUser()) { //当前登录的科室是否为一级供应室,登录完成删除之前提示过的生物监测记录 +&& loginUserData.getFirstSupplyRoomUser()) { //当前登录的科室为一级供应室,登录完成删除之前提示过的生物监测记录,并且删除之前提示过的加急物品 + String userName = loginUserData.getUserName(); + String currentOrgUnitCode = loginUserData.getCurrentOrgUnitCode(); + //删除之前提示过的生物监测记录 ((BiologyMonitorWarningManager)SpringBeanManger.getBean("biologyMonitorWarningManager")) - .deleteBiologyMonitorWarningByUserNameAndCurrentDepartCode(loginUserData.getUserName(), loginUserData.getCurrentOrgUnitCode()); + .deleteBiologyMonitorWarningByUserNameAndCurrentDepartCode(userName, currentOrgUnitCode); + + //删除之前提示过的加急物品 + UrgentGoodsWarningManager urgentGoodsWarningManager = ((UrgentGoodsWarningManager)SpringBeanManger.getBean("urgentGoodsWarningManager")); + urgentGoodsWarningManager.deleteUrgentGoodsWarning(userName, currentOrgUnitCode); } String logonType = (String)session.getAttribute("logonType");