1

Laravel/app/Services/Admin/YeWu/HealthCheckupService.php

@@ -156,13 +156,13 @@ public function SaveFile($arr){
     }
     //查询个人查询体检记录列表
     public function GetPersonCheckUpList($arr){
-        $list = DB::table("examination_records")->where(['id_card_num'=>$arr['id_card_num']])->get();
+        $list = DB::table("examination_records")->where(['id_card_num'=>$arr['id_card_num'],'is_del'=>0])->get();
         return \Yz::Return(true,'查询成功',['list'=>$list,'count'=>count($list)]);
     }
     //根据体检号查询体检详情
     public function GetPersonCheckUpDetail($arr){
 
-        $detail=DB::table('examination_records')->where(['tijian_num'=>$arr['tijian_num']])->first();
+        $detail=DB::table('examination_records')->where(['tijian_num'=>$arr['tijian_num'],'is_del'=>0])->first();
         if(!empty($detail)){
             return \Yz::Return(true,'查询成功',$detail);
         }else{
@@ -196,11 +196,11 @@ public function GetCheckUpList($arr){
 
         }
         array_push($canshu,($arr['page']-1)*$arr['pageSize'],$arr['pageSize']);
-        $query=DB::select("select a.*,b.org_name from examination_records as a LEFT JOIN  medical_institution as b on a.institution_id=b.id ".$sql." order by a.id desc limit ?,?",$canshu);
+        $query=DB::select("select a.*,b.org_name from examination_records as a LEFT JOIN  medical_institution as b on a.institution_id=b.id ".$sql." and a.is_del=0 order by a.id desc limit ?,?",$canshu);
         foreach ($query as $key=>$item){
             $item->psfds=json_decode($item->pdfs,true);
         }
-        $count=DB::select("select count(*) as  c from examination_records as a  ".$sql,$canshu);
+        $count=DB::select("select count(*) as  c from examination_records as a  ".$sql." and a.is_del=0",$canshu);
         return \Yz::Return(true,'',['list'=>$query,'count'=>$count[0]->c]);
 
     }