Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r13289 -r13689
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 13289)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 13689)
@@ -152,6 +152,8 @@
             				'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment,
             				'packageTypeAbbreviation':packageTypeAbbreviation
             		};
+            		printSummaryObj.washOperator = tousseObj.washOperator;
+            		printSummaryObj.tousseType = tousseObj.tousseType;
             		defaultPrintForeignToussePackage(printSummaryObj);
             	}else{
             		//打印标签纸类型（大标签打印材料/小标签不打印材料）
@@ -179,6 +181,8 @@
             		var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
             				'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount,
             				'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation};
+            		obj.washOperator = tousseObj.washOperator;
+            		obj.tousseType = tousseObj.tousseType;
             		defaultPrintPackage(obj);	
             	}
             }
@@ -189,119 +193,21 @@
 
 // 打印消毒物品以及材料明细
 var printLabelOfDisinfection = function(tousseObj){
-	
-	var barcodes = tousseObj.barcodes;
-	var validDate = tousseObj.validDate;
-	var packageType = tousseObj.packageType;
-	
-    if (typeof(validDate) == undefined || typeof(validDate) == "undefined"){
-    	alert("包装类型【" + packageType + "】的有效期未定义，请检查系统参数设置！");
-    	return;
-    }
-    
-	var isTraceable = tousseObj.isTraceable;
-	var fixedBarcode = tousseObj.fixedBarcode;
-
-	var tousseName = tousseObj.tousseName;
-	
-	var packTime = tousseObj.packTime;
-	var sterilizationDate = tousseObj.sterilizationDate; // 灭菌日期，高水平消毒的消毒物品，采用该值作为消毒日期
-	var materialsJsonArray = tousseObj.materialsJsonArray;
-	var department = tousseObj.department;
-	var isSterile = tousseObj.isSterile;
-    
-	var operatorToPrint = tousseObj.operatorToPrint;
-	var reviewerToPrint = tousseObj.reviewerToPrint;
-	
-    if(barcodes != null  && barcodes.length > 0){
-          if(department != null && department != ""){
-        	  // 消毒物品如果追溯，则在物品名字前面打印科室名称，不追溯就不打印科室名称
-        	  /*if (isTraceable){
-        		  tousseName  = "(" + department + ")" + tousseName;
-        	  }*/
-        	  //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称
-        	  if(tousseObj.isPrintOrg == true){
-        		  tousseName = "(" + department + ")" + tousseName;
-        	  }
-          }
-          for ( var j = 0; j < barcodes.length; j++) {
-        	  var printBarcodeStr = barcodes[j];
-        	  if(!isTraceable){
-        		  printBarcodeStr = fixedBarcode;
-        	  }
-        		if (printBarcodeStr != null &&  printBarcodeStr != '') {
-
-        			LODOP = getLodop(document.getElementById('LODOP'), document
-        					.getElementById('LODOP_EM'));
-        			var position = tousseName.indexOf("_");
-        			if (position > 0){
-        				tousseName = tousseName.substring(0, position);
-        			}
-        			
-        			var tableHtml ="<table border ='0' style=\"width: 50mm; height: 30mm\">";
-        			tableHtml += "<tr>";
-        			tableHtml += "<td colspan='4' style='font-size: 15px;font-weight:bold'><center>"+tousseName+"</center>";
-        			tableHtml += "</td>";
-        			tableHtml += "</tr>";
-
-        			var dateStr = packTime;
-        			// 如果该消毒物品需要灭菌，并且灭菌日期不为空，则消毒日期取灭菌日期的值
-        			if (tousseObj.isSterile == '是' && sterilizationDate != "" && sterilizationDate != 'undefined'){
-        				dateStr = sterilizationDate;
-        			}
-        			
-        			if (dateStr.length > 10){
-        				dateStr = dateStr.substring(0,10);
-        			}
-
-        			tableHtml += "<tr>";
-        			tableHtml += "<td colspan='4' style='font-size: 12px;;font-weight:bold' align='center'>消毒日期:" + dateStr + "<center>";
-        			tableHtml += "</center></td></tr>";
-        			
-        			if(sstsConfig.printValidDateUtil){
-        				var validDateStr = validDate;
-            			if (validDateStr.length > 10){
-            				validDateStr = validDateStr.substring(0,10);
-            			}
-            			tableHtml += "<tr>";
-            			tableHtml += "<td colspan='4' style='font-size: 12px;;font-weight:bold' align='center'>失效日期:" + validDateStr + "<center>";
-            			tableHtml += "</center></td></tr>";
-        			}
-        			
-        			//打印材料明细
-        			if(materialsJsonArray && materialsJsonArray.length>0){
-        				tableHtml += "<tr>";
-        				tableHtml += "<td colspan='4'>";
-        				
-        				var materialHtml = "<table  border =1 cellspacing=0 cellpadding=0 style='border-collapse:collapse;font-size: 12px;font-weight:bold' bordercolor='#000000'>";
-//        				materialHtml += "<tr><td align='center' width='250'><strong>物品名称</strong></td><td align='center' width='80'><strong>数量</strong></td></tr>";
-        				for ( var i = 0; i < materialsJsonArray.length; i++) {
-        					materialHtml += "<tr><td align='center' width='250'>"+materialsJsonArray[i].name+"</td><td align='center' width='80'>"+materialsJsonArray[i].count+"</td></tr>";
-        					
-        				}
-        				materialHtml += "</table>";
-        				
-        				
-        				tableHtml +=  (materialHtml + "</td></tr>");
-        			}
-        			
-        			tableHtml += "<tr>";
-        			tableHtml += "<td colspan='4' style='font-size: 10px;'><center>";
-        			tableHtml += tousseObj.packageTypeAbbreviation+"<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + printBarcodeStr + "'/>";
-        			tableHtml += "</br>"+printBarcodeStr;
-        			tableHtml += "</center></td></tr>";
-        			
-        			
-        			tableHtml += "</table>";
-        			LODOP.ADD_PRINT_HTM(0,0,"100%","100%","<body leftmargin=0 topmargin=0>"+tableHtml+"</body>");
-        			LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
-
-        			LODOP.PRINT();
-        		} else {
-        			alert("打印的物品没有条码，无法打印");
-        		}
-          }
-    }
+	var pageType = tousseObj.pageType;
+	if(isPageTypeConfigured(tousseObj.tousseType,pageType)){
+//		alert(tousseObj.isTraceable)
+//		if(!tousseObj.isTraceable){
+//			alert(tousseObj.fixedBarcode)
+//			tousseObj.barcode = tousseObj.fixedBarcode;
+//  	  	}
+//		setFormTypeOfPrintedByPageType(pageType);
+//		print(tousseObj);
+//		setPrinterByConfig();
+//		LODOP.PRINT();
+		printLabel(tousseObj);
+		return;
+	}
+	defaultPrintDisinfection(tousseObj);
 };
 
 /**