Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r16077 -r16251
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 16077)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 16251)
@@ -226,12 +226,24 @@
 	defaultPrintDisinfection(tousseObj);
 };
 
+function getDefaultPrintLabelsConfig(){
+	var cfg = {
+		groupLabelsByDepart: false
+	};
+	return cfg;
+}
 /**
  * 打印物品的标签
  */
-function doPrintLabels(tousses){
+function doPrintLabels(tousses,cfg){
+	cfg = cfg || getDefaultPrintLabelsConfig();
 	tousses = createMultipleLabels(tousses);// 生成多份标签
-	tousses = groupLabels(tousses);// 标签分组
+	if(cfg.groupLabelsByDepart){
+		tousses = groupLabelsByDepart(tousses);// 标签分组
+	}else{
+		tousses = groupLabels(tousses);// 标签分组
+	}
+	
 //	for (var i=0;i<tousses.length;i++){
 //		var tousseObj = tousses[i];
 //		if(!tousseObj.isPrint){
@@ -374,6 +386,97 @@
 	retTousses.push(oneColumnTousses);
 	return retTousses;
 }
+// 按照科室来分组
+function groupLabelsByDepart(tousses){
+	var retTousses = [];
+	var departToOneColumnToussesGroupMap = {};
+	var departToMultiColumnToussesGroupMap = {};
+	var departToToussesGroupMap = {};
+	for (var i=0;i<tousses.length;i++){
+		var tousseObj = tousses[i];
+		if(!tousseObj.isPrint){
+			continue;
+		}
+		var depart = tousseObj.depart;
+		var configObj = getConfigObj(tousseObj);
+		if(isUndefinedOrNull(depart)){
+			depart = '';
+		}
+		if(configObj == null){
+			continue;
+		}
+		var columnAmount = configObj.columnAmount;
+		if(isUndefinedOrNull(columnAmount)){
+			columnAmount = 1;
+		}
+		if(columnAmount == 1){
+			var oneColumnTousses = departToOneColumnToussesGroupMap[depart];
+			if(isUndefinedOrNull(oneColumnTousses)){
+				oneColumnTousses = {
+						columnAmount: columnAmount,
+						tousses:[]
+				}
+				departToOneColumnToussesGroupMap[depart] = oneColumnTousses;
+			}
+			oneColumnTousses.tousses.push(tousseObj);
+		}else{
+			var pageType = tousseObj.pageType;
+			var toussesGroup = null;
+			
+			var toussesGroups = departToMultiColumnToussesGroupMap[depart];
+			if(isUndefinedOrNull(toussesGroups)){
+				toussesGroups = [];
+				departToMultiColumnToussesGroupMap[depart] = toussesGroups;
+			}
+			for(var r=0;r<toussesGroups.length;++r){
+				if(pageType == toussesGroups[r].pageType){
+					toussesGroup = toussesGroups[r];
+					break;
+				}
+			}
+			if(toussesGroup == null){
+				toussesGroup = {
+						pageType:pageType,
+						columnAmount:columnAmount,
+						tousses:[]
+				}
+				toussesGroups.push(toussesGroup);
+			}
+			toussesGroup.tousses.push(tousseObj);
+		}
+	}
+	// 多列
+	for( var d in departToMultiColumnToussesGroupMap ){
+		if(departToMultiColumnToussesGroupMap.hasOwnProperty(d)){
+			var toussesGroups = departToToussesGroupMap[d];
+			if(isUndefinedOrNull(toussesGroups)){
+				toussesGroups = [];
+//				departToMultiColumnToussesGroupMap[d] = toussesGroups;
+			}
+			departToToussesGroupMap[d] = toussesGroups.concat(departToMultiColumnToussesGroupMap[d]);
+		}
+	}
+	// 单列
+	for( var d in departToOneColumnToussesGroupMap ){
+		if(departToOneColumnToussesGroupMap.hasOwnProperty(d)){
+			var toussesGroups = departToToussesGroupMap[d];
+			if(isUndefinedOrNull(toussesGroups)){
+				toussesGroups = [];
+//				departToMultiColumnToussesGroupMap[d] = toussesGroups;
+			}
+			departToToussesGroupMap[d] = toussesGroups.concat(departToOneColumnToussesGroupMap[d]);
+		}
+	}
+	// 生成新的分组列表
+	for( var d in departToToussesGroupMap ){
+		if(departToToussesGroupMap.hasOwnProperty(d)){
+			var toussesGroups = departToToussesGroupMap[d];
+			retTousses = retTousses.concat(departToToussesGroupMap[d]);
+		}
+	}
+	var str = JSON.stringify(retTousses);
+	return retTousses;
+}
 function doPrintLabel(tousseObj){
 	//先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整)
 	tousseObj.tousseNameWithoutDepart = tousseObj.tousseName;