Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java =================================================================== diff -u -r36113 -r36115 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java (.../UrgentLevelManagerImpl.java) (revision 36113) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java (.../UrgentLevelManagerImpl.java) (revision 36115) @@ -275,7 +275,7 @@ info.put("barcode", rs.getString("barcode"));//标识牌条码 Date expectUseTime = rs.getTimestamp("expectUseTime"); if(expectUseTime != null){ - info.put("expectUseTime", DateTools.YMDHMFORMAT.get().format(rs.getTimestamp("expectUseTime"))); + info.put("expectUseTime", DateTools.YMDHMFORMAT.get().format(expectUseTime)); } info.put("operationRoomName", rs.getString("operationRoomName")); info.put("fullName", rs.getString("fullName"));