Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js
===================================================================
diff -u -r30712 -r30721
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30712)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 30721)
@@ -795,91 +795,7 @@
 		]
 	}
 }
-var foreignTousseMiddleLableConfig = {
-	customPrint: printForeignTousseMiddleLable_gzzyyfs
-}
 
-function printForeignTousseMiddleLable_gzzyyfs(printSummaryObj) {
-	var name = printSummaryObj.name;
-	var barcode = printSummaryObj.barcode;
-	var material = printSummaryObj.material;
-	var operator = printSummaryObj.operator;
-	var reviewer = printSummaryObj.reviewer;
-	var sterilizationDate = printSummaryObj.sterilizationDate;
-	var validDate = printSummaryObj.validDate;
-	var foreignPackageObjectArray = printSummaryObj.foreignPackageObjectArray;
-	var sterilizer = printSummaryObj.sterilizer;
-	var frequency = printSummaryObj.frequency;
-	var hospitalName = printSummaryObj.hospitalName;
-	var total = printSummaryObj.total;
-	var labelType = printSummaryObj.labelType;
-	var patient = printSummaryObj.patient;
-	LODOP = getLodop(document.getElementById('LODOP'), document
-		.getElementById('LODOP_EM'));
-	var tableHtml = "<table border ='0' style=\"width: 60mm; height: 80mm\">";
-	tableHtml += "<tr height='20px'>";
-	tableHtml += "<td colspan='4' style='font-size: 15px;'><center>" + name + "</center>";
-	//	tableHtml += "<hr width=300 size=1 color=#00ffff align=center noshade>";
-	tableHtml += "</td>";
-	tableHtml += "</tr>";
-
-	tableHtml += "<tr height='24px'>";
-	tableHtml += "<td style='font-size: 14px;'><center>灭菌:</center></td>";
-	tableHtml += "<td style='font-size: 14px;' align='left'>" + sterilizationDate + "</td>";
-	tableHtml += "<td style='font-size: 14px;'><center>装配员:</center></td>";
-	tableHtml += "<td style='font-size: 14px;' align='left'>" + operator + "</td>";
-	tableHtml += "</tr>";
-
-	tableHtml += "<tr height='24px'>";
-	tableHtml += "<td style='font-size: 14px;'><center>失效:</center></td>";
-	tableHtml += "<td style='font-size: 14px;' align='left'>" + validDate + "</td>";
-	tableHtml += "<td style='font-size: 14px;'><center>审核员:</center></td>";
-	tableHtml += "<td style='font-size: 14px;' align='left'>" + reviewer + "</td>";
-	tableHtml += "</tr>";
-
-	tableHtml += "<tr height='24px'>";
-	tableHtml += "<td style='font-size: 14px;' colspan='4' align='center'>" + total + "</td>";
-	tableHtml += "</tr>";
-
-	tableHtml += "<tr height='24px'>";
-	tableHtml += "<td style='font-size: 14px;'><center>病人:</center></td>";
-	tableHtml += "<td colspan='3' style='font-size: 14px;' align='left'>" + patient + "</td>";
-	tableHtml += "</tr>";
-	//	tableHtml += "<tr height='24px'>";
-	//	tableHtml += "<td style='font-size: 14px;'><center>病人:</center></td>";
-	//	tableHtml += "<td style='font-size: 14px;' align='left'>"+foreignPackageObjectArray[2]+"</td>";
-	//	tableHtml += "<td style='font-size: 14px;'><center>住院号:</center></td>";
-	//	tableHtml += "<td style='font-size: 14px;' align='left'>"+foreignPackageObjectArray[0]+"</td>";
-	//	tableHtml += "</tr>";
-
-	if (sterilizer == null || sterilizer.length == 0) {
-		tableHtml += "<tr height='24px'>";
-		tableHtml += "<td colspan='4' style='font-size: 14px;'><center>" + hospitalName + "</center></td>";
-		tableHtml += "</tr>";
-	} else {
-		var str = "【" + sterilizer + "】第" + frequency + "炉";
-		tableHtml += "<tr height='24px'>";
-		tableHtml += "<td colspan='4' style='font-size: 14px;'><center>" + str + "</center></td>";
-		tableHtml += "</tr>";
-	}
-	tableHtml += "<tr height='10px'>";
-	tableHtml += "<td colspan='4' style='font-size: 10px;'><center>";
-	tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
-	tableHtml += "</br>" + barcode;
-	tableHtml += "</center></td></tr>";
-
-	tableHtml += "<tr height='10px'>";
-	tableHtml += "<td colspan='4' style='font-size: 10px;'><center>";
-	tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
-	tableHtml += "</br>" + barcode;
-	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");
-}
-
 /**
  * 定制标识牌中标签的打印格式
  */
