diff --git a/Laravel/app/Lib/Yz.php b/Laravel/app/Lib/Yz.php index d30f426..b025998 100644 --- a/Laravel/app/Lib/Yz.php +++ b/Laravel/app/Lib/Yz.php @@ -23,6 +23,14 @@ public static function echoError1($msg){ return response()->json($result)->setEncodingOptions(JSON_UNESCAPED_UNICODE); } + public static function ReturnNew($status,$msg,$data=null){ + $result=array(); + $result['status']=$status; + $result['msg']=$msg; + $result['data']=$data; + return $result; + } + public static function Return($status,$msg,$data=[]){ $result=array(); $result['status']=$status; diff --git a/Laravel/app/Services/Admin/YeWu/AppointmentService.php b/Laravel/app/Services/Admin/YeWu/AppointmentService.php index 3341754..ea4a0e4 100644 --- a/Laravel/app/Services/Admin/YeWu/AppointmentService.php +++ b/Laravel/app/Services/Admin/YeWu/AppointmentService.php @@ -118,7 +118,7 @@ public function CheckAppointment($name,$id_card_num,$type,$currentOrgName='',$do if ($date > $now) { $conflictService = app()->make(\App\Services\ConflictService::class); $conflictService->logConflict($name, $encode_id_card_num, $currentOrgName,$doctor_name, $cha_jkz->org_name, $cha_jkz->created_at, $type, 'CheckAppointment'); - return \Yz::Return(false,'该人员已于'.$cha_jkz->created_at.'在'.$cha_jkz->org_name.'登记'); + return \Yz::ReturnNew(false,'该人员已于'.$cha_jkz->created_at.'在'.$cha_jkz->org_name.'登记'); } } //查询是否有预约记录