Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/caspSterilizerRecordLineChart.jsp
===================================================================
diff -u -r33560 -r33581
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/caspSterilizerRecordLineChart.jsp	(.../caspSterilizerRecordLineChart.jsp)	(revision 33560)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizerRecord/caspSterilizerRecordLineChart.jsp	(.../caspSterilizerRecordLineChart.jsp)	(revision 33581)
@@ -46,7 +46,6 @@
 				document.getElementById('endDate').value = data.endDate || '';
 				document.getElementById('runTime').value = data.runTime || '';
 				document.getElementById('runStatus').value = data.runStatus || '';
-				document.getElementById('resultInfo').value = data.resultInfo || '';
 				document.getElementById('alarmInformation').value = data.alarmInformation || '';
 				if(data.preheat == null || data.preheat == undefined){
 					document.getElementById("pre").style.visibility="hidden";
@@ -276,7 +275,7 @@
 </h1>
 <div class="main" style="width: 900px;margin: 0 auto;">
 	<div class="sterilizer_msg">
-		<label class=x-form-item-label  for=machineNumber style="font-weight:bold;">设备编号122:</LABEL> 
+		<label class=x-form-item-label  for=machineNumber style="font-weight:bold;">设备编号:</LABEL> 
 		<input name=machineNumber  id=machineNumber type=text readOnly  autocomplete="off" style="border:none;font-weight:bold;" qtip>
 	</div>
 	<div class="sterilizer_msg ml50">
@@ -319,11 +318,7 @@
 		<label class=x-form-item-label style="font-weight:bold;" for=runStatus>运行状态:</LABEL> 
 		<input name=runStatus  id=runStatus type=text  readOnly  autocomplete="off" style="border:none;font-weight:bold;" qtip>
 	</div>
-	<div class="sterilizer_msg ml50">
-		<label class=x-form-item-label style="font-weight:bold;" for=resultInfo>结束信息:</LABEL> 
-		<input name=resultInfo  id=resultInfo type=text  readOnly  autocomplete="off" style="border:none;font-weight:bold;" qtip>
-	</div>
-	<div  class="sterilizer_msg" font-weight:bold>
+	<div  class="sterilizer_msg ml50" font-weight:bold>
 		<label class=x-form-item-label style="font-weight:bold;" for=alarmInformation>报警信息:</LABEL> 
 		<input name=alarmInformation  id=alarmInformation type=text  readOnly  autocomplete="off" style="border:none;font-weight:bold;" qtip>
 	</div>
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r33560 -r33581
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 33560)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 33581)
@@ -7082,19 +7082,18 @@
 			if(StringUtils.isNotBlank(caspSterilizerRecord.getRunTime())){
 				int len = caspSterilizerRecord.getRunTime().length();
 				if(len == 3){
-					rueslt.put("runTime", caspSterilizerRecord.getRunTime().substring(0, 1) + "分" + caspSterilizerRecord.getRunTime().substring(0, 2) + "秒");
+					rueslt.put("runTime", caspSterilizerRecord.getRunTime().substring(0, 1) + "分" + caspSterilizerRecord.getRunTime().substring(1) + "秒");
 				}else if(len == 4){
-					rueslt.put("runTime", caspSterilizerRecord.getRunTime().substring(0, 2) + "分" + caspSterilizerRecord.getRunTime().substring(0, 2) + "秒");
+					rueslt.put("runTime", caspSterilizerRecord.getRunTime().substring(0, 2) + "分" + caspSterilizerRecord.getRunTime().substring(2) + "秒");
 				}else if(len == 5){
-					rueslt.put("runTime", caspSterilizerRecord.getRunTime().substring(0, 3) + "分" + caspSterilizerRecord.getRunTime().substring(0, 2) + "秒");
+					rueslt.put("runTime", caspSterilizerRecord.getRunTime().substring(0, 3) + "分" + caspSterilizerRecord.getRunTime().substring(3) + "秒");
 				}else{
 					rueslt.put("runTime", caspSterilizerRecord.getRunTime());
 				}
 			}
 			//0：灭菌成功、1：灭菌失败
 			if("0".equals(caspSterilizerRecord.getRunStatus())){
-				rueslt.put("runStatus", "正常");
-				rueslt.put("resultInfo", "灭菌结束,物理监测合格！");
+				rueslt.put("runStatus", "正常    灭菌结束,物理监测合格！");
 			}else{
 				rueslt.put("runStatus", "未知的运行状态" + caspSterilizerRecord.getRunStatus());
 			}