Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
===================================================================
diff -u -r26683 -r26764
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 26683)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 26764)
@@ -227,5 +227,9 @@
   hiddenUserSyncButton:true,
   recyclingStatusOfIdCardBarcode : "已使用,已废弃",
   //验证添加使用记录时物品是否已位于手术间；（物品位于手术间，或者流转位置类型为手术间）
-  checkTousseLocatedInOperatingRoomWhenAddUseRecord : true
+  checkTousseLocatedInOperatingRoomWhenAddUseRecord : true,
+  //是否开启打印灭菌温度压力曲线 
+  printSterileTPLineData:true,
+  //灭菌炉、温度曲线图页面是否显示数据温度压力数据,true显示，false或者没有配置不显示
+  sterilizerLineChartIsShowTable:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js
===================================================================
diff -u -r26686 -r26764
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js	(.../printConfig.js)	(revision 26686)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js	(.../printConfig.js)	(revision 26764)
@@ -1546,6 +1546,101 @@
 	}
 }
 
+/**
+ * 自定义灭菌炉打印
+ */
+var sterilizationRecordDataConfig = {
+		customPrint:printsterilizationRecord
+}
+
+function printsterilizationRecord(data){
+	
+	//1、图表数据
+	myChart = echarts.init(document.getElementById('sterilizerLineChart'));
+  	// 把echarts图片转成64编码的图片
+ 	var img = new Image();
+  	var imgSrc = myChart.getDataURL();
+  	// 渲染到图表上面，遮住图表
+  	document.getElementById('hiddenPrintChart').setAttribute('src',imgSrc);
+	var srcs = document.getElementById('hiddenPrintChart').getAttribute("src");
+	//2、基础表格数据
+	var srData = data['srData'];
+	var status = srData["status"];
+	var endTime = "";
+	//结束时间(灭菌状态不为灭菌中时才打印结束时间)
+	if(status != statusBegin){//var statusBegin 定义在sterilizerLineChart.jsp
+		 endTime = srData["endTime"];
+	}
+	var srDataHtml = "<table border ='0';style='width= 90%;'>";
+	srDataHtml += "<tr>";
+	srDataHtml +=  "<td rowspan='4' style='font-size:17px;text-align:center;border:1px solid #000000;'>";
+   // srDataHtml += "<b><font style='font-size:22px;'>炉号：</font></b><br>";
+    
+	srDataHtml += "<b><font style='font-size:22px;'>炉次："+  srData.frequency +"</font></b></td>" +
+	        "<td width='30%' style='font-size:14px;text-align:left;'><b style='font-weight:normal;'>机器名称："+srData["machName"]+"</b></td>" +
+			"<td width='40%' style='font-size:14px;text-align:left;'><b style='font-weight:normal;'>启动时间："+srData["startTime"]+"</b></td></tr>" 
+	srDataHtml += "<tr style='font-size:14px;text-align:left;'>" +
+			"<td width='40%'><b style='font-weight:normal;'>循环次数："+srData["cycleCounter"]+"</b></td>" +
+			"<td width='30%'><b style='font-weight:normal;'>结束时间："+endTime+"</b></td></tr>"
+	srDataHtml += "<tr style='font-size:14px;text-align:left;'>" +
+			"<td width='40%'><b style='font-weight:normal;'>程序："+srData["sterilizationType"]+"</b></td></tr>"
+	srDataHtml += "<tr style='font-size:14px;text-align:left;'>" +
+           "<td width='40%'><b style='font-weight:normal;'>灭菌："+ srData.sterilizationUser+"</b></td>"+
+	       "<td width='40%'><b style='font-weight:normal;'>核对："+  srData.finishComfirmer+"</b></td></tr>" 
+	srDataHtml += "</table>";
+	
+	//3、过滤后的详细表格数据
+	var dataTableHtml = "<table border ='0' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000' width='90%'>";
+	dataTableHtml += "<tr style='font-size:12px;text-align:center;font-weight:normal;'><td width='40%'>时间(年/月/日 时:分:秒)</td><td width='30%'>温度(C)</td><td width='30%'>压力(Kpa)</td></tr>";
+	var printTable = data['table'];
+	//按灭菌阶段填充表格
+	for(var key in printTable){
+		var tableRows = printTable[key];
+		dataTableHtml += "<tr style='min-height:20px;font-size:12px;'>"
+		+"<td colspan='3'><font style='padding-left:10%;'>"+key+"</font></td></tr>"
+		for(var i = 0;i < tableRows.length;i++){
+			var tableData = tableRows[i];
+			dataTableHtml += "<tr style='font-size:12px;text-align:center;'>"
+			+"<td>"+ tableData["time"]+"</td>"
+			+"<td><span style='color:#00CD66;'>"+ tableData["t1Temp"]+"</span></td>"//温度1
+			+"<td><span style='color:#CD2990;'>"+ tableData["p1Mbar"] +"</span></td></tr>";//压力1
+		}
+	}
+	//详细表格页眉
+	dataTableHtml += "<tfoot><tr><td width='100%' colspan='3' style='background: #f0f0f0;font-size:14px;text-align:right;'>" +
+            "<b>"+		
+            srData["printUser"]+"，zhujiang hospital，"+srData["sterilizationTime"] + "，Page <font tdata='PageNO'>##</font>"+
+            "</b>&nbsp;<span style='font-size:12px;text-align:right;'>"+srData["machName"]+",循环次数:"+srData["cycleCounter"]+            
+			"</span></td></tr></tfoot>";
+	dataTableHtml += "</table>";
+	//4、顶部
+	var headHtml = "<div style='margin-top: 30px;margin-bottom: 14px;text-align: center;background: #f0f0f0;line-height: 30px;font-size:22px'>" +
+			"<b>新华灭菌器炉次记录报告</b></div>";
+	
+	//打印设置
+	var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM'));
+	
+	//顶部
+	LODOP.ADD_PRINT_HTM(10,20,"95%",30,headHtml);
+	//基础数据
+	LODOP.ADD_PRINT_TABLE(55,"10%","90%","200px",srDataHtml);
+	LODOP.ADD_PRINT_IMAGE(155,"3%","100%","100%","<img border='0' src='"+srcs+"'/>");
+	LODOP.SET_PRINT_STYLEA(0,"Stretch",2);//按原图比例(不变形)缩放模式
+	//图表部分数据
+//	LODOP.ADD_PRINT_CHART(155,"3%",'100%','7.5cm',6,chartTableHtml);
+	//0则代表当前（最后加入的那个）数据项，设置图表样式，设置3d效果为01(最低)，左右方向的旋转角度：360，前后方向的旋转角度：360 
+	//LODOP.SET_PRINT_STYLEA(0,"ChartStyle","--------01---360360");
+	LODOP.ADD_PRINT_TEXT(480,350,"100%",5,"灭菌温度压力数据表");
+	//LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+	//过滤峰值点后的详细表格数据
+	LODOP.ADD_PRINT_TABLE(510,10,"100%","100%",dataTableHtml);
+
+	LODOP.SET_PRINT_STYLEA(0,"Offset2Top",-450);//设置次页(第一页后)开始的上边距偏移量，0则代表当前（最后加入的那个）数据项
+	//LODOP.SET_PRINT_STYLE("FontSize",9);
+	//LODOP.PREVIEW();
+    //LODOP.PRINT();
+}
+
 var recyclingItemsPrintConfig = {
 	customPrint:printrecyclingItems_xjjqzyy,
 	isPrintTousse : true,
@@ -1651,7 +1746,9 @@
 		//备单
 		operationReservations:operationReservationsConfig,
 		//打印回收清单
-    recyclingItems : recyclingItemsPrintConfig
+    recyclingItems : recyclingItemsPrintConfig,
+    //灭菌详细
+    sterilizationRecordData : sterilizationRecordDataConfig
 };
 var printerNameMapping = {
    '模板-器械标签' : 'Zebra GT800 - EPL',
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp
===================================================================
diff -u -r26187 -r26764
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp	(.../sterilizerLineChart.jsp)	(revision 26187)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp	(.../sterilizerLineChart.jsp)	(revision 26764)
@@ -67,6 +67,9 @@
 			text-align: left;
 		}
 		.ml50{margin-left: 50px;}
