Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r33672 -r33673 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 33672) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 33673) @@ -117,7 +117,7 @@ if(StringUtils.isNotBlank(record.getPhase()) && (!record.getPhase().equals(lastName) || lastName == null)){ lastName = record.getPhase(); JSONObject phaseObj = new JSONObject(); - phaseObj.put("phase", record.getPhase()); + phaseObj.put("phase", record.getPhase() + getPhaseStr(record.getPhase())); sterilizerRecordArr.add(phaseObj); lastName = record.getPhase(); } Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java =================================================================== diff -u -r33652 -r33673 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java (.../GetingeDataManagerImpl.java) (revision 33652) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java (.../GetingeDataManagerImpl.java) (revision 33673) @@ -662,7 +662,7 @@ // 温度 String tTemperature = null; // 读取直到最后一行 - List records = new FileOfDatReader().getAllLine(inputStream); + List records = new FileOfDatReader().getAllLine(inputStream, "UTF-8"); for(String line : records){ if(StringUtils.isBlank(line)){ continue;