Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r15229 -r17226
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 15229)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 17226)
@@ -129,8 +129,9 @@
 	}
 
 	/**
-	 * 即将过期器械包
-	 * 
+	 * 构建获取“即将过期器械包数量”的sql语句..
+	 * @param supplyRoomType	供应室类型
+	 * @param orgUnitCoding	科室编码
 	 * @return
 	 */
 	private String getWarningTousseGoodsSQL(int supplyRoomType, String orgUnitCoding) {
@@ -162,8 +163,9 @@
 	}
 
 	/**
-	 * 获取已过期的器械包数量
-	 * 
+	 * 构建获取“获取已过期的器械包数量”的sql语句..
+	 * @param roomType	供应室类型
+	 * @param orgUnitCoding	科室编码
 	 * @return
 	 */
 	private String getExpiredToussesCount(int roomType,
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/departTousseGoodsWarningView.js
===================================================================
diff -u -r12331 -r17226
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/departTousseGoodsWarningView.js	(.../departTousseGoodsWarningView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/departTousseGoodsWarningView.js	(.../departTousseGoodsWarningView.js)	(revision 17226)
@@ -6,8 +6,8 @@
 }
 
 function callDepartTousse(departmentCode){
-	var warningType2 = Ext.getCmp('warningType2').getValue();
-	location.href=WWWROOT + "/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?department="+departmentCode+"&warningType2="+warningType2;
+	var warningType = Ext.getCmp('warningType2').getValue();
+	location.href=WWWROOT + "/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?department="+departmentCode+"&warningType="+warningType;
 }
 
 function renderSterilizer(v, p, record) {
Index: forgon-core/src/main/java/com/forgon/security/service/OperationManager.java
===================================================================
diff -u -r12331 -r17226
--- forgon-core/src/main/java/com/forgon/security/service/OperationManager.java	(.../OperationManager.java)	(revision 12331)
+++ forgon-core/src/main/java/com/forgon/security/service/OperationManager.java	(.../OperationManager.java)	(revision 17226)
@@ -32,8 +32,17 @@
 	
 	public void updateOperationsForRole(String roleId, String[] operationIds);
 	
+	/**
+	 * 判断用户，是否拥有指定的权限..
+	 * @param operationId	指定的权限
+	 * @param userOperationIds	用户的全部的权限
+	 * @return
+	 */
 	public boolean isUserHasOperation(String operationId, String userOperationIds);
 	
+	/**
+	 *  得到当前用户的所有操作ID，返回的是字符串
+	 */
 	public String getOperationIdsBySessionUser();
 	
 	public List<String> getAllUserFullNameByOperationId(String operationId);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r17209 -r17226
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 17209)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 17226)
@@ -401,19 +401,8 @@
     Ext.QuickTips.init();
     Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
     
-    var allFlag = '全部';
-    var dt = new Date();
-	$Id('parm_s_startTime').value = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-01";
-	$Id('parm_s_endTime').value = Ext.util.Format.date(dt, 'Y-m-d');
-	
-    var type = allFlag;
-    if(department && warningType2){  //前一个页面指定了“科室”和“告警类型”
-        document.getElementById("parm_s_type").value = warningType2;
-        document.getElementById("parm_s_department").value = department;
-        type = warningType2;
-    } else {
-    	document.getElementById("parm_s_type").value = allFlag;
-    }
+    $Id('parm_s_type').value = warningType;
+    $Id('parm_s_department').value = department;
     
     var columns = [
         {header : "器械包名称",width : 200,dataIndex : 'tousseName',renderer:renderCallTousseInstanceInfoShowFun},
@@ -477,7 +466,7 @@
         editable:false,
         triggerAction : 'all',
         width : 150,
-        value : type,
+        value : warningType,
         listeners : {
             select : function(combo,record,index ){
                 $Id('parm_s_type').value = combo.getRawValue();
@@ -492,7 +481,6 @@
 		id : 'startTime',
 		name : 'startTime',
 		readOnly : true,
-		value: new Date(dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01"),
 		format : 'Y-m-d',
 		altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 		listeners : {
@@ -508,7 +496,6 @@
 		id : 'endTime',
 		name : 'endTime',
 		readOnly : true,
-		value: dt,
 		format : 'Y-m-d',
 		altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 		listeners : {
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r17215 -r17226
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 17215)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 17226)
@@ -1277,7 +1277,7 @@
 	}else if(v ==disabledGoods || v == diposableGoods){
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp?queryType='+v);
 	}else if(v == warningTousseGoods || v == disabledTousseGoods){
-		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?warningType2='+v);
+		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?warningType='+v);
 	}else if(v == warningMaterialGoods ){
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?warning=warning');
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp
===================================================================
diff -u -r17209 -r17226
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 17209)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 17226)
@@ -30,13 +30,17 @@
 	//扫描篮筐允许的篮筐状态集合
     var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
     
+    var allFlag = '全部';
     var warningTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_TOUSSE%>';
     var disabledTousseGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DISABLED_TOUSSE%>';
     var department = '<%= request.getParameter("department")%>';
+    if(department == null || department == "null"){
+    	department = "";
+    }
     
-    var warningType2 = '<%= request.getParameter("warningType2")%>';
-    if(warningType2 == null || warningType2 == "null"){
-    	warningType2 = "";
+    var warningType = '<%= request.getParameter("warningType")%>';
+    if(warningType == null || warningType == "null"){
+    	warningType = allFlag;
     }
     
 var System_TousseGoods_delete = true;