Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js
===================================================================
diff -u -r13386 -r13421
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js	(.../customTousseForm.js)	(revision 13386)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js	(.../customTousseForm.js)	(revision 13421)
@@ -103,26 +103,8 @@
 		}
 	}
 }
+
 /**
- * 在设置申请科室后调用
- * @param applyDepartCoding 申请科室编码
- */
-/*function onApplyDepartSet(applyDepartCoding){
-	//选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值
-	handleDepartStore.proxy.extraParams.applyDepartCode = applyDepartCoding;
-	handleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType;
-	handleDepartStore.load({
-		callback: function(records, operation, success) {
-			if (records.length == 1){
-				var record = records[0];
-				top.Ext.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
-				top.Ext.getCmp("handleDepartName").setValue(record.data.name);
-				top.Ext.getCmp('handleDepart').setValue(record.data.cssdOrgUnitCode);
-			}
-		}
-	});
-}*/
-/**
  * 
  * @param appId
  * @param tousseId
@@ -211,14 +193,6 @@
 			name : 'settleAccountsDepartCoding',
 			id : 'settleAccountsDepartCoding'
 		},{
-			xtype : 'hidden',
-			name : 'handleDepartCoding',
-			id : 'handleDepartCoding'
-		},{
-			xtype : 'hidden',
-			name : 'handleDepartName',
-			id : 'handleDepartName'
-		},{
 			xtype : "fieldset",
 			title: '基础数据',
 			bodyStyle : 'padding:1px;',
@@ -288,7 +262,6 @@
 								var departArray = dept.split("－");
 								this.setValue(departArray[departArray.length-1]);
 							}
-							//onApplyDepartSet(departCoding);
 						},
 						focus : function(thiz){
 							thiz.selectText();
@@ -333,37 +306,6 @@
 							}
 						}]
 			},{
-				columnWidth : .5,
-				layout : 'form',
-				labelWidth : 70,
-				items : [{
-					xtype : 'combo',
-					fieldLabel : '处理科室',
-					id : 'handleDepart',
-					name : 'handleDepart',
-					minChars : 0,
-					valueField : 'cssdOrgUnitCode',
-					displayField : 'name',
-					store : handleDepartStore,
-					forceSelection : true,
-					lazyInit : true,
-					triggerAction : 'all',
-					hideTrigger : false,
-					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);
-							top.Ext.getCmp("handleDepartName").setValue(record.data.name);
-						},
-						focus : function(thiz){
-							thiz.selectText();
-						}
-					}
-				}]
-			},{
 				columnWidth : .5
 				,layout : 'form'
 				,labelWidth : 70
@@ -685,7 +627,6 @@
 		departComp.disable();
 		var departCodingComp = top.Ext.getCmp("departCoding");
 		departCodingComp.setValue($Id('departCoding').value);
-		//onApplyDepartSet($Id('departCoding').value);
 	}
 	if(appId == 0) {
 		//申请科室是否为结算科室
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
===================================================================
diff -u -r13400 -r13421
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java	(.../CustomRecyclingApplicationAction.java)	(revision 13400)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java	(.../CustomRecyclingApplicationAction.java)	(revision 13421)
@@ -22,7 +22,9 @@
 import org.hibernate.Hibernate;
 
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
+import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
@@ -57,6 +59,8 @@
 	private SerialNumManager serialNumManager;
 
 	private SupplyRoomConfigManager supplyRoomConfigManager;
+	
+	private TaskGroupManager taskGroupManager;
 
 	public void setSupplyRoomConfigManager(
 			SupplyRoomConfigManager supplyRoomConfigManager) {
@@ -80,6 +84,10 @@
 		return recyclingApplication;
 	}
 
+	public void setTaskGroupManager(TaskGroupManager taskGroupManager) {
+		this.taskGroupManager = taskGroupManager;
+	}
+
 	private RecyclingApplicationManager recyclingApplicationManager;
 
 	public void setRecyclingApplicationManager(
@@ -100,10 +108,11 @@
 		String customTousseInstanceIds = StrutsParamUtils.getPraramValue(
 				"customTousseInstanceIds", "");
 		String name = StrutsParamUtils.getPraramValue("name", "");
-		String handleDepartCoding = StrutsParamUtils.getPraramValue("handleDepartCoding",null);
-		String handleDepartName = StrutsParamUtils.getPraramValue("handleDepartName",null);
+		
 		SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
 		Double price = config.getCustomToussePrice();
+		
+		TaskGroup taskGroup = taskGroupManager.getTaskGroup(config.getCustomTousseDefaultTaskGroup());
 
 		PrintWriter printWriter = null;
 		try {
@@ -150,8 +159,10 @@
 		tousseDefinition.setWorkLoadStatisticalMethod(TousseDefinition.WORKLOAD_STATISTICAL_METHOD_MATERIAL_AND_DIPOSABLES);
 		tousseDefinition.setTaskGroup(supplyRoomConfigManager.getCustomTousseDefaultTaskGroup());
 		//SupplyRoomConfig cssd = supplyRoomConfigManager.getFirstSupplyRoomConfig();
-		tousseDefinition.setHandlerDepartCode(handleDepartCoding);
-		tousseDefinition.setHandlerDepartName(handleDepartName);
+		if(taskGroup != null){
+			tousseDefinition.setHandlerDepartCode(taskGroup.getDepartCode());
+			tousseDefinition.setHandlerDepartName(taskGroup.getDepartName());
+		}
 		if (price != null) {
 			tousseDefinition.setPrice(price);
 		}
@@ -260,8 +271,11 @@
 		recyclingApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
 		recyclingApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
 		recyclingApplication.setOrderByFiled(InvoicePlan.RECYCLING_AWAITRECYCLE);
-		recyclingApplication.setHandleDepart(handleDepartName);
-		recyclingApplication.setHandleDepartCoding(handleDepartCoding);
+		if(taskGroup != null){
+			recyclingApplication.setHandleDepart(taskGroup.getDepartName());
+			recyclingApplication.setHandleDepartCoding(taskGroup.getDepartCode());
+		}
+		
 		recyclingApplication.setReaders(";ORGUNIT_"
 				+ recyclingApplication.getDepartCoding() + ";");