diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index e81b4a574..fec7cabfe 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -468,12 +468,17 @@ public class OrderService {
 
 		for (OrderVO orderVO : pageInfo.getList()) {
 			orderVO.setPileConnectorCode(orderVO.getPileSn() + orderVO.getConnectorCode());
-			if (orderVO.getStartTime() != null && orderVO.getEndTime() != null) {
+			String chargingTime = "0分钟";
+			if (orderVO.getStartTime() != null) {
 				Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
-				Date endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
+				Date endTimeDate = new Date();
+				if (orderVO.getEndTime() != null) {
+					endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
+				}
 				// 计算出两个时间差
-				orderVO.setChargingTime(DateUtils.getDatePoor(endTimeDate, startTimeDate));
+				chargingTime = DateUtils.getDatePoor(endTimeDate, startTimeDate);
 			}
+			orderVO.setChargingTime(chargingTime);
 		}
 
 		// 返回结果集