| xqd
@@ -347,6 +347,7 @@ class PatientController extends AuthController
|
|
|
DB::rollBack();
|
|
|
return out('', 500, $e->getMessage());
|
|
|
}
|
|
|
+ $this->ReceivingReminderOK($find['id']);
|
|
|
|
|
|
return out();
|
|
|
}
|
| xqd
@@ -781,18 +782,18 @@ class PatientController extends AuthController
|
|
|
$req = request()->post();
|
|
|
$this->validate(request(), [
|
|
|
'user_id' => 'required|integer',
|
|
|
-// 'order_id',
|
|
|
+ 'order_id',
|
|
|
// 'is_showAll'=>'required|integer'
|
|
|
]);
|
|
|
$user = $this->user;
|
|
|
$docter_id = $user['id'];
|
|
|
|
|
|
// 订单内点击
|
|
|
-// if (isset($req['order_id'])&&!empty($req['order_id'])){
|
|
|
-// $data = Order::with(['orderPatient','user'])->where('id',$req['order_id'])->first();
|
|
|
-// }else{
|
|
|
+ if (isset($req['order_id'])&&!empty($req['order_id'])){
|
|
|
+ $data = Order::with(['orderPatient','user'])->where('id',$req['order_id'])->first();
|
|
|
+ }else{
|
|
|
$data = Order::with(['orderPatient','user'])->where(['user_id'=>$req['user_id'],'docter_id'=>$docter_id,'product_type'=>2,'order_status'=>3])->orderBy('id','desc')->first();
|
|
|
-// }
|
|
|
+ }
|
|
|
|
|
|
// 返回数组
|
|
|
$res_patient = [];
|
| xqd
@@ -815,15 +816,15 @@ class PatientController extends AuthController
|
|
|
// }
|
|
|
if ($data) {
|
|
|
$data = $data->toArray();
|
|
|
- $res_patient['data']['order_sn'] = $data['order_sn'];
|
|
|
- $res_patient['data']['user_id'] = $data['user_id'];
|
|
|
- $res_patient['data']['user_name'] = $data['user']['nickname'];
|
|
|
- $res_patient['data']['user_avatar'] = $data['user']['avatar'];
|
|
|
- $res_patient['data']['sex'] = $data['order_patient']['sex'];
|
|
|
- $res_patient['data']['name'] = $data['order_patient']['name'];
|
|
|
- $res_patient['data']['numbirthday'] = numBirthday($data['order_patient']['birthday']);
|
|
|
- $res_patient['data']['symptoms'] = $data['order_patient']['symptoms'];//病情描述
|
|
|
- $res_patient['data']['medical_imgs'] = json_decode($data['order_patient']['medical_imgs'], true);//病情照片
|
|
|
+ $res_patient['order_sn'] = $data['order_sn'];
|
|
|
+ $res_patient['user_id'] = $data['user_id'];
|
|
|
+ $res_patient['user_name'] = $data['user']['nickname'];
|
|
|
+ $res_patient['user_avatar'] = $data['user']['avatar'];
|
|
|
+ $res_patient['sex'] = $data['order_patient']['sex'];
|
|
|
+ $res_patient['name'] = $data['order_patient']['name'];
|
|
|
+ $res_patient['numbirthday'] = numBirthday($data['order_patient']['birthday']);
|
|
|
+ $res_patient['symptoms'] = $data['order_patient']['symptoms'];//病情描述
|
|
|
+ $res_patient['medical_imgs'] = json_decode($data['order_patient']['medical_imgs'], true);//病情照片
|
|
|
}
|
|
|
return out($res_patient);
|
|
|
}
|