Index: ssts-web/src/main/webapp/systemmanage/timeoutSetting.jsp
===================================================================
diff -u -r29513 -r32177
--- ssts-web/src/main/webapp/systemmanage/timeoutSetting.jsp	(.../timeoutSetting.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/systemmanage/timeoutSetting.jsp	(.../timeoutSetting.jsp)	(revision 32177)
@@ -12,6 +12,7 @@
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript" src="${ctx }/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/systemmanage/timeoutSetting.js?version=${svnRevision}"></script>
 <style type="text/css" media="all">
 .allow-float {clear: none!important;}
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r31942 -r32177
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 31942)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 32177)
@@ -801,7 +801,24 @@
 
 /*Annie-e*/
 
+//DGSETYY-13:增加使用到回收超时提醒
+function getUnRecycleUseRecordAlarmWarning(){
+	Ext.Ajax.request({
+		url : WWWROOT+ '/system/systemWarningAction!getUnRecycleUseRecordAlarmWarning.do',
+		success : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			var success = result.success;
+			if (success && result.message) {
+				showResult(result.message);
+			}
+		},
+		failure : function(response, options) {
+			showResult('操作失败,服务器正忙,请稍候再试!');
+		}
+	});
+}
 
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	top.Ext.QuickTips.init();
@@ -852,8 +869,21 @@
 	    {header : "优先转换状态",width : 150,dataIndex : 'priorConvertStatus',hidden:fromDepartmentUseRecord || (sstsConfig.enablePriorConvertApplyGoods ? false :true)},
 	    {header : operatorColumnHeader,width : 60,dataIndex : 'operator',hidden:existsObjInArray(operatorColumnHeader,hiddenColumnsOfUseRecordListView)},
 	    {header : departColumnHeader,width : 80,dataIndex : 'depart',hidden:existsObjInArray(departColumnHeader,hiddenColumnsOfUseRecordListView)},
