diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php new file mode 100644 index 0000000..1dea04f --- /dev/null +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php @@ -0,0 +1,20 @@ +get('userid');//中间件产生的参数 + $group = $request->get('role');//中间件产生的参数 + $page =request('page'); + $pageSize =request('pageSize'); + $searchInfo=request('searchInfo'); + $s=app()->make(AppointmentService::class); + return $s->GetAppointmentList(['userid'=>$userid,'group'=>$group,'page'=>$page,'pageSize'=>$pageSize,'searchInfo'=>$searchInfo]); + } +} diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index d9f2646..5acd345 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -7,6 +7,8 @@ use Illuminate\Http\Request; use App\Services\Admin\YeWu\HealthCheckupService; use App\Services\mH5\PersonService; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Storage; + class HealthCheckupController extends Controller { //创建体检记录 @@ -58,7 +60,7 @@ class HealthCheckupController extends Controller if(!$save['status']) return \Yz::echoError1('文件保持失败'); - $u=DB::table('examination_records')->where(['id'=>$cha[0]->id])->update(['report_file'=>$save['data']]); + $u=DB::table('examination_records')->where(['id'=>$cha[0]->id])->update(['report_file'=>Storage::url($save['data'])]); if($u>0){ return \Yz::Return(true,'上传成功',['file'=>$save['data']]); }else{ @@ -82,4 +84,15 @@ class HealthCheckupController extends Controller $s=app()->make(HealthCheckupService::class); return $s->GetPersonCheckUpDetail(['tijian_num'=>$tijian_num]); } + + //admin后台获取体检记录列表 + public function GetCheckUpList(Request $request){ + $userid = $request->get('userid');//中间件产生的参数 + $group = $request->get('role');//中间件产生的参数 + $page =request('page'); + $pageSize =request('pageSize'); + $searchInfo=request('searchInfo'); + $s=app()->make(HealthCheckupService::class); + return $s->GetCheckUpList(['userid'=>$userid,'group'=>$group,'page'=>$page,'pageSize'=>$pageSize,'searchInfo'=>$searchInfo]); + } } diff --git a/Laravel/app/Http/Controllers/API/UkeyController.php b/Laravel/app/Http/Controllers/API/UkeyController.php new file mode 100644 index 0000000..9281e47 --- /dev/null +++ b/Laravel/app/Http/Controllers/API/UkeyController.php @@ -0,0 +1,31 @@ +get('userid');//中间件产生的参数 + $pwd=request('pwd'); //密码 + $sfid=request('sfid'); //密码 + $s=app()->make(LoginService::class); + $check=$s->CheckPwd(['userid'=>$userid,'password'=>$pwd]); + if($check['status']){ + $u=DB::table('users')->where(['id'=>$userid])->update([ + 'ukey_sfuid'=>$sfid, + ]); + if($u){ + return \Yz::Return(true,'绑定成功',[]); + }else{ + return \Yz::echoError1("绑定失败"); + } + }else{ + return \Yz::echoError1("密码验证失败"); + } + } +} diff --git a/Laravel/app/Http/Controllers/API/mH5/PersonController.php b/Laravel/app/Http/Controllers/API/mH5/PersonController.php index 089c601..f755999 100644 --- a/Laravel/app/Http/Controllers/API/mH5/PersonController.php +++ b/Laravel/app/Http/Controllers/API/mH5/PersonController.php @@ -5,7 +5,7 @@ namespace App\Http\Controllers\API\mH5; use App\Http\Controllers\Controller; use App\Services\mH5\PersonService; use Illuminate\Http\Request; - +use Illuminate\Support\Facades\DB; class PersonController extends Controller { //注册 @@ -21,4 +21,19 @@ class PersonController extends Controller $s=app()->make(PersonService::class); return $s->GetPersonRecode(['openid'=>$openid,'group'=>$group]); } + //获取用户pdf + public function GetPersonReportDetail(){ + $tijian_num =request('tijian_num'); + $info=DB::table('examination_records')->where(['tijian_num'=>$tijian_num])->first(); + if($info){ + $item=DB::table('report_result_item') + ->where(['examination_id'=>$info->id]) + ->select(['item_name','item_result','flag'])->get(); + $info->items=$item; + return \Yz::Return(true,'',['info'=>$info]); + }else{ + return \Yz::echoError1('未找到相关体检信息'); + } + + } } diff --git a/Laravel/app/Services/Admin/UserService.php b/Laravel/app/Services/Admin/UserService.php index 192d227..8f7389f 100644 --- a/Laravel/app/Services/Admin/UserService.php +++ b/Laravel/app/Services/Admin/UserService.php @@ -60,7 +60,7 @@ class UserService return $result; } public function GetDetail($arr){ - $c=DB::table('users')->select(['id','cn_name','username','status','group','img','xtsign_userid','xtsign_username'])->where(['id'=>$arr['id']])->whereIn('status',[0,1])->get(); + $c=DB::table('users')->select(['id','cn_name','username','status','group','img','xtsign_userid','xtsign_username','ukey_sfuid'])->where(['id'=>$arr['id']])->whereIn('status',[0,1])->get(); if(count($c)){ $result['info']=$c; $result['status']='ok'; diff --git a/Laravel/app/Services/Admin/YeWu/AppointmentService.php b/Laravel/app/Services/Admin/YeWu/AppointmentService.php new file mode 100644 index 0000000..0569748 --- /dev/null +++ b/Laravel/app/Services/Admin/YeWu/AppointmentService.php @@ -0,0 +1,49 @@ +=? and a.date<=? '; + array_push($canshu,$arr['searchInfo']['dateRange'][0],$arr['searchInfo']['dateRange'][1]); + } + + + if($arr['group']==7){ + $cha=DB::table('medical_institution')->where(['link_user_id'=>$arr['userid']])->get(); + $sql=$sql .' and a.org_id=?'; + array_push($canshu, $cha[0]->id); + }else{ + if($arr['searchInfo']['orgId']){ + + $sql=$sql .' and a.org_id=?'; + array_push($canshu, $arr['searchInfo']['orgId']); + } + + } + + array_push($canshu,($arr['page']-1)*$arr['pageSize'],$arr['pageSize']); + + $query=DB::select("select a.*,b.org_name from appointment_record as a LEFT JOIN + medical_institution as b on a.org_id=b.id ".$sql." order by a.id desc limit ?,?",$canshu); + + $count=DB::select("select count(*) as c from appointment_record as a ".$sql,$canshu); + return \Yz::Return(true,'',['list'=>$query,'count'=>$count[0]->c]); + + } +} diff --git a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php index af57083..f194682 100644 --- a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php +++ b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php @@ -46,10 +46,14 @@ class HealthCheckupService $u2=DB::table('examination_records')->insert([ "name"=>$CheckupInfo['name'], + "sex"=>$CheckupInfo['sex'], + "tel"=>$CheckupInfo['tel'], "id_card_num"=>$CheckupInfo['id_card_num'], "type"=>$CheckupInfo['type'], + "industry_type"=>$CheckupInfo['industry_type'], "institution_id"=>$org_id[0]->id, "tijian_time"=>$CheckupInfo['tijian_time'], + "register_time"=>$CheckupInfo['register_time'],//登记时间 "tijian_num"=>$CheckupInfo['tijian_num'], "report_content"=>json_encode($CheckupInfo['report_content']), "fee_type"=>$CheckupInfo['fee_type'] @@ -112,5 +116,35 @@ class HealthCheckupService } + } + //获取体检记录列表 + public function GetCheckUpList($arr){ + $sql=' where 1=1'; + $canshu=array(); + + if($arr['searchInfo']['dateRange']){ + + $sql=$sql . ' and a.tijian_time>=? and a.tijian_time<=? '; + array_push($canshu,$arr['searchInfo']['dateRange'][0],$arr['searchInfo']['dateRange'][1]); + } + + + if($arr['group']==7){ + $cha=DB::table('medical_institution')->where(['link_user_id'=>$arr['userid']])->get(); + $sql=$sql .' and a.institution_id=?'; + array_push($canshu, $cha[0]->id); + }else{ + if($arr['searchInfo']['orgId']){ + + $sql=$sql .' and a.institution_id=?'; + array_push($canshu, $arr['searchInfo']['orgId']); + } + + } + array_push($canshu,($arr['page']-1)*$arr['pageSize'],$arr['pageSize']); + $query=DB::select("select a.*,b.org_name from examination_records as a LEFT JOIN medical_institution as b on a.institution_id=b.id ".$sql." order by a.id desc limit ?,?",$canshu); + $count=DB::select("select count(*) as c from examination_records as a ".$sql,$canshu); + return \Yz::Return(true,'',['list'=>$query,'count'=>$count[0]->c]); + } } diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 649e056..8c83fd5 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -45,7 +45,10 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1'],function () { Route::post('admin/CalendarGetList','App\Http\Controllers\API\Admin\YeWu\healthCalendarController@getList'); //admin后台获取日历列表 Route::post('admin/CalendarListDel','App\Http\Controllers\API\Admin\YeWu\healthCalendarController@Del'); //admin后台删除日历 Route::post('admin/CalendarChangeInfo','App\Http\Controllers\API\Admin\YeWu\healthCalendarController@ChangeInfo'); //admin后台更新日历 + Route::post('admin/GetCheckUpList','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@GetCheckUpList'); //admin后台获取体检记录 + Route::post('admin/GetAppointmentList','App\Http\Controllers\API\Admin\YeWu\AppointmentController@GetAppointmentList'); //admin后台获取预约记录 Route::post('admin/XTSignBindUser','App\Http\Controllers\API\XTSignController@bindUser');//admin后台用户绑定协同签名useid + Route::post('admin/UkeyBindUser','App\Http\Controllers\API\UkeyController@Bind');//admin后台用户绑定协同签名useid }); @@ -58,6 +61,7 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1/mH5'],function () Route::post('GetEnableCalendar','App\Http\Controllers\API\mH5\OrganizationController@GetEnableCalendar'); //获取可用体检机构日历 Route::post('StartYuYue','App\Http\Controllers\API\mH5\OrganizationController@StartYuYue'); //开始预约 Route::post('UpFile','App\Http\Controllers\API\UpLoadController@UpFile'); //上传文件 + Route::post('GetPersonReportDetail','App\Http\Controllers\API\mH5\PersonController@GetPersonReportDetail');//获取用户pdf }); diff --git a/el-admin/.env.development b/el-admin/.env.development index 8bf461b..f1e7868 100644 --- a/el-admin/.env.development +++ b/el-admin/.env.development @@ -1,2 +1,3 @@ ENV = 'development' VITE_APP_API = '/api/' +VITE_APP_FILE = 'http://localhostcommon' \ No newline at end of file diff --git a/el-admin/.env.production b/el-admin/.env.production index 6d8ddb9..1a89d63 100644 --- a/el-admin/.env.production +++ b/el-admin/.env.production @@ -1,4 +1,4 @@ ENV = 'production' VITE_APP_API = 'https://www.yanzai.vip/common/laravel/public/api/' - +VITE_APP_FILE = 'https://www.yanzai.vip/common/laravel/public' diff --git a/el-admin/index.html b/el-admin/index.html index 03cdc53..c7c1988 100644 --- a/el-admin/index.html +++ b/el-admin/index.html @@ -9,5 +9,6 @@
+