Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
===================================================================
diff -u -r18747 -r19460
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 18747)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 19460)
@@ -1902,6 +1902,7 @@
         	  }*/
         	  //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称
         	  if(tousseObj.printOrgSource != "无"){
+        		  var departPrefix = "(" + department + ")";
         		  if(tousseName.indexOf(departPrefix) == -1){// 此方法可能会被嵌套调用多次
       				  tousseName = "(" + department + ")" + tousseName;
       			  }
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r19396 -r19460
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 19396)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 19460)
@@ -3,8 +3,6 @@
 var packingMenu ;
 var reviewPackingMenu ;
 var sterilizationRecordMenu ;
-//用来判断Ext4.onReady执行完没有
-var windowOnLoaded = false;
 var tabs;     //tabPanel
 //tips提示的元素,在addIconTips()方法中添加
 var tipsEle = [];
@@ -410,7 +408,6 @@
 	    }
 	});
 	store.load();
-    windowOnLoaded = true;
 });
 
 function initTipPosition(){
@@ -1105,11 +1102,32 @@
 }
 
 function logout(){
-    top.document.location.href=WWWROOT+"/j_spring_security_logout";
-    if (top.document.location.href.indexOf("https") >=0 ){
-	    alert("谢谢使用，您已经成功退出系统！");
-	    window.close(); //ensure to clear SSL cache after x509 logout
-    }
+	//写入退出日志
+	try{
+		Ext.Ajax.request({
+			url :  WWWROOT + '/log/saveLog.do',
+			params : {model : '登录',type : '退出系统',description : '退出系统'},
+			success : function(){
+				top.document.location.href=WWWROOT+"/j_spring_security_logout";
+			    if (top.document.location.href.indexOf("https") >=0 ){
+				    alert("谢谢使用，您已经成功退出系统！");
+				    window.close(); //ensure to clear SSL cache after x509 logout
+			    }
+			},failure : function(){
+				top.document.location.href=WWWROOT+"/j_spring_security_logout";
+			    if (top.document.location.href.indexOf("https") >=0 ){
+				    alert("谢谢使用，您已经成功退出系统！");
+				    window.close(); //ensure to clear SSL cache after x509 logout
+			    }
+			}
+		});
+	}catch(e){
+		top.document.location.href=WWWROOT+"/j_spring_security_logout";
+		if (top.document.location.href.indexOf("https") >=0 ){
+			alert("谢谢使用，您已经成功退出系统！");
+			window.close(); //ensure to clear SSL cache after x509 logout
+		}
+	}
 }
 
 function getCurrentTab() { 
@@ -1249,7 +1267,20 @@
 	                   height:140,
 	                   width:400
 	               });
-	    	   warningGrid.getStore().loadData(result.data);
+	    		//根据配置项判断告警类型的信息是否需要提示(中大五院期望不要提示“已过期的器械包物品”)
+	    		var needLoadingWarnningData = [];
+	    		for(var i = 0;i < result.data.length;i++){
+	    			//需要提示的告警类型
+	    			var warningItemType = result.data[i].warningItemType;
+	    			if(!sstsConfig.donotWarnOutDateTousseAfterLogon || warningItemType != '已过期的器械包物品'){
+	    				needLoadingWarnningData.push(result.data[i]);
+	    			}
+	    		}
+	    		if(needLoadingWarnningData.length == 0){
+	    			doSync = false;
+	    			return false;
+	    		}
+	    	   warningGrid.getStore().loadData(needLoadingWarnningData);
                warningWindow = new Ext.Window({
                    autoHeight:true,
                    title : '系统告警',
@@ -1333,12 +1364,20 @@
 }
 
 function openSelectOrgUnitWindow(){
-	var data = new Array();
+	var data = [];
 	var orgUnitIdArray = directOrgUnitCodesWhereUserBelong.split(";");
 	var orgUnitNameArray = directOrgUnitNamesWhereUserBelong.split(";");
+	
 	if(orgUnitIdArray.length > 1){
 		for(var i = 0; i < orgUnitIdArray.length; i++){
-			data.push([orgUnitIdArray[i],orgUnitNameArray[i]]);
+			var showOrgUnitName = orgUnitNameArray[i];
+			if(sstsConfig.changeOrgUnitOmitParentOrgUnitName){
+				var lastSplitIndex = showOrgUnitName.lastIndexOf("－");
+				if(lastSplitIndex > -1){
+					showOrgUnitName = showOrgUnitName.substring(lastSplitIndex + 1);
+				}
+			}
+			data.push([orgUnitIdArray[i],showOrgUnitName]);
 			
 		}
 		var store = new Ext.data.SimpleStore({
@@ -1352,15 +1391,15 @@
 			closeAction : 'close',
 			closable:true,
 			layout:'fit',
-			width : 250,
-			height : 200,
+			width : 350,
+			height : 250,
 			modal:true,
 			plain: true,
 			y:10,
 			layout:'absolute',
 			items:[{
 				xtype:'combo',
-				width:200,
+				width:300,
 				x: 25,
 	            y: 50,
 				store: store,
@@ -1372,6 +1411,7 @@
 		        emptyText:'请选择科室',
 		        selectOnFocus:true,
 		        value : departName,  //默认选中当前科室（陈家儒改）
+		        tpl:'<tpl for="."><div class="x-combo-list-item" ext:qtip="{orgUnitName}">{orgUnitName}</div></tpl>',
 		        listeners:{
 					scope:this,
 			         'select': changeCurrentOrgUnit
Index: ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/config.js
===================================================================
diff -u -r19225 -r19460
--- ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/config.js	(.../config.js)	(revision 19225)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gxzyyf1/config.js	(.../config.js)	(revision 19460)
@@ -33,5 +33,7 @@
   hideApplyDepartColumn : true, // 隐藏申请科室
   hideSettleDepartColumn : false, // 隐藏结算科室
   //回收一键入筐
-  recycleAllTousseIntoBasket : true
+  recycleAllTousseIntoBasket : true,
+  //切换科室时的科室名字是否去掉上一级(及上一级的上一级,依此类推)的层级
+  changeOrgUnitOmitParentOrgUnitName : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
===================================================================
diff -u -r18058 -r19460
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js	(.../config.js)	(revision 18058)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js	(.../config.js)	(revision 19460)
@@ -80,5 +80,7 @@
   // 禁用在线人数统计功能
   disableOnlineUserStatistic : true,
   //定时废弃当前已装配但还未审核的器械包的供应室编码
-  autoWasteTousseInstanceTodayPackedButNotReviewedBelongCssdCode : "300101"
+  autoWasteTousseInstanceTodayPackedButNotReviewedBelongCssdCode : "300101",
+  //登录后是否不提示已过期的器械包告警
+  donotWarnOutDateTousseAfterLogon : true
 }
\ No newline at end of file