Index: ssts-web/src/main/webapp/common/selPersonByOrgUnit.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selPersonByOrgUnit.jsp	(.../selPersonByOrgUnit.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selPersonByOrgUnit.jsp	(.../selPersonByOrgUnit.jsp)	(revision 40044)
@@ -96,9 +96,9 @@
 			alert("请输入要查询的姓名！");
 			return false;
 		}
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
 	DirectoryHelper.findAllUser(ifReturnId,setAllListOption);
-	DWREngine.setAsync(true); 
+	dwr.engine.setAsync(true);
 	var listBoxOptions =  document.forms[0].elements['allList'].options;
 	var optionsMap = new Object();
 	var isFinded = false;
Index: ssts-web/src/main/webapp/expensivegoodshomepage/main.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/expensivegoodshomepage/main.jsp	(.../main.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/expensivegoodshomepage/main.jsp	(.../main.jsp)	(revision 40044)
@@ -78,7 +78,7 @@
 }
 
 function iniNoteInfo(){
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
     var userName =$Id('userName').value;
     if(userName==null){
 	    alert("无效的用户名");
Index: ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/orgUnitExt.js	(.../orgUnitExt.js)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/orgUnitExt.js	(.../orgUnitExt.js)	(revision 40044)
@@ -385,13 +385,13 @@
     	
     	var orgUnitName = Ext.getCmp('name').getValue();
     	var name = "";
-    	DWREngine.setAsync(false);
+    	dwr.engine.setAsync(false);
     	SupplyRoomConfigTableManager.getUnitName(function(unitName){
     		if(unitName != null && unitName != ""){
     			name = unitName;
     		}
     	});
-    	DWREngine.setAsync(true);
+    	dwr.engine.setAsync(true);
     	printOrgUnitInfo(barcodeStr,orgUnitName,name,type);
     }
     
@@ -508,13 +508,13 @@
     //科室编码不可以相同，科室名称可以相同（下面注释掉的的方法两者都不可以相同）
     function validateOrgCode(){
         if(StringUtils.isBlank(id)){  //新添加的操作，验证部门编码即可
-        	DWREngine.setAsync(false);
+        	dwr.engine.setAsync(false);
             if(sstsConfig.enableThirdPartyDepartmentCoding){
                 OrgUnitTableManager.isRepeatCoding(Ext.getCmp('orgForeignKey').getValue().Trim(),setIsRepeatCoding);
             }else {
                 OrgUnitTableManager.isRepeatCoding(Ext.getCmp('orgUnitCoding').getValue().Trim(),setIsRepeatCoding);
             }
-	        DWREngine.setAsync(true);
+	        dwr.engine.setAsync(true);
         } 
         
         if (!isNotRepeatCoding){
@@ -527,15 +527,15 @@
     
 //	function validateOrgCodeAndName(){
 //        if(StringUtils.isBlank(id)){  //新添加的操作，验证部门编码和部门名称
-//        	DWREngine.setAsync(false);
+//        	dwr.engine.setAsync(false);
 //	        OrgUnitTableManager.isRepeatCoding(Ext.getCmp('orgUnitCoding').getValue().Trim(),setIsRepeatCoding);
 //	        OrgUnitTableManager.isRepeatName(Ext.getCmp('name').getValue().Trim(),setIsRepeatName);
-//	        DWREngine.setAsync(true);
+//	        dwr.engine.setAsync(true);
 //        } else {  //更新的操作，就只验证部门名称就可以了
 //        	if (oldName != Ext.getCmp('name').getValue().Trim()) {  //如果改部门的名称就要去后台验证此部门是不是已经存在
-//        		DWREngine.setAsync(false);
+//        		dwr.engine.setAsync(false);
 //    	        OrgUnitTableManager.isRepeatName(Ext.getCmp('name').getValue().Trim(),setIsRepeatName);
-//    	        DWREngine.setAsync(true);
+//    	        dwr.engine.setAsync(true);
 //        	} else {
 //        		isNotRepeatName = true;
 //        	}
Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 40044)
@@ -29,14 +29,14 @@
 		var newPassword = Ext.getCmp('newPassword').getValue();
 		if(isNeedUpdateResetDate=='true'){
 			alertTitle = "重置";
-			DWREngine.setAsync(false);
+			dwr.engine.setAsync(false);
 			UserTableManager.resetPWDAndUpdateResetDate(paramId,newPassword,true,showTable);
-			DWREngine.setAsync(true);
+			dwr.engine.setAsync(true);
 		}else{
 			alertTitle = "修改";
-			DWREngine.setAsync(false);
+			dwr.engine.setAsync(false);
 			UserTableManager.modifyPWD(paramId,newPassword,showTable);
-			DWREngine.setAsync(true);
+			dwr.engine.setAsync(true);
 		}
 	}
 	thiz.enable();
Index: ssts-web/src/main/webapp/common/selPersonAndOrgByExt.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selPersonAndOrgByExt.jsp	(.../selPersonAndOrgByExt.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selPersonAndOrgByExt.jsp	(.../selPersonAndOrgByExt.jsp)	(revision 40044)
@@ -147,9 +147,9 @@
             return false;
         }
         
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         changeType();
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
         
         var isFinded = false;
         var selObj = formPanel.findById('selTypeList');
Index: ssts-web/src/main/webapp/common/selPersonByExt.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selPersonByExt.jsp	(.../selPersonByExt.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selPersonByExt.jsp	(.../selPersonByExt.jsp)	(revision 40044)
@@ -150,9 +150,9 @@
             return false;
         }
         
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         changeType();
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
         
         var isFinded = false;
         var selObj = formPanel.findById('selTypeList');
Index: ssts-web/src/main/webapp/js/serialNumber.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/js/serialNumber.js	(.../serialNumber.js)	(revision 40042)
+++ ssts-web/src/main/webapp/js/serialNumber.js	(.../serialNumber.js)	(revision 40044)
@@ -15,14 +15,14 @@
 
 	//alert(checkPOName+";"+checkPropertyName+";"+checkPropertyField+";"+alertMsg+";"+type);
 	var tag=true;
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
 	
 	SerialNumberManager.SerialNumberUniqueCheck(checkPOName,checkPropertyName,checkPropertyField,checkInfo);
 	
 	function checkInfo(data) {
     	tag=data;
    	}
-	DWREngine.setAsync(true); 
+	dwr.engine.setAsync(true); 
 
 	if(tag==false){
 		alert(alertMsg);
Index: ssts-web/src/main/webapp/js/linkage.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/js/linkage.js	(.../linkage.js)	(revision 40042)
+++ ssts-web/src/main/webapp/js/linkage.js	(.../linkage.js)	(revision 40044)
@@ -60,7 +60,7 @@
 	    thirdSelect.options[0].text = " 请先选定" + firstDefaultValue + " ";
 	    thirdSelect.options[0].value = "";
     } else {
-	    DWREngine.setAsync(false);
+	    dwr.engine.setAsync(false);
 	    LinkageTableManager.getAllChildrenNode(firstId,linkageType,backingFirst);
 	
 	    function backingFirst(data){
@@ -86,7 +86,7 @@
 	        }
 	    }
 	}
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
 }
 
 //变化第二级联动时加载第三级联动数据
