Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
===================================================================
diff -u -r15933 -r15955
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 15933)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 15955)
@@ -1180,21 +1180,89 @@
 	            ]
 	        }
 }
+//打印外来器械包中标签
+function printForeignTousseMiddleLable(tousse){
+	doGetLodop();
+	
+	LODOP.ADD_PRINT_HTM("33mm","1mm","26mm","3mm","<div style='font-size:6;font-weight:bold;'>" + StringUtils.defaultIfEmpty(tousse.sterilingType,"") + "</div>");
+	LODOP.ADD_PRINT_HTM("0mm","0mm","RightMargin:0mm","5mm", "<div style='font-size:15px;font-weight:bold;text-align:center'>" + StringUtils.defaultIfEmpty(tousse.nameWithoutPartInfo,"") + "</div>");
+	
+	LODOP.SET_PRINT_STYLE("FontSize",8);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("5mm","10mm","60mm","4mm", "供应商:" + StringUtils.defaultIfEmpty(tousse.supplierName,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",8);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("5mm","45mm","60mm","4mm", "手术预约日期:" + StringUtils.defaultIfEmpty(tousse.operationTime,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",8);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("9mm","10mm","30mm","4mm", "包装总数:" + StringUtils.defaultIfEmpty(tousse.splitPackagesAmount,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",8);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("9mm","45mm","30mm","4mm", "使用医生:" + StringUtils.defaultIfEmpty(tousse.doctor,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",8);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("13mm","10mm","30mm","4mm", "第几包:" + StringUtils.defaultIfEmpty(tousse.packageNumber,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",8);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("13mm","45mm","30mm","4mm", "使用病人:" + StringUtils.defaultIfEmpty(tousse.patient,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",8);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("17mm","10mm","67mm","11mm", "手术名称:" + StringUtils.defaultIfEmpty(tousse.surgery,""));
+	
+	if(tousse.implantAmount && parseInt(tousse.implantAmount) > 0){
+		LODOP.SET_PRINT_STYLE("FontSize",8);
+		LODOP.SET_PRINT_STYLE("Bold",1);
+		LODOP.ADD_PRINT_TEXT("30mm","1mm","30mm","5mm", "植入物:" + StringUtils.defaultIfEmpty(tousse.implantAmount,""));
+		
+		LODOP.SET_PRINT_STYLE("FontSize",8);
+		LODOP.SET_PRINT_STYLE("Bold",1);
+		LODOP.ADD_PRINT_TEXT("30mm","25mm","44mm","5mm", "生物监测结果及签名:");
+	}
+	
+	LODOP.SET_PRINT_STYLE("FontSize",6);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("38mm","25mm","19mm","3mm", "装配员:" + StringUtils.defaultIfEmpty(tousse.operator,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",6);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("41mm","25mm","19mm","3mm", "审核员:" + StringUtils.defaultIfEmpty(tousse.reviewer,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",6);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("38mm","1mm","26mm","3mm", "灭菌期:" + StringUtils.defaultIfEmpty(tousse.sterilizationDate,""));
+	
+	LODOP.SET_PRINT_STYLE("FontSize",6);
+	LODOP.SET_PRINT_STYLE("Bold",1);
+	LODOP.ADD_PRINT_TEXT("41mm","1mm","26mm","3mm", "失效期:" + StringUtils.defaultIfEmpty(tousse.validDate,""));
+	
+	// 打印条码信息
+	LODOP.ADD_PRINT_BARCODE("35mm","43mm","32mm","10mm","128Auto", tousse.barcode);
+	LODOP.SET_PRINT_STYLEA(0, 'ShowBarText', true);
+	LODOP.SET_PRINT_STYLEA(0, 'FontSize', 6);
+	LODOP.SET_PRINT_STYLEA(0, 'NotOnlyHighPrecision', true);
+}
+
 //外来器械包中标签
 var foreignTousseMiddleLableConfig = {
-//		customPrint:printForeignTousseMiddleLable
+		customPrint:printForeignTousseMiddleLable,
 		headerContent : [
 		// 灭菌方式
 		{label : "", dataIndex : 'sterilingType', position : ["32mm","1mm","26mm","3mm"], type: 'html', beforeStr: "<div style='font-size:6;font-weight:bold;'>", afterStr: "</div>"},
 		// 器械包名称，水平居中
-		{label : "", dataIndex : 'nameWithoutPartInfo', position : ["0mm","14mm","RightMargin:0mm","5mm"], type: 'html', beforeStr: "<div style='font-size:15px;font-weight:bold;text-align:center'>", afterStr: "</div>"},
-		{label : "手术名称:", dataIndex : 'surgery', fontSize : 8, bold: 1, position : ["7mm","15mm","60mm","5mm"]},
-		{label : "供应商:", dataIndex : 'supplierName', fontSize : 8, bold: 1, position : ["12mm","15mm","60mm","5mm"]},
-		{label : "手术预约日期:", dataIndex : 'operationTime', fontSize :8, bold: 1, position : ["12mm","45mm","60mm","5mm"]},
-		{label : "包装总数:", dataIndex : 'splitPackagesAmount', fontSize : 8, bold: 1, position : ["17mm","15mm","30mm","5mm"]},
-		{label : "使用医生:", dataIndex : 'doctor', fontSize :8, bold: 1, position : ["17mm","45mm","30mm","5mm"]},
-		{label : "第几包:", dataIndex : 'packageNumber', fontSize :8, bold: 1, position : ["22mm","15mm","30mm","5mm"]},
-		{label : "使用病人:", dataIndex : 'patient', fontSize : 8, bold: 1, position : ["22mm","45mm","30mm","5mm"]},
+		{label : "", dataIndex : 'nameWithoutPartInfo', position : ["0mm","0mm","RightMargin:0mm","5mm"], type: 'html', beforeStr: "<div style='font-size:15px;font-weight:bold;text-align:center'>", afterStr: "</div>"},
+		{label : "手术名称:", dataIndex : 'surgery', fontSize : 8, bold: 1, position : ["5mm","10mm","67mm","11mm"]},
+		{label : "供应商:", dataIndex : 'supplierName', fontSize : 8, bold: 1, position : ["17mm","10mm","60mm","4mm"]},
+		{label : "手术预约日期:", dataIndex : 'operationTime', fontSize :8, bold: 1, position : ["17mm","45mm","60mm","4mm"]},
+		{label : "包装总数:", dataIndex : 'splitPackagesAmount', fontSize : 8, bold: 1, position : ["21mm","10mm","30mm","4mm"]},
+		{label : "使用医生:", dataIndex : 'doctor', fontSize :8, bold: 1, position : ["21mm","45mm","30mm","4mm"]},
+		{label : "第几包:", dataIndex : 'packageNumber', fontSize :8, bold: 1, position : ["25mm","10mm","30mm","4mm"]},
+		{label : "使用病人:", dataIndex : 'patient', fontSize : 8, bold: 1, position : ["25mm","45mm","30mm","4mm"]},
 		{label : "植入物:", dataIndex : 'implantAmount', fontSize : 8, bold: 1, position : ["30mm","1mm","30mm","5mm"]},
 		{label : "生物监测结果及签名:", dataIndex : '', fontSize :8, bold: 1, position : ["30mm","25mm","44mm","5mm"]},
 		{label : "装配员:", dataIndex : 'operator', fontSize : 6, bold: 1, position : ["38mm","25mm","19mm","3mm"]},
@@ -1450,34 +1518,18 @@
 	setFontSizeBold(17,1);// 设置字体
 	setAlignment('center');// 对齐
 	
-	LODOP.ADD_PRINT_TEXT("30mm","1%","50%","8mm", "器械名称:  "+tousse.tousseName);
-	LODOP.ADD_PRINT_TEXT("30mm","31%","50%","8mm", "供应商:  "+tousse.supplierName);
-	LODOP.ADD_PRINT_TEXT("30mm","62%","50%","8mm", "手术名称:  "+obj.surgery);
-	LODOP.ADD_PRINT_TEXT("38mm","1%","50%","8mm", "使用病人:  "+obj.patient);
-	LODOP.ADD_PRINT_TEXT("38mm","31%","50%","8mm", "使用医生:  "+obj.doctor);
-	LODOP.ADD_PRINT_TEXT("38mm","62%","50%","8mm", "预定使用日期:  ");
+	LODOP.ADD_PRINT_TEXT("30mm","1%","50%","8mm", "器械名称: "+tousse.tousseName);
+	LODOP.ADD_PRINT_TEXT("30mm","44%","50%","8mm", "供应商: "+tousse.supplierName);
+	LODOP.ADD_PRINT_TEXT("30mm","77%","50%","8mm", "预定使用日期: ");
+	LODOP.ADD_PRINT_TEXT("38mm","1%","50%","8mm", "使用病人: "+obj.patient);
+	LODOP.ADD_PRINT_TEXT("38mm","21%","50%","8mm", "使用医生: "+obj.doctor);
+	LODOP.ADD_PRINT_TEXT("38mm","44%","55%","8mm", "手术名称: "+obj.surgery);
+	
 	// 打印表格
 	var tableStr = getMaterialsTabHtml_foreignTousseAppliation_zd5y_2(obj,tousse);
 //	alert(tableStr)
-	addPrintTable(tableStr,"46mm","1%","98%","BottomMargin:10mm");
+	addPrintTable(tableStr,"47mm","1%","98%","BottomMargin:10mm");
 }
-// 打印外来器械包中标签
-function printForeignTousseMiddleLable(obj,tousse){
-	doGetLodop();
-	// 设置默认字体
-	setDefaultFontNameSizeBold('宋体',11,0)
-	LODOP.ADD_PRINT_TEXT(30,0,"100%",22, "中大五院外来器械接收单");
-	setFontSizeBold(17,1);// 设置字体
-	setAlignment('center');// 对齐
-	
-	LODOP.ADD_PRINT_TEXT(80,"4%","30%",5, "手术名称:  "+obj.surgery);
-	LODOP.ADD_PRINT_TEXT(80,"35%","30%",5, "器械包名称:  "+tousse.tousseName);
-	LODOP.ADD_PRINT_TEXT(80,"66%","20%",5, "供应商名称:  "+obj.supplierName);
-	// 打印表格
-	var tableStr = getMaterialsTabHtml_foreignTousseAppliation_zd5y(obj,tousse);
-//	alert(tableStr)
-	addPrintTable(tableStr,100,"4%","90%","BottomMargin:10mm");
-}
 var idCardLargeLabelConfig = {
 	customPrint:printIDCardLargeLabel
 }