Merge branch 'dev'
This commit is contained in:
commit
d531315fbb
@ -82,7 +82,7 @@ class TestController extends AbstractController
|
||||
|
||||
// 获取未接诊的医生
|
||||
public function uninquiry(){
|
||||
$data = array();
|
||||
$datas = array();
|
||||
|
||||
$params = array();
|
||||
$params['inquiry_status'] = 3;// 待接诊
|
||||
@ -104,15 +104,17 @@ class TestController extends AbstractController
|
||||
}elseif ($row['inquiry_type'] == 4){
|
||||
$inquiry_type = "问诊购药";
|
||||
}
|
||||
|
||||
$data = array();
|
||||
$data['user_name'] = $user_doctor['user_name'];
|
||||
$data['inquiry_type'] = $inquiry_type;
|
||||
$data['patient_name'] = $row['patient_name'];
|
||||
$data['pay_time'] = $row['pay_time'];
|
||||
|
||||
$datas[] = $data;
|
||||
}
|
||||
}
|
||||
|
||||
return $this->response->json(success($data));
|
||||
return $this->response->json(success($datas));
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user