Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r20913 -r22652
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 20913)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 22652)
@@ -115,6 +115,22 @@
 	tousseObj.materialAmount = jsonObj.materialAmount;
 	tousseObj.totalAmount = jsonObj.totalAmount;
 }
+// 设置和类型有关的信息
+function setTypeInfoForPrint(tousseObj,barcode){
+	var typeInfoObj = null;
+	DWREngine.setAsync(false);
+	PackingTableManager.getTypeInfoForPrint(barcode,function(result){
+		typeInfoObj = Ext.decode(result);
+	});
+	DWREngine.setAsync(true);
+	
+	if(typeInfoObj){
+		tousseObj.typeInfoObj = typeInfoObj;
+		if(typeInfoObj.comboTousseInfo){
+			tousseObj.comboTousseNameAmountInfo = typeInfoObj.comboTousseInfo.comboTousseNameAmountInfo;
+		}
+	}
+}
 // 设置灭菌程序简称
 function setSterilisationAbbreviationForPrint(tousseObj,barcode){
 	var sterilisationAbbreviation = "";
@@ -248,6 +264,7 @@
             			}
             		}
             		var printBarcodeStr = barcodes[j];
+            		setTypeInfoForPrint(tousseObj,printBarcodeStr);
             		if(!isTraceable){//不追溯打固定条码
             			printBarcodeStr = fixedBarcode;
             		}
@@ -625,7 +642,7 @@
 // 根据配置为包名增加科室前缀
 function addDepartPrefixForTousseName(tousseObj){
 	setTousseNameWithoutDepart(tousseObj);
-	if(tousseObj.printOrgSource != "无"){
+	if((tousseObj.printOrgSource != "无") || tousseObj.tousseType=='聚合包'){
 		if(tousseObj.department){
 			var departPrefix = "(" + tousseObj.department + ")";
 			if(tousseObj.tousseName.indexOf(departPrefix) == -1){// 此方法可能会被嵌套调用多次