-	    {header : enteringDateColumnHeader,width : 120,dataIndex : 'enteringDate',hidden:existsObjInArray(enteringDateColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute},
-	    {header : applicationTimeColumnHeader,width : 120,dataIndex : 'applicationTime',hidden:fromDepartmentUseRecord || existsObjInArray(applicationTimeColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute},
+	    {header : enteringDateColumnHeader,width : 120,dataIndex : 'enteringDate',hidden:existsObjInArray(enteringDateColumnHeader,hiddenColumnsOfUseRecordListView),renderer : function(v , p , rec){
+			//DGSETYY-13:增加使用到回收超时提醒
+			if (v == null) {
+				return "";
+			} else {
+				var isUseToRecycleWarn = rec.data.isUseToRecycleWarn;
+				var status = rec.data.status;
+				if((isUseToRecycleWarn == 'true' || isUseToRecycleWarn == true) && status !== '已申请'){
+					return '<span style="background: red;color: #fff;">'+v.substring(0, 16)+'</span>';
+				}else {
+					return v.substring(0, 16);
+				}
+			}
+		}},
+		{header : applicationTimeColumnHeader,width : 120,dataIndex : 'applicationTime',hidden:fromDepartmentUseRecord || existsObjInArray(applicationTimeColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute},
 	    {header : remarkColumnHeader,width : 120,dataIndex : 'remark',id : 'autoWidth',hidden:existsObjInArray(remarkColumnHeader,hiddenColumnsOfUseRecordListView)}
 	];
 
@@ -895,6 +925,7 @@
 	    {name : 'enteringDate'},
 	    {name : 'applicationTime'},
 	    {name : 'status'},
+		{name : 'isUseToRecycleWarn'},
 		{name : 'finishPush'},
 	    {name : 'lastPushDateTime'},
 	    {name : 'remark'},
@@ -1065,6 +1096,8 @@
 		dwrCallParams // 这个参数只是占位作用
 	);
 
+	getUnRecycleUseRecordAlarmWarning();
+
 	var viewport = new Ext.Viewport({
 		layout : 'border',
 		items : [{
Index: ssts-web/src/main/webapp/systemmanage/timeoutSetting.js
===================================================================
diff -u -r29300 -r32177
--- ssts-web/src/main/webapp/systemmanage/timeoutSetting.js	(.../timeoutSetting.js)	(revision 29300)
+++ ssts-web/src/main/webapp/systemmanage/timeoutSetting.js	(.../timeoutSetting.js)	(revision 32177)
@@ -311,16 +311,16 @@
 					columnWidth:0.5,
 					border:0,
 					items:[{
-						xtype:'textfield',
+						xtype:'numberfield',
 						id:'deliveryToSignHour',
 						name:'deliveryToSignHour',
 						labelWidth:'100',
 						labelAlign: 'right',
 						fieldLabel: '小时',
 						allowBlank:false,
 						regex:/^[0-9]\d*$/,
-						regexText:'请输入数字',
-						blankText:'请输入数字',
+						regexText:'请输入整数',
+						blankText:'请输入整数',
 						listeners:{
 							focus:onTextfieldFoucus
 						}
@@ -330,16 +330,16 @@
 					columnWidth:0.5,
 					border:0,
 					items:[{
-						xtype:'textfield',
+						xtype:'numberfield',
 						id:'deliveryToSignMinute',
 						name:'deliveryToSignMinute',
 						labelWidth:'100',
 						labelAlign: 'right',
 						fieldLabel: '分钟',
 						allowBlank:false,
 						regex:/^[0-9]$|^[0-5][0-9]$/,
-						regexText:'请输入0到59的数字',
-						blankText:'请输入0到59的数字',
+						regexText:'请输入0到59的整数',
+						blankText:'请输入0到59的整数',
 						listeners:{
 							focus:onTextfieldFoucus
 						}
@@ -366,10 +366,6 @@
 				id:'departCodes',
 				name:'departCodes'
 			},{
-				xtype:'hidden',
-				id:'orgUnitIds',
-				name:'orgUnitIds'
-			},{
 				columnWidth : .2,
 				layout : 'form',
 				border:0,
@@ -380,8 +376,7 @@
 						click : function(){
 							var departNames = Ext4.getCmp('departNames').getValue();
 							var codes = Ext4.getCmp("departCodes").getValue();
-							var orgUnitIds = Ext4.getCmp("orgUnitIds").getValue();
-							openSelectReceiverOrganization(departNames,codes,orgUnitIds);
+							openSelectReceiverOrganization(departNames,codes);
 						} 								
 					}
 				}]
@@ -405,6 +400,111 @@
 					triggerAction : 'all'
 				}]
 			}]
+		},{
+			xtype : "panel",
+			title : '使用到回收',
+			layout:'column',
+			autoHeight :true ,
+			items : [{
+				xtype : "fieldset",
+				title : '超时时间',
+				layout:'column',
+				autoHeight :true ,
+				columnWidth:1,
+				items : [{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'numberfield',
+						id:'useToRecycleHour',
+						name:'useToRecycleHour',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '小时',
+						allowBlank:false,
+						regex:/^[0-9]\d*$/,
+						regexText:'请输入整数',
+						blankText:'请输入整数',
+						listeners:{
+							focus:onTextfieldFoucus
+						}
+					}]
+				},{
+					layout:'form',
+					columnWidth:0.5,
+					border:0,
+					items:[{
+						xtype:'numberfield',
+						id:'useToRecycleMinute',
+						name:'useToRecycleMinute',
+						labelWidth:'100',
+						labelAlign: 'right',
+						fieldLabel: '分钟',
+						allowBlank:false,
+						regex:/^[0-9]$|^[0-5][0-9]$/,
+						regexText:'请输入0到59的整数',
+						blankText:'请输入0到59的整数',
+						listeners:{
+							focus:onTextfieldFoucus
+						}
+					}]
+				}]
+			},{
+				layout : 'form',
+				columnWidth : 0.8,
+				border:0,
+				items : [{
+					xtype : 'textarea',
+					fieldLabel : '提醒科室',
+					labelWidth:'110',
+					labelAlign: 'right',
+					id : 'useToRecycleDepartNames',
+					name : 'useToRecycleDepartNames',
+					height : 100,
+					allowBlank : false,
+					readOnly:true,
+					anchor : '95%'
+				}]
+			},{
+				xtype:'hidden',
+				id:'useToRecycleDepartCodes',
+				name:'useToRecycleDepartCodes'
+			},{
+				columnWidth : .2,
+				layout : 'form',
+				border:0,
+				items : [{
+					xtype : 'button',
+					text : '选择科室',
+					listeners:{
+						click : function(){
+							var departNames = Ext4.getCmp('useToRecycleDepartNames').getValue();
+							var codes = Ext4.getCmp("useToRecycleDepartCodes").getValue();
+							openSelectReceiverOrganization(departNames,codes,'useToRecycleDepart');
+						} 								
+					}
+				}]
+			},{
+				layout : 'form',
+				columnWidth : 1,
+				border:0,
+				items : [{
+					xtype:'combobox',
+					id:'useToRecycleShowMessageBox',
+					name: 'useToRecycleShowMessageBox',
+					store:yesNoStore,
+					labelWidth:'110',
+					labelAlign: 'right',
+			        fieldLabel: '是否显示提示框',
+			        valueField : 'value',
+					displayField : 'text',
+					forceSelection : true,
+					editable:false,
+					allowBlank:false,
+					triggerAction : 'all'
+				}]
+			}]
 		}],
 
         buttons: [{
@@ -444,73 +544,19 @@
 				Ext4.getCmp('deliveryToSignMinute').setValue(result.deliveryToSignMinute);
 				Ext4.getCmp('deliveryToSignShowMessageBox').setValue(result.deliveryToSignShowMessageBox);
 				Ext4.getCmp('departNames').setValue(result.deliveryToSignOrgUnitNames);
-				Ext4.getCmp('orgUnitIds').setValue(result.deliveryToSignOrgUnitIds);
 				Ext4.getCmp('departCodes').setValue(result.deliveryToSignOrgUnitCodes);
+
+				Ext4.getCmp('useToRecycleHour').setValue(result.useToRecycleHour);
+				Ext4.getCmp('useToRecycleMinute').setValue(result.useToRecycleMinute);
+				Ext4.getCmp('useToRecycleShowMessageBox').setValue(result.useToRecycleShowMessageBox);
+				Ext4.getCmp('useToRecycleDepartNames').setValue(result.useToRecycleOrgUnitNames);
+				Ext4.getCmp('useToRecycleDepartCodes').setValue(result.useToRecycleOrgUnitCodes);
 			}
 		},
 		failure : function(response, options) {
 		}
 	});
     
