Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigForm.js
===================================================================
diff -u -r20735 -r27277
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigForm.js	(.../useRecordConvertConfigForm.js)	(revision 20735)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigForm.js	(.../useRecordConvertConfigForm.js)	(revision 27277)
@@ -13,23 +13,33 @@
 		sameLevel :'yes',
 		range : 'all',
 		departNames :departNames,
-		departCodes : codes
+		departCodes : codes,
+		hideAddAllButton:true
 	};
-	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp?hideAddAllButton=true",param, "800", "450");
+	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
 	//org_3306;org_3219,口腔科;妇科
 	var codes ='';
-    if(selectedOrgUnitArray != null&&selectedOrgUnitArray!=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);
+
+	if(selectedOrgUnitArray == undefined){
+    	return;
+    }else {
+    	var loop = setInterval(function() {
+              if(selectedOrgUnitArray.closed) {
+                clearInterval(loop);
+
+               	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);
+              }
+        },500);
     }
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js
===================================================================
diff -u -r27248 -r27277
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js	(.../departmentgroupForm.js)	(revision 27248)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js	(.../departmentgroupForm.js)	(revision 27277)
@@ -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) {
@@ -54,7 +42,7 @@
 			    	top.Ext4.getCmp("departCodes").setValue(tem);
 		    	}
               }
-        });
+        },500);
     }
 }