Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js
===================================================================
diff -u -r13705 -r13943
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js	(.../foreignTousseApplicationForm.js)	(revision 13705)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js	(.../foreignTousseApplicationForm.js)	(revision 13943)
@@ -976,6 +976,8 @@
     rootNode.eachChild(function(pNode){
         if(!pNode.isLeaf()){//父节点 ,每个都是一个tousse
         	var materials = [];
+        	var tools = [];
+        	var implants = [];
         	var pAttr = pNode.attributes;
         	var tousse = {
         			'tousseName':pAttr.tousseName,
@@ -984,6 +986,8 @@
         			'type':pAttr.type,
         			'price':pAttr.price,
         			'includeImplant':pAttr.includeImplant,
+        			'tools':tools,
+        			'implants':implants,
         			'materials':materials
         			};
         	tousses.push(tousse);
@@ -994,10 +998,16 @@
             			'tousseName':cAttr.tousseName,
             			'supplierName':cAttr.supplierName,
             			'amount':cAttr.amount,
+            			'minDismantleAmount': cAttr.minDismantleAmount,
             			'type':cAttr.type,
             			'price':cAttr.price,
             			'includeImplant':cAttr.includeImplant
             			};
+                if(material.includeImplant == '是'){
+                	implants.push(material);
+                }else{
+                	tools.push(material);
+                }
                 materials.push(material);
             });
             // 计算总数
Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
===================================================================
diff -u -r13686 -r13943
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 13686)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 13943)
@@ -1190,6 +1190,161 @@
 
 	return tableHtml;
 }
