XIAOPAN

@@ -533,7 +533,7 @@ class UsersController extends HomeBaseController{
             ->alias('o')
             ->alias('o')
             ->join('equipment e','o.eq_name=e.name')
             ->join('equipment e','o.eq_name=e.name')
             ->field('o.order_no,o.users_id,o.start_time,e.serial_number,e.hospital')
             ->field('o.order_no,o.users_id,o.start_time,e.serial_number,e.hospital')
-            ->where(['o.users_id'=>$user_id,'o.state'=>1,'o.type'=>1,'e.is_delete'=>0])
+            ->where(['o.users_id'=>$user_id,'o.state'=>1,'o.type'=>['in',[1,2]],'e.is_delete'=>0])
             ->find();
             ->find();
         if ($order){
         if ($order){
             $this->apiResponse(302,'有未完成订单');
             $this->apiResponse(302,'有未完成订单');