@@ -893,6 +809,24 @@
 		return;
 	}
 	doGetLodop();
+	var tableTop = 0;
+	var tableLeft = 21;
+	var tableWidth = "95%";
+	var tableHeight = "100%";
+	//设置idcard的自定义打印格式，包括打印的logo图片。logo图片的宽和高要事先调整好，打印函数不能对图片进行大小的控制
+	var idCardPrintConfig = printConfig["idcardPrintConfig"];
+	if (!isUndefinedOrNullOrEmpty(idCardPrintConfig)) {
+		// 设置纸张类型为连续纸，纸张宽度为100mm，打印完毕后的下边距为20mm
+		LODOP.SET_PRINT_PAGESIZE(idCardPrintConfig.pageSize[0], idCardPrintConfig.pageSize[1], idCardPrintConfig.pageSize[2], idCardPrintConfig.pageSize[3]);
+		// 打印图片logo，前面4个参数控制图片的位置，分别为上边距，左边距，图片宽度，图片高度
+		var url = WWWROOT + "/disinfectsystem/config/" + projectName + "/img/" + idCardPrintConfig.logoFileName;
+		LODOP.ADD_PRINT_IMAGE(idCardPrintConfig.logoPosition[0], idCardPrintConfig.logoPosition[1], idCardPrintConfig.logoPosition[2], idCardPrintConfig.logoPosition[3], "<img src='" + url + "'/>")
+
+		tableTop = idCardPrintConfig.tablePosition[0];
+		tableLeft = idCardPrintConfig.tablePosition[1];
+		tableWidth = idCardPrintConfig.tablePosition[2];
+		tableHeight = idCardPrintConfig.tablePosition[3];
+	}
 	var barcode = idCardInstance.barcode;
 	var date = idCardInstance.printDate;
 	var name = idCardInstance.tousseDefinition.name;
@@ -1047,10 +981,93 @@
 	}
 	tableHtml += "</table>";
 
-	LODOP.ADD_PRINT_HTM(0, 0, "98%", "100%", "<body leftmargin='8px' topmargin=0>" + tableHtml + "</body>");
+	LODOP.ADD_PRINT_HTM(tableTop, tableLeft, tableWidth, tableHeight, "<body leftmargin='8px' topmargin=0>" + tableHtml + "</body>");
 	LODOP.PRINT();
 }
+var foreignTousseMiddleLableConfig = {
+	customPrint: printForeignTousseMiddleLable_gzzyyfs
+}
 
