diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php new file mode 100644 index 0000000..abee870 --- /dev/null +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -0,0 +1,22 @@ +make(HealthCheckupService::class); + return $s->CreateRecord($CheckupInfo); + } +} diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthOrganizationController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthOrganizationController.php index ace9fe6..b074d31 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthOrganizationController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthOrganizationController.php @@ -12,7 +12,7 @@ class HealthOrganizationController extends Controller public function GetEnableList(Request $request){ $userid = $request->get('userid');//中间件产生的参数 $group = $request->get('role');//中间件产生的参数 - if($group<>1 or $group<>7) \Yz::echoError('无此接口访问权限'); + if($group<>1 or $group<>7) return \Yz::echoError('无此接口访问权限'); $s=app()->make(HealthOrganizationService::class); return $s->GetList(['type'=>'enable','group'=>$group,'userid'=>$userid]); diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/healthCalendarController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/healthCalendarController.php index f444e7a..3b3dab2 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/healthCalendarController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/healthCalendarController.php @@ -23,7 +23,7 @@ class healthCalendarController extends Controller $userid = $request->get('userid');//中间件产生的参数 $group = $request->get('role');//中间件产生的参数 $info= request('info'); - if($group<>1 or $group<>7) \Yz::echoError('无此接口访问权限'); + if($group<>1 or $group<>7) return \Yz::echoError('无此接口访问权限'); $s=app()->make(HealthCalendarService::class); return $s->CreateCalendar(['info'=>$info,'group'=>$group,'userid'=>$userid]); diff --git a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php new file mode 100644 index 0000000..140f82a --- /dev/null +++ b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php @@ -0,0 +1,75 @@ +make(PersonService::class); + $check=$s->GetPersonRecode(['id_num'=>$CheckupInfo['id_card_num']]); + + if(!$check['status']) return $check; + + $status=false; + DB::beginTransaction(); // 开始事务 + try { + // 执行数据库操作 + if($CheckupInfo['type']==1){ + //如果体检类型为健康证 更新预约记录表 + $u= DB::table('appointment_record') + ->where([ + 'id_card_num'=>$CheckupInfo['id_card_num'], + 'org_id'=>$CheckupInfo['institution_id'], + 'status'=>1 + ])->whereBetween('created_at',[$firstDay,$lastDay])->update(['status'=>2]); + + + } + $u2=DB::table('examination_records')->insert([ + "id_card_num"=>$CheckupInfo['id_card_num'], + "type"=>$CheckupInfo['type'], + "institution_id"=>$CheckupInfo['institution_id'] + ]); + if($CheckupInfo['type']==1){ + + if($u==1 and $u2==true){ + + DB::commit(); // 提交事务 + $status=true; + }else{ + + DB::rollBack(); // 回滚事务 + } + }else{ + if($u2){ + + DB::commit(); // 提交事务 + $status=true; + }else{ + DB::rollBack(); // 回滚事务 + + } + } + + } catch (\Exception $e) { + DB::rollBack(); // 回滚事务 + + + } + + if($status){ + return \Yz::Return(true,'ok',[]); + }else{ + return \Yz::echoError1("操作失败"); + } + + } +} diff --git a/Laravel/app/Services/mH5/PersonService.php b/Laravel/app/Services/mH5/PersonService.php index d415597..067db96 100644 --- a/Laravel/app/Services/mH5/PersonService.php +++ b/Laravel/app/Services/mH5/PersonService.php @@ -63,7 +63,7 @@ class PersonService $firstDay = date('Y-01-01', strtotime($currentYear)); $lastDay = date('Y-12-31', strtotime($currentYear)); - $c=DB::table('examination_records')->select(['id','id_card_num','created_at as insertime'])->where([['id_card_num','=',$id_num],['created_at','>',$firstDay],['created_at','<',$lastDay]])->get(); + $c=DB::table('examination_records')->select(['id','id_card_num','created_at as insertime'])->where([['id_card_num','=',$id_num],['created_at','>=',$firstDay],['created_at','<=',$lastDay]])->get(); if(count($c)>0){ $result['status']=false; $result['msg']='已体检过'; diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 6a2830c..2de1821 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -57,3 +57,8 @@ 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::get('CreateCheckupRecord','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@CreateRecord'); //创建预约记录 diff --git a/mH5/src/assets/image/zhang.png b/mH5/src/assets/image/zhang.png new file mode 100644 index 0000000..4d1eccf Binary files /dev/null and b/mH5/src/assets/image/zhang.png differ diff --git a/mH5/src/router/index.js b/mH5/src/router/index.js index 9ae86a3..9fd43fa 100644 --- a/mH5/src/router/index.js +++ b/mH5/src/router/index.js @@ -40,6 +40,14 @@ const router = createRouter({ path: '/yuYueSuccess', name: 'YuYueSuccess', component: () => import('../views/YuYueSuccess.vue') + },{ + path: '/showReport', + name: 'ShowReport', + component: () => import('../views/ShowReport.vue') + },{ + path: '/healthCertificate', + name: 'HealthCertificate', + component: () => import('../views/HealthCertificate.vue') }] }) diff --git a/mH5/src/views/HealthCertificate.vue b/mH5/src/views/HealthCertificate.vue new file mode 100644 index 0000000..eb98401 --- /dev/null +++ b/mH5/src/views/HealthCertificate.vue @@ -0,0 +1,177 @@ + + \ No newline at end of file diff --git a/mH5/src/views/Register.vue b/mH5/src/views/Register.vue index 6c14054..d0152ba 100644 --- a/mH5/src/views/Register.vue +++ b/mH5/src/views/Register.vue @@ -35,8 +35,7 @@ \ No newline at end of file