体检记录软删除

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

@@ -59,7 +59,7 @@ public function UploadFile(Request $request){
         $firstDay = date('Y-01-01', strtotime($currentYear));
         $lastDay = date('Y-12-31', strtotime($currentYear));
 
-        $cha=DB::table('examination_records')->where(['id_card_num'=>$id_card_num,'tijian_num'=>$tijian_num])->whereBetween('created_at', [$firstDay, $lastDay])->get();
+        $cha=DB::table('examination_records')->where(['id_card_num'=>$id_card_num,'tijian_num'=>$tijian_num,'is_del'=>0])->whereBetween('created_at', [$firstDay, $lastDay])->get();
         if(count($cha)==0) return \Yz::echoError1('未找到此用户对应的体检号记录，无法存储报告');
 
         if ($file->isValid()) {
@@ -234,7 +234,7 @@ public function DelCheckUpInfo()
         $id_card_num=$HSM_sfz['data'];
         $org_id=DB::table('medical_institution')->where('sn',$code)->first();
         if(!$org_id) return \Yz::echoError1('机构不存在');
-        $info=DB::table('examination_records')->where(['tijian_num'=>$tijian_num,'id_card_num'=>$id_card_num,'institution_id'=>$org_id->id])->first();
+        $info=DB::table('examination_records')->where(['tijian_num'=>$tijian_num,'id_card_num'=>$id_card_num,'institution_id'=>$org_id->id,'is_del'=>0])->first();
         if(!$info) return \Yz::echoError1('未找到对应记录');
 
         //记录删除日志

Laravel/app/Services/mH5/PersonService.php

@@ -85,7 +85,7 @@ public function GetPersonRecode($arr,$type=1){
 
             //查询体检记录表 免费体检记录
             $c=DB::table('examination_records as a') ->join('medical_institution as b', 'a.institution_id', '=', 'b.id')
-                ->select(['a.id','a.institution_id','a.id_card_num','a.tijian_num','a.tijian_time','a.created_at as insertime','b.org_name'])->where([['a.id_card_num','=',$id_num],['a.created_at','>=',$firstDay],['a.created_at','<=',$lastDay],'a.fee_type'=>0])->get();
+                ->select(['a.id','a.institution_id','a.id_card_num','a.tijian_num','a.tijian_time','a.created_at as insertime','b.org_name'])->where([['a.id_card_num','=',$id_num],['a.created_at','>=',$firstDay],['a.created_at','<=',$lastDay],'a.fee_type'=>0,'a.is_del'=>0])->get();
             if(count($c)>0){
                 $result['status']=false;
                 $result['msg']='已体检过';