Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
===================================================================
diff -u -r16901 -r16922
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 16901)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 16922)
@@ -152,7 +152,7 @@
         listeners: {
             load: function (store, records) {
                 if (records.length > 0) {
-                    if (top.Ext.getCmp('taskGroup')) {
+                    if (top.Ext.getCmp('taskGroup') && !id) {
                         top.Ext.getCmp('taskGroup').setValue(records[0].data.taskGroupName);
                     }
                 }
@@ -1006,32 +1006,30 @@
                 //读取聚合包下的器械包
                 configStore.load({params: {id: tousseDefinition.id}});
                 //读取聚合包下的处理科室与任务组
-                // Ext.Ajax.request({
-                //     url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadComboTousseTaskGroup.do',
-                //     params: {id: id},
-                //     success: function (response, options) {
-                //         var result = Ext.decode(response.responseText);
-                //         if (result.success) {
-                //
-                //         	top.Ext.getCmp('cssdCode').setValue(result.cssdCode);
-                //         	cssdNameStore.loadData([{departCode:result.cssdCode,departName:result.cssdName}]);
-                //         	//top.Ext.getCmp('cssdName').setValue(result.cssdName);
-                //         	taskGroupJsonStore.loadData([{taskGroupName:result.taskGroup}]);
-                //         	//top.Ext.getCmp('taskGroup').setValue(result.taskGroup);
-                //         } else {
-                //         	showResult("未找到聚合包处理科室与任务组配置数据");
-                //         }
-                //     },
-                //     failure: function (response, options) {
-                //         showResult("加载聚合包处理科室与任务组报错");
-                //     }
-                // });
-
-
-                var data = Ext.decode('{"data": [{"departCode": "001", "departName": "名字"},{"departCode": "002", "departName": "名字2"}], "totalCount": 2}');
-                cssdNameStore.loadData(data, true);
-                var cmp = Ext.getCmp('cssdName');
-                cmp.setValue("名字");
+                 Ext.Ajax.request({
+                     url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadComboTousseTaskGroup.do',
+                     params: {id: id},
+                     success: function (response, options) {
+                         var result = Ext.decode(response.responseText);
+                         if (result.success) {
+                
+                         	top.Ext.getCmp('cssdCode').setValue(result.cssdCode);
+                         	var data = Ext.decode('{"data": [{departCode:"'+result.cssdCode+'",departName:"'+result.cssdName+'"}]}');
+                         	//因为是本地数据源,且store的autoLoad属性为true,所以不需要再loadData了,否则将会出现重复数据选项
+                         	//cssdNameStore.loadData(data,true);
+                         	top.Ext.getCmp('cssdName').setValue(result.cssdName);
+                         	
+                         	var taskGroupData = Ext.decode('{"data": [{taskGroupName:"'+result.taskGroup+'"}]}');
+                         	taskGroupJsonStore.loadData(taskGroupData,true);
+                         	top.Ext.getCmp('taskGroup').setValue(result.taskGroup);
+                         } else {
+                         	//showResult("未找到聚合包处理科室与任务组配置数据");
+                         }
+                     },
+                     failure: function (response, options) {
+                         showResult("加载聚合包处理科室与任务组报错");
+                     }
+                 });
             },
             failure: function (form, action) {
             }