diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php index 0dd40ac..8faf512 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php @@ -295,4 +295,34 @@ class WorkMainController extends Controller $service = new PlanListService(); return $service->CancelYuYue($MainListId,$reg_num); } + //获取某个患者全部预约记录 + public function GetPersonYuYueList() + { + $searchInfo = request('searchInfo'); + $reg_num = request('reg_num'); + $list=DB::table('s_list') + ->leftJoin('s_period','s_list.reservation_time','=','s_period.id') + ->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id') + ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name') + ->where(['s_list.is_del'=>0,'s_list.is_nullify'=>0]) + ->where('s_list.reg_num', $reg_num) + ->whereIn('list_status',[1,2,3]); + + $count = $list; + $count = $count->count(); + $list=$list->orderBy('id', 'desc')->get(); + + $qudao=DB::table('s_appointment_type')->get(); + foreach ($list as $key=>$item){ + foreach ($qudao as $q){ + if($q->id==$item->appointment_type_id){ + $item->qudao_name=$q->name; + } + } + + } + + return \Yz::Return(true,'查询完成',['list'=>$list,'count'=>$count]); + } + } diff --git a/Laravel/public/jq_page/PersonEntrustList.html b/Laravel/public/jq_page/PersonEntrustList.html new file mode 100644 index 0000000..17aad55 --- /dev/null +++ b/Laravel/public/jq_page/PersonEntrustList.html @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
姓名电话登记号申请科室预约科室预约资源预约时段项目渠道状态
+
+ + + + \ No newline at end of file diff --git a/Laravel/public/jq_page/appointment.html b/Laravel/public/jq_page/appointment.html index 032e765..07d18f0 100644 --- a/Laravel/public/jq_page/appointment.html +++ b/Laravel/public/jq_page/appointment.html @@ -15,8 +15,8 @@ + + \ No newline at end of file diff --git a/YiJi-admin/vite.config.js b/YiJi-admin/vite.config.js index 9b87467..7292124 100644 --- a/YiJi-admin/vite.config.js +++ b/YiJi-admin/vite.config.js @@ -24,7 +24,7 @@ export default defineConfig({ port: 5174, proxy: { '/api': { - target: 'http://yijiyuyue/api', // 实际的API服务器地址 + target: 'http://yijiyuyue-NanShanFuYou/api', // 实际的API服务器地址 changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') // 如果API地址有前缀,可以进行转写 }