diff --git a/app/Services/OrderPrescriptionService.php b/app/Services/OrderPrescriptionService.php index 404fb12..7160cf6 100644 --- a/app/Services/OrderPrescriptionService.php +++ b/app/Services/OrderPrescriptionService.php @@ -37,7 +37,6 @@ class OrderPrescriptionService extends BaseService { $params = array(); $params['pharmacist_id'] = $pharmacist_id; - $params['prescription_status'] = 1; // 处方状态(1:待审核 2:待使用 3:已失效 4:已使用) $params['pharmacist_audit_status'] = $pharmacist_audit_status; // 药师审核状态(0:审核中 1:审核成功 2:审核驳回) $params['platform_audit_status'] = $platform_audit_status; // 处方平台审核状态(0:审核中 1:审核成功 2:审核驳回) diff --git a/app/Services/UserPharmacistService.php b/app/Services/UserPharmacistService.php index 55b75a5..a7d72e8 100644 --- a/app/Services/UserPharmacistService.php +++ b/app/Services/UserPharmacistService.php @@ -21,8 +21,12 @@ class UserPharmacistService extends BaseService $per_page = $this->request->input('per_page', 10); $OrderPrescriptionService = new OrderPrescriptionService(); - $prescription = $OrderPrescriptionService->getPharmacistWaitAuditPage($user_info['client_user_id'],$pharmacist_audit_status,$page,$per_page); - + $prescription = $OrderPrescriptionService->getPharmacistWaitAuditPage($user_info['client_user_id'],$pharmacist_audit_status,$platform_audit_status,$page,$per_page); + if (!empty($prescription['data'])){ + foreach ($prescription['data'] as &$item){ + $item['prescription_img'] = addAliyunOssWebsite($item['prescription_img']); + } + } return success($prescription); } } \ No newline at end of file