新增检后签到接口、增加是否可以检后签到字段

main
yanzai 1 year ago
parent 1c8fa557c5
commit 0d250b8803

@ -82,6 +82,7 @@ class ApiMapController extends Controller
'AddressData' => $base_url . '/api/H5/Address/data', // 省市区数据 'AddressData' => $base_url . '/api/H5/Address/data', // 省市区数据
'UserHunjian' => $base_url . '/api/H5/User/hunjian', // 婚检人员信息 'UserHunjian' => $base_url . '/api/H5/User/hunjian', // 婚检人员信息
'hunjianBySFZ' => $base_url . '/api/H5/hunjianBySFZ', // 婚检人员信息 'hunjianBySFZ' => $base_url . '/api/H5/hunjianBySFZ', // 婚检人员信息
'CheckedSignIn' => $base_url . '/api/H5/CheckedSignIn', // 检后签到
]; ];
} }

@ -1011,4 +1011,17 @@ class OrderController extends Controller
} }
return ['price'=>$true_price,'quanInfo'=>$quanInfo]; 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']];
}
}
} }

@ -40,6 +40,7 @@ class PEISApiController extends Controller
$api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup?key=YmMxOGI2MDUxZmFh"; $api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup?key=YmMxOGI2MDUxZmFh";
$api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}";
$api['弃检接口'] = "{$url}/Home/AbandonCheck"; $api['弃检接口'] = "{$url}/Home/AbandonCheck";
$api['检后签到'] = "{$url}/Home/PostExamSignIn?eventNo={$code}";
} }
if($env=='dev') { //如果是测试环境 if($env=='dev') { //如果是测试环境
@ -62,6 +63,7 @@ class PEISApiController extends Controller
$api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup/{$code}"; $api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup/{$code}";
$api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}";
$api['弃检接口'] = "{$url}/Home/AbandonCheck/{$code}"; $api['弃检接口'] = "{$url}/Home/AbandonCheck/{$code}";
$api['检后签到'] = "{$url}/Home/PostExamSignIn?eventNo={$code}";
} }

@ -3,6 +3,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Http\Controllers\API\AspNetZhuanController; use App\Http\Controllers\API\AspNetZhuanController;
use App\Http\Controllers\API\H5\OrderController;
use App\Http\Controllers\API\PEISApiController; use App\Http\Controllers\API\PEISApiController;
use App\Http\Controllers\API\XCXApiController; use App\Http\Controllers\API\XCXApiController;
use App\Services\ComboItemGroupService; use App\Services\ComboItemGroupService;
@ -16,7 +17,7 @@ class TestController extends Controller
public function DBtest(){ public function DBtest(){
echo DB::table('users')->count(); echo DB::table('users')->count();
// $order= new OrderService(); // $order= new OrderService();
// dd($order->DepartmentItemCount(173)); // dd($order->DepartmentItemCount(355));
//退款------------------ //退款------------------
// $data = [ // $data = [
// 'orderid' => '20241108112106776eslNJ2', // 'orderid' => '20241108112106776eslNJ2',
@ -59,6 +60,7 @@ class TestController extends Controller
// dd($service->QiJian("2411090001","张三",['1812'])); // dd($service->QiJian("2411090001","张三",['1812']));
// $peis = new PEISApiController(); // $peis = new PEISApiController();
// $data = [ // $data = [
// '电话号码' => "", // '电话号码' => "",

@ -16,6 +16,7 @@ class OrderService
$hospital=DB::table('hospitals')->where('id',$order->hospital_id)->first(); $hospital=DB::table('hospitals')->where('id',$order->hospital_id)->first();
if(!$hospital) return ['status'=>false,'msg'=>'医院不存在']; if(!$hospital) return ['status'=>false,'msg'=>'医院不存在'];
$wait_day=false; $wait_day=false;
$is_checked_sign_in=false;
if(isset($order->tj_number) and !empty($order->tj_number)){ if(isset($order->tj_number) and !empty($order->tj_number)){
$peis = new PEISApiController(); $peis = new PEISApiController();
$wait=$peis::Get($peis::Api('报告时间计算',$order->tj_number),$hospital->code,"报告时间计算"); $wait=$peis::Get($peis::Api('报告时间计算',$order->tj_number),$hospital->code,"报告时间计算");
@ -24,6 +25,28 @@ class OrderService
} else { } else {
$wait_day=-1; $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); $buy_info=json_decode($order->buy_info,true);
@ -86,7 +109,7 @@ class OrderService
'count'=>count($item), '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) public function Cancel($orderInfo)

@ -71,7 +71,7 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () {
Route::post('/AnalysisTypeGetList', 'App\Http\Controllers\API\H5\AnalysisTypeController@GetList');//趋势分析项目列表 Route::post('/AnalysisTypeGetList', 'App\Http\Controllers\API\H5\AnalysisTypeController@GetList');//趋势分析项目列表
Route::post('/HunQianQuestionSubmit', 'App\Http\Controllers\API\H5\QuestionController@HunQianQuestionSubmit');//婚前问卷提交 Route::post('/HunQianQuestionSubmit', 'App\Http\Controllers\API\H5\QuestionController@HunQianQuestionSubmit');//婚前问卷提交
Route::post('/hunjianBySFZ', 'App\Http\Controllers\API\H5\UserController@hunjianBySFZ');//根据身份证查询建档信息 Route::post('/hunjianBySFZ', 'App\Http\Controllers\API\H5\UserController@hunjianBySFZ');//根据身份证查询建档信息
Route::post('/CheckedSignIn', 'App\Http\Controllers\API\H5\OrderController@CheckedSignIn');//检后签到

Loading…
Cancel
Save