Index: ssts-web/src/main/webapp/disinfectsystem/customform/formdefinitionView.js
===================================================================
diff -u -r18491 -r27280
--- ssts-web/src/main/webapp/disinfectsystem/customform/formdefinitionView.js	(.../formdefinitionView.js)	(revision 18491)
+++ ssts-web/src/main/webapp/disinfectsystem/customform/formdefinitionView.js	(.../formdefinitionView.js)	(revision 27280)
@@ -171,10 +171,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]);
+		    	}
+              }
+        });
     }
 }