-	function checkModuleTextIsExist(moduleStr,poModuleName,moduleCmpId){}
-	
-	function openSelectReceiverOrganization(departNames,codes,orgUnitIds){
-		var param = {
-			allowNull:true,
-			onlyOneOrg : true,
-			resultType:'code',
-			tabType : 'orgUnit',
-			sameLevel :'yes',
-			range : 'all',
-			departNames :departNames,
-			departCodes : codes,
-			orgUnitIds:orgUnitIds
-		};
-		var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
-		//org_3306;org_3219,口腔科;妇科
-		var codes ='';
-		
-		if(selectedOrgUnitArray == undefined){
-			return;
-		}else if(selectedOrgUnitArray[0] !== undefined){
-			codes = '';
-			var tem ='';
-	
-			var tempArray = selectedOrgUnitArray[0].split(';');
-			for(var i=0;i<tempArray.length;i++){
-				codes += tempArray[i]+";";
-			}
-			for(var j=0;j<codes.length-1;j++){
-				tem += codes.charAt(j);
-			}
-			Ext4.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
-			Ext4.getCmp("orgUnitIds").setValue(selectedOrgUnitArray[2]);
-			Ext4.getCmp("departCodes").setValue(tem);
-		}else {
-			var loop = setInterval(function() {
-				  if(selectedOrgUnitArray.closed) {
-					clearInterval(loop);
-	
-					   codes = '';
-					var tem ='';
-					var returnValue = selectedOrgUnitArray.returnValue || [];
-					if(returnValue.length > 0){
-						var tempArray = selectedOrgUnitArray.returnValue[0].split(';');
-						for(var i=0;i<tempArray.length;i++){
-							codes += tempArray[i]+";";
-						}
-						for(var j=0;j<codes.length-1;j++){
-							tem += codes.charAt(j);
-						}
-						Ext4.getCmp("departNames").setValue(selectedOrgUnitArray.returnValue[1]);
-						Ext4.getCmp("orgUnitIds").setValue(selectedOrgUnitArray.returnValue[2]);
-						Ext4.getCmp("departCodes").setValue(tem);
-					}
-				  }
-			},500);
-		}
-	}
-    
     function save(){
     	if(!formObj.isValid()){
     		showResult('请正确输入表单各值');
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
===================================================================
diff -u -r31923 -r32177
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 31923)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 32177)
@@ -65,11 +65,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>使用记录</title>
 
