Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r13465 -r13469
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 13465)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 13469)
@@ -2133,21 +2133,18 @@
 	}
 	
 	/**
-	 * 添加一级供应室处理器械包配置
+	 * 添加供应室处理器械包配置,根据器械包定义的处理科室及任务组
 	 * @param tousseDefinition
 	 * @param upload
 	 * @param materialInstanceStr
 	 */
 	public void addCssdHandleToussesConfig(TousseDefinition tousseDefinition){
-		SupplyRoomConfig firstSupplyRoomConfig = 
-				supplyRoomConfigManager.getFirstSupplyRoomConfig();
-		if(firstSupplyRoomConfig != null){
-			CssdHandleTousses cssdHandleTousses = new CssdHandleTousses();
-			cssdHandleTousses.setOrgUnitCode(firstSupplyRoomConfig.getOrgUnitCoding());
-			cssdHandleTousses.setOrgUnitName(firstSupplyRoomConfig.getOrgUnitName());
-			cssdHandleTousses.setTousseDefinitionId(tousseDefinition.getId());
-			cssdHandleTousses.setTousseName(tousseDefinition.getName());
-			objectDao.saveOrUpdate(cssdHandleTousses);
-		}
+		CssdHandleTousses cssdHandleTousses = new CssdHandleTousses();
+		cssdHandleTousses.setOrgUnitCode(tousseDefinition.getHandlerDepartCode());
+		cssdHandleTousses.setOrgUnitName(tousseDefinition.getHandlerDepartName());
+		cssdHandleTousses.setTaskGroup(tousseDefinition.getTaskGroup());
+		cssdHandleTousses.setTousseDefinitionId(tousseDefinition.getId());
+		cssdHandleTousses.setTousseName(tousseDefinition.getName());
+		objectDao.saveOrUpdate(cssdHandleTousses);
 	}
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r13390 -r13469
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 13390)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 13469)
@@ -272,7 +272,7 @@
 	 * 保存
 	 */
 	public void saveTousseDefinition() {
-		String msg = "{success:true,message:'保存成功！'}";
+		String msg = "{success:true,message:\"保存成功！\"}";
 		String time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
 		String userName = AcegiHelper.getLoginUser().getUserFullName();
 		Authentication auth = SecurityContextHolder.getContext()
@@ -311,16 +311,17 @@
 				tousseDefinitionManager.saveTousseDefinition(tousseDefinition,
 						upload,null);
 				if(newTousse){
+					//添加对应供应室处理器械包配置
 					tousseDefinitionManager.addCssdHandleToussesConfig(tousseDefinition);
 				}
 			} catch (Exception e) {
-				msg = "{success:false,message:'保存失败！'}";
+				msg = "{success:false,message:\"保存失败！\"}";
 				e.printStackTrace();
 			}
 		}
 		try {
 			videoFileManager.deleteTempFile();
-			StrutsParamUtils.getResponse().setCharacterEncoding("GBK");
+			StrutsParamUtils.getResponse().setContentType("text/html;charset=UTF-8");
 			StrutsParamUtils.getResponse().getWriter().print(msg);
 		} catch (IOException e) {
 			e.printStackTrace();
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r13355 -r13469
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 13355)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 13469)
@@ -129,7 +129,7 @@
 		listeners:{
 			load:function(store,records) {
 				if(records.length>0 && id==0) {
-					if (top.Ext.getCmp('taskGroup')) {
+					if (top.Ext.getCmp('taskGroup') && top.Ext.getCmp('taskGroup').getValue() == '') {
 						top.Ext.getCmp('taskGroup').setValue(records[0].data.taskGroupName);
 					}
 				}
@@ -142,7 +142,7 @@
 		listeners:{
 			load:function(store,records) {
 				if(records.length>0 && id==0) {
-					if (top.Ext.getCmp('tousseGroupName')) {
+					if (top.Ext.getCmp('tousseGroupName') && top.Ext.getCmp('tousseGroupName').getValue() == '') {
 						top.Ext.getCmp('tousseGroupName').setValue(records[0].data.id);
 					}
 				}
@@ -250,7 +250,7 @@
 		listeners:{
 			load:function(store,records) {
 				if(records.length>0 && id==0) {
-					if (top.Ext.getCmp('sterilingMethod')) {
+					if (top.Ext.getCmp('sterilingMethod') && top.Ext.getCmp('sterilingMethod').getValue() == '') {
 						top.Ext.getCmp('sterilingMethod').setValue(records[0].data.taskGroupName);
 					}
 				}
@@ -265,7 +265,7 @@
 		listeners:{
 			load:function(store,records) {
 				if(records.length>0 && id==0) {
-					if (top.Ext.getCmp('cleanMethod')) {
+					if (top.Ext.getCmp('cleanMethod') && top.Ext.getCmp('cleanMethod').getValue() == '') {
 						top.Ext.getCmp('cleanMethod').setValue(records[0].data.cleaningMethod);
 					}
 				}
@@ -279,7 +279,7 @@
 		listeners:{
 			load:function(store,records) {
 				if(records.length>0 && id==0) {
-					if (top.Ext.getCmp('packageType')){
+					if (top.Ext.getCmp('packageType') && top.Ext.getCmp('packageType').getValue() == ''){
 						top.Ext.getCmp('packageType').setValue(records[0].data.typeName);
 					}
 				}
@@ -1559,8 +1559,13 @@
 					if(id == 0){
 						taskGroupJsonStore.load();
 						packTypeStore.load();
-						top.Ext.getCmp('packageSize').setValue('大包');
-						top.Ext.getCmp('isCleanedEntirely').setValue('是');
+						//大小及是否整包清洗之前未选择过时,才赋初始值
+						if(top.Ext.getCmp('packageSize') && top.Ext.getCmp('packageSize').getValue() == ''){
+							top.Ext.getCmp('packageSize').setValue('大包');
+						}
+						if(top.Ext.getCmp('isCleanedEntirely') && top.Ext.getCmp('isCleanedEntirely').getValue() == ''){
+							top.Ext.getCmp('isCleanedEntirely').setValue('是');
+						}
 						
 						
 					}