Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r26892 -r26895 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26892) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26895) @@ -86,7 +86,7 @@ String brand = sterilizationRecord.getSterilizer().getDeviceInterface().getDeviceBrand(); for (SterilizerRecord record : sterilizerRecords) { String time = ""; //时间 - if(null != record.getProcStartTime() && !DeviceInterface.GETINGE.equals(brand)){ + if(null != record.getProcStartTime() && !DeviceInterface.GETINGE.equals(brand) && !DeviceInterface.BELIMED.equals(brand)){ time = DateTools.getFormatDateStr(record.getProcStartTime(), DateTools.COMMON_DATE_HMS); }else{ time = getTimeDateStr(record.getTime(),DateTools.COMMON_DATE_HMS ); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r26890 -r26895 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 26890) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 26895) @@ -227,6 +227,7 @@ // 读取直到最后一行 String line = ""; int lineNo = 0; + Date procStartTime = null; // List records = new // ArrayList(); while ((line = br.readLine()) != null) { @@ -237,11 +238,12 @@ record.setMachineNo(split[0].replaceAll("\"", "")); record.setCycleCounter(Long.parseLong(split[1])); String time = split[2]; - time = time.replaceAll("\"", ""); - String procStartTimeStr = yymmdd + time.substring(time.indexOf(" ") + 1); - Date procStartTime = sdf.parse(procStartTimeStr); + time = yymmdd + time.replaceAll("\"", ""); + time = time.substring(time.indexOf(" ") + 1); + if(procStartTime == null){ + procStartTime = sdf.parse(time); + } record.setProcStartTime(procStartTime); - time = yymmdd + time; record.setTime(time); record.setStep(split[3]); record.setPhase(split[4]); @@ -265,14 +267,16 @@ record.setCycleCounter(Long.parseLong(split[1])); String time = split[2]; time = time.replaceAll("\"", ""); + time = time.substring(time.indexOf(" ") + 1); String hmsTime = getTime(time); if (StringUtils.isBlank(hmsTime)) { hmsTime = getTime1(time); } - String procStartTimeStr = yymmdd + time.substring(time.indexOf(" ") + 1); time = yymmdd + hmsTime; record.setTime(time); - Date procStartTime = sdf.parse(procStartTimeStr); + if(procStartTime == null){ + procStartTime = sdf.parse(time); + } record.setProcStartTime(procStartTime); record.setStep(split[3]); record.setPhase(split[4]); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r26892 -r26895 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 26892) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 26895) @@ -806,21 +806,11 @@ lastSlr = sterilizerRecords.get(sterilizerRecords.size()-1); firstSlr = sterilizerRecords.get(0); } - SimpleDateFormat sdf= Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS; + //SimpleDateFormat sdf= Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS; //开始灭菌时间 - String firstSlrProcStartTime = null; - if(firstSlr.getProcStartTime() != null && !DeviceInterface.GETINGE.equals(brand)){ - firstSlrProcStartTime = sdf.format(firstSlr.getProcStartTime()); - }else{ - firstSlrProcStartTime = firstSlr.getTime(); - } + String firstSlrProcStartTime = firstSlr.getTime(); //结束灭菌时间 - String lastSlrProcStartTime = null; - if(lastSlr.getProcStartTime() != null && !DeviceInterface.GETINGE.equals(brand)){ - lastSlrProcStartTime = sdf.format(lastSlr.getProcStartTime()); - }else{ - lastSlrProcStartTime = lastSlr.getTime(); - } + String lastSlrProcStartTime = lastSlr.getTime(); obj.put("sterilizationType", StringUtils.defaultString(sterilizationRecord.getSterilizationType(), " "));//灭菌程序 obj.put("status",StringUtils.defaultString(sterilizationRecord.getStatus(), " ")); //灭菌状态 obj.put("frequency", StringUtils.defaultString(sterilizationRecord.getFrequency().toString(), " ")); //炉次