修正分页
This commit is contained in:
parent
b7be7e9a79
commit
9030031041
@ -92,4 +92,15 @@ class PatientOrderController extends AbstractController
|
|||||||
$data = $PatientOrderService->getPatientProductOrderList();
|
$data = $PatientOrderService->getPatientProductOrderList();
|
||||||
return $this->response->json($data);
|
return $this->response->json($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取药品订单详情
|
||||||
|
* @return ResponseInterface
|
||||||
|
*/
|
||||||
|
public function getPatientProductOrderInfo(): ResponseInterface
|
||||||
|
{
|
||||||
|
$PatientOrderService = new PatientOrderService();
|
||||||
|
$data = $PatientOrderService->getPatientProductOrderInfo();
|
||||||
|
return $this->response->json($data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -196,7 +196,7 @@ class UserDoctor extends Model
|
|||||||
* @param int|null $per_page
|
* @param int|null $per_page
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public static function getInquiryDoctorPage(string $keyword = "", array $hospital_params = [], array $doctor_params = [], array $doctor_expertise_params = [], string|int $sort_order = 1, array $fields = ["*"], int $page = null, ?int $per_page = 10): array
|
public static function getInquiryDoctorPage(string $keyword = "", array $hospital_params = [], array $doctor_params = [], array $doctor_expertise_params = [], string|int $sort_order = 1, array $fields = ["*"], ?int $per_page = 10, int $page = null): array
|
||||||
{
|
{
|
||||||
$query = self::with([
|
$query = self::with([
|
||||||
"Hospital:hospital_id,hospital_name,hospital_status,hospital_level_name,province_id,city_id",
|
"Hospital:hospital_id,hospital_name,hospital_status,hospital_level_name,province_id,city_id",
|
||||||
|
|||||||
@ -30,6 +30,8 @@ class PatientDoctorService extends BaseService
|
|||||||
$city_id = $this->request->input('city_id');
|
$city_id = $this->request->input('city_id');
|
||||||
$sort_order = $this->request->input('sort_order');
|
$sort_order = $this->request->input('sort_order');
|
||||||
$keyword = $this->request->input('keyword',"");
|
$keyword = $this->request->input('keyword',"");
|
||||||
|
$page = $this->request->input('page',1);
|
||||||
|
$per_page = $this->request->input('per_page',10);
|
||||||
|
|
||||||
// 组合条件
|
// 组合条件
|
||||||
$hospital_params = array();// 医院搜索
|
$hospital_params = array();// 医院搜索
|
||||||
@ -85,7 +87,7 @@ class PatientDoctorService extends BaseService
|
|||||||
"be_good_at",
|
"be_good_at",
|
||||||
];
|
];
|
||||||
|
|
||||||
$user_doctors = UserDoctor::getInquiryDoctorPage($keyword, $hospital_params, $doctor_params, $doctor_expertise_params, $sort_order, $fields);
|
$user_doctors = UserDoctor::getInquiryDoctorPage($keyword, $hospital_params, $doctor_params, $doctor_expertise_params, $sort_order, $fields,$per_page);
|
||||||
|
|
||||||
// 处理数据
|
// 处理数据
|
||||||
if (!empty($user_doctors['data'])) {
|
if (!empty($user_doctors['data'])) {
|
||||||
|
|||||||
@ -431,4 +431,28 @@ class PatientOrderService extends BaseService
|
|||||||
|
|
||||||
return success($order_product);
|
return success($order_product);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取药品订单详情
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function getPatientProductOrderInfo(): array
|
||||||
|
{
|
||||||
|
$user_info = $this->request->getAttribute("userInfo") ?? [];
|
||||||
|
|
||||||
|
$order_product_id = $this->request->route('order_product_id');
|
||||||
|
|
||||||
|
// 获取订单数据
|
||||||
|
$params = array();
|
||||||
|
$params['patient_id'] = $user_info['client_user_id'];
|
||||||
|
$params['order_product_id'] = $order_product_id;
|
||||||
|
$params['is_delete'] = 0;
|
||||||
|
$order_product = OrderInquiry::getOne($params);
|
||||||
|
if (empty($order_product)){
|
||||||
|
return fail();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -301,13 +301,13 @@ Router::addGroup('/patient', function () {
|
|||||||
Router::get('', [PatientOrderController::class, 'getPatientProductOrderList']);
|
Router::get('', [PatientOrderController::class, 'getPatientProductOrderList']);
|
||||||
|
|
||||||
// 获取药品订单详情
|
// 获取药品订单详情
|
||||||
Router::post('/8', [PatientOrderController::class, 'imCallBack']);
|
Router::post('/{order_product_id:\d+}', [PatientOrderController::class, 'getPatientProductOrderInfo']);
|
||||||
|
|
||||||
// 药品订单取消支付-1未支付
|
// 药品订单取消支付-1未支付
|
||||||
Router::put('/cancel-pay/{order_inquiry_id:\d+}', [PatientOrderController::class, 'putPatientInquiryOrderCancelPay']);
|
Router::put('/cancel-pay/{order_inquiry_id:\d+}', [PatientOrderController::class, 'putPatientInquiryOrderCancelPay']);
|
||||||
|
|
||||||
// 创建处方订单
|
// 创建处方订单
|
||||||
Router::post('/17', [PatientOrderController::class, 'imCallBack']);
|
Router::post('/121212da', [PatientOrderController::class, 'imCallBack']);
|
||||||
});
|
});
|
||||||
|
|
||||||
// 处方订单
|
// 处方订单
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user