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('请正确输入表单各值');