diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php index ac4a8b1..85d58c6 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/AppointmentController.php @@ -138,14 +138,16 @@ public function DelAppintmentInfo() $record->id_card_num, null, $doctor_name, - '对外接口删除', + '接口删除-取消登记', + $record->org_name ?? '', + $record->type ?? '', '' ); //软删除 $del = DB::table('appointment_record')->where('id', $record->id)->update(['is_del'=>1]); if($del){ - return \Yz::Return(true,'删除成功',[]); + return \Yz::Return(true,'删除成功',null); }else{ return \Yz::echoError1('删除失败'); } diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php index 9b6d0a3..377a38f 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php @@ -38,8 +38,16 @@ public function CheckRequirements(){ $name=request('name'); $type=request('type');//体检类型 1,健康证2老年人 $currentOrgName=request('org_name'); + $org_code=request('org_code'); $doctor_name=request('doctor_name'); + if(empty($currentOrgName) && !empty($org_code)){ + $orgInfo = DB::table('medical_institution')->where('sn', $org_code)->first(); + if($orgInfo){ + $currentOrgName = $orgInfo->org_name; + } + } + $s=app()->make(AppointmentService::class); return $s->CheckAppointment($name,$id_card_num,$type,$currentOrgName,$doctor_name); } @@ -249,6 +257,8 @@ public function DelCheckUpInfo() null, $doctor_name, '接口删除-取消总检', + $org_id->org_name ?? '', + $info->type ?? '', '' ); diff --git a/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php b/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php index adb9157..294089f 100644 --- a/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php +++ b/Laravel/app/Http/Controllers/API/WeiHu/TiJianListController.php @@ -131,6 +131,8 @@ public function Del(Request $request) $userid, $operatorName, $reason, + $record->org_name ?? '', + $record->type ?? '', $screenshot ); $update = DB::table($tablename)->where('id', $id)->update(['is_del' => 1]); diff --git a/Laravel/app/Services/DeleteLogService.php b/Laravel/app/Services/DeleteLogService.php index b03258b..dc674d3 100644 --- a/Laravel/app/Services/DeleteLogService.php +++ b/Laravel/app/Services/DeleteLogService.php @@ -7,7 +7,7 @@ class DeleteLogService { - public function logDeletion($tableName, $recordId, $name, $idCardNum, $operatorId, $operatorName, $reason, $screenshot) + public function logDeletion($tableName, $recordId, $name, $idCardNum, $operatorId, $operatorName, $reason, $currentOrgName, $type, $screenshot) { try { DB::table('delete_operation_log')->insert([ @@ -18,6 +18,8 @@ public function logDeletion($tableName, $recordId, $name, $idCardNum, $operatorI 'operator_id' => $operatorId, 'operator_name' => $operatorName, 'reason' => $reason, + 'current_org_name' => $currentOrgName, + 'type' => $type, 'screenshot' => $screenshot, 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),