+//构造表格
+function getMaterialsTabHtml_foreignTousseAppliation_zd5y_2(printSummaryObj,tousse){
+	var itemsPerRow = 2;// 每行打印2个item
+	var materials = tousse.materials;
+	var tools = tousse.tools;
+	var implants = tousse.implants;
+	var mod = tools.length % itemsPerRow;
+	if(mod != 0){// 填补空对象
+		var paddingItemsCount = itemsPerRow - mod;
+		for(var i=0;i<paddingItemsCount;++i){
+			tools.push({});
+		}
+	}
+	mod = implants.length % itemsPerRow;
+	if(mod != 0){// 填补空对象
+		var paddingItemsCount = itemsPerRow - mod;
+		for(var i=0;i<paddingItemsCount;++i){
+			implants.push({});
+		}
+	}
+	var toolsAmount = tools.length;
+	var toolsRowsAmount = parseInt(toolsAmount/itemsPerRow);
+	var implantsAmount = implants.length;
+	var implantsRowsAmount = parseInt(implantsAmount/itemsPerRow);
+	
+	tousse.toolsRowspan = toolsRowsAmount+3;
+	tousse.implantsRowspan = implantsRowsAmount+3;
+	
+	for(var i=0;i<tools.length;++i){
+		tools[i].prototype = tousse;
+	}
+	for(var i=0;i<implants.length;++i){
+		implants[i].prototype = tousse;
+	}
+	// 打印材料明细
+	var tempStr;
+	var tdStyle = tousse.tdStyle = 'font-size:15;BORDER: #000000 1px solid';
+	var tableHtml = '<table width ="750px" border =0 cellspacing=0 cellpadding=0 style="border-collapse:collapse" bordercolor="#000000">';
+	tempStr = '<tr height=50>\
+		<td rowspan="${toolsRowspan}" align="center" width ="3%" style="${tdStyle}">工具</td>\
+		<td rowspan="2" align="center" width ="14%" style="${tdStyle}">器械名称</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">器械数量</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">每把器械拆卸的最小单位</td>\
+		<td rowspan="2"  align="center" width ="5%" style="${tdStyle}">配件缺失</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">功能残损</td>\
+		<td colspan="2" align="center"  style="${tdStyle}">清点数量</td>\
+		<td rowspan="2" align="center" width ="14%" style="${tdStyle}">器械名称</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">器械数量</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">每把器械拆卸的最小单位</td>\
+		<td rowspan="2"  align="center" width ="5%" style="${tdStyle}">配件缺失</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">功能残损</td>\
+		<td colspan="2" align="center"  style="${tdStyle}">清点数量</td>\
+		</tr>';
+	tableHtml += fillPropertiesFromObj(tousse,tempStr);
+	tempStr = '<tr height=25>\
+		<td align="center" width ="5%" style="${tdStyle}">手术前</td>\
+		<td align="center" width ="5%" style="${tdStyle}">手术后</td>\
+		<td align="center" width ="5%" style="${tdStyle}">手术前</td>\
+		<td align="center" width ="5%" style="${tdStyle}">手术后</td>\
+		</tr>';
+	tableHtml += fillPropertiesFromObj(tousse,tempStr);
+	// 工具
+	if(toolsRowsAmount > 0){
+		for(var row=0;row<toolsRowsAmount;++row){
+			tableHtml += '<tr height=25>';
+			var itemIndex = row*itemsPerRow + 0;
+			var material1 = tools[itemIndex];
+			var material2 = tools[itemIndex+1];
+			material1.tdStyle = tdStyle;
+			material2.tdStyle = tdStyle;
+			tempStr = '<td align="left"  style="${tdStyle}">${tousseName}</td>\
+				<td align="center"  style="${tdStyle}">${amount}</td>\
+				<td align="center"  style="${tdStyle}">${minDismantleAmount}</td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td align="center"  style="${tdStyle}"></td>';
+			tableHtml += fillPropertiesFromObj(material1,tempStr);
+			
+			tempStr = '<td align="left"  style="${tdStyle}">${tousseName}</td>\
+				<td align="center"  style="${tdStyle}">${amount}</td>\
+				<td align="center"  style="${tdStyle}">${minDismantleAmount}</td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td align="center"  style="${tdStyle}"></td>';
+			tableHtml += fillPropertiesFromObj(material2,tempStr);
+			tableHtml += "</tr>";
+		}
+	}
+	// 工具总数
+	tempStr = '<tr height=25>\
+		<td colspan="14" align="center" style="${tdStyle}">工具总件数：  ${toolsAmount}  件</td>\
+		</tr>';
+	tableHtml += fillPropertiesFromObj(tousse,tempStr);
+	// 植入物表头
+	tempStr = '<tr height=25>\
+		<td rowspan="${implantsRowspan}" align="center" style="${tdStyle}">植入物</td>\
+		<td rowspan="2" align="center" style="${tdStyle}">名称</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">数量</td>\
+		<td colspan="5" align="center"  style="${tdStyle}">清点数量</td>\
+		<td rowspan="2" align="center" style="${tdStyle}">名称</td>\
+		<td rowspan="2" align="center" width ="5%" style="${tdStyle}">数量</td>\
+		<td colspan="5" align="center"  style="${tdStyle}">清点数量</td>\
+		</tr>';
+	tableHtml += fillPropertiesFromObj(tousse,tempStr);
+	tempStr = '<tr height=25>\
+		<td align="center" style="${tdStyle}">手术前</td>\
+		<td colspan="2" align="center" style="${tdStyle}">手术使用</td>\
+		<td colspan="2" align="center" style="${tdStyle}">手术后</td>\
+		<td align="center" style="${tdStyle}">手术前</td>\
+		<td colspan="2" align="center" style="${tdStyle}">手术使用</td>\
+		<td colspan="2" align="center" style="${tdStyle}">手术后</td>\
+		</tr>';
+	tableHtml += fillPropertiesFromObj(tousse,tempStr);
+	// 植入物明细
+	if(implantsRowsAmount > 0){
+		for(var row=0;row<implantsRowsAmount;++row){
+			tableHtml += '<tr height=25>';
+			var itemIndex = row*itemsPerRow + 0;
+			var material1 = implants[itemIndex];
+			var material2 = implants[itemIndex+1];
+			material1.tdStyle = tdStyle;
+			material2.tdStyle = tdStyle;
+			tempStr = '<td align="left"  style="${tdStyle}">${tousseName}</td>\
+				<td align="center"  style="${tdStyle}">${amount}</td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td colspan="2" align="center"  style="${tdStyle}"></td>\
+				<td colspan="2" align="center"  style="${tdStyle}"></td>';
+			tableHtml += fillPropertiesFromObj(material1,tempStr);
+			
+			tempStr = '<td align="left"  style="${tdStyle}">${tousseName}</td>\
+				<td align="center"  style="${tdStyle}">${amount}</td>\
+				<td align="center"  style="${tdStyle}"></td>\
+				<td colspan="2" align="center"  style="${tdStyle}"></td>\
+				<td colspan="2" align="center"  style="${tdStyle}"></td>';
+			tableHtml += fillPropertiesFromObj(material2,tempStr);
+			tableHtml += "</tr>";
+		}
+	}
+	// 植入物总数
+	tempStr = '<tr height=25>\
+		<td align="center"  colspan="14" style="${tdStyle}">植入物总件数：  ${includeImplantAmount}  件</td>\
+		</tr>';
+	tableHtml += fillPropertiesFromObj(tousse,tempStr);
+	// 备注
+	tempStr = '<tr height=60>\
+		<td align="center" style="${tdStyle}">备注</td>\
+		<td colspan="14" align="center" style="${tdStyle}"></td>\
+		</tr>';
+	tableHtml += fillPropertiesFromObj(tousse,tempStr);
+	tableHtml += '</table>';
+
+	return tableHtml;
+}
 function printForeignTousseApplication(obj){
 	var tousses = obj.tousses;
 	if(tousses.length > 0){// TODO 以后可能会有多个包要打印
@@ -1200,17 +1355,20 @@
 	doGetLodop();
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',11,0)
-	LODOP.ADD_PRINT_TEXT(30,0,"100%",22, "中大五院外来器械接收单");
+	LODOP.ADD_PRINT_TEXT("5mm",0,"100%","25mm", "中山大学附属第五医院外来器械清点单");
 	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);
+	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", "预定使用日期:  ");
 	// 打印表格
-	var tableStr = getMaterialsTabHtml_foreignTousseAppliation_zd5y(obj,tousse);
+	var tableStr = getMaterialsTabHtml_foreignTousseAppliation_zd5y_2(obj,tousse);
 //	alert(tableStr)
-	addPrintTable(tableStr,100,"4%","90%","BottomMargin:10mm");
+	addPrintTable(tableStr,"46mm","1%","98%","BottomMargin:10mm");
 }
 // 打印外来器械包中标签
 function printForeignTousseMiddleLable(obj,tousse){