患者详情服务包数量修复

app/Http/Controllers/Api/V2/DoctorController.php

@@ -1324,11 +1324,9 @@ class DoctorController extends AuthController
         $patientsArr = [];
         $ws['user_id'] = $req['user_id'];
         $ws['product_type'] = 6;
-        $fuw_order = Order::with('orderPack')->where($ws)->orderBy('created_at', 'desc')->get();
+        $fuw_order = Order::with('orderPack')->where($ws)->whereIn('order_status',[3,4])->orderBy('created_at', 'desc')->get();
         if ($fuw_order) {
             $fuw_order = $fuw_order->toArray();
-//            var_dump($fuw_order);
-
             foreach ($fuw_order as $kk => $vv) {
                 $fuwArr[$kk]['order_id'] = $vv['id'];
                 if ($vv['order_pack']) {
@@ -1398,20 +1396,15 @@ class DoctorController extends AuthController
 
         // 拼接服务消息
         $wh['user_id'] = $req['user_id'];
-        $wh['order_status'] = ['>', 3];
         $wh['product_type'] = 6;
         $fuwuList = [];
-        $fuwuInfo = Order::where($wh)->get();
+        $fuwuInfo = Order::where($wh)->whereIn('order_status',[3,4])->get();
         $fuwuList['fuwu_num'] = count($fuwuInfo);
         $whs['user_id'] = $req['user_id'];
-        $whs['order_status'] = ['>', 3];
-        $order_nums = Order::where($whs)->get();
-
+        $order_nums = Order::where($whs)->whereIn('order_status',[3,4])->get();
         $fuwuList['order_num'] = count($order_nums);
         $pati_nums = Patient::where('user_id', '=', $req['user_id'])->get();
         $fuwuList['pati_num'] = count($pati_nums);
-
-
         $returnArr = [
             'user_arr' => $userArr,
             'patients_arr' => $patientsArr,//患者档案