diff --git a/models/Carpark_model.php b/models/Carpark_model.php
index b58bd05..ad4cb8b 100644
--- a/models/Carpark_model.php
+++ b/models/Carpark_model.php
@@ -118,7 +118,7 @@ class Carpark_model extends CI_Model
                     ->get()
                     ->result_array();
         */ 
-        $sql = '(select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.in_time as time_order 
+        $sql1 = '(select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.in_time as time_order 
 					from cario c left join members m on c.obj_id = m.lpr 
 					where c.err = 0 and c.out_time is null) 
 				union 
@@ -126,6 +126,18 @@ class Carpark_model extends CI_Model
 					from cario c left join members m on c.obj_id = m.lpr 
 					where c.err = 0 and c.out_time is not null) 
 				order by time_order desc limit 10;'; 
+				
+		$sql = '(select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.in_time as time_order 
+					from cario c left join members m on c.obj_id = m.lpr 
+					where c.err = 0 and c.out_time is null 
+					order by time_order desc limit 10) 
+				union 
+				(select c.cario_no, c.in_out, in_lane, out_lane, c.in_time, c.out_time, c.minutes, c.obj_id as lpr, c.etag, c.in_pic_name, c.out_pic_name, m.member_name as owner, c.out_time as time_order 
+					from cario c left join members m on c.obj_id = m.lpr 
+					where c.err = 0 and c.out_time is not null 
+					order by time_order desc limit 10) 
+				order by time_order desc limit 10;'; 
+				
         $data_cario = $this->db->query($sql)->result_array();
                                               
         // $lane_arr = array(0 => '入1', 1 => '入2', 3 => '出3', 3 => '出4');         
diff --git a/models/Carpayment_model.php b/models/Carpayment_model.php
index 58eb416..4714c71 100644
--- a/models/Carpayment_model.php
+++ b/models/Carpayment_model.php
@@ -528,7 +528,7 @@ class Carpayment_model extends CI_Model
           	$data['end_time'] = '00:00';
         }
                 
-        $result = $this->db->select("in_time, date_format(pay_time, '%Y/%m/%d %T') as pay_time, in_pic_name, member_no, in_lane, in_out, station_no")
+        $result_bak = $this->db->select("in_time, date_format(pay_time, '%Y/%m/%d %T') as pay_time, in_pic_name, member_no, in_lane, in_out, station_no")
         		->from('cario')	
                 //->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0))
 				->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0, 'ticket_type' => 0))	// 20180130 刷卡進的跳過
@@ -536,6 +536,15 @@ class Carpayment_model extends CI_Model
                 ->limit(1)
                 ->get()
                 ->row_array();
+				
+		$result = $this->db->select("in_time, date_format(pay_time, '%Y/%m/%d %T') as pay_time, in_pic_name, member_no, in_lane, in_out, station_no")
+        		->from('cario')	
+                //->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0))
+				->where(array('obj_type' => 1, 'obj_id' => $lpr, 'finished' => 0, 'err' => 0))
+                ->order_by('cario_no', 'desc') 
+                ->limit(1)
+                ->get()
+                ->row_array();
             
         if (!empty($result['in_time']))
         {