diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
index 1e1b2fc..758886e 100644
--- a/app/Http/Controllers/DeviceController.php
+++ b/app/Http/Controllers/DeviceController.php
@@ -257,11 +257,16 @@ class DeviceController extends Controller
         $startTime = $request->input('start_time');
         $endTime = $request->input('end_time');
         $diffDays = 0;
+        $day = date('Y-m-d');
         //如果传了开始时间和结束时间，计算中间天数
         if($startTime && $endTime){
-            $startDay = Carbon::parse($startTime);
-            $endDay = Carbon::parse($endTime);
-            $diffDays = $startDay->diffInDays($endDay, false);
+            if($startTime == $endTime){//查询某一天
+                $day = $startTime;
+            }else{
+                $startDay = Carbon::parse($startTime);
+                $endDay = Carbon::parse($endTime);
+                $diffDays = $startDay->diffInDays($endDay, false);
+            }
         }
 
         $xKeys = [];
@@ -271,9 +276,12 @@ class DeviceController extends Controller
             }
         }else{
             //调整截至到当前小时
-            $h = date('H');
+            $h = 23;
+            if($day == date('Y-m-d')){
+                $h = date('H');
+            }
             for ($i = 0; $i < ($h+1); $i++) {
-                $xKeys[] = date('Y-m-d').' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00';
+                $xKeys[] = $day.' '.str_pad($i, 2, '0', STR_PAD_LEFT).':00:00';
             }
         }
         $device = Device::find($deviceId);