Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r15855 -r15941
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 15855)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 15941)
@@ -188,33 +188,33 @@
 		showResult("请选择要打印的申请单！");
 		return false;
 	}
-	var ids = null;
-	var depart = null;
+	
+	// 按科室分组
+	var departToAppIdsMap = {};
 	for ( var i = 0, len = records.length; i < len; i++) {
 		var curDepart = records[i].data['depart'];
 		var hasPacked = records[i].data['hasPacked'];
 		if(hasPacked=='否'){
 			showResult("流水号为【"+records[i].data['serialNumber']+"】的单还未装配,不能打印!");
 			return false;
 		}
-		if(depart == null){
-			depart = curDepart;
-		}else{
-			if(depart != curDepart){
-				showResult("必须选择相同的部门！");
-				return false;
-			}
-		}
-		if (ids == null) {
+		var ids = departToAppIdsMap[curDepart];
+		
+		if (isUndefinedOrNullOrEmpty(ids)) {
 			ids = records[i].data['id'];
 		} else {
 			ids = ids + ',' + records[i].data['id'];
 		}
+		departToAppIdsMap[curDepart] = ids;
 	}
 	top.Ext.MessageBox.confirm("请确认", "要打印申请单吗？",
 			function(btn) {
 				if (btn == 'yes') {
-					batchPrintForeignProxyDisinfectionApplications(ids,depart ,0);
+					for(var depart in departToAppIdsMap ){
+						if(departToAppIdsMap.hasOwnProperty(depart)){
+							batchPrintForeignProxyDisinfectionApplications(departToAppIdsMap[depart],depart ,0);
+						}
+					}
 				}
 			});
 }