From 60218a20657f2af10449731d0840eb13d94db293 Mon Sep 17 00:00:00 2001 From: yanzai Date: Sat, 27 Jul 2024 16:35:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BD=93=E6=A3=80=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/YeWu/HealthCheckupController.php | 25 +++++++++++++++++++ Laravel/app/Lib/Yz.php | 2 -- Laravel/app/Services/mH5/PersonService.php | 4 +-- Laravel/routes/api.php | 2 ++ 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index 1df0d16..d458c78 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -137,6 +137,7 @@ class HealthCheckupController extends Controller 'hmac'=>$Hmac['data'], ]); if($i){ + return \Yz::Return(true,'记录完成',["num"=>$tijian_num]); }else{ return \Yz::echoError1("操作失败"); @@ -208,4 +209,28 @@ class HealthCheckupController extends Controller ->get(); return \Yz::Return(true,'查询成功',['list'=>$list,'dateRange'=>[$searchInfo['start'],$searchInfo['end']]]); } + //删除体检记录 + public function DelCheckUpInfo() + { + $id_card_num=request('id_card_num'); + $tijian_num=request('tijian_num'); + $code=request('code'); + $type=request('type'); + $HSM_sfz =\App\Lib\HSM::HsmEncrypt($id_card_num); + if($HSM_sfz['status']!=true){ + return \Yz::echoError1('调用HSM加密失败'); + } + $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,'type'=>$type])->first(); + if(!$info) return \Yz::echoError1('未找到对应记录'); + $del=DB::table('examination_records')->where(['id'=>$info->id])->delete(); + if($del){ + return \Yz::Return(true,'删除成功',[]); + }else{ + return \Yz::echoError1('删除失败'); + } + + } } diff --git a/Laravel/app/Lib/Yz.php b/Laravel/app/Lib/Yz.php index 7b12d15..d30f426 100644 --- a/Laravel/app/Lib/Yz.php +++ b/Laravel/app/Lib/Yz.php @@ -86,8 +86,6 @@ class Yz{ $result=$resdata; } - - LogService::CheckTableName(); date_default_timezone_set('PRC'); $table_name='zz_request_log_' . date('ym'); diff --git a/Laravel/app/Services/mH5/PersonService.php b/Laravel/app/Services/mH5/PersonService.php index 393d6c8..3a1f96d 100644 --- a/Laravel/app/Services/mH5/PersonService.php +++ b/Laravel/app/Services/mH5/PersonService.php @@ -112,7 +112,7 @@ class PersonService $arr['id_num']=$HSM_sfz['data']; $cha = DB::select("SELECT a.*,b.sex,b.tel,b.status,c.org_name from appointment_record as a INNER JOIN persons as b on a.person_id=b.id INNER JOIN medical_institution as c on a.org_id=c.id where a.id_card_num=? - and a.status in (1,2) and is_del=0",[$arr['id_num']]); + and a.status in (1,2) and is_del=0 order by a.id desc",[$arr['id_num']]); //dd($cha); if(count($cha)>0){ @@ -158,6 +158,4 @@ class PersonService } - - } diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index d31603f..0a4e2d9 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -96,6 +96,8 @@ Route::group(['middleware'=>['check.sign','log'],'prefix'=>'v1'],function () { Route::post('CreateAppointment','App\Http\Controllers\API\Admin\YeWu\AppointmentController@CreateAppointment');//创建预约记录 Route::post('CreateCheckupPdf','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@CreateCheckupPdf');//对外接口，创建体检记录 姓名、电话、身份证、体检机构编码、体检号、pdfs Route::get('GetReportUrl','App\Http\Controllers\API\mH5\PersonController@GetReportUrl');//对外接口，获取用户体检报告url + Route::post('DelCheckUpInfo','App\Http\Controllers\API\Admin\YeWu\HealthCheckupController@DelCheckUpInfo');//对外接口，删除体检记录 + });