Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r26890 -r26892 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26890) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 26892) @@ -14,6 +14,7 @@ import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; @@ -82,9 +83,10 @@ JSONArray timeArray = new JSONArray(); JSONArray t1TempArray = new JSONArray(); JSONArray p1MbarArray = new JSONArray(); + String brand = sterilizationRecord.getSterilizer().getDeviceInterface().getDeviceBrand(); for (SterilizerRecord record : sterilizerRecords) { String time = ""; //时间 - if(null != record.getProcStartTime()){ + if(null != record.getProcStartTime() && !DeviceInterface.GETINGE.equals(brand)){ time = DateTools.getFormatDateStr(record.getProcStartTime(), DateTools.COMMON_DATE_HMS); }else{ time = getTimeDateStr(record.getTime(),DateTools.COMMON_DATE_HMS ); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r26771 -r26892 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 26771) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 26892) @@ -28,6 +28,7 @@ import com.forgon.disinfectsystem.basedatamanager.sterilizer.service.SterilizerManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; +import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.basedatamanager.sterilisation.Sterilisation; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; @@ -798,6 +799,7 @@ List sterilizerRecords = sterilizerRecordManager.getSterilizerRecord(sterilizationRecordId); SterilizationRecord sterilizationRecord = sterilizationRecordManager.getSterilizationRecordById(sterilizationRecordId); Sterilizer sDefine = sterilizationRecord.getSterilizer(); + String brand = sDefine.getDeviceInterface().getDeviceBrand(); SterilizerRecord lastSlr = new SterilizerRecord();//最后一条灭菌炉信息 SterilizerRecord firstSlr = new SterilizerRecord();//第一条灭菌炉信息 if(sterilizerRecords != null){ @@ -807,14 +809,14 @@ SimpleDateFormat sdf= Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS; //开始灭菌时间 String firstSlrProcStartTime = null; - if(firstSlr.getProcStartTime() != null){ + if(firstSlr.getProcStartTime() != null && !DeviceInterface.GETINGE.equals(brand)){ firstSlrProcStartTime = sdf.format(firstSlr.getProcStartTime()); }else{ firstSlrProcStartTime = firstSlr.getTime(); } //结束灭菌时间 String lastSlrProcStartTime = null; - if(lastSlr.getProcStartTime() != null){ + if(lastSlr.getProcStartTime() != null && !DeviceInterface.GETINGE.equals(brand)){ lastSlrProcStartTime = sdf.format(lastSlr.getProcStartTime()); }else{ lastSlrProcStartTime = lastSlr.getTime();