Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab.js
===================================================================
diff -u -r12607 -r27282
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab.js	(.../interfereSterilizationTab.js)	(revision 12607)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereSterilizationTab.js	(.../interfereSterilizationTab.js)	(revision 27282)
@@ -244,38 +244,51 @@
 					iconCls : 'btn_ext_application_search',
 					handler : function() {
 						var array = openModalWindow(WWWROOT + '/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?pop=pop', '灭菌记录', '800', '520');
-					    if (typeof (array) != "undefined" && array != null) {
-					    	
-					    	top.Ext.getCmp('startDateTime').setValue(array[0][1]);
-							top.Ext.getCmp('endDateTime').setValue(array[0][2]);
-							top.Ext.getCmp('sterilizerName').setValue(array[0][3]);
-							top.Ext.getCmp('sterileFrequency').setValue(array[0][4]);
-							var recordId = array[0][0];
-							top.Ext.getCmp('sterilizationRecordId').setValue(recordId);
-							
-							basketStore.removeAll();
-							top.Ext.getCmp('sterilizationBasket').setValue("");
-							top.Ext.getCmp('sterilizationBasketName').setValue("");
-							
-							Ext.Ajax.request({
-								url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!loadSterilizationBasket.do?id='+recordId,
-								success : function(response, options) {
-									var result = Ext.decode(response.responseText);
-									if(result.length > 0){
-										for(var i = 0;i < result.length;i++){
-											var record = new basketRecord({
-												reviewBasketId : result[i].reviewBasketId,
-										 	    basketName : result[i].basketName
-								    		});
-											basketStore.add(record);
-										}
-									}
-								},
-								failure : function(response, options) {
-									alert(response.responseText);
-									showResult('加载失败，请联系系统管理员。');
-								}
-							});
+					   	
+					   	if(array == undefined){
+					    	return;
+					    }else {
+					    	var loop = setInterval(function() {
+					              if(array.closed) {
+					                clearInterval(loop);
+
+							    	var returnValue = array.returnValue || [];
+
+							    	if(returnValue.length > 0){
+							    		var recordId = returnValue[0][0];
+
+							    		top.Ext.getCmp('startDateTime').setValue(returnValue[0][1]);
+										top.Ext.getCmp('endDateTime').setValue(returnValue[0][2]);
+										top.Ext.getCmp('sterilizerName').setValue(returnValue[0][3]);
+										top.Ext.getCmp('sterileFrequency').setValue(returnValue[0][4]);
+										top.Ext.getCmp('sterilizationRecordId').setValue(recordId);
+										basketStore.removeAll();
+										top.Ext.getCmp('sterilizationBasket').setValue("");
+										top.Ext.getCmp('sterilizationBasketName').setValue("");
+
+										Ext.Ajax.request({
+											url : WWWROOT + '/disinfectSystem/sterilization/sterilizationRecordAction!loadSterilizationBasket.do?id='+recordId,
+											success : function(response, options) {
+												var result = Ext.decode(response.responseText);
+												if(result.length > 0){
+													for(var i = 0;i < result.length;i++){
+														var record = new basketRecord({
+															reviewBasketId : result[i].reviewBasketId,
+													 	    basketName : result[i].basketName
+											    		});
+														basketStore.add(record);
+													}
+												}
+											},
+											failure : function(response, options) {
+												alert(response.responseText);
+												showResult('加载失败，请联系系统管理员。');
+											}
+										});
+							    	}
+							    	
+					              }
+					        });
 					    }
         			}
 				}]
Index: ssts-web/src/main/webapp/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigForm.js
===================================================================
diff -u -r27248 -r27282
--- ssts-web/src/main/webapp/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigForm.js	(.../goodsDepartShareConfigForm.js)	(revision 27248)
+++ ssts-web/src/main/webapp/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigForm.js	(.../goodsDepartShareConfigForm.js)	(revision 27282)
@@ -21,18 +21,6 @@
 	
     if(selectedOrgUnitArray == undefined){
     	return;
-    }else if(selectedOrgUnitArray[0] != null&&selectedOrgUnitArray[0]!=undefined){
-    	codes = '';
-    	var tem ='';
-    	var tempArray = selectedOrgUnitArray[0].split(';');
-    	for(var i=0;i<tempArray.length;i++){
-    		codes += tempArray[i]+";";
-	    }
-    	for(var j=0;j<codes.length-1;j++){
-    		tem += codes.charAt(j);
-    	}
-    	top.Ext4.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
-    	top.Ext4.getCmp("departCodes").setValue(tem);
     }else {
     	var loop = setInterval(function() {
               if(selectedOrgUnitArray.closed) {