Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
===================================================================
diff -u -r12835 -r12848
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 12835)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 12848)
@@ -18,7 +18,12 @@
 	    {name : 'amount',mapping : 'amount'},
 	    {name : 'borrowPrice',mapping : 'borrowPrice'}
 	   ]
-	)
+	),
+	listeners:{
+		beforeload : function(store){
+			store.baseParams["cssdOrgUnitCode"] = top.Ext.getCmp('handleDepartCoding').getValue();
+		}
+	}
 });
 function createTousseLeaseNode(isParentNode,attrId,tousseName,type,amount,time,price){
 	var node;
@@ -394,6 +399,10 @@
 					id : 'settleAccountsDepartCoding'
 				},{
 					xtype : 'hidden',
+					name : 'handleDepartCoding',
+					id : 'handleDepartCoding'
+				},{
+					xtype : 'hidden',
 					name : 'type',
 					id : 'type',
 					value : tousseLeaseApplicationForm
@@ -449,14 +458,16 @@
 						anchor : '100%',
 						listeners:{
 							select:function(combo, record, index){
-								var settleAccountsDepartCoding = top.Ext.getCmp("depart").getValue();
-								top.Ext.getCmp("departCoding").setValue(settleAccountsDepartCoding);
+								var applyDepartCoding = top.Ext.getCmp("depart").getValue();
+								top.Ext.getCmp("departCoding").setValue(applyDepartCoding);
 								//截取科室名称
-								var settleAccountsDepart = top.Ext.getCmp("depart").getRawValue();
-								if(settleAccountsDepart != ""){
-									var departArray = settleAccountsDepart.split("－");
+								var applyAccountsDepart = top.Ext.getCmp("depart").getRawValue();
+								if(applyAccountsDepart != ""){
+									var departArray = applyAccountsDepart.split("－");
 									this.setValue(departArray[departArray.length-1]);
 								}
+								
+								handleDepartStore.reload();
 							},
 							focus : function(thiz){
 								thiz.selectText();
@@ -517,6 +528,44 @@
 						cls:'fieldReadOnlyNoRemove'
 					}]
 				},{
+					columnWidth : .5,
+					layout : 'form',
+					labelWidth : 70,
+					items : [{
+						xtype : 'combo',
+						fieldLabel : '处理科室',
+						id : 'handleDepart',
+						name : 'handleDepart',
+						queryParam : 'spell',
+						minChars : 0,
+						valueField : 'cssdOrgUnitCode',
+						displayField : 'name',
+						store : handleDepartStore,
+						forceSelection : true,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : false,
+						anchor : '100%',
+						listeners:{
+							select:function(combo, record, index){
+								var handleDepartCoding = top.Ext.getCmp("handleDepart").getValue();
+								top.Ext.getCmp("handleDepartCoding").setValue(handleDepartCoding);
+								//截取科室名称
+								var handleDepart = top.Ext.getCmp("handleDepart").getRawValue();
+								if(handleDepart != ""){
+									this.setValue(handleDepart);
+								}
+								
+								tousseAndDiposableGoodsStoreForBorrowing.reload();
+							},
+							focus : function(thiz){
+								thiz.selectText();
+							}
+						}
+					}]
+				},{
 					columnWidth : 1,
 					layout : 'form',
 					labelWidth : 70,
@@ -699,6 +748,8 @@
 		top.Ext.getCmp('applicant').setValue($Id('userName').value);
 		top.Ext.getCmp('depart').setValue($Id('depart').value);
 		top.Ext.getCmp('departCoding').setValue($Id('departCoding').value);
+		
+		handleDepartStore.reload();
 		//申请科室是否为结算科室
 		//是否供应室用户
         var isSupplyRoomUser = validateIsSupplyRoomUser();
@@ -717,5 +768,7 @@
 		top.Ext.getCmp('depart').setValue($Id('depart').value);
 		top.Ext.getCmp('depart').disable();
 		top.Ext.getCmp('departCoding').setValue($Id('departCoding').value);
+		
+		handleDepartStore.reload();
 	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js
===================================================================
diff -u -r12745 -r12848
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js	(.../cssdHandleToussesForm.js)	(revision 12745)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesForm.js	(.../cssdHandleToussesForm.js)	(revision 12848)
@@ -111,7 +111,7 @@
 						triggerAction : 'all',
 						hideTrigger : true,
 						typeAhead : false,
-						allowBlank : true,
+						allowBlank : false,
 						listeners : {
 							select : function(combo, record, index) {
 								if (record && record.data){
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
===================================================================
diff -u -r12825 -r12848
--- ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12825)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12848)
@@ -32,7 +32,7 @@
 	),
 	listeners : {
 		beforeload : function(store,option) {
-			store.baseParams['wareHouseId'] = top.Ext.getCmp('wareHouseId').getValue(id);
+			store.baseParams['wareHouseId'] = top.Ext.getCmp('wareHouseId').getValue();
 		}
 	}
 });
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js
===================================================================
diff -u -r12745 -r12848
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js	(.../cssdServiceDeptsForm.js)	(revision 12745)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsForm.js	(.../cssdServiceDeptsForm.js)	(revision 12848)
@@ -114,7 +114,7 @@
 						id : 'clinicOrgUnit',
 						name : 'clinicOrgUnit',
 						queryParam : 'spell',
-						editable:false,
+						minChars : 0,
 						valueField : 'orgUnitCoding',
 						displayField : 'name',
 						store : new Ext.data.Store({
@@ -132,8 +132,11 @@
 							  ])
 						  }),
 						forceSelection : true,
-						allowBlank : false,
+						lazyInit : true,
 						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : false,
 						anchor : '100%',
 						listeners:{
 							select:function(combo, record, index){
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
===================================================================
diff -u -r12599 -r12848
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 12599)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 12848)
@@ -140,6 +140,37 @@
 	)
 });
 
+//处理科室store
+var handleDepartStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+		root : 'data'
+	},[
+	    {name : 'cssdOrgUnitCode',mapping : 'cssdOrgUnitCode'},
+	    {name : 'name',mapping : 'cssdOrgUnitName'}
+	  ]
+	),listeners:{
+		beforeload : function(store,option) {
+			if(top.Ext.getCmp('departCoding').getValue() == ''){
+				alert('请先选择申请科室!');
+				return false;
+			}
+			store.baseParams['applyDepartCode'] = top.Ext.getCmp('departCoding').getValue();
+		},
+		load : function(store,option) {
+			//如果结果只有一个,默认选中第一条
+			if(store.getCount() == 1){
+				top.Ext.getCmp('handleDepart').setValue(store.getAt(0).data.cssdOrgUnitCode);
+				top.Ext.getCmp('handleDepartCoding').setValue(store.getAt(0).data.cssdOrgUnitCode.name);
+				tousseAndDiposableGoodsStoreForBorrowing.reload();
+			}
+		}
+	}
+});
+
 var tousseAndDiposableGoodsStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseData.do',
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java
===================================================================
diff -u -r12845 -r12848
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java	(.../CssdServiceDeptsAction.java)	(revision 12845)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cssdservicedepts/action/CssdServiceDeptsAction.java	(.../CssdServiceDeptsAction.java)	(revision 12848)
@@ -109,7 +109,7 @@
 		}
 		
 		if(StringUtils.isNotBlank(spell)){
-			sql += " and (upper(spelling) = '" + spell.toUpperCase() + "' or upper(wbCode) = '" + spell.toUpperCase() + "') ";
+			sql += " and (upper(spelling) like '%" + spell.toUpperCase() + "%' or upper(wbCode) like '%" + spell.toUpperCase() + "%') ";
 		}
 		
 		List<OrgUnit> orgUnitList = (List<OrgUnit>)objectDao.findBySql(OrgUnit.class.getSimpleName() , sql);