diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index d458c78..8a7c6af 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -209,6 +209,7 @@ class HealthCheckupController extends Controller ->get(); return \Yz::Return(true,'查询成功',['list'=>$list,'dateRange'=>[$searchInfo['start'],$searchInfo['end']]]); } + //删除体检记录 public function DelCheckUpInfo() { @@ -233,4 +234,5 @@ class HealthCheckupController extends Controller } } + } diff --git a/Laravel/app/Services/Admin/YeWu/AppointmentService.php b/Laravel/app/Services/Admin/YeWu/AppointmentService.php index d912fa6..75e8c96 100644 --- a/Laravel/app/Services/Admin/YeWu/AppointmentService.php +++ b/Laravel/app/Services/Admin/YeWu/AppointmentService.php @@ -34,8 +34,8 @@ class AppointmentService if($arr['searchInfo']['dateRange']){ - $sql=$sql . ' and a.date>=? and a.date<=? '; - array_push($canshu,$arr['searchInfo']['dateRange'][0],$arr['searchInfo']['dateRange'][1]); + $sql=$sql . ' and a.created_at>=? and a.created_at<=? '; + array_push($canshu,$arr['searchInfo']['dateRange'][0].' 00:00:00',$arr['searchInfo']['dateRange'][1].' 23:59:59'); } @@ -45,9 +45,9 @@ class AppointmentService array_push($canshu, $cha[0]->sn); }else{ if($arr['searchInfo']['orgId']){ - - $sql=$sql .' and a.org_id=?'; - array_push($canshu, $arr['searchInfo']['orgId']); + $cha=DB::table('medical_institution')->where(['id'=>$arr['searchInfo']['orgId']])->get(); + $sql=$sql .' and a.org_code=?'; + array_push($canshu, $cha[0]->sn); } } diff --git a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php index e88cf09..215dea5 100644 --- a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php +++ b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php @@ -169,8 +169,8 @@ class HealthCheckupService 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]); + $sql=$sql . ' and a.created_at>=? and a.created_at<=? '; + array_push($canshu,$arr['searchInfo']['dateRange'][0].' 00:00:00',$arr['searchInfo']['dateRange'][1].' 23:59:59'); } diff --git a/el-admin/.env.production b/el-admin/.env.production index c9b3ed5..a8603bf 100644 --- a/el-admin/.env.production +++ b/el-admin/.env.production @@ -1,6 +1,6 @@ ENV = 'production' VITE_APP_API_6666 = 'http://192.168.50.123:33583/common/la/public/api/' -VITE_APP_FILE_5555 = 'http://192.168.50.123:33583/common/la/public' +VITE_APP_FILE_6666 = '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 diff --git a/el-admin/src/router/index.js b/el-admin/src/router/index.js index ed75e89..dcc1624 100644 --- a/el-admin/src/router/index.js +++ b/el-admin/src/router/index.js @@ -95,7 +95,7 @@ const router = createRouter({ path: '/report/healthcard', name: 'ReportHealthCard', component: () => import('../views/Report/HealthCard.vue'), - meta: { title: '健康证统计' } + meta: { title: '体检统计' } },{ path: '/systemMngr/Configs', name: 'SystemConfigs', diff --git a/el-admin/src/views/AppointmentMngr/AppointmentList.vue b/el-admin/src/views/AppointmentMngr/AppointmentList.vue index 9f0fb1c..d5645b5 100644 --- a/el-admin/src/views/AppointmentMngr/AppointmentList.vue +++ b/el-admin/src/views/AppointmentMngr/AppointmentList.vue @@ -4,7 +4,7 @@ 机构名称 - + diff --git a/el-admin/src/views/MedicalCenter/HealthCheckList.vue b/el-admin/src/views/MedicalCenter/HealthCheckList.vue index 80a07ed..4506807 100644 --- a/el-admin/src/views/MedicalCenter/HealthCheckList.vue +++ b/el-admin/src/views/MedicalCenter/HealthCheckList.vue @@ -4,7 +4,7 @@ 机构名称 - + @@ -36,7 +36,7 @@ 老年人 - +