From e0c8fe879afa7daf5a5a8eafdcc765f529505b34 Mon Sep 17 00:00:00 2001 From: yanzai Date: Sat, 27 Jul 2024 11:40:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BD=93=E6=A3=80=E5=8F=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=BA=E6=9E=84=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/Admin/YeWu/HealthCheckupController.php | 2 +- Laravel/app/Services/Admin/YeWu/HealthCheckupService.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index 7937331..1df0d16 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -98,7 +98,7 @@ class HealthCheckupController extends Controller if(!$org_id) return \Yz::echoError1('机构码不存在'); //检查体检流水号是否存在，存在禁止再次插入。 - $check_cunzai=DB::table('examination_records')->where('tijian_num',$tijian_num)->get(); + $check_cunzai=DB::table('examination_records')->where(['tijian_num'=>$tijian_num,'institution_id'=>$org_id->id])->get(); if(count($check_cunzai)>0) return \Yz::echoError1('此体检号已经存在，禁止创建'); $sex=\App\Lib\Tools::getGenderFromIDCard($id_card_num); $age=\App\Lib\Tools::calculateAgeFromID($id_card_num,date('Y-m-d H:i:s')); diff --git a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php index b7c8c8c..d7e91b6 100644 --- a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php +++ b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php @@ -38,7 +38,7 @@ class HealthCheckupService $status=false; //检查体检流水号是否存在，存在禁止再次插入。 - $check_cunzai=DB::table('examination_records')->where('tijian_num',$CheckupInfo['tijian_num'])->get(); + $check_cunzai=DB::table('examination_records')->where(['tijian_num'=>$CheckupInfo['tijian_num'],'institution_id'=>$org_id[0]->id])->get(); if(count($check_cunzai)>0) return \Yz::echoError1('此体检号已经存在，禁止创建'); DB::beginTransaction(); // 开始事务 @@ -64,7 +64,7 @@ class HealthCheckupService $date = date("Ymd"); preg_match('/^(data:\s*image\/(\w+);base64,)/', $CheckupInfo['head_img'], $res); $file = base64_decode(Str::after($CheckupInfo['head_img'], $res[1])); - $filePath = 'APIUpload/'.$date.'/'.$CheckupInfo['tijian_num'].'.jpg'; + $filePath = 'APIUpload/'.$date.'/'.$CheckupInfo['tijian_num'].$CheckupInfo['id_card_num'].'.jpg'; Storage::disk('public')->put($filePath, $file); $img_url='/storage/'.$filePath; }