Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
===================================================================
diff -u -r20106 -r20122
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 20106)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 20122)
@@ -42,21 +42,27 @@
 	me.list.setWidth(200);
 	var deptCodes = top.Ext.getCmp("handlerDepartCodes").getValue().split(',');
 	//alert('me.store.getCount()='+me.store.getCount());alert('deptCodes.length='+deptCodes.length);
+	//循环下拉框里的数据
 	for (var h = 0; h < me.store.getCount(); h++) {
 		var rec = me.store.getAt(h);
-		for (var i = 0; i < deptCodes.length; i++) {
-			if (rec.get('departCode') == deptCodes[i]) {
-				try{
-					rec.set('check', true);
-					rec.set('color', '#afd7af');
-					break;
-				}catch(e){
-					me.store.add(rec);
-					rec.set('check', true);
-					rec.set('color', '#afd7af');
-					break;
+		if(rec.get('departCode') && deptCodes && deptCodes.length > 0){
+			//循环隐藏域的变量
+			for (var i = 0; i < deptCodes.length; i++) {
+				if (rec.get('departCode') == deptCodes[i]) {
+					try{
+						rec.set('check', true);
+						rec.set('color', '#afd7af');
+						break;
+					}catch(e){
+						me.store.add(rec);
+						rec.set('check', true);
+						rec.set('color', '#afd7af');
+						break;
+					}
 				}
 			}
+		}else{
+			
 		}
 	}
 }
@@ -1412,6 +1418,12 @@
         thiz.enable();
         return false;
     }
+    
+    if(!top.Ext.getCmp("handlerDepartCodes").getValue()){
+    	showResult('请选择科室!');
+        thiz.enable();
+        return false;
+    }
 
     var comboTousseCount = configStore.getCount();
     if (comboTousseCount <= 0) {