报告列表增加筛选

Laravel/app/Http/Controllers/API/H5/DoctorController.php

@@ -15,6 +15,7 @@ class DoctorController extends Controller
          [
            'head_img'=>'/storage/20240822/yisheng.png',
            'name'=>'李医生',
+           'level'=>'副主任医师',
            'hospital'=>'秀英',
            'time'=>'周二下午、周三、五上午',
            'desc'=>'擅长：产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠'
@@ -22,6 +23,7 @@ class DoctorController extends Controller
          [
            'head_img'=>'/storage/20240822/yisheng.png',
            'name'=>'张医生',
+           'level'=>'副主任医师',
            'hospital'=>'秀英',
            'time'=>'周二下午、周三、五上午',
            'desc'=>'擅长：产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠'
@@ -29,6 +31,7 @@ class DoctorController extends Controller
          [
            'head_img'=>'/storage/20240822/yisheng.png',
            'name'=>'王医生',
+           'level'=>'副主任医师',
            'hospital'=>'秀英',
            'time'=>'周二下午、周三、五上午',
            'desc'=>'擅长：产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠，产科急危重症抢救及高危妊娠'

Laravel/app/Http/Controllers/API/H5/PayController.php

@@ -61,7 +61,7 @@ class PayController extends Controller
     $timestamp=(string)time();
 
     //签名
-    $pay_path="/pages/other/entry/index?path=/pages/physical-examination/payment/index";
+    $pay_path="/jeecg-boot/hospital/openapi/order/create";
     $base64Signature=$XCXApi::Sign($pay_path,$params,$nonce,$timestamp,true);
     $params['timestamp']=$timestamp;
     $params['nonce']=$nonce;

Laravel/app/Http/Controllers/API/H5/ReportController.php

@@ -12,12 +12,24 @@ class ReportController extends Controller
   public function GetReportList()
   {
     $openid = request('openid');
+    $tj_status = request('tj_status');
     if (!isset($openid)) return \Yz::echoError1("openid不能为空");
+
     $user = DB::table('web_users')->where(['openid' => $openid, 'status' => 1, 'is_del' => 0])->first();
     if (!$user) return \Yz::echoError1('用户不存在');
     $persons = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->pluck('id_number')->toArray();
 
-    $list = DB::table('report_l1_records')->select('姓名', '性别', '登记时间', '套餐名称', '体检号', '体检状态', 'is_read')->whereIn('证件号码', $persons)->get();
+    $list = DB::table('report_l1_records')->select('姓名', '性别', '登记时间', '套餐名称', '体检号', '体检状态', 'is_read')->whereIn('证件号码', $persons);
+    if(isset($tj_status)){
+      if($tj_status===0){
+        $tj_status='报告未出';
+      }
+      if($tj_status===1){
+        $tj_status='报告已出';
+      }
+      $list=$list->where('体检状态', $tj_status);
+    }
+    $list=$list->get();
     return \Yz::Return(true, "查询完成", ['list' => $list]);
   }
 

Laravel/app/Http/Controllers/API/XCXApiController.php

@@ -140,11 +140,12 @@ class XCXApiController extends Controller
     // 使用私钥进行 RSA 签名
     openssl_sign($SignStr, $signature, $private_key, OPENSSL_ALGO_SHA256);
 
-    if ($is_urlencode) {
+
-      $signature = urlencode($signature);
-    }
     // 对签名结果进行 Base64 编码
     $base64Signature = base64_encode($signature);
+    if ($is_urlencode) {
+      $base64Signature = urlencode($base64Signature);
+    }
     //  dd($SignStr,$base64Signature);
     return $base64Signature;
   }