判断体检号增加机构条件

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'));

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;
             }