Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
===================================================================
diff -u -r13714 -r14235
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp	(.../borrowingTousseView.jsp)	(revision 13714)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp	(.../borrowingTousseView.jsp)	(revision 14235)
@@ -25,6 +25,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript">
 var tousseApplicationForm = '<%=InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM%>';//器械包申请单
 var tousseLeaseApplicationForm = '<%=InvoicePlan.TYPE_BORROWINGSINGLE%>';//借物单
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
===================================================================
diff -u -r12848 -r14235
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 12848)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 14235)
@@ -126,6 +126,7 @@
 	  ]
 	)
 });
+//结算科室store
 var departJsonStoreExt2 = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
@@ -140,36 +141,7 @@
 	)
 });
 
-//处理科室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 invoicePlanForTousseType_Tousse = "器械包";
 
 var tousseAndDiposableGoodsStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js
===================================================================
diff -u -r14069 -r14235
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 14069)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js	(.../borrowingTousseForm.js)	(revision 14235)
@@ -1,3 +1,35 @@
+//处理科室(即服务的供应室)数据源
+var borrowHandleDepartStore = new Ext4.data.JsonStore({
+	proxy : {
+		type : 'ajax',
+		url : WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do',
+		reader : {
+			type : 'json',
+			root : 'data'
+		}
+	},
+	fields : [
+	    /*{name : 'cssdOrgUnitId',mapping : 'cssdOrgUnitId'},*/
+	    {name : 'cssdOrgUnitCode',mapping : 'cssdOrgUnitCode'},
+	    {name : 'name',mapping : 'cssdOrgUnitName'}
+	],listeners:{
+		beforeload : function(store,option) {
+			if(top.Ext.getCmp('departCoding').getValue() == ''){
+				alert('请先选择申请科室!');
+				return false;
+			}
+			store.proxy.extraParams['applyDepartCode'] = top.Ext.getCmp('departCoding').getValue();
+		},
+		load : function(store,option) {
+			//如果结果只有一个,默认选中第一条
+			if(store.getCount() == 1){
+				top.Ext.getCmp('handleDepart').setValue(store.getAt(0).data.name);
+				top.Ext.getCmp('handleDepartCoding').setValue(store.getAt(0).data.cssdOrgUnitCode);
+				tousseAndDiposableGoodsStoreForBorrowing.reload();
+			}
+		}
+	}
+});
 /**
  * 创建借物单的明细节点
  */
@@ -468,7 +500,24 @@
 									this.setValue(departArray[departArray.length-1]);
 								}
 								
-								handleDepartStore.reload();
+								top.Ext.getCmp('settleAccountsDepart').setValue(applyAccountsDepart);
+						        top.Ext.getCmp('settleAccountsDepartCoding').setValue(applyDepartCoding);
+								
+						        //选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值
+						        borrowHandleDepartStore.proxy.extraParams.applyDepartCode = applyDepartCoding;
+						        borrowHandleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType_Tousse;
+						        borrowHandleDepartStore.load({
+									//params:{applyDepartCode:deptCoding,tousseType:invoicePlanForTousseType_Tousse},
+									callback: function(records, operation, success) {
+										var record = records;
+										if (records.length == 1){
+											record = records[0];
+											//top.Ext4.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
+											//top.Ext4.getCmp('handleDepart').setValue(record.data.name);
+											
+										}
+									}
+								});
 							},
 							focus : function(thiz){
 								thiz.selectText();
@@ -541,7 +590,7 @@
 						minChars : 0,
 						valueField : 'cssdOrgUnitCode',
 						displayField : 'name',
-						store : handleDepartStore,
+						store : borrowHandleDepartStore,
 						forceSelection : true,
 						lazyInit : true,
 						triggerAction : 'all',
@@ -757,7 +806,24 @@
 		top.Ext.getCmp('depart').setValue($Id('depart').value);
 		top.Ext.getCmp('departCoding').setValue($Id('departCoding').value);
 		
-		handleDepartStore.reload();
+		top.Ext.getCmp('settleAccountsDepart').setValue($Id('depart').value);
+        top.Ext.getCmp('settleAccountsDepartCoding').setValue($Id('departCoding').value);
+		
+        //选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值
+        borrowHandleDepartStore.proxy.extraParams.applyDepartCode = $Id('departCoding').value;
+        borrowHandleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType_Tousse;
+        borrowHandleDepartStore.load({
+			//params:{applyDepartCode:deptCoding,tousseType:invoicePlanForTousseType_Tousse},
+			callback: function(records, operation, success) {
+				var record = records;
+				if (records.length == 1){
+					record = records[0];
+					//top.Ext4.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
+					//top.Ext4.getCmp('handleDepart').setValue(record.data.name);
+					
+				}
+			}
+		});
 		//申请科室是否为结算科室
 		//是否供应室用户
         var isSupplyRoomUser = validateIsSupplyRoomUser();
@@ -777,6 +843,6 @@
 		top.Ext.getCmp('depart').disable();
 		top.Ext.getCmp('departCoding').setValue($Id('departCoding').value);
 		
-		handleDepartStore.reload();
+		borrowHandleDepartStore.reload();
 	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/untracableTousseForm.js
===================================================================
diff -u -r14149 -r14235
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/untracableTousseForm.js	(.../untracableTousseForm.js)	(revision 14149)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/untracableTousseForm.js	(.../untracableTousseForm.js)	(revision 14235)
@@ -14,6 +14,24 @@
 	})
 });
 
