diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index 52b9b0f..7937331 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -167,4 +167,45 @@ class HealthCheckupController extends Controller $s=app()->make(HealthCheckupService::class); return $s->GetCheckUpList(['userid'=>$userid,'group'=>$group,'page'=>$page,'pageSize'=>$pageSize,'searchInfo'=>$searchInfo]); } + //统计各个体检机构体检数量 + public function CheckUpCount(Request $request) + { + $s_group=[1,8]; + $userid = $request->get('userid');//中间件产生的参数 + $group = $request->get('role');//中间件产生的参数 + $searchInfo=request('searchInfo'); + if(!in_array($group,$s_group) ){ + $cha=DB::table('medical_institution')->where(['link_user_id'=>$userid])->first(); + if(!!$cha){ + $searchInfo['org_id']=$cha->id; + }else{ + return \Yz::echoError1("当前用户，未关联体检机构"); + } + + } + $list=DB::table('examination_records as a') + ->select('b.sn','b.org_name',DB::raw('count(*) as count')) + ->leftJoin('medical_institution as b','a.institution_id','=','b.id'); + + if(empty($searchInfo['dateRange'])){ + $searchInfo['start']=date('Y-m-d')." 00:00:00"; + $searchInfo['end']= date('Y-m-d')." 23:59:59"; + }else{ + $searchInfo['start']=$searchInfo['dateRange'][0]." 00:00:00"; + $searchInfo['end']=$searchInfo['dateRange'][1]." 23:59:59"; + } + + if(isset($searchInfo['org_id'])){ + $list=$list->where('a.institution_id',$searchInfo['org_id']); + } + if(isset($searchInfo['checkType'])){ + $list=$list->where('a.type',$searchInfo['checkType']); + } + $list=$list + ->where([['a.is_del','=',0],['a.created_at','>=',$searchInfo['start']],['a.created_at','<=',$searchInfo['end']]]) + ->groupBy('b.sn','b.org_name') + ->orderBy('count','desc') + ->get(); + return \Yz::Return(true,'查询成功',['list'=>$list,'dateRange'=>[$searchInfo['start'],$searchInfo['end']]]); + } } diff --git a/Laravel/app/Http/Controllers/API/DxAppController.php b/Laravel/app/Http/Controllers/API/DxAppController.php index 19247cc..0dc4d97 100644 --- a/Laravel/app/Http/Controllers/API/DxAppController.php +++ b/Laravel/app/Http/Controllers/API/DxAppController.php @@ -27,7 +27,10 @@ class DxAppController extends Controller curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); curl_setopt($curl, CURLOPT_HTTPHEADER, [ 'Content-Type: application/json; charset=utf-8', - 'Content-Length: ' . strlen($data_string) + 'Content-Length: ' . strlen($data_string), + "appCode: CwaYrR", + "sign: 965E90EE2B2E216721FF54A32B6D699A", + "APICODE: b317f8e3-66d7-4f75-b1c9-58ead6343e9f", ]); // curl_setopt($curl, CURLOPT_POSTFIELDS, $data_string); $r = curl_exec($curl); diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index a8041d8..d31603f 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -59,6 +59,8 @@ Route::group(['middleware'=>['checktoken','log'],'prefix'=>'v1'],function () { Route::post('admin/InstitutionGetSetingDetail','App\Http\Controllers\API\Admin\YeWu\InstitutionController@GetSetingDetail');//获取机构设置详情 Route::post('admin/GetConfigs','App\Http\Controllers\API\Admin\YeWu\ConfigsController@GetConfigs');//获取设置 Route::post('admin/SaveConfig','App\Http\Controllers\API\Admin\YeWu\ConfigsController@SaveConfig');//保存设置 + + Route::post('admin/CheckUpCount','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@CheckUpCount');//体检统计 }); diff --git a/el-admin/.env.production b/el-admin/.env.production index 7983029..9207569 100644 --- a/el-admin/.env.production +++ b/el-admin/.env.production @@ -1,6 +1,6 @@ ENV = 'production' -VITE_APP_API_77777 = 'http://192.168.50.123:33583/common/la/public/api/' -VITE_APP_FILE_7777 = 'http://192.168.50.123:33583/common/la/public' +VITE_APP_API = 'http://192.168.50.123:33583/common/la/public/api/' +VITE_APP_FILE = 'http://192.168.50.123:33583/common/la/public' -VITE_APP_API = 'http://172.31.68.39:33583/common/la/public/api/' -VITE_APP_FILE = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file +VITE_APP_API_5555 = 'http://172.31.68.39:33583/common/la/public/api/' +VITE_APP_FILE_5555 = 'http://172.31.68.39:33583/common/la/public' \ No newline at end of file diff --git a/el-admin/src/api/api.js b/el-admin/src/api/api.js index f037905..c9e8100 100644 --- a/el-admin/src/api/api.js +++ b/el-admin/src/api/api.js @@ -162,4 +162,9 @@ export const GetConfigs = (data={}) => { //保存系统参数设置 export const SaveConfig = (data={}) => { return axios({url:import.meta.env.VITE_APP_API+'v1/admin/SaveConfig',data:data}) +} + +//体检数量统计 +export const CheckUpCount = (data={}) => { + return axios({url:import.meta.env.VITE_APP_API+'v1/admin/CheckUpCount',data:data}) } \ No newline at end of file diff --git a/el-admin/src/router/index.js b/el-admin/src/router/index.js index f6371d8..ed75e89 100644 --- a/el-admin/src/router/index.js +++ b/el-admin/src/router/index.js @@ -91,6 +91,11 @@ const router = createRouter({ name: 'ReportAppointmentList', component: AppointmentCount, meta: { title: '预约登记统计' } + },{ + path: '/report/healthcard', + name: 'ReportHealthCard', + component: () => import('../views/Report/HealthCard.vue'), + meta: { title: '健康证统计' } },{ path: '/systemMngr/Configs', name: 'SystemConfigs', diff --git a/el-admin/src/views/Report/AppointmentCount.vue b/el-admin/src/views/Report/AppointmentCount.vue index da4b0d9..5e25b04 100644 --- a/el-admin/src/views/Report/AppointmentCount.vue +++ b/el-admin/src/views/Report/AppointmentCount.vue @@ -60,6 +60,7 @@ loading.value=false if (res.status) { tableData.value = res.data.list + searchInfo.value.dateRange=res.data.dateRange } else { ElMessage.error(res.msg) } diff --git a/el-admin/src/views/Report/HealthCard.vue b/el-admin/src/views/Report/HealthCard.vue new file mode 100644 index 0000000..a4ade83 --- /dev/null +++ b/el-admin/src/views/Report/HealthCard.vue @@ -0,0 +1,83 @@ + + + + + \ No newline at end of file diff --git a/mH5/src/views/AppLogin.vue b/mH5/src/views/AppLogin.vue index 7c9d20a..5c03a65 100644 --- a/mH5/src/views/AppLogin.vue +++ b/mH5/src/views/AppLogin.vue @@ -262,8 +262,8 @@ onMounted(() => { openid = route.query.userId sessionStorage.setItem('openid', openid); - //AppGetUserinfoAction() - tiaoGuoAppYanzheng(); + AppGetUserinfoAction() + //tiaoGuoAppYanzheng(); GetConfigInArrayFunc(); console.log(openid); })