Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 40042)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp (.../portalPage.jsp) (revision 40044)
@@ -13,6 +13,20 @@
<%@ include file="/common/taglibs.jsp"%>
<%@page import="java.io.File" %>
<%@page import="com.forgon.disinfectsystem.entity.satisfactionsurvey.Satisfaction"%>
+
+
+
+
+${title}
+
+
+
+
+
+
+
+
+
<%
PortalPageAction portalPageAction = (PortalPageAction)SpringBeanManger.getBean("portalPageAction");
SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
@@ -26,7 +40,7 @@
response.sendRedirect("/openSystemMainPage.jsp");
return;
}
-
+
String directOrgUnitCodesWhereUserBelong = userData.getDirectOrgUnitCodesWhereUserBelong();
boolean isUserBelongToMultipleDeparts = false; // 用户是否属于多个部门
if (directOrgUnitCodesWhereUserBelong != null && directOrgUnitCodesWhereUserBelong.indexOf(";") > 0){
@@ -67,7 +81,7 @@
}
String menuPath = "disinfectsystem/config/" + project + "/menu/menuconfigure.js";
File fileMenu = new File(application.getRealPath("/") + menuPath);
-
+
if(fileMenu.exists()){
session.setAttribute("menuPath", application.getAttribute("ctx") + "/"+menuPath);
}else{
@@ -76,7 +90,7 @@
request.setAttribute("quickJumpOperationTousseOp",supplyRoomConfigManager.getSystemParamsObj().getQuickJumpOperationTousseOp());
request.setAttribute("quickJumpGroupStorage",supplyRoomConfigManager.getSystemParamsObj().getQuickJumpGroupStorage());
-
+
String openSelectOrgUnitWindow = (String)session.getAttribute("openSelectOrgUnitWindow"); //决定要不要显示切换科室的窗口
if ("打开".equals(openSelectOrgUnitWindow)) {
session.setAttribute("openSelectOrgUnitWindow", "不打开"); //这一步防止刷新又会打开
@@ -94,21 +108,9 @@
}
tem = tem.substring(0, tem.length()-1);
}
- tem += "]";
+ tem += "]";
request.setAttribute("sterilerGroupList", tem);
%>
-
-
-
-
-${title}
-
-
-
-
-
-
-
-
-