-<link rel="stylesheet" type="text/css" href="${ctx}/ext/treepanel/resources/css/column-tree.css?version=${svnRevision}"></link>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/expand/css/column-tree.css?version=${svnRevision}"></link>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <%@ include file="/common/include_Ext42_Js.jsp"%>
 <script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js?version=${svnRevision}"></script>
-<script type="text/javascript" src="${ctx}/ext/treepanel/ColumnNodeUI.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/ext/expand/js/ColumnNodeUI.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/ext/expand/js/RowExpander.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/mapObject.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
===================================================================
diff -u -r31216 -r32177
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 31216)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 32177)
@@ -62,6 +62,8 @@
 function saveDepartNameAndCode(formName) {
     var nameArr = [];
     var codeArr = [];
+    var nameString = '';
+    var codeString = '';
 
     if (formName == 'satisfactionSurveyTemplateForm') {
         for (var i = 0; i < departListStore.getCount(); i++) {
@@ -75,35 +77,57 @@
             codeArr[i] = departCode;
         }
 
-        if (nameArr.length == 0 || codeArr.length == 0) {
-            showResult('请选择一个科室');
-            return
+        if (nameArr.length !== 0 && codeArr.length !== 0) {
+            nameString = nameArr.join(';');
+            codeString = codeArr.join(';')
         }
 
         if (top.Ext.getCmp("readersForDisplay") && top.Ext.getCmp("readers")) {
-            top.Ext.getCmp("readersForDisplay").setValue(nameArr.join(';'));
-            top.Ext.getCmp("readers").setValue(codeArr.join(';'));
+            top.Ext.getCmp("readersForDisplay").setValue(nameString);
+            top.Ext.getCmp("readers").setValue(codeString);
         }
+    } else if(formName == 'useToRecycleDepart'){
+        for (var i = 0; i < departListStore.getCount(); i++) {
+            var record = departListStore.getAt(i);
+            nameArr[i] = record.get('name');
+            codeArr[i] = record.get('departCode');
+        }
+
+        if (nameArr.length !== 0 && codeArr.length !== 0) {
+            nameString = nameArr.join(';');
+            codeString = codeArr.join(';')
+        }
+
+        if (Ext4.getCmp("useToRecycleDepartNames") && Ext4.getCmp("useToRecycleDepartCodes")) {
+            Ext4.getCmp("useToRecycleDepartNames").setValue(nameString);
+            Ext4.getCmp("useToRecycleDepartCodes").setValue(codeString);
+        }
     } else {
         for (var i = 0; i < departListStore.getCount(); i++) {
             var record = departListStore.getAt(i);
             nameArr[i] = record.get('name');
             codeArr[i] = record.get('departCode');
         }
 
-        if (nameArr.length == 0 || codeArr.length == 0) {
-            showResult('请选择一个科室');
-            return
+        if (nameArr.length !== 0 && codeArr.length !== 0) {
+            nameString = nameArr.join(';');
+            codeString = codeArr.join(';')
         }
+
         if (top.Ext4.getCmp("departNames") && top.Ext4.getCmp("departCodes")) {
-            top.Ext4.getCmp("departNames").setValue(nameArr.join(';'));
-            top.Ext4.getCmp("departCodes").setValue(codeArr.join(';'));
+            top.Ext4.getCmp("departNames").setValue(nameString);
+            top.Ext4.getCmp("departCodes").setValue(codeString);
         }
 
         if (top.Ext.getCmp("departNames") && top.Ext.getCmp("departCodes")) {
-            top.Ext.getCmp("departNames").setValue(nameArr.join(';'));
-            top.Ext.getCmp("departCodes").setValue(codeArr.join(';'));
+            top.Ext.getCmp("departNames").setValue(nameString);
+            top.Ext.getCmp("departCodes").setValue(codeString);
         }
+
+        if (Ext4.getCmp("departNames") && Ext4.getCmp("departCodes")) {
+            Ext4.getCmp("departNames").setValue(nameString);
+            Ext4.getCmp("departCodes").setValue(codeString);
+        }
     }
 
     departWin.close();