diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php index 76fd680..b5ff84c 100644 --- a/Laravel/app/Http/Controllers/API/ApiMapController.php +++ b/Laravel/app/Http/Controllers/API/ApiMapController.php @@ -82,6 +82,7 @@ class ApiMapController extends Controller 'AddressData' => $base_url . '/api/H5/Address/data', // 省市区数据 'UserHunjian' => $base_url . '/api/H5/User/hunjian', // 婚检人员信息 'hunjianBySFZ' => $base_url . '/api/H5/hunjianBySFZ', // 婚检人员信息 + 'CheckedSignIn' => $base_url . '/api/H5/CheckedSignIn', // 检后签到 ]; } diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 18b0126..025e9b2 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -1011,4 +1011,17 @@ class OrderController extends Controller } return ['price'=>$true_price,'quanInfo'=>$quanInfo]; } + //检后签到 + public function CheckedSignIn() + { + $tj_number=request('tj_number'); + $peis = new PEISApiController(); + $res = $peis::Post2('检后签到', $peis::Api('检后签到',$tj_number),1,[]); + $res = json_decode($res, true); + if($res['Success']===true){ + return ['status'=>true,'msg'=>$res['Message']]; + }else{ + return ['status'=>false,'msg'=>$res['Message']]; + } + } } diff --git a/Laravel/app/Http/Controllers/API/PEISApiController.php b/Laravel/app/Http/Controllers/API/PEISApiController.php index dfee1c5..20ccfc0 100644 --- a/Laravel/app/Http/Controllers/API/PEISApiController.php +++ b/Laravel/app/Http/Controllers/API/PEISApiController.php @@ -40,6 +40,7 @@ class PEISApiController extends Controller $api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup?key=YmMxOGI2MDUxZmFh"; $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; $api['弃检接口'] = "{$url}/Home/AbandonCheck"; + $api['检后签到'] = "{$url}/Home/PostExamSignIn?eventNo={$code}"; } if($env=='dev') { //如果是测试环境 @@ -62,6 +63,7 @@ class PEISApiController extends Controller $api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup/{$code}"; $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; $api['弃检接口'] = "{$url}/Home/AbandonCheck/{$code}"; + $api['检后签到'] = "{$url}/Home/PostExamSignIn?eventNo={$code}"; } diff --git a/Laravel/app/Http/Controllers/TestController.php b/Laravel/app/Http/Controllers/TestController.php index 4baf2d0..a74459f 100644 --- a/Laravel/app/Http/Controllers/TestController.php +++ b/Laravel/app/Http/Controllers/TestController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Http\Controllers\API\AspNetZhuanController; +use App\Http\Controllers\API\H5\OrderController; use App\Http\Controllers\API\PEISApiController; use App\Http\Controllers\API\XCXApiController; use App\Services\ComboItemGroupService; @@ -15,8 +16,8 @@ class TestController extends Controller { public function DBtest(){ echo DB::table('users')->count(); - // $order= new OrderService(); - // dd($order->DepartmentItemCount(173)); + // $order= new OrderService(); + // dd($order->DepartmentItemCount(355)); //退款------------------ // $data = [ // 'orderid' => '20241108112106776eslNJ2', @@ -59,6 +60,7 @@ class TestController extends Controller // dd($service->QiJian("2411090001","张三",['1812'])); + // $peis = new PEISApiController(); // $data = [ // '电话号码' => "", diff --git a/Laravel/app/Services/OrderService.php b/Laravel/app/Services/OrderService.php index 0554104..7a7a2bd 100644 --- a/Laravel/app/Services/OrderService.php +++ b/Laravel/app/Services/OrderService.php @@ -16,6 +16,7 @@ class OrderService $hospital=DB::table('hospitals')->where('id',$order->hospital_id)->first(); if(!$hospital) return ['status'=>false,'msg'=>'医院不存在']; $wait_day=false; + $is_checked_sign_in=false; if(isset($order->tj_number) and !empty($order->tj_number)){ $peis = new PEISApiController(); $wait=$peis::Get($peis::Api('报告时间计算',$order->tj_number),$hospital->code,"报告时间计算"); @@ -24,6 +25,28 @@ class OrderService } 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; + } + } + } + } } $buy_info=json_decode($order->buy_info,true); @@ -86,7 +109,7 @@ class OrderService 'count'=>count($item), ]; } - return ['department_list'=>$de_list,'wait_day'=>$wait_day]; + return ['department_list'=>$de_list,'wait_day'=>$wait_day,'is_checked_sign_in'=>$is_checked_sign_in]; } public function Cancel($orderInfo) diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index bfdc87a..e4fa788 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -71,7 +71,7 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () { Route::post('/AnalysisTypeGetList', 'App\Http\Controllers\API\H5\AnalysisTypeController@GetList');//趋势分析项目列表 Route::post('/HunQianQuestionSubmit', 'App\Http\Controllers\API\H5\QuestionController@HunQianQuestionSubmit');//婚前问卷提交 Route::post('/hunjianBySFZ', 'App\Http\Controllers\API\H5\UserController@hunjianBySFZ');//根据身份证查询建档信息 - + Route::post('/CheckedSignIn', 'App\Http\Controllers\API\H5\OrderController@CheckedSignIn');//检后签到