Merge branch 'main' of https://git.cjy.net.cn/zhangyan/hainan_2024

Laravel/app/Http/Controllers/TestController.php

@@ -16,8 +16,8 @@ class TestController extends Controller
 {
     public function DBtest(){
      echo  DB::table('users')->count();
-     // $order= new OrderService();
-    // dd($order->DepartmentItemCount(355));
+      $order= new OrderService();
+     dd($order->DepartmentItemCount(355));
       //退款------------------
 //      $data = [
 //        'orderid' => '20241108112106776eslNJ2',

Laravel/app/Services/OrderService.php

@@ -24,29 +24,30 @@ class OrderService
             $wait_day=$wait['Data']['预计所需天数'];
           } else {
             $wait_day=-1;
-          }
-
-          //查询体检报告
-          $data = [
-            '电话号码' => "",
-            '证件号码' => "",
-            '体检号' => $order->tj_number,
-            '包含内部信息' => true
-          ];
-          $res = $peis::Post('体检报告查询', $order->hospital_id, $data);
-          if(count($res['data']) > 0) {
-            $res = $res['data'][0];
-            if (isset($res['收费项目列表'])) {
-              foreach ($res['收费项目列表'] as $it) {
-                if($it['项目状态']=='未完成'){
-                  $is_checked_sign_in=false;
-                  break;
-                }else{
-                  $is_checked_sign_in=true;
+            //查询体检报告
+            $data = [
+              '电话号码' => "",
+              '证件号码' => "",
+              '体检号' => $order->tj_number,
+              '包含内部信息' => true
+            ];
+            $res = $peis::Post('体检报告查询', $order->hospital_id, $data);
+            if(count($res['data']) > 0) {
+              $res = $res['data'][0];
+              if (isset($res['收费项目列表'])) {
+                foreach ($res['收费项目列表'] as $it) {
+                  if($it['项目状态']=='未完成'){
+                    $is_checked_sign_in=false;
+                    break;
+                  }else{
+                    $is_checked_sign_in=true;
+                  }
                 }
               }
             }
           }
+
+
         }
 
         $buy_info=json_decode($order->buy_info,true);