Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js
===================================================================
diff -u -r30146 -r30148
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 30146)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/selectDepartExt4.js	(.../selectDepartExt4.js)	(revision 30148)
@@ -26,7 +26,7 @@
 }
 
 //添加科室
-function addDepartItem(code, name, orgUnitId) {
+function addDepartItem(code, name) {
     if (name == null || name == '') {
         showResult('请选择科室！');
         return false;
@@ -45,6 +45,19 @@
     top.Ext4.getCmp("departName2").setValue("");
 }
 
+//添加搜索结果的科室
+function addDepartItems(code, name) {
+    var b = isDepartRepeat(name);
+    if (b) {
+        return;
+    }
+    var record = {
+        departCode: code,
+        name: name
+    };
+    departListStore.add(record)
+}
+
 //保存选择的科室和编码
 function saveDepartNameAndCode() {
     var nameArr = [];
@@ -136,18 +149,31 @@
             select: function (combo, record, index) {
                 var tem = record[0].data.departCode;
                 var name = record[0].data.name;
-                var orgUnitId = record[0].data.orgUnitId;
-                addDepartItem(tem, name, orgUnitId);
+                addDepartItem(tem, name);
             }
         }
     }, {
+        text: '添加科室',
+        iconCls: 'btn_ext_application_add',
+        handler: function () {
+            for (var i = 0; i < departJsonStore.getCount(); i++) {
+                var departCode = departJsonStore.getAt(i).get('departCode');
+                var name = departJsonStore.getAt(i).get('name');
+                addDepartItems(departCode, name)
+            }
+            top.Ext4.getCmp("departName2").setValue("");
+        }
+    }, {
         text: '添加所有',
         iconCls: 'btn_ext_application_add',
         handler: function () {
-            departListStore.removeAll();
+            departJsonStore.load();
+            top.Ext4.getCmp("departName2").setValue("");
             setTimeout(function () {
                 for (var i = 0; i < departJsonStore.getCount(); i++) {
-                    departListStore.add(departJsonStore.getAt(i));
+                    var departCode = departJsonStore.getAt(i).get('departCode');
+                    var name = departJsonStore.getAt(i).get('name');
+                    addDepartItems(departCode, name)
                 }
             }, 200);
         }