Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r12532 -r12599
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 12532)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 12599)
@@ -206,8 +206,12 @@
     if(barcodes != null  && barcodes.length > 0){
           if(department != null && department != ""){
         	  // 消毒物品如果追溯，则在物品名字前面打印科室名称，不追溯就不打印科室名称
-        	  if (isTraceable){
+        	  /*if (isTraceable){
         		  tousseName  = "(" + department + ")" + tousseName;
+        	  }*/
+        	  //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称
+        	  if(tousseObj.isPrintOrg == true){
+        		  tousseName = "(" + department + ")" + tousseName;
         	  }
           }
           for ( var j = 0; j < barcodes.length; j++) {
@@ -280,6 +284,54 @@
     }
 };
 
+/**
+ * 打印物品的标签
+ */
+function doPrintLabels(tousses){
+	
+	// 必须先调用此代码，然后才能调用Ext.MessageBox.updateProgress
+	showProgressBar(true,'打印中','请稍候...');
+	for (var i=0;i<tousses.length;i++){
+		
+		var tousseObj = tousses[i];
+		
+		if(tousseObj.isPrint){
+
+			top.Ext.MessageBox.updateProgress((i + 1)/tousses.length,'正在打印第' + (i + 1) + '个,共' + tousses.length +  '个');
+
+			//打印消毒物品(如果为消毒物品,根据是否追溯的配置决定是否打印科室)。(消毒物品打印科室现在也改为同器械包一致，即按器械包定义的是否打印科室决定 since:2016-02-25)
+			if(tousseObj.isDisinfection){
+				printLabelOfDisinfection(tousseObj);
+			}
+			// 打印器械包
+			else{
+				//如果该器械包配置需要打印科室且科室信息不为空,将科室信息拼加至名称前面进行打印
+				if(tousseObj.isPrintOrg == true){
+					if(tousseObj.department && tousseObj.department != ''){
+						tousseObj.tousseName = "(" + tousseObj.department + ")" + tousseObj.tousseName;
+					}
+				}
+				printLabel(tousseObj);
+			}
+
+			//打印材料
+			if(tousseObj.tousseDefinition && tousseObj.tousseDefinition.isPrintMaterialForPacking == true){
+				//增加异常抓取机制,防止因为打印材料出错影响对话框的关闭
+				try{
+					//printTousseDefinitionSmallLabel(tousseObj.tousseDefinition);
+					//printConfig.materialLabel.customPrint(tousseObj.tousseDefinition);
+					printTousseDefinitionMaterials(tousseObj.tousseDefinition,0);
+				}catch(e){
+
+				}
+			}
+		}
+	}
+
+	hideMessageBox(true);
+
+}
+
 function getDepartBarcodeByDepart(depart) {
 	var departBarcode = '';
 	DWREngine.setAsync(false);
@@ -291,6 +343,18 @@
 	DWREngine.setAsync(true);
 	return departBarcode;
 }
+// 根据编码获取部门
+function getDepartByCode(code) {
+	var depart = null;
+	DWREngine.setAsync(false);
+	OrgUnitTableManager.getOrgUnitByCode(code, function(result) {
+		if (result != null) {
+			depart = JSON.parse(result);
+		}
+	});
+	DWREngine.setAsync(true);
+	return depart;
+}
 function hideField(field)
 {
 	field.disable();// for validation