Index: ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
===================================================================
diff -u -r27830 -r27887
--- ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js	(.../orgUnitExtView.js)	(revision 27830)
+++ ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js	(.../orgUnitExtView.js)	(revision 27887)
@@ -57,14 +57,14 @@
 	});
 }
 
-function search(searchText){
+function search(searchText,searchId){
 	if(searchText!=null && searchText.length!=0){
 		var treePanel = viewport.findById('west-panel');
 		Ext.Ajax.request({
-			url: WWWROOT + '/systemmanage/loadOrgUnitByName.do',
-			params: { name: searchText },
+			url: WWWROOT + '/systemmanage/loadOrgUnitById.do',
+			params: {orgUnitId:searchId},
 			success: function(response ,options){
-				var jsonObj = Ext.decode(response.responseText);
+                var jsonObj = Ext.decode(response.responseText);
 				if(jsonObj!=null && jsonObj.length!=0){
 					if(jsonObj.success){
         				treePanel.expandPath(jsonObj.data,'id',function(bSuccess, oLastNode){
@@ -290,7 +290,7 @@
     reader : new Ext.data.JsonReader({
         root : 'data'
     },[
-        {name : 'name',mapping : 'name'}
+        {name : 'name',mapping : 'name',id:'id'}
       ]
     )
 });
@@ -536,15 +536,22 @@
 					anchor : '100%',
 					listeners:{
 						select:function(combo, record, index){
-							Ext.getCmp('searchField').setValue(record.data.name);
-							search(record.data.name);
+                            Ext.getCmp('searchField').setValue(record.data.name);
+                            Ext.getCmp('searchID').setValue(record.json.id);
+							search(record.data.name,record.json.id);
 						}
 					}
                 },{
+                    xtype : 'combo',
+					id : 'searchID',
+                    name : 'searchID',
+                    hidden:true
+                },{
                 	text:'查询',
                 	handler:function(){
-                		var searchText = Ext.getCmp('searchField').getValue();
-                		search(searchText);
+                        var searchText = Ext.getCmp('searchField').getValue();
+                        var searchId = Ext.getCmp('searchID').getValue();
+                		search(searchText,searchId);
                 	}
                 }
             ]
Index: ssts-web/src/main/webapp/systemmanage/disabledOrgUnitExtView.js
===================================================================
diff -u -r27830 -r27887
--- ssts-web/src/main/webapp/systemmanage/disabledOrgUnitExtView.js	(.../disabledOrgUnitExtView.js)	(revision 27830)
+++ ssts-web/src/main/webapp/systemmanage/disabledOrgUnitExtView.js	(.../disabledOrgUnitExtView.js)	(revision 27887)
@@ -57,12 +57,12 @@
 	});
 }
 
-function search(searchText){
+function search(searchText,searchId){
 	if(searchText!=null && searchText.length!=0){
 		var treePanel = viewport.findById('west-panel');
 		Ext.Ajax.request({
-			url: WWWROOT + '/systemmanage/loadOrgUnitByName.do',
-			params: { name: searchText },
+			url: WWWROOT + '/systemmanage/loadOrgUnitById.do',
+			params: {orgUnitId:searchId},
 			success: function(response ,options){
 				var jsonObj = Ext.decode(response.responseText);
 				if(jsonObj!=null && jsonObj.length!=0){
@@ -261,7 +261,7 @@
 	reader : new Ext.data.JsonReader({
 		root : 'data'
 	},[
-	    {name : 'name',mapping : 'name'}
+	    {name : 'name',mapping : 'name',id:'id'}
 	  ]
 	)
 });
@@ -439,14 +439,21 @@
 					listeners:{
 						select:function(combo, record, index){
 							Ext.getCmp('searchField').setValue(record.data.name);
-							search(record.data.name);
+							Ext.getCmp('searchID').setValue(record.json.id);
+							search(record.data.name,record.json.id);
 						}
 					}
                 },{
+                    xtype : 'combo',
+					id : 'searchID',
+                    name : 'searchID',
+                    hidden:true
+                },{
                 	text:'查询',
                 	handler:function(){
                 		var searchText = Ext.getCmp('searchField').getValue();
-                		search(searchText);
+                		var searchId = Ext.getCmp('searchID').getValue();
+                		search(searchText,searchId);
                 	}
                 }
             ]
Index: ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.js
===================================================================
diff -u -r26835 -r27887
--- ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.js	(.../departmentStockInputView.js)	(revision 26835)
+++ ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.js	(.../departmentStockInputView.js)	(revision 27887)
@@ -49,12 +49,12 @@
 	$Id("parm_s_tousseGroupName").value = tousseGroupName;
 	grid.dwrReload();
 }
-function search(searchField){
+function search(searchField,searchId){
 	if(searchField!=null && searchField.length!=0){
 		var treePanel = viewport.findById('west-panel');
 		Ext.Ajax.request({
-			url: WWWROOT + '/systemmanage/loadOrgUnitByName.do',
-			params: { name: searchField },
+			url: WWWROOT + '/systemmanage/loadOrgUnitById.do',
+			params: {orgUnitId:searchId},
 			success: function(response ,options){
 				var jsonObj = Ext.decode(response.responseText);
 				if(jsonObj!=null && jsonObj.length!=0){
@@ -123,11 +123,14 @@
     	proxy : new Ext.data.HttpProxy({
     		url : WWWROOT + '/systemmanage/getOrgNameBySpellingAndWB!getOrgNameBySpellingAndWB.do',
     		method : 'POST'
-    	}),
+		}),
+		baseParams :{
+			showDisableOrgUnit : false
+		},
     	reader : new Ext.data.JsonReader({
     		root : 'data'
     	},[
-    	    {name : 'name',mapping : 'name'}
+    	    {name : 'name',mapping : 'name',id:'id'}
     	  ]
     	)
     });
@@ -674,15 +677,22 @@
 					listeners:{
 						select:function(combo, record, index){
 							Ext.getCmp('searchField').setValue(record.data.name);
-							search(record.data.name);
+							Ext.getCmp('searchID').setValue(record.json.id);
+                            search(record.data.name,record.json.id);
 						}
 					}
                 	
                 },{
+					xtype : 'combo',
+					id : 'searchID',
+					name : 'searchID',
+					hidden:true
+				},{
                 	text:'查询',
                 	handler:function(){
                 		var searchField = Ext.getCmp('searchField').getValue();
-                		search(searchField);
+                		var searchId = Ext.getCmp('searchID').getValue();
+                		search(searchField,searchId);
                 	}
                 }],
                 loader: myLoader,   //数据加载
Index: ssts-web/src/main/webapp/systemmanage/userExtView.js
===================================================================
diff -u -r27830 -r27887
--- ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 27830)
+++ ssts-web/src/main/webapp/systemmanage/userExtView.js	(.../userExtView.js)	(revision 27887)
@@ -50,12 +50,12 @@
 function updateAllUserSmsSendAmount(){
     openNewSizeWindow(WWWROOT + '/systemmanage/setSmsSendAmount.jsp', '修改所有用户短信数量', '400', '160',"no");
 }
-function search(searchField){
+function search(searchField,searchId){
 	if(searchField!=null && searchField.length!=0){
 		var treePanel = viewport.findById('west-panel');
 		Ext.Ajax.request({
-			url: WWWROOT + '/systemmanage/loadOrgUnitByName.do',
-			params: { name: searchField },
+			url: WWWROOT + '/systemmanage/loadOrgUnitById.do',
+			params: {orgUnitId:searchId},
 			success: function(response ,options){
 				var jsonObj = Ext.decode(response.responseText);
 				if(jsonObj!=null && jsonObj.length!=0){
@@ -330,7 +330,7 @@
 	reader : new Ext.data.JsonReader({
 		root : 'data'
 	},[
-	    {name : 'name',mapping : 'name'}
+	    {name : 'name',mapping : 'name',id:'id'}
 	  ]
 	)
 });
@@ -593,16 +593,23 @@
     					anchor : '100%',
     					listeners:{
     						select:function(combo, record, index){
-    							Ext.getCmp('searchField').setValue(record.data.name);
-    							search(record.data.name);
+                                Ext.getCmp('searchField').setValue(record.data.name);
+                                Ext.getCmp('searchID').setValue(record.json.id);
+                                search(record.data.name,record.json.id);
     						}
     					}
                     	
                     },{
+                        xtype : 'combo',
+                        id : 'searchID',
+                        name : 'searchID',
+                        hidden:true
+                    },{
                     	text:'查询',
                     	handler:function(){
                     		var searchField = Ext.getCmp('searchField').getValue();
-                    		search(searchField);
+                    		var searchId = Ext.getCmp('searchID').getValue();
+                		    search(searchField,searchId);
                     	}
                     }
                 ]