+		.sterilizer-LineChart-title{
+			font-weight: normal;
+		}
 	</style>
 </head>
 <body style="text-align:center;height:670px;" onload="getSterilizationRecord(); initLoad();">
@@ -162,7 +165,7 @@
 						},{
 							type: 'value',
 							name: '压力(Kpa)',
-							max:250,
+							//max:250,
 							//min:-1.0,
 							//interval: 10,
 							axisLabel: {
@@ -280,8 +283,49 @@
 	window.onresize = function(){
 		myChart.resize();
 	}
-  }
 	
+	if(sstsConfig.sterilizerLineChartIsShowTable){
+		$("#sterilizerLineChartTable").show();
+		$.ajax({
+			type:'post',
+			url:WWWROOT + '/disinfectSystem/sterilization/sterilizerRecordLineChartAction!getChartDataBySterilizationRecordId.do?sterilizationRecordId=${param.sterilizationRecordId}&time='+new Date(),
+			dataType:'json',
+			success:function(result){
+				var success = result.success;
+				var data = result.data;
+				if(success){
+					if(!isUndefinedOrNullOrEmpty(data)){
+						var dataTableHtml = "<table border ='0' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000' width='90%'>";
+						dataTableHtml += "<tr style='font-size:12px;text-align:center;font-weight:normal;'><td width='40%'>时间(年/月/日 时:分:秒)</td><td width='30%'>温度(C)</td><td width='30%'>压力(Kpa)</td></tr>";
+						var printTable = data['table'];
+						//按灭菌阶段填充表格
+						for(var key in printTable){
+							var tableRows = printTable[key];
+							dataTableHtml += "<tr style='min-height:20px;font-size:12px;'>"
+							+"<td colspan='3' style='text-align:left;'><font style='padding-left:10%;'>"+key+"</font></td></tr>"
+							for(var i = 0;i < tableRows.length;i++){
+								var tableData = tableRows[i];
+								dataTableHtml += "<tr style='font-size:12px;text-align:center;'>"
+								+"<td>"+ tableData["time"]+"</td>"
+								+"<td><span style='color:#00CD66;'>"+ tableData["t1Temp"]+"</span></td>"//温度1
+								+"<td><span style='color:#CD2990;'>"+ tableData["p1Mbar"] +"</span></td></tr>";//压力1
+							}
+						}
+						dataTableHtml += "</table>";
+						$("#sterilizerLineChartTable").append(dataTableHtml);
+					}
+				}else{
+					alert(result.message);
+				}
+			},
+			error:function(){
+				
+			}
+		});
+	}
+
+}
+	
 	//打印此报告(两部分:上部分为chart,下部分为表格)
 	function pintReport(){
 		//window.print();return;//用这一句要去掉print.js的引用
@@ -296,7 +340,7 @@
 				if(success){
 					if(!isUndefinedOrNullOrEmpty(data)){
 						//print.js
-						doPrintSterilizationRecord(data);
+						doPrintSterilizationRecord(data,sterilizationUser);						
 					}
 				}else{
 					alert(result.message);
@@ -365,5 +409,10 @@
 <!--  echarts-->
 <div id="sterilizerLineChart" style="width: 100%;height:400px;"></div>
 <img id="hiddenPrintChart" src="" style="display:none;"/>
+<!-- 数据表格，目前只有新疆军区总医院显示 -->
+<div id="sterilizerLineChartTable" style="display:none;">
+	<h5 class="sterilizer-LineChart-title">灭菌温度压力数据表</h5>
+</div>
+	
 </body>
 </html>
\ No newline at end of file