Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java
===================================================================
diff -u -r36106 -r36113
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java	(.../UrgentLevelManagerImpl.java)	(revision 36106)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManagerImpl.java	(.../UrgentLevelManagerImpl.java)	(revision 36113)
@@ -3,28 +3,12 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -289,7 +273,10 @@
 			while(rs.next()){
 				JSONObject info = new JSONObject();
 				info.put("barcode", rs.getString("barcode"));//标识牌条码
-				info.put("expectUseTime", DateTools.YMDHMFORMAT.get().format(rs.getTimestamp("expectUseTime")));
+				Date expectUseTime = rs.getTimestamp("expectUseTime");
+				if(expectUseTime != null){
+					info.put("expectUseTime", DateTools.YMDHMFORMAT.get().format(rs.getTimestamp("expectUseTime")));
+				}
 				info.put("operationRoomName", rs.getString("operationRoomName"));
 				info.put("fullName", rs.getString("fullName"));
 				infos.add(info);