From c15bf3807560b9f33f777671acb633c127061fe2 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Sun, 23 Apr 2023 18:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php | 2 +-
 app/Model/OrderPrescription.php                                 | 2 ++
 app/Services/UserDoctorService.php                              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php b/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php
index 3418090..6ab73e8 100644
--- a/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/AutoPharmacistCaVerifyDelayDirectConsumer.php
@@ -139,7 +139,7 @@ class AutoPharmacistCaVerifyDelayDirectConsumer extends ConsumerMessage
                 Log::getInstance("queue-AutoPharmacistCaVerify")->error("错误：超出最大执行次数或检测错误");
 
                 // 修改处方表为未通过
-                $this->modifyOrderPrescription($data['prescription_file_id'],2,"请联系平台客服，请勿重开处方");
+                $this->modifyOrderPrescription($data['order_prescription_id'],2,"请联系平台客服，请勿重开处方");
 
                 // 医生-开具的处方审核未通过
                 $MessagePush = new MessagePush($user_doctor['user_id'], $order_prescription['order_inquiry_id']);
diff --git a/app/Model/OrderPrescription.php b/app/Model/OrderPrescription.php
index 8570a10..6266b52 100644
--- a/app/Model/OrderPrescription.php
+++ b/app/Model/OrderPrescription.php
@@ -150,7 +150,9 @@ class OrderPrescription extends Model
             'OrderPrescriptionIcd'
         ])
             ->where($params)
+            ->orderBy('created_at','desc')
             ->paginate($per_page, $fields, "page", $page);
+
         $data = array();
         $data['current_page'] = $raw->currentPage();// 当前页码
         $data['total'] = $raw->total();//数据总数
diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php
index a42a7e6..27b07a8 100644
--- a/app/Services/UserDoctorService.php
+++ b/app/Services/UserDoctorService.php
@@ -496,7 +496,7 @@ class UserDoctorService extends BaseService
             $data['patient_name'] = $order_prescription['patient_name'];
             $data['patient_sex'] = $order_prescription['patient_sex'];
             $data['patient_age'] = $order_prescription['patient_age'];
-            $data['created_at'] = $order_prescription['created_at']; // 开方时间
+            $data['created_at'] = date('Y-m-d H:i:s',strtotime($order_prescription['created_at'])); // 开方时间
             $data['pharmacist_audit_status'] = $order_prescription['pharmacist_audit_status'];// 药师审核状态（0:审核中 1:审核成功 2:审核驳回）
             $data['pharmacist_fail_reason'] = $order_prescription['pharmacist_fail_reason'];// 驳回原因
             $data['platform_audit_status'] = $order_prescription['platform_audit_status'];// 处方平台审核状态（0:审核中 1:审核成功 2:审核驳回）