@@ -98,7 +98,7 @@
         thirdSelect.options[0].text = " 请先选定" + secondDefaultValue + " ";
         thirdSelect.options[0].value = "";
     }else {
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         LinkageTableManager.getAllChildrenNode(secondId,linkageType,backingSecond);
         function backingSecond( data ){
             if (data != null){
@@ -116,7 +116,7 @@
                 thirdSelect.options[0].value = "";
             }
         }
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
     }
 }
 
@@ -192,7 +192,7 @@
         secondSelect.options[0].text = " 请先选定" + firstDefaultValue + " ";
         secondSelect.options[0].value = "";
     } else {
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         LinkageTableManager.getAllChildrenNode(firstId,linkageType,backingFirst);
     
         function backingFirst(data){
@@ -212,7 +212,7 @@
             }
         }
     }
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
 }
 
 //保存前的数据拷贝
Index: ssts-web/src/main/webapp/systemmanage/httpTreeOptionView.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/httpTreeOptionView.jsp	(.../httpTreeOptionView.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/httpTreeOptionView.jsp	(.../httpTreeOptionView.jsp)	(revision 40044)
@@ -20,7 +20,7 @@
 var rootId = "";
 var optionType = "${param.optionType}";
 function initDate(){
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
 	HttpTreeOptionTableManager.getHttpTreeOptionTitle(optionType,titleCallBack);
 	function titleCallBack(title){
 		entityName = title;
@@ -30,7 +30,7 @@
 		rootId = data;
 		$Id("parm_s_parentId").value = data;
 	}
-	DWREngine.setAsync(true);
+	dwr.engine.setAsync(true);
 }
 
 </script>
Index: ssts-web/src/main/webapp/systemmanage/userExtView.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 40044)
@@ -523,13 +523,13 @@
         	    		department = currentOrgUnitName;
         	    	}
         	    	var name = "";
-			    	DWREngine.setAsync(false);
+			    	dwr.engine.setAsync(false);
 			    	SupplyRoomConfigTableManager.getUnitName(function(unitName){
 			    		if(unitName != null && unitName != ""){
 			    			name = unitName;
 			    		}
 			    	});
-			    	DWREngine.setAsync(true);
+			    	dwr.engine.setAsync(true);
         	    	printUserInfo(barcode,userFullName,department,name,0);
         	    }
         	   }else{
Index: ssts-web/src/main/webapp/systemmanage/userFormExt.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/userFormExt.js	(.../userFormExt.js)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/userFormExt.js	(.../userFormExt.js)	(revision 40044)
@@ -73,9 +73,9 @@
         }
     }
 	isRepeatLogninId = false;
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
     UserTableManager.isRepeatLogninId(id,Ext.getCmp('name').getValue(),setIsRepeatLogninId);
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
     if (isRepeatLogninId){
     	alert("用户登录名已经存在，请重新输入！");
 		return false;
@@ -504,13 +504,13 @@
     		orgUnitNames = currentOrgUnitName;
     	}
     	var name = "";
-    	DWREngine.setAsync(false);
+    	dwr.engine.setAsync(false);
     	SupplyRoomConfigTableManager.getUnitName(function(unitName){
     		if(unitName != null && unitName != ""){
     			name = unitName;
     		}
     	});
-    	DWREngine.setAsync(true);
+    	dwr.engine.setAsync(true);
     	printUserInfo(barcode,userName,orgUnitNames,name,type);
     }
 
Index: ssts-web/src/main/webapp/homepage/main.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/main.jsp	(.../main.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/main.jsp	(.../main.jsp)	(revision 40044)
@@ -78,7 +78,7 @@
 }
 
 function iniNoteInfo(){
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
     var userName =$Id('userName').value;
     if(userName==null){
 	    alert("无效的用户名");
Index: ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js.bak
===================================================================
diff -u -r39460 -r40044
--- ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js.bak	(.../menuconfigure.js.bak)	(revision 39460)
+++ ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js.bak	(.../menuconfigure.js.bak)	(revision 40044)
@@ -189,7 +189,7 @@
 			   {hidden :SSTS_tousseAccess,text:"物品存取",href:WWWROOT+'/disinfectsystem/storageLocationManage/goodsAccess.jsp',hrefTarget:linkTarget,leaf:true}
 	    ]
 	};
-DWREngine.setAsync(false);
+dwr.engine.setAsync(false);
 PackingTableManager.getAllTaskGroup(setTaskGroup);
 function setTaskGroup(taskGroup){
 	for(var i=0;i<taskGroup.length;i++){
@@ -225,7 +225,7 @@
 	historyPackingLink.leaf = true;
 	DisinfectsystemTreeData[4].children[taskGroup.length+1] = historyPackingLink;
 }
-DWREngine.setAsync(true);
+dwr.engine.setAsync(true);
 if(sterilerGroupList.length >0){
 	for(var i=0;i<sterilerGroupList.length;i++){
 		var link1 = new Object();
Index: ssts-web/src/main/webapp/styles/left_menu.css
===================================================================
diff -u -r39460 -r40044
--- ssts-web/src/main/webapp/styles/left_menu.css	(.../left_menu.css)	(revision 39460)
+++ ssts-web/src/main/webapp/styles/left_menu.css	(.../left_menu.css)	(revision 40044)
@@ -139,25 +139,19 @@
 	BORDER-RIGHT: #80b4db 1px solid; PADDING-RIGHT: 0px; BORDER-TOP: #80b4db 1px solid; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; BORDER-LEFT: #80b4db 1px solid; PADDING-TOP: 0px; BORDER-BOTTOM: #80b4db 1px solid
 }
 .coolButton {
-	BORDER-RIGHT: buttonface 0px solid; PADDING-RIGHT: 5px; BORDER-TOP: buttonface 0px solid; PADDING-LEFT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 12px; FILTER: DropShadow(Color=#000000, OffX=1, OffY=1, Positive=1); PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; BORDER-LEFT: buttonface 0px solid; CURSOR: hand; COLOR: #222222; PADDING-TOP: 2px; BORDER-BOTTOM: buttonface 0px solid; WHITE-SPACE: nowrap
+
 }
 .coolButtonHover {
-	BORDER-RIGHT: buttonface 0px solid; PADDING-RIGHT: 5px; BORDER-TOP: buttonface 0px solid; PADDING-LEFT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 12px; FILTER: DropShadow(Color=#000000, OffX=1, OffY=1, Positive=1); PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; BORDER-LEFT: buttonface 0px solid; CURSOR: hand; COLOR: #222222; PADDING-TOP: 2px; BORDER-BOTTOM: buttonface 0px solid; WHITE-SPACE: nowrap
 }
 .coolButtonActiveHover {
-	BORDER-RIGHT: buttonface 0px solid; PADDING-RIGHT: 5px; BORDER-TOP: buttonface 0px solid; PADDING-LEFT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 12px; FILTER: DropShadow(Color=#000000, OffX=1, OffY=1, Positive=1); PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; BORDER-LEFT: buttonface 0px solid; CURSOR: hand; COLOR: #222222; PADDING-TOP: 2px; BORDER-BOTTOM: buttonface 0px solid; WHITE-SPACE: nowrap
 }
 .coolButtonActive {
-	BORDER-RIGHT: buttonface 0px solid; PADDING-RIGHT: 5px; BORDER-TOP: buttonface 0px solid; PADDING-LEFT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 12px; FILTER: DropShadow(Color=#000000, OffX=1, OffY=1, Positive=1); PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; BORDER-LEFT: buttonface 0px solid; CURSOR: hand; COLOR: #222222; PADDING-TOP: 2px; BORDER-BOTTOM: buttonface 0px solid; WHITE-SPACE: nowrap
 }
 .coolButtonActiveDisabled {
-	BORDER-RIGHT: buttonface 0px solid; PADDING-RIGHT: 5px; BORDER-TOP: buttonface 0px solid; PADDING-LEFT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 12px; FILTER: DropShadow(Color=#000000, OffX=1, OffY=1, Positive=1); PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; BORDER-LEFT: buttonface 0px solid; CURSOR: hand; COLOR: #222222; PADDING-TOP: 2px; BORDER-BOTTOM: buttonface 0px solid; WHITE-SPACE: nowrap
 }
 .coolButtonDisabled {
-	BORDER-RIGHT: buttonface 0px solid; PADDING-RIGHT: 5px; BORDER-TOP: buttonface 0px solid; PADDING-LEFT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 12px; FILTER: DropShadow(Color=#000000, OffX=1, OffY=1, Positive=1); PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; BORDER-LEFT: buttonface 0px solid; CURSOR: hand; COLOR: #222222; PADDING-TOP: 2px; BORDER-BOTTOM: buttonface 0px solid; WHITE-SPACE: nowrap
 }
 .coolButtonUpDisabled {
-	BORDER-RIGHT: buttonface 0px solid; PADDING-RIGHT: 5px; BORDER-TOP: buttonface 0px solid; PADDING-LEFT: 5px; FONT-WEIGHT: normal; FONT-SIZE: 12px; FILTER: DropShadow(Color=#000000, OffX=1, OffY=1, Positive=1); PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; BORDER-LEFT: buttonface 0px solid; CURSOR: hand; COLOR: #222222; PADDING-TOP: 2px; BORDER-BOTTOM: buttonface 0px solid; WHITE-SPACE: nowrap
 }
 DIV {
 	FONT-SIZE: 12px;
@@ -191,7 +185,6 @@
 	FONT-WEIGHT: bold; FONT-SIZE: 10pt; COLOR: #ff9900; FONT-STYLE: normal; FONT-FAMILY: Arial,Helvetica; TEXT-DECORATION: none
 }
 .cabinput {
-	BORDER-RIGHT: #666666 1px ridge; BORDER-TOP: #999999 1px ridge; FONT-SIZE: 12px; BORDER-LEFT: #999999 1px ridge; CURSOR: hand; COLOR: #006699; BORDER-BOTTOM: #666666 1px ridge; FONT-FAMILY: "verdana", "tahoma", "ms shell dlg", "sans-serif", "??"; HEIGHT: 20px; ffffff: 
 }
 .uTitleTD {
 	PADDING-RIGHT: 2px; PADDING-LEFT: 2px; FONT-SIZE: 9pt; PADDING-BOTTOM: 2px; VERTICAL-ALIGN: middle; COLOR: #ffffff; PADDING-TOP: 2px; FONT-FAMILY: "??"; BACKGROUND-COLOR: #6699cc; TEXT-ALIGN: center
Index: ssts-web/src/main/webapp/systemmanage/httpTreeOptionForm.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/httpTreeOptionForm.jsp	(.../httpTreeOptionForm.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/httpTreeOptionForm.jsp	(.../httpTreeOptionForm.jsp)	(revision 40044)
@@ -17,12 +17,12 @@
 var optionType = "${param.optionType}";
 var entityName = "";
 function initDate(){
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
     HttpTreeOptionTableManager.getHttpTreeOptionTitle(optionType,titleCallBack);
     function titleCallBack(title){
         entityName = title;
     }
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
 }
 </script>
 </head>
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 40042)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 40044)
@@ -72,11 +72,11 @@
 function synchronizationSetDateField(extObject, format, datefieldId, datefieldValue, refreshFrequency) {
 
     if (!datefieldValue) { //如果没传时间的值，就取服务器的当前时间
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         ServerTimeTableManager.getServerDateTime(format, function (config) {
             datefieldValue = config;
         });
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
     }
 
     extObject.getCmp(datefieldId).setValue(new Date(datefieldValue));
@@ -2940,9 +2940,9 @@
  * @param fn dwr的请求方法
  */
 function sendDWRAsync(fn) {
-    //DWREngine.setAsync(false);
+    //dwr.engine.setAsync(false);
     fn();
-    //DWREngine.setAsync(true);
+    //dwr.engine.setAsync(true);
 }
 
 /**
Index: ssts-web/src/main/webapp/homepage/footer.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/footer.jsp	(.../footer.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/footer.jsp	(.../footer.jsp)	(revision 40044)
@@ -29,9 +29,9 @@
 </body>
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx }/dwr/interface/OnlineUserManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx }/dwr/interface/OnlineUserManager.js?version=${svnRevision}"></script>
 <script language = "javascript">
 	var userView;
 	function viewAllOnlineUser(){
Index: ssts-web/src/main/webapp/systemmanage/roleFormExt.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/roleFormExt.js	(.../roleFormExt.js)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/roleFormExt.js	(.../roleFormExt.js)	(revision 40044)
@@ -258,9 +258,9 @@
     	var companyId = getURLParameter('companyId','');
     	var isValid = true;
     	if(StringUtils.isBlank(id)){
-	        DWREngine.setAsync(false);
+	        dwr.engine.setAsync(false);
 	        RoleTableManager.isRepeatRoleName('ROLE_'+Ext.getCmp('simpleName').getValue().Trim()+"_" +companyId ,function(sign){isNotRepeatRole = sign});
-	        DWREngine.setAsync(true);
+	        dwr.engine.setAsync(true);
         }
         if (isNotRepeatRole){
         	alert("角色ID已经存在，请重新输入！");
Index: ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp	(.../httpOptionByValue.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/httpOptionByValue.jsp	(.../httpOptionByValue.jsp)	(revision 40044)
@@ -85,11 +85,11 @@
         levelArray.push(selectElement.options[i].text.Trim());
     }
     var isListChange;
-    DWREngine.setAsync(false);
+    dwr.engine.setAsync(false);
     HttpOptionManager.isListChange(levelArray, listId,function(retValue){
     	isListChange = retValue
     });
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
     if(isListChange)
     {
     	var bool = window.confirm("配置项已修改,确定保存?");
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
===================================================================
diff -u -r39460 -r40044
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 39460)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 40044)
@@ -3,7 +3,6 @@
 var cm;
 var invoiceGrid;
 var applicationWindow;
-
 /**
  * 是否要隐藏批量审核借物单按钮
  * @returns {boolean}
@@ -534,7 +533,7 @@
 				var tableContent = record.data['htmlContent'];// 
 				if(!tableContent){
 					var content = "";
-					DWREngine.setAsync(false);
+					dwr.engine.setAsync(false);
 					InvoicePlanTableManager.findApplicationItemVOListByInvoicePlanId(record.data['id'],function(voItems){
 						for(var i=0;i<voItems.length;i++) {
 							var tousseName = voItems[i].name;
@@ -565,7 +564,7 @@
 							}
 						}
 					});
-					DWREngine.setAsync(true);
+					dwr.engine.setAsync(true);
 					tableContent = ("<table height='100%' width='430px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9'  height=25><td width='190px' align='center'><h3>物品名称</h3></td><td width='70px' align='center'><h3>申请数量</h3></td><td width='70px' align='center'><h3>回收数量</h3></td><td width='80px' align='center'><h3>已发货数量</h3></td>"+BorrowName);
 					if(isDiposableApplicationForm){
 						tableContent += "<td width='70px' align='center'><h3>编码</h3></td>";
Index: ssts-web/src/main/webapp/common/selSMSPersonByExt.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selSMSPersonByExt.jsp	(.../selSMSPersonByExt.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selSMSPersonByExt.jsp	(.../selSMSPersonByExt.jsp)	(revision 40044)
@@ -147,9 +147,9 @@
             return false;
         }
         
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         changeType();
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
         
         var listBoxOptions =  document.forms[0].elements["allList"].options;
         var options =  new Array();
Index: ssts-web/src/main/webapp/systemmanage/httpOption.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/httpOption.jsp	(.../httpOption.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/httpOption.jsp	(.../httpOption.jsp)	(revision 40044)
@@ -79,11 +79,11 @@
         levelArray.push(selectElement.options[i].text.Trim());
     }
     var isListChange;
-    DWREngine.setAsync(false);
+    dwr.engine.setAsync(false);
     HttpOptionManager.isListChange(levelArray, listId,function(retValue){
     	isListChange = retValue
     });
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
     if(isListChange)
     {
     	var bool = window.confirm("配置项已修改,确定保存?");
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 40044)
@@ -98,7 +98,7 @@
 </operation:authorize>
 
 var System_DBManage = true;
-<authz:authorize ifAnyGranted="ROLE_ADMINISTRATOR">
+<authz:authorize access="hasAnyAuthority('ROLE_ADMINISTRATOR')">
 System_DBManage = false;
 </authz:authorize>
 
@@ -1190,7 +1190,7 @@
  * 《使用记录》菜单(启用科室使用记录配置项,该菜单名为病人使用记录)
  */
 var SSTS_UseRecord_Menu = true;
-<operation:authorize ifAnyGranted="SSTS_UseRecord_SeeAll,SSTS_UseRecord_SeeAllDepart,SSTS_UseRecord_Convert,SSTS_UseRecord_Review,SSTS_UseRecord_Create,SSTS_UseRecord_Update,SSTS_UseRecord_Select,SSTS_UseRecord_Delete,SSTS_ScheduleExpeditedOfUseRecord_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_list">
+<operation:authorize ifAnyGranted="SSTS_UseRecord_SeeAll,SSTS_UseRecord_SeeAllDepart,SSTS_UseRecord_Convert,SSTS_UseRecord_Review,SSTS_UseRecord_Create,SSTS_UseRecord_Update,SSTS_UseRecord_Select,SSTS_UseRecord_Delete,SSTS_ScheduleExpeditedOfUseRecord_Manager">
 	if (!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord')) {
 		SSTS_UseRecord_Menu = false;
 	}
@@ -1215,17 +1215,7 @@
 		SSTS_ScheduleExpeditedOfUseRecord_Manager = false
 	}
 </operation:authorize>
-
 /**
- * 《GDSRMYY-623：预约加急分组设置》菜单
- */
-var SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = true;
-<operation:authorize ifAnyGranted="SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_list">
-	if(sstsConfig.enableScheduleExpeditedOfUseRecord){
-		SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = false
-	}
-</operation:authorize>
-/**
  * 《质量监测管理》总菜单
  */
 var SSTS_QualityRecord_Menu = true;
@@ -1999,16 +1989,6 @@
 </operation:authorize>
 
 /**
- * 《GZSZYY-107：设备维护分组设置》权限
- */
- var SSTS_DeviceMaintenanceCusGroup_manager = true;
-<operation:authorize ifAnyGranted="SSTS_DeviceMaintenanceCusGroup_manager">
-	if(sstsConfig.enableGroupManagementOfDeviceMaintenanceFunction){
-		SSTS_DeviceMaintenanceCusGroup_manager = false
-	}
-</operation:authorize>
-
-/**
  * 《灭菌目的设置管理》权限
  */
 var SSTS_SterilizationPurpose_manager = true;
@@ -2578,23 +2558,11 @@
 </operation:authorize>
 
 
-/**
- * 《DGSETYY-108:默认定期监测管理查看》权限
- */
-var SSTS_RoutineMonitoring_DefaultSelect = true;
-<operation:authorize ifAnyGranted="SSTS_RoutineMonitoring_DefaultSelect">
-	if(sstsConfig.enableDefaultQualityMonitoringDefinitionAlerts){
-		SSTS_RoutineMonitoring_DefaultSelect = false
-	}
-</operation:authorize>
-
-
 var SSTS_routineMonitoring_manager = true;
-<operation:authorize ifAnyGranted="SSTS_RoutineMonitoring_Create,SSTS_RoutineMonitoring_Update,SSTS_RoutineMonitoring_Select,SSTS_RoutineMonitoring_Delete,SSTS_RoutineMonitoring_Review,SSTS_RoutineMonitoring_DefaultSelect">
+<operation:authorize ifAnyGranted="SSTS_RoutineMonitoring_Create,SSTS_RoutineMonitoring_Update,SSTS_RoutineMonitoring_Select,SSTS_RoutineMonitoring_Delete,SSTS_RoutineMonitoring_Review">
 SSTS_routineMonitoring_manager = false;
 </operation:authorize>
 
-
 /**
  * 《导入基础数据管理》权限
  */
@@ -2863,8 +2831,7 @@
 && SSTS_DiposableGoodsType_manager && SSTS_Container && SSTS_Supplier && SSTS_CleanMethod && SSTS_Rinser && SSTS_Sterilisation 
 && SSTS_Sterilizer && SSTS_Bioreader && SSTS_Expiration && SSTS_SerialNumber_manager && SSTS_ImportBaseData_manager && SSTS_IPAndOrgUnitMapping 
 && SSTS_GoodsBindingConfig && SSTS_GoodsFilterConfig && SSTS_Tousse && SSTS_Damage && SSTS_TousseGroup && SSTS_UrgentLevel_manager
-&& SSTS_OperationRoom_manager && SSTS_equipment_manager && SSTS_DiposableGoodsSummary_manager && SSTS_ChineseMedicineApparatus_manager
-&& SSTS_DeviceMaintenanceCusGroup_manager;
+&& SSTS_OperationRoom_manager && SSTS_equipment_manager && SSTS_DiposableGoodsSummary_manager && SSTS_ChineseMedicineApparatus_manager;
 
 var enableSurgicalInstrumentsManagement = false;
 if (sstsConfig.enableSurgicalInstrumentsManagement) {
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 40044)
@@ -501,9 +501,9 @@
 
 	if((packingImg || comboToussePackingImg || reviewPackingImg || sterilizationRecordImg || quickJumpGroupStorageImg)
 			|| (useRecordImg && hasTwoUseRecordOperation)){
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         PackingTableManager.getAllTaskGroup(setTaskGroup);
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
         //动态生成菜单
 		if(showLeft){
 			var sterilizationRecordMenuBox = '<ul class="child">';
@@ -798,13 +798,13 @@
 	    					handler:function(){
 	    						var dataStore = grid.getStore();
 	    						var title = "";
-	    		                DWREngine.setAsync(false);
+	    		                dwr.engine.setAsync(false);
 	    		                SupplyRoomConfigTableManager.getStartTimeObject(function(config){
 	    		                  if(config != null){
 	    		                    title = config.unitName;
 	    		                  }
 	    		                });
-	    		                DWREngine.setAsync(true);
+	    		                dwr.engine.setAsync(true);
 	    		                title += departName+"部门待召回物品清单";
 	    						Ext.MessageBox.show({  
 	    		                	title:'请等待',  
@@ -1555,7 +1555,7 @@
 	if(itemId==-1){//个人桌面的iframe
 		returnContent = parsePortal(jsonObj);
 	}else{
-		if(url.indexOf((WWWROOT+"/"))==-1){
+		if(url.indexOf((WWWROOT+"/"))===-1){
 			url = WWWROOT + url;
 		}
 		returnContent = '<iframe id="iframe_' + itemId + '" name="desktopIframe" class="iframeClass" allowTransparency= "true" src="' + url + '" border="0" frameborder="0" height="'+height+'px" framespacing="0" marginheight="0" scrolling="auto" marginwidth="0" style="width:100%;"></iframe>';
Index: ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js	(.../orgUnitExtView.js)	(revision 40042)
+++ ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js	(.../orgUnitExtView.js)	(revision 40044)
@@ -423,13 +423,13 @@
 					var orgUnitName  = recs[i].get("name");
 					var barcode = recs[i].get("barcode");
 					var name = "";
-			    	DWREngine.setAsync(false);
+			    	dwr.engine.setAsync(false);
 			    	SupplyRoomConfigTableManager.getUnitName(function(unitName){
 			    		if(unitName != null && unitName != ""){
 			    			name = unitName;
 			    		}
 			    	});  
-			    	DWREngine.setAsync(true);
+			    	dwr.engine.setAsync(true);
 					printOrgUnitInfo(barcode,orgUnitName,name,0);
 				}
     	   }else{
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 40044)
@@ -160,8 +160,7 @@
 	children:[
         {hidden :SSTS_UseRecord_Menu,text:sstsConfig.enableDepartmentUseRecord ? "病人使用记录" : "使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DepartmentUseRecord_Menu,text:"科室使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true',hrefTarget:linkTarget,leaf:true},
-		{hidden :SSTS_ScheduleExpeditedOfUseRecord_Manager,text:"预约加急管理",href:WWWROOT+'/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
-		{hidden :SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,text:"预约加急分组设置",href:WWWROOT+'/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}
+		{hidden :SSTS_ScheduleExpeditedOfUseRecord_Manager,text:"预约加急管理",href:WWWROOT+'/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 });
 
@@ -261,7 +260,7 @@
 });
 
 /**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) begin */
-DWREngine.setAsync(false);
+dwr.engine.setAsync(false);
 PackingTableManager.getAllTaskGroup(setTaskGroup);
 function setTaskGroup(taskGroup){
 	for(var i=0;i<taskGroup.length;i++){
@@ -316,7 +315,7 @@
 /**设置"装配管理"菜单的下一级子菜单(各任务组装配、自定义装配、历史装配记录)、"审核打包"菜单的下一级子菜单(各任务组) end */
 
 /**设置"灭菌管理"菜单的下一级子菜单(各灭菌炉组装配、灭菌交接、灭菌物品装载、当天灭菌记录管理、历史灭菌记录管理、代理灭菌管理、外部代理灭菌管理) begin */
-DWREngine.setAsync(true);
+dwr.engine.setAsync(true);
 if(sterilerGroupList.length >0){
 	for(var i=0;i<sterilerGroupList.length;i++){
 		var link1 = new Object();
@@ -432,9 +431,8 @@
 			hidden:SSTS_routineMonitoring_Config,
 			children:[
 			      {hidden :SSTS_routineMonitoring_Config,text:"定期监测定义",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=definitionList&formType=定期监测'),hrefTarget:linkTarget,leaf:true},
-			      {hidden :SSTS_routineMonitoring_Config,text:"已部署定期监测定义",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployed&formType=定期监测'),hrefTarget:linkTarget,leaf:true},
-				  {hidden :SSTS_RoutineMonitoring_DefaultSelect,text:"默认定期监测管理查看",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringFormView.jsp?listType=deployed&formType=定期监测'),hrefTarget:linkTarget,leaf:true}
-			]
+			      {hidden :SSTS_routineMonitoring_Config,text:"已部署定期监测定义",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.jsp?listType=deployed&formType=定期监测'),hrefTarget:linkTarget,leaf:true}
+		    ]
 		}
     ]
 },{
@@ -479,7 +477,7 @@
 	hidden:SSTS_ExpensiveGoods_Hidden_Menu,
 	children:[
         {hidden :SSTS_ExpensiveGoodsDefinition_Hidden_Manager,text:"高值耗材定义管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_ExpensiveGoodsImport_Hidden_Menu,text:"导入高值耗材",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.mhtml',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ExpensiveGoodsImport_Hidden_Menu,text:"导入高值耗材",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ViewExpensiveGoodsInstance_Hidden_Menu,text:"高值耗材实例列表",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsInstance/expensiveGoodsInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoodsStockEntry_Hidden_Manager,text:"高值耗材库存",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材申请单",href:WWWROOT+'/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -607,7 +605,7 @@
         {hidden :SSTS_InterfereWashAndDisinfectRecord_ViewMenu,text:"清洗记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereSterilizationRecord_ViewMenu,text:"代理灭菌单干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereProxyDisinfectionView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereForeigntousseApplication_ViewMenu,text:"外来器械干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_InterfereOrgUnit_ViewMenu,text:"科室干预管理",href:WWWROOT+'/disinfectsystem/interfere/processSameOrgunitName/processSameOrgunitNameData.mhtml',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_InterfereOrgUnit_ViewMenu,text:"科室干预管理",href:WWWROOT+'/disinfectsystem/interfere/processSameOrgunitName/processSameOrgunitNameData',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereTerminateInvoicePlan_ViewMenu,text:"批量终止申请单管理",href:WWWROOT+'/disinfectsystem/interfere/interfereTerminateInvoicePlanView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereUeserRecord_ViewMenu,text:"使用记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_InterfereReviewRecord_ViewMenu,text:""+reviewViewText2+"器械包干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereReviewView.jsp',hrefTarget:linkTarget,leaf:true}
@@ -633,7 +631,7 @@
 	hidden:sstsConfig.disableDepartmentProblemFeedback?true:SSTS_ProblemReport_Menu,
 	children:[
 		{hidden :sstsConfig.disableDepartmentProblemFeedback?true:SSTS_ProblemReport_Menu,text:"科室问题反馈",href:WWWROOT+'/disinfectsystem/problemReport/problemReport.jsp',hrefTarget:linkTarget,leaf:true},
-		{hidden :sstsConfig.disableDepartmentProblemFeedback?true:SSTS_ProblemReport_Menu,text:"科室问题反馈类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=question_feedback',hrefTarget:linkTarget,leaf:true}
+		{hidden :sstsConfig.disableDepartmentProblemFeedback?true:SSTS_ProblemReport_Menu,text:"科室问题反馈类型设置",href:WWWROOT+'/systemmanage/httpOption?listId=question_feedback',hrefTarget:linkTarget,leaf:true}
 	]
 },{
 	text:"系统告警",
@@ -920,7 +918,7 @@
 //获取文件夹
 function folderList(isFirst) {
 	Ext.Ajax.request({
-		url: WWWROOT + '/disinfectSystem/customizedReports/folderController/getAllFolders.mhtml',
+		url: WWWROOT + '/disinfectSystem/customizedReports/folderController/getAllFolders',
 		success: function(response, options) {
 			var result = response.responseText;
 
@@ -950,7 +948,7 @@
 	var isTrue = isFirst || false;
 	
 	Ext.Ajax.request({
-		url: WWWROOT + '/disinfectSystem/customizedReports/reportController/getAllReportDefinitions.mhtml',
+		url: WWWROOT + '/disinfectSystem/customizedReports/reportController/getAllReportDefinitions',
 		params: {
 			isDraft: 0
 		},
@@ -1078,7 +1076,7 @@
             {hidden :System_Role_Select,text:"权限管理",href:WWWROOT+'/systemmanage/roleList.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_role.gif'},
             {hidden :System_Log_Menu,text:"日志管理",href:WWWROOT+'/log/loggrid.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :System_DBManage,text:"初始化演示数据",href:WWWROOT+'/systemmanage/initData.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :System_DBManage,text:"导出邮件",href:WWWROOT+'/email/exportMailForm.mhtml',hrefTarget:linkTarget,leaf:true},
+            {hidden :System_DBManage,text:"导出邮件",href:WWWROOT+'/email/exportMailForm',hrefTarget:linkTarget,leaf:true},
             {hidden :System_DBManage,text:"备份数据库",href:WWWROOT+'/databaseBackupAndRestore/backup.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :System_DBManage,text:"还原数据库",href:WWWROOT+'/databaseBackupAndRestore/restore.jsp',hrefTarget:linkTarget,leaf:true},
 			{hidden :false,text:"活动管理",href:WWWROOT+'/systemmanage/system/activityView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -1092,7 +1090,7 @@
         hidden : SSTS_BaseData_Manager,
         children:[
             {hidden :SSTS_departMentApplication,text:"科室申领模版",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentapptemplate/departmentAppTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ShiftConfig_manager,text:"班次类型配置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=shiftType&optionName=班次参数设置'),hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ShiftConfig_manager,text:"班次类型配置",href:encodeURI(WWWROOT+'/systemmanage/httpOption?listId=shiftType&optionName=班次参数设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=1),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=2),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || !((sstsConfig.hasOwnProperty('printInvoiceVersion')) && sstsConfig.printInvoiceVersion==2),text:"打印发货单设置",href:WWWROOT+'/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -1106,30 +1104,30 @@
             {hidden :SSTS_RecyclePrint_Menu,text:"手术器械科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/operationTousse/gridView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"物品科室共用配置",href:WWWROOT+'/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_UseRecordConvertConfig_Manager,text:"使用记录转换配置",href:WWWROOT+'/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SpecialInfection_manager,text:"特殊感染类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :!sstsConfig.enableReduceSendAmountAfterTerminatePackAmountFunction,text:"装配删除原因设置",href:WWWROOT+'/disinfectsystem/basedatamanager/packingDeleteCause/packingDeleteCauseView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=patientArea',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_application_end_cause_manager,text:"申请单终止原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=application_end_cause',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_foreignTousseProcessType_manager,text:"外来器械处理方式",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignTousseProcessType',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true},
+            {hidden :!sstsConfig.enablePatientAreaSetting,text:"病区设置",href:WWWROOT+'/systemmanage/httpOption?listId=patientArea',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_application_end_cause_manager,text:"申请单终止原因设置",href:WWWROOT+'/systemmanage/httpOption?listId=application_end_cause',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_foreignTousseProcessType_manager,text:"外来器械处理方式",href:WWWROOT+'/systemmanage/httpOption?listId=foreignTousseProcessType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption?listId=materialType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ChineseMedicineApparatus_manager,text:"中医器具类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/chineseMedicineApparatus/chineseMedicineApparatusView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_Material,text:"材料清洗分类设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialWashClasify',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Material,text:"材料清洗分类设置",href:WWWROOT+'/systemmanage/httpOption?listId=materialWashClasify',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_TaskGroup,text:"任务组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/taskGroup/taskGroupView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Damage,text:"丢失报损类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_Error_Damage_Remark,text:"丢失报损备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=error_damage_remark',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Error_Damage_Remark,text:"丢失报损备注设置",href:WWWROOT+'/systemmanage/httpOption?listId=error_damage_remark',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_TousseGroup,text:"器械包分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Operation_manager,text:"手术名称设置",href:WWWROOT+'/systemmanage/operationNameView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ProjectName_manager,text:"设备维护项目名称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=projectName',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue.mhtml?listId=packType',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_equipment_manager,text:"设备设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=equipment',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ProjectName_manager,text:"设备维护项目名称设置",href:WWWROOT+'/systemmanage/httpOption?listId=projectName',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue?listId=packType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_equipment_manager,text:"设备设置",href:WWWROOT+'/systemmanage/httpOption?listId=equipment',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/disinfectsystem/basedatamanager/washMethod/washMethodView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置'),hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_DiposableGoodsType_manager,text:"一次性物品类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=diposableGoodsType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption?listId=tousseWeight&optionName=器械包重量设置'),hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_DiposableGoodsType_manager,text:"一次性物品类型设置",href:WWWROOT+'/systemmanage/httpOption?listId=diposableGoodsType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_DiposableGoodsSummary_manager,text:"一次性物品汇总打印设置",href:WWWROOT+'/disinfectsystem/basedatamanager/diposableGoodsSummary/diposableGoodsSummaryView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=expensiveGoodsType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材类型设置",href:WWWROOT+'/systemmanage/httpOption?listId=expensiveGoodsType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Container,text:"容器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/container/containerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Supplier,text:"供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/supplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ExpensiveGoodsSupplier_Hidden_Menu,text:"高值耗材供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -1138,11 +1136,10 @@
             {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RinserGroup_manager,text:"清洗机分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/rinserGroup/rinserGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_DeviceMaintenanceCusGroup_manager,text:"设备维护分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/deviceMaintenanceCusGroup/deviceMaintenanceCusGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilerGroup/sterilerGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizationPurpose/sterilizationPurposeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Sterilisation,text:"灭菌程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Bioreader,text:"生物阅读器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/bioreader/bioreaderView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :(!sstsConfig.hasOwnProperty('disableDeviceInterface')) || sstsConfig.disableDeviceInterface,text:"设备接口管理",href:WWWROOT+'/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -1152,7 +1149,7 @@
             {hidden :SSTS_SupplyRoomType_manager,text:"仓库管理",href:WWWROOT+'/disinfectsystem/basedatamanager/warehouse/wareHouseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"各环节超时设置",href:WWWROOT+'/systemmanage/timeoutSetting.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SerialNumber_manager,text:"流水号设置",href:WWWROOT+'/disinfectsystem/basedatamanager/serialnumconfig/serialNumConfigView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ImportBaseData_manager,text:"导入导出基础数据",href:WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importBasedata.mhtml',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ImportBaseData_manager,text:"导入导出基础数据",href:WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importBasedata',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_MonthlyPeopleCount_manager,text:"月度人数统计设置",href:WWWROOT+'/disinfectsystem/basedatamanager/monthlyPeopleCountSetting/monthlyPeopleCountSettingView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_IPAndOrgUnitMapping,text:"IP对应的默认科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/iPAndOrgUnitMapping/iPAndOrgUnitMappingView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_GoodsBindingConfig,text:"物品绑定",href:WWWROOT+ '/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -1167,13 +1164,13 @@
             {hidden :SSTS_UsedDoctor_manager,text:"常用医生设置",href:WWWROOT+'/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_TousseExclusiveDoctor_Menu,text:"医生专用器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :!(!SSTS_Handover_manager && sstsConfig.enableHandoverModule),text:"交接模块管理",href:WWWROOT+'/disinfectsystem/basedatamanager/handover/handoverView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_BorrowCardinality_manager,text:"借物基数管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cardinalManagementOfBorrow/cardinalManagementOfBorrowView.jsp',hrefTarget:linkTarget,leaf:true},
 			{hidden :false,text:"设置不合格数来源",href:WWWROOT+'/disinfectsystem/reportforms/js/setUnqualifiedSourceForm.jsp',hrefTarget:linkTarget,leaf:true},
-			{hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true},
+			{hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption?listId=positionalTitle',hrefTarget:linkTarget,leaf:true},
             {hidden :!sstsConfig.enableMultipleBranchesOfHospital,text:"院区设置",href:WWWROOT+'/disinfectsystem/basedatamanager/branchesOfHospital/branchesOfHospitalView.jsp',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js	(.../selPersonByOrgUnitByExt.js)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selPersonByOrgUnitByExt.js	(.../selPersonByOrgUnitByExt.js)	(revision 40044)
@@ -540,9 +540,9 @@
 		return false;
 	}
 
-	DWREngine.setAsync(false);
+	dwr.engine.setAsync(false);
 	changeType();
-	DWREngine.setAsync(true);
+	dwr.engine.setAsync(true);
 
 	var listBoxOptions =  document.forms[0].elements["allList"].options;
 	var options =  new Array();
Index: ssts-web/src/main/webapp/common/selPersonByFlow.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selPersonByFlow.jsp	(.../selPersonByFlow.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selPersonByFlow.jsp	(.../selPersonByFlow.jsp)	(revision 40044)
@@ -150,9 +150,9 @@
             return false;
         }
         
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         changeType();
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
         
         var isFinded = false;
         var selObj = formPanel.findById('selTypeList');
Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 40041)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordViewForm.js	(.../useRecordViewForm.js)	(revision 40044)
@@ -981,11 +981,11 @@
 					var expectUseTimeCheckHidden = top.Ext.getCmp('expectUseTimeCheckHidden').getValue();
 					if (expectUseTimeCheckHidden == false || expectUseTimeCheckHidden == 'false') {
 						var datefieldValue;
-						DWREngine.setAsync(false);
+						dwr.engine.setAsync(false);
 						ServerTimeTableManager.getServerDateTime('yyyy/MM/dd HH:mm', function (config) {
 							datefieldValue = config;
 						});
-						DWREngine.setAsync(true);
+						dwr.engine.setAsync(true);
 						var expectUseTime = top.Ext.getCmp('expectUseTime').getRawValue();
 						var expectUseTime1 = expectUseTime.replace(/-/g, '/');//兼容IE
 						var nowDateStr = new Date(datefieldValue).getTime();
Index: ssts-web/src/main/webapp/common/selRoleByExt.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selRoleByExt.jsp	(.../selRoleByExt.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selRoleByExt.jsp	(.../selRoleByExt.jsp)	(revision 40044)
@@ -95,7 +95,7 @@
             selectOptionsMap[tempArray[1]] = [tempArray[0]];
         }
     }
-    DWREngine.setAsync(false);
+    dwr.engine.setAsync(false);
     if(paramRolesId != '' || paramRolesId != (separator)) {
 		var paramRoleIdArr = paramRolesId.split(separator);
 		for(var i=0; i<paramRoleIdArr.length; i++) {
@@ -106,7 +106,7 @@
 			}
 		}
     }
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
     
     DWRUtil.removeAllOptions('waitSeleteItems');
     DWRUtil.addOptions('waitSeleteItems', selectOptionsMap,false);
Index: ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js	(.../supplyRoomsUnfinishedWork.js)	(revision 40044)
@@ -1135,7 +1135,7 @@
 				var tableContent = record.data['htmlContent'];// 
 				if(!tableContent){
 					var content = "";
-					DWREngine.setAsync(false);
+					dwr.engine.setAsync(false);
 					InvoicePlanTableManager.findApplicationItemVOListByInvoicePlanId(record.data['id'],function(voItems){
 						for(var i=0;i<voItems.length;i++) {
 							var tousseName = voItems[i].name;
@@ -1165,7 +1165,7 @@
 							}
 						}
 					});
-					DWREngine.setAsync(true);
+					dwr.engine.setAsync(true);
 					tableContent = ("<table height='100%' width='400px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9'  height=25><td width='190px' align='center'><h3>物品名称</h3></td><td width='70px' align='center'><h3>申请数量</h3></td><td width='70px' align='center'><h3>已发货数量</h3></td>"+BorrowName);
 					if(isDiposableApplicationForm){
 						tableContent += "<td width='70px' align='center'><h3>编码</h3></td>";
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"%>
+<html>
+<head>
+<meta http-equiv="X-UA-Compatible" content="IE=8"/>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+<title>${title}</title>
+<script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
+<link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/css/easyui.css?version=${svnRevision}"></link>	
+<link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/css/default.css?version=${svnRevision}"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/theme/style/main.css?version=${svnRevision}"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css?version=${svnRevision}"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/common/common.css?version=${svnRevision}"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/common/commonForExt4.css?version=${svnRevision}"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <%
 		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);
 %>
-<html>
-<head>
-<meta http-equiv="X-UA-Compatible" content="IE=8"/>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<title>${title}</title>
-<link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/css/easyui.css?version=${svnRevision}"></link>	
-<link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/css/default.css?version=${svnRevision}"></link>
-<link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/theme/style/main.css?version=${svnRevision}"></link>
-<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css?version=${svnRevision}"></link>
-<link rel="stylesheet" type="text/css" href="${ctx}/common/common.css?version=${svnRevision}"></link>
-<link rel="stylesheet" type="text/css" href="${ctx}/common/commonForExt4.css?version=${svnRevision}"></link>
-<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script>
 	var isFirstSupplyRoomUser = '${isFirstSupplyRoomUser}';
 	var profile = '${profile}';
@@ -161,8 +163,6 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/PortalDWRManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/ui/jquery-1.4.2.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/ui/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/ui/ui.core.min.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/homepage/portal.jsp
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/homepage/portal.jsp	(.../portal.jsp)	(revision 40042)
+++ ssts-web/src/main/webapp/homepage/portal.jsp	(.../portal.jsp)	(revision 40044)
@@ -21,9 +21,9 @@
 	request.setAttribute("sterilerGroupList", tem);
 %>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js?version=${svnRevision}"></script>
 <%@ include file="/common/includeCoreExtJsAndCss.jsp"%>
 <%@ include file="/homepage/menu.jsp"%>
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/common/selectOrgUnitByExt.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selectOrgUnitByExt.jsp	(.../selectOrgUnitByExt.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selectOrgUnitByExt.jsp	(.../selectOrgUnitByExt.jsp)	(revision 40044)
@@ -334,11 +334,11 @@
 }
 
 function initData(){
-    DWREngine.setAsync(false);
+    dwr.engine.setAsync(false);
     initDefinedUserGroup();
     initDefinedOrgUnitGroup();
     initRole();
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
 }
 
 function getUserByOrgunit(nodeId){
Index: ssts-web/src/main/webapp/common/selOrgUnitByExt.jsp
===================================================================
diff -u -r40041 -r40044
--- ssts-web/src/main/webapp/common/selOrgUnitByExt.jsp	(.../selOrgUnitByExt.jsp)	(revision 40041)
+++ ssts-web/src/main/webapp/common/selOrgUnitByExt.jsp	(.../selOrgUnitByExt.jsp)	(revision 40044)
@@ -127,7 +127,7 @@
         selectOptionsMap[tempArray[1]] = [tempArray[0]];
     }
 
-    DWREngine.setAsync(false);
+    dwr.engine.setAsync(false);
     if(paramOrgIds != '' || paramOrgIds != (separator)) {
 		var paramOrgIdArr = paramOrgIds.split(separator);
 		for(var i=0; i<paramOrgIdArr.length; i++) {
@@ -139,7 +139,7 @@
 		}
     }
 
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
     
     DWRUtil.removeAllOptions('waitSeleteItems');
     DWRUtil.addOptions('waitSeleteItems', selectOptionsMap,false);
Index: ssts-web/src/main/webapp/js/selectlink3.js
===================================================================
diff -u -r40042 -r40044
--- ssts-web/src/main/webapp/js/selectlink3.js	(.../selectlink3.js)	(revision 40042)
+++ ssts-web/src/main/webapp/js/selectlink3.js	(.../selectlink3.js)	(revision 40044)
@@ -10,7 +10,7 @@
 	    thirdSelect.options[0].text = " 请先选定" + firstDefaultValue + " ";
 	    thirdSelect.options[0].value = "";
     } else {
-	    DWREngine.setAsync(false);
+	    dwr.engine.setAsync(false);
 	    KnowledgeFolderManager.getAllChildrenNodeForSelectLink(firstId,folderId,backingArea);
 	
 	    function backingArea(data){
@@ -33,7 +33,7 @@
 	        }
 	    }
 	}
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
 }
 
 function changeSecond(secondSelectId,thirdSelectId,secondDefaultValue,thirdDefaultValue,folderId){
@@ -45,7 +45,7 @@
         thirdSelect.options[0].value = "";
     }else {
 
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         KnowledgeFolderManager.getAllChildrenNodeForSelectLink(secondId,folderId,backingProvince);
         
         function backingProvince( cities ){
@@ -63,7 +63,7 @@
 			thirdSelect.options[0].selected = true;
             
         }
-        DWREngine.setAsync(true);
+        dwr.engine.setAsync(true);
     }
 }
 
@@ -75,7 +75,7 @@
         secondSelect.options[0].text = " 请先选定" + firstDefaultValue + " ";
         secondSelect.options[0].value = "";
     } else {
-        DWREngine.setAsync(false);
+        dwr.engine.setAsync(false);
         KnowledgeFolderManager.getAllChildrenNodeForSelectLink(firstId,folderId,backingArea);
     
         function backingArea(data){
@@ -95,5 +95,5 @@
             }
         }
     }
-    DWREngine.setAsync(true);
+    dwr.engine.setAsync(true);
 }
\ No newline at end of file