Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java
===================================================================
diff -u -r33645 -r33652
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java	(.../SterilizerRecordLineChartAction.java)	(revision 33645)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java	(.../SterilizerRecordLineChartAction.java)	(revision 33652)
@@ -84,6 +84,8 @@
 	 */
 	public void createEChartData() {
 		String sterilizationRecordId = StrutsParamUtils.getPraramValue("sterilizationRecordId", null);
+		//是否查询表格
+		boolean queryTable = StrutsParamUtils.getBoolPraramValue("queryTable", false);
 		JSONObject rueslt = new JSONObject();
 		try {
 			SterilizationRecord sterilizationRecord = sterilizationRecordManager.getSterilizationRecordById(Long.valueOf(sterilizationRecordId));
@@ -92,7 +94,10 @@
 				JSONArray timeArray = new JSONArray();
 				JSONArray t1TempArray = new JSONArray();
 				JSONArray p1MbarArray = new JSONArray();
-				String brand = sterilizationRecord.getSterilizer().getDeviceInterface().getDeviceBrand();
+				DeviceInterface deviceInterface = sterilizationRecord.getSterilizer().getDeviceInterface();
+				String brand = deviceInterface.getDeviceBrand();
+				JSONArray sterilizerRecordArr = new JSONArray();
+				String lastName = null;
 				for (SterilizerRecord record : sterilizerRecords) {
 					String time = ""; //时间
 					if(null != record.getProcStartTime() && !DeviceInterface.GETINGE.equals(brand) && !DeviceInterface.BELIMED.equals(brand)){
@@ -106,8 +111,24 @@
 					timeArray.add(time);
 					t1TempArray.add(record.getT1Temp());//温度1
 					p1MbarArray.add(record.getP1Mbar());//压力1
+					
+					if(queryTable && DeviceInterface.GETINGE.equals(brand)){
+						JSONObject sterilizerRecordObj = new JSONObject();
+						if(StringUtils.isNotBlank(record.getPhase()) && (!record.getPhase().equals(lastName) || lastName == null)){
+							lastName = record.getPhase();
+							JSONObject phaseObj = new JSONObject();
+							phaseObj.put("phase", record.getPhase() + getPhaseStr(record.getPhase()));
+							sterilizerRecordArr.add(phaseObj);
+							lastName = record.getPhase();
+						}
+						sterilizerRecordObj.put("time", time);
+						sterilizerRecordObj.put("T1Temp", record.getT1Temp());
+						sterilizerRecordObj.put("P1Mbar", record.getP1Mbar());
+						sterilizerRecordArr.add(sterilizerRecordObj);
+					}
 				}
 				rueslt.put("timeData", timeArray);
+				rueslt.put("sterilizerRecordArr", sterilizerRecordArr);
 				rueslt.put("t1TempData", t1TempArray);
 				rueslt.put("p1MbarData", p1MbarArray);
 				StrutsResponseUtils.output(true, rueslt);
@@ -120,6 +141,36 @@
 		}
 	}
 	/**
+	 * 获取阶段对应的中文名字
+	 * @param phase 阶段英文名
+	 * @return
+	 */
+	private String getPhaseStr(String phase){
+		if("PROCESS COMPLETE".equals(phase)){
+			return "（过程完成）";
+		}else if("HEAT UP".equals(phase)){
+			return "（加热）";
+		}else if("STERILIZING".equals(phase)){
+			return "（灭菌）";
+		}else if("NEG PULSING".equals(phase)){
+			return "（负脉冲）";
+		}else if("START".equals(phase)){
+			return "（开始）";
+		}else if("POS PULSING".equals(phase)){
+			return "（正脉冲）";
+		}else if("POSTTREATMENT".equals(phase)){
+			return "（脉冲）";
+		}else if("DRYING".equals(phase)){
+			return "（干燥）";
+		}else if("DRYING AIRPULS".equals(phase)){
+			return "";
+		}else if("EQUALIZATION".equals(phase)){
+			return "（气压平衡）";
+		}else{
+			return "";
+		}
+	}
+	/**
 	 * 返回低温灭菌echart曲线数据
 	 */
 	public void createLowTemperatureEChartData() {
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
===================================================================
diff -u -r33647 -r33652
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 33647)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java	(.../GetingeDataManagerImpl.java)	(revision 33652)
@@ -655,6 +655,7 @@
 		try{
 			inputStream = commonFileManager.getInputStream(remoteType, ftp, fileName, remoteFile, fos);
 			String cycleCounter = null;
+			String phase = null;
 			String spaceTime = null;
 			Date startDate = null;
 			// 读取直到最后一行
@@ -672,6 +673,8 @@
 				if( line.contains("<PROCCYCLE>") &&  line.contains("</PROCCYCLE>"))
 				{
 					cycleCounter = getValueByKey(line,"PROCCYCLE");
+				}else if(line.contains("<PHASE>") && line.contains("</PHASE>")){
+					phase = getValueByKey(line,"PHASE");
 				}else if( line.contains("<PROCSTARTTIME>") &&  line.contains("</PROCSTARTTIME>"))
 				{
 					String timeStr = getValueByKey(line,"PROCSTARTTIME");
@@ -682,6 +685,7 @@
 				}else if(line.contains("<CP>") &&  line.contains("</CP>")){
 					String p1Bar = getValueByKey(line,"CP");
 					record.setCycleCounter(Long.valueOf(cycleCounter));
+					record.setPhase(phase);
 					record.setMachineNo(machineNumber);
 					record.setDeviceInterfaceID(devInterface.getId().toString());
 					// 时间格式 2016/4/15 16:32:49