+function printForeignTousseMiddleLable_gzzyyfs(printSummaryObj) {
+	var name = printSummaryObj.name;
+	var barcode = printSummaryObj.barcode;
+	var material = printSummaryObj.material;
+	var operator = printSummaryObj.operator;
+	var reviewer = printSummaryObj.reviewer;
+	var sterilizationDate = printSummaryObj.sterilizationDate;
+	var validDate = printSummaryObj.validDate;
+	var foreignPackageObjectArray = printSummaryObj.foreignPackageObjectArray;
+	var sterilizer = printSummaryObj.sterilizer;
+	var frequency = printSummaryObj.frequency;
+	var hospitalName = printSummaryObj.hospitalName;
+	var total = printSummaryObj.total;
+	var labelType = printSummaryObj.labelType;
+	var patient = printSummaryObj.patient;
+	LODOP = getLodop(document.getElementById('LODOP'), document
+		.getElementById('LODOP_EM'));
+	var tableHtml = "<table border ='0' style=\"width: 60mm; height: 80mm\">";
+	tableHtml += "<tr height='20px'>";
+	tableHtml += "<td colspan='4' style='font-size: 15px;'><center>" + name + "</center>";
+	//	tableHtml += "<hr width=300 size=1 color=#00ffff align=center noshade>";
+	tableHtml += "</td>";
+	tableHtml += "</tr>";
+
+	tableHtml += "<tr height='24px'>";
+	tableHtml += "<td style='font-size: 14px;'><center>灭菌:</center></td>";
+	tableHtml += "<td style='font-size: 14px;' align='left'>" + sterilizationDate + "</td>";
+	tableHtml += "<td style='font-size: 14px;'><center>装配员:</center></td>";
+	tableHtml += "<td style='font-size: 14px;' align='left'>" + operator + "</td>";
+	tableHtml += "</tr>";
+
+	tableHtml += "<tr height='24px'>";
+	tableHtml += "<td style='font-size: 14px;'><center>失效:</center></td>";
+	tableHtml += "<td style='font-size: 14px;' align='left'>" + validDate + "</td>";
+	tableHtml += "<td style='font-size: 14px;'><center>审核员:</center></td>";
+	tableHtml += "<td style='font-size: 14px;' align='left'>" + reviewer + "</td>";
+	tableHtml += "</tr>";
+
+	tableHtml += "<tr height='24px'>";
+	tableHtml += "<td style='font-size: 14px;' colspan='4' align='center'>" + total + "</td>";
+	tableHtml += "</tr>";
+
+	tableHtml += "<tr height='24px'>";
+	tableHtml += "<td style='font-size: 14px;'><center>病人:</center></td>";
+	tableHtml += "<td colspan='3' style='font-size: 14px;' align='left'>" + patient + "</td>";
+	tableHtml += "</tr>";
+	//	tableHtml += "<tr height='24px'>";
+	//	tableHtml += "<td style='font-size: 14px;'><center>病人:</center></td>";
+	//	tableHtml += "<td style='font-size: 14px;' align='left'>"+foreignPackageObjectArray[2]+"</td>";
+	//	tableHtml += "<td style='font-size: 14px;'><center>住院号:</center></td>";
+	//	tableHtml += "<td style='font-size: 14px;' align='left'>"+foreignPackageObjectArray[0]+"</td>";
+	//	tableHtml += "</tr>";
+
+	if (sterilizer == null || sterilizer.length == 0) {
+		tableHtml += "<tr height='24px'>";
+		tableHtml += "<td colspan='4' style='font-size: 14px;'><center>" + hospitalName + "</center></td>";
+		tableHtml += "</tr>";
+	} else {
+		var str = "【" + sterilizer + "】第" + frequency + "炉";
+		tableHtml += "<tr height='24px'>";
+		tableHtml += "<td colspan='4' style='font-size: 14px;'><center>" + str + "</center></td>";
+		tableHtml += "</tr>";
+	}
+	tableHtml += "<tr height='10px'>";
+	tableHtml += "<td colspan='4' style='font-size: 10px;'><center>";
+	tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
+	tableHtml += "</br>" + barcode;
+	tableHtml += "</center></td></tr>";
+
+	tableHtml += "<tr height='10px'>";
+	tableHtml += "<td colspan='4' style='font-size: 10px;'><center>";
+	tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
+	tableHtml += "</br>" + barcode;
+	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");
+}
 var foreignTousseLargeLabelConfig = {
 	customPrint: foreignTousseLargeLabel_gzzyyfs
 }