体检表 判断 is_del

Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php

@@ -102,7 +102,7 @@ public function CreateCheckupPdf()
         if(!$org_id) return \Yz::echoError1('机构码不存在');
 
         //检查体检流水号是否存在，存在禁止再次插入。
-        $check_cunzai=DB::table('examination_records')->where(['tijian_num'=>$tijian_num,'institution_id'=>$org_id->id])->get();
+        $check_cunzai=DB::table('examination_records')->where(['tijian_num'=>$tijian_num,'institution_id'=>$org_id->id,'is_del'=>0])->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

@@ -40,7 +40,7 @@ public function CreateRecord($CheckupInfo){
         $status=false;
 
         //检查体检流水号是否存在，存在禁止再次插入。
-        $check_cunzai=DB::table('examination_records')->where(['tijian_num'=>$CheckupInfo['tijian_num'],'institution_id'=>$org_id[0]->id])->get();
+        $check_cunzai=DB::table('examination_records')->where(['tijian_num'=>$CheckupInfo['tijian_num'],'institution_id'=>$org_id[0]->id,'is_del'=>0])->get();
         if(count($check_cunzai)>0)  return ['status'=>false,'msg'=>'此体检号已经存在，禁止创建'];
 
         DB::beginTransaction(); // 开始事务