Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js
===================================================================
diff -u -r27248 -r27279
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js	(.../departmentgroupOptionForm.js)	(revision 27248)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js	(.../departmentgroupOptionForm.js)	(revision 27279)
@@ -20,18 +20,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) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js
===================================================================
diff -u -r25277 -r27279
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 25277)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualityMonitoringDefinitionView.js	(.../qualityMonitoringDefinitionView.js)	(revision 27279)
@@ -109,10 +109,23 @@
 		};
 	}
 	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
-    if(selectedOrgUnitArray != null){
-    	var tem = selectedOrgUnitArray[0];
-    	top.Ext.getCmp("departCodes").setValue(tem);
-    	top.Ext.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
+    
+	if(selectedOrgUnitArray == undefined){
+    	return;
+    }else {
+    	var loop = setInterval(function() {
+              if(selectedOrgUnitArray.closed) {
+                clearInterval(loop);
+
+		    	var returnValue = selectedOrgUnitArray.returnValue || [];
+
+		    	if(returnValue.length > 0){
+		    		var tem = returnValue[0];
+			    	top.Ext.getCmp("departCodes").setValue(tem);
+	    			top.Ext.getCmp("departNames").setValue(returnValue[1]);
+		    	}
+              }
+        });
     }
 }