+//为了不与通用申请单、一次性服务申请单及器械包申请的变量弄混,现单独声明出来
+var untracebleHandleDepartStore = new Ext4.data.JsonStore({
+	proxy : {
+		type : 'ajax',
+		url : WWWROOT + '/systemmanage/getCssdsByApplyDepartAndType.do',
+		reader : {
+			type : 'json',
+			root : 'data'
+		}
+	},
+	fields : [
+	    /*{name : 'cssdOrgUnitId',mapping : 'cssdOrgUnitId'},*/
+	    {name : 'cssdOrgUnitCode',mapping : 'cssdOrgUnitCode'},
+	    {name : 'name',mapping : 'cssdOrgUnitName'}
+	]
+});
+untracebleHandleDepartStore.reload();
+
 //提交后的回调函数
 var untracableCallback;
 
@@ -386,6 +404,10 @@
 			id : 'settleAccountsDepartCoding'
 		},{
 			xtype : 'hidden',
+			name : 'handleDepartCoding',
+			id : 'handleDepartCoding'
+		},{
+			xtype : 'hidden',
 			name : 'isApplyEntireTousse',
 			id : 'isApplyEntireTousse'
 		},{
@@ -427,17 +449,38 @@
 					hideTrigger : true,
 					typeAhead : false,
 					allowBlank : false,
-					anchor : '100%',
+					anchor : '95%',
 					listeners:{
 						select:function(combo, record, index){
 							var settleAccountsDepartCoding = top.Ext.getCmp("depart").getValue();
 							top.Ext.getCmp("departCoding").setValue(settleAccountsDepartCoding);
+							top.Ext.getCmp("settleAccountsDepartCoding").setValue(settleAccountsDepartCoding);
 							//截取科室名称
 							var settleAccountsDepart = top.Ext.getCmp("depart").getRawValue();
 							if(settleAccountsDepart != ""){
 								var departArray = settleAccountsDepart.split("－");
 								this.setValue(departArray[departArray.length-1]);
+								
+								top.Ext.getCmp("settleAccountsDepart").store.reload();
+								top.Ext.getCmp("settleAccountsDepart").setValue(departArray[departArray.length-1]);
 							}
+							
+							//选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值
+							untracebleHandleDepartStore.proxy.extraParams.applyDepartCode = settleAccountsDepartCoding;
+							untracebleHandleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType_Tousse;
+							untracebleHandleDepartStore.load({
+								callback: function(records, operation, success) {
+									var record = records;
+									if (records.length == 1){
+										record = records[0];
+										top.Ext.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
+										top.Ext.getCmp('handleDepart').setValue(record.data.name);
+										
+										comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = record.data.cssdOrgUnitCode;
+										comboGoodsStore.reload();
+									}
+								}
+							});
 						},
 						focus : function(thiz){
 							thiz.selectText();
@@ -477,7 +520,7 @@
 					hideTrigger : true,
 					typeAhead : false,
 					allowBlank : false,
-					anchor : '100%',
+					anchor : '95%',
 					listeners:{
 						select:function(combo, record, index){
 							var settleAccountsDepartCoding = top.Ext.getCmp("settleAccountsDepart").getValue();
@@ -494,26 +537,36 @@
 						}
 					}
 				}]
-			},{
+			}, {
 				columnWidth : .33,
 				layout : 'form',
 				labelWidth : 70,
 				items : [{
-						xtype : 'combo',
-						id : 'urgency',
-						name : 'urgency',
-						fieldLabel : "紧急度",
-						value : '普通',
-						valueField : 'displayName',
-						displayField : 'displayName',
-						store : urgencyStore,
-						triggerAction : 'all',
-						mode : 'local',
-						editable : false,
-						forceSelection : true,
-						readOnly : true,
-						allowBlank : false,
-						anchor : '100%'
+					xtype : 'combo',
+					fieldLabel : '处理科室',
+					id : 'handleDepart',
+					name : 'handleDepart',
+					minChars : 0,
+					valueField : 'name',
+					displayField : 'name',
+					store : untracebleHandleDepartStore,
+					queryParam : 'spell',
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : false,
+					anchor : '95%',
+					flex : 1,
+					listeners:{
+						select:function(combo, record, index){
+							top.Ext.getCmp('handleDepartCoding').setValue(record.data.cssdOrgUnitCode);
+						},
+						focus : function(thiz){
+							thiz.selectText();
+						}
+					}						
 				}]
 			},{
 				columnWidth : .33,
@@ -547,6 +600,27 @@
 					cls:'fieldReadOnlyNoRemove'
 				}]
 			},{
+				columnWidth : .33,
+				layout : 'form',
+				labelWidth : 70,
+				items : [{
+						xtype : 'combo',
+						id : 'urgency',
+						name : 'urgency',
+						fieldLabel : "紧急度",
+						value : '普通',
+						valueField : 'displayName',
+						displayField : 'displayName',
+						store : urgencyStore,
+						triggerAction : 'all',
+						mode : 'local',
+						editable : false,
+						forceSelection : true,
+						readOnly : true,
+						allowBlank : false,
+						anchor : '100%'
+				}]
+			},{
 				columnWidth : 1,
 				layout : 'form',
 				labelWidth : 70,
@@ -704,9 +778,7 @@
 			failure : function(form, action) {
 			}
 		});
-	}
-	
-	if(untraceableAppId == null) {
+	}else if(!untraceableAppId || untraceableAppId == null || untraceableAppId == 0) {
 		top.Ext.getCmp('depart').setValue($Id('depart').value);
 		top.Ext.getCmp('departCoding').setValue($Id('departCoding').value);
 		//申请科室是否为结算科室
@@ -716,6 +788,23 @@
 				top.Ext.getCmp('settleAccountsDepartCoding').setValue($Id('departCoding').value);
 			}
 		});
+		
+		//选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值
+		untracebleHandleDepartStore.proxy.extraParams.applyDepartCode = $Id('departCoding').value;
+		untracebleHandleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType_Tousse;
+		untracebleHandleDepartStore.load({
+			callback: function(records, operation, success) {
+				var record = records;
+				if (records.length == 1){
+					record = records[0];
+					top.Ext.getCmp('handleDepartCoding').setValue(record.data.name);
+					top.Ext.getCmp('handleDepart').setValue(record.data.name);
+					
+					comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = record.data.cssdOrgUnitCode;
+					comboGoodsStore.reload();
+				}
+			}
+		});
 	}
 	
 	if(untraceableAppId == null && untraceableAppId <= 0){
