diff --git a/app/Amqp/Consumer/CancelUnpayOrdersDelayDirectConsumer.php b/app/Amqp/Consumer/CancelUnpayOrdersDelayDirectConsumer.php
index 69a5d7f..d31ab16 100644
--- a/app/Amqp/Consumer/CancelUnpayOrdersDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/CancelUnpayOrdersDelayDirectConsumer.php
@@ -6,6 +6,7 @@ namespace App\Amqp\Consumer;
 
 use App\Model\OrderInquiry;
 use App\Model\OrderInquiryCoupon;
+use App\Model\OrderProduct;
 use App\Model\UserCoupon;
 use App\Utils\Log;
 use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
@@ -44,83 +45,193 @@ class CancelUnpayOrdersDelayDirectConsumer extends ConsumerMessage
         Db::beginTransaction();
 
         try {
-            // 获取订单数据
-            $params = array();
-            $params['order_inquiry_id'] = $data['order_inquiry_id'];
-            $order_inquiry = OrderInquiry::getOne($params);
-            if (empty($order_inquiry)) {
-                Db::rollBack();
-                Log::getInstance()->error("队列执行失败原因：未查询到对应订单数据");
-                return Result::DROP;// 销毁
-            }
-
-            // 检测订单状态
-            if ($order_inquiry['inquiry_status'] != 1) {
-                Db::rollBack();
-                // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
-                Log::getInstance()->error("队列执行失败原因：订单状态为" . $order_inquiry['inquiry_status'] . "无法执行");
-                return Result::DROP;// 销毁
-            }
-
-            if (!in_array($order_inquiry['inquiry_refund_status'],[0,4,5])) {
-                Db::rollBack();
-                // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
-                Log::getInstance()->error("队列执行失败原因：订单正在退款中");
-                return Result::DROP;// 销毁
-            }
-
-            if ($order_inquiry['inquiry_pay_status'] == 2) {
-                Db::rollBack();
-                // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
-                Log::getInstance()->error("队列执行失败原因：订单已支付");
-                return Result::DROP;// 销毁
-            }
-
-            // 检测订单删除状态
-            if ($order_inquiry['is_delete'] == 1) {
-                Db::rollBack();
-                // 删除状态（0:否 1:是）
-                Log::getInstance()->error("取消未支付订单：订单已被删除");
-                return Result::ACK;// 销毁
-            }
-
-            // 取消问诊订单
-            $data = array();
-            $data['inquiry_status'] = 7;
-            $data['inquiry_pay_status'] = 5;
-            $data['cancel_time'] = date("Y-m-d H:i:s",time());
-            $data['cancel_reason'] = 5; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
-            $data['updated_at'] = date("Y-m-d H:i:s",time());
-
-            $params = array();
-            $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-            OrderInquiry::edit($params,$data);
-
-            // 处理订单优惠卷
-            if (!empty($order_inquiry['coupon_amount_total']) && $order_inquiry['coupon_amount_total'] > 0){
-                // 获取用户优惠卷信息
-                $params = array();
-                $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-                $order_inquiry_coupon = OrderInquiryCoupon::getOne($params);
-                if (!empty($order_inquiry_coupon)){
-                    // 恢复优惠卷
-                    $data = array();
-                    $data['user_coupon_status'] = 0;
-                    $data['coupon_use_date'] = date('Y-m-d H:i:s',time());
-
-                    $params = array();
-                    $params['user_coupon_id'] = $order_inquiry_coupon['user_coupon_id'];
-                    UserCoupon::edit($params,$data);
+            if ($data['order_type'] == 1){
+                // 问诊订单取消
+                $result = $this->cancelUnpayInquiryOrder($data['order_no']);
+                if ($result['status'] == 0){
+                    Db::rollBack();
+                    Log::getInstance()->error("取消未支付订单失败：" . $result['message']);
+                    return Result::DROP;// 销毁
+                }elseif ($result['status'] == 2){
+                    Db::rollBack();
+                    Log::getInstance()->error("取消未支付订单失败：" . $result['message']);
+                    return Result::ACK;// 销毁
                 }
+            }elseif ($data['order_type'] == 2){
+                // 药品订单取消
+
             }
 
+
+
+
+
+
+
+
+
+
+
+
+
             Db::commit();
             Log::getInstance()->error("取消未支付订单 队列执行成功");
             return Result::ACK;
         } catch (\Exception $e) {
             Db::rollBack();
-            Log::getInstance()->error("队列执行失败原因：" . $e->getMessage());
+            Log::getInstance()->error("取消未支付订单执行失败：" . $e->getMessage());
             return Result::REQUEUE; // 重回队列
         }
     }
+
+    /**
+     * 取消未支付的问诊订单
+     * @param string $order_no 系统订单编号
+     * @return array
+     */
+    public function cancelUnpayInquiryOrder(string $order_no): array
+    {
+        $result = array();
+        $result['status'] = 1;
+        $result['message'] = "成功";
+
+        // 获取订单数据
+        $params = array();
+        $params['inquiry_no'] = $order_no;
+        $order_inquiry = OrderInquiry::getOne($params);
+        if (empty($order_inquiry)) {
+            $result['status'] = 0;
+            $result['message'] = "取消未支付的问诊订单失败：未查询到对应订单数据";
+            return $result;
+        }
+
+        // 检测订单状态
+        if ($order_inquiry['inquiry_status'] == 7) {
+            // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
+            $result['status'] = 2;
+            $result['message'] = "取消未支付的问诊订单：订单已取消";
+            return $result;
+        }
+
+        if ($order_inquiry['inquiry_status'] != 1) {
+            // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
+            $result['status'] = 0;
+            $result['message'] = "取消未支付的问诊订单：订单状态为" . $order_inquiry['inquiry_status'] . "无法执行";
+            return $result;
+        }
+
+        if (!in_array($order_inquiry['inquiry_refund_status'],[0,4,5])) {
+            // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
+            $result['status'] = 0;
+            $result['message'] = "取消未支付的问诊订单：订单正在退款中";
+            return $result;
+        }
+
+        if ($order_inquiry['inquiry_pay_status'] == 2) {
+            // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
+            $result['status'] = 2;
+            $result['message'] = "取消未支付的问诊订单：订单已支付";
+            return $result;
+        }
+
+        // 检测订单删除状态
+        if ($order_inquiry['is_delete'] == 1) {
+            // 删除状态（0:否 1:是）
+            $result['status'] = 2;
+            $result['message'] = "取消未支付的问诊订单：订单已被删除";
+            return $result;
+        }
+
+        // 取消问诊订单
+        $data = array();
+        $data['inquiry_status'] = 7;
+        $data['inquiry_pay_status'] = 5;
+        $data['cancel_time'] = date("Y-m-d H:i:s",time());
+        $data['cancel_reason'] = 5; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
+        $data['updated_at'] = date("Y-m-d H:i:s",time());
+
+        $params = array();
+        $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+        OrderInquiry::edit($params,$data);
+
+        // 处理订单优惠卷
+        if (!empty($order_inquiry['coupon_amount_total']) && $order_inquiry['coupon_amount_total'] > 0){
+            // 获取用户优惠卷信息
+            $params = array();
+            $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+            $order_inquiry_coupon = OrderInquiryCoupon::getOne($params);
+            if (!empty($order_inquiry_coupon)){
+                // 恢复优惠卷
+                $data = array();
+                $data['user_coupon_status'] = 0;
+                $data['coupon_use_date'] = date('Y-m-d H:i:s',time());
+
+                $params = array();
+                $params['user_coupon_id'] = $order_inquiry_coupon['user_coupon_id'];
+                UserCoupon::edit($params,$data);
+            }
+        }
+
+        return $result;
+    }
+
+    public function cancelUnpayProductOrder(string $order_no): array
+    {
+        $result = array();
+        $result['status'] = 1;
+        $result['message'] = "成功";
+
+        // 获取药品订单数据
+        $params = array();
+        $params['order_product_no'] = $order_no;
+        $order_product = OrderInquiry::getOne($params);
+        if (empty($order_product)){
+            $result['status'] = 0;
+            $result['message'] = "取消未支付的问诊订单失败：未查询到对应订单数据";
+            return $result;
+        }
+
+        // 检测订单状态
+        if ($order_product['order_product_status'] == 5){
+            // 订单状态（1:待支付 2:待发货 3:已发货 4:已签收 5:已取消）
+            $result['status'] = 2;
+            $result['message'] = "取消未支付的问诊订单：订单已取消";
+            return $result;
+        }
+
+        if ($order_product['order_product_status'] != 1){
+            // 订单状态（1:待支付 2:待发货 3:已发货 4:已签收 5:已取消）
+            $result['status'] = 0;
+            $result['message'] = "取消未支付的问诊订单：订单状态为" . $order_product['order_product_status'] . "无法执行";
+            return $result;
+        }
+
+        if (!in_array($order_product['refund_status'],[0,4,5])) {
+            // 商品订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
+            $result['status'] = 0;
+            $result['message'] = "取消未支付的问诊订单：订单正在退款中";
+            return $result;
+        }
+
+        if ($order_product['inquiry_pay_status'] == 2) {
+            // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
+            $result['status'] = 2;
+            $result['message'] = "取消未支付的问诊订单：订单已支付";
+            return $result;
+        }
+
+        // 取消药品订单
+        $data = array();
+        $data['order_product_status'] = 5;
+        $data['cancel_time'] = date("Y-m-d H:i:s",time());
+        $data['cancel_reason'] = 3; // 订单取消原因（1:主动取消 2:复核失败/库存不足 3:支付超时
+        $data['cancel_remarks'] = 5; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
+        $data['updated_at'] = date("Y-m-d H:i:s",time());
+
+        $params = array();
+        $params['order_inquiry_id'] = $order_product['order_inquiry_id'];
+        OrderProduct::edit($params,$data);
+
+        //
+    }
 }
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index 0cced5b..adf271c 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -23,6 +23,7 @@ use App\Model\SystemInquiryConfig;
 use App\Model\UserCoupon;
 use App\Model\UserDoctor;
 use App\Model\UserPatient;
+use App\Utils\Log;
 use App\Utils\Mask;
 use App\Utils\PcreMatch;
 use Extend\Wechat\WechatPay;
@@ -264,7 +265,8 @@ class InquiryService extends BaseService
 
             // 增加至取消订单延迟队列
             $data = array();
-            $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+            $data['order_no'] = $order_inquiry['inquiry_no'];
+            $data['order_type'] = 1;
 
             $message = new CancelUnpayOrdersDelayDirectProducer($data);
             $message->setDelayMs(1000 * 60 * 30);
@@ -323,12 +325,14 @@ class InquiryService extends BaseService
         $order_inquiry_case['weight'] = $order_inquiry_case['weight'] ?: $patient_family['weight'] ?: NULL;
         $order_inquiry_case['job_name'] = $patient_family['job_name'] ?? "";
         $order_inquiry_case['nation_name'] = $patient_family['nation_name'] ?? "";
+        $order_inquiry_case['marital_status'] = $patient_family['marital_status'] ?? 0;
 
         // 获取患者家庭成员信息表-健康情况
         $params = array();
         $params['family_id'] = $order_inquiry_case['family_id'];
         $patient_family_health = PatientFamilyHealth::getOne($params);
         $order_inquiry_case['diagnosis_hospital'] = $patient_family_health['diagnosis_hospital'] ?? "";
+        $order_inquiry_case['drugs_name'] = $patient_family_health['drugs_name'] ?? "";
 
         // 获取患者家庭成员信息表-个人情况
         $params = array();
@@ -749,4 +753,6 @@ class InquiryService extends BaseService
         $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
         OrderInquiry::edit($params, $data);
     }
+
+
 }
\ No newline at end of file
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index eb3fc37..5a15a3b 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -550,7 +550,7 @@ class PatientOrderService extends BaseService
             $data['order_product_status'] = 5;
             $data['cancel_time'] = date("Y-m-d H:i:s",time());
             $data['cancel_reason'] = 1; // 订单取消原因（1:主动取消 2:复核失败/库存不足 3:支付超时
-            $data['cancel_remarks'] = "主动取消";
+            $data['cancel_remarks'] = 2; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
             $data['updated_at'] = date("Y-m-d H:i:s",time());
 
             $params = array();
@@ -769,18 +769,26 @@ class PatientOrderService extends BaseService
             return fail(HttpEnumCode::HTTP_ERROR,"收货地址错误");
         }
 
-
         $amount_total = 0;
-        $coupon_amount_total = 0;
         $logistics_fee = 0; // 运费金额
 
         // 检测药品是否存在，库存是否足够,获取订单金额
         foreach ($order_prescription_product as $value){
             $params = array();
             $params['product_id'] = $value['product_id'];
-            $product = Product::getOne($params);
-            if (empty($product)){
-                return fail(HttpEnumCode::HTTP_ERROR,"处方存在未知药品");
+            $product = Product::getWithAmountOne($params);
+            if (empty($product)) {
+                Db::rollBack();
+                return fail(HttpEnumCode::HTTP_ERROR, "处方存在未知药品");
+            }
+
+            // 检测商品库存
+            if (!empty($product['ProductPlatformAmount'])) {
+                if ($value['prescription_product_num'] > $product['ProductPlatformAmount']['real_stock']) {
+                    // 此处是否需要特殊返回
+                    Db::rollBack();
+                    return fail(HttpEnumCode::HTTP_ERROR, "意向药品库存不足");
+                }
             }
 
             $amount_total += $product['product_price'];
@@ -882,9 +890,6 @@ class PatientOrderService extends BaseService
             return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage());
         }
 
-
-
-
         return success();
     }
 
@@ -987,7 +992,7 @@ class PatientOrderService extends BaseService
         // 获取处方药品信息
         $params = array();
         $params['order_prescription_id'] = $order_prescription['order_prescription_id'];
-        $order_prescription_product = OrderPrescriptionProduct::getWithProductList($params);
+        $order_prescription_product = OrderPrescriptionProduct::getList($params);
         if (empty($order_prescription_product)){
             return fail(HttpEnumCode::SERVER_ERROR);
         }
@@ -996,9 +1001,22 @@ class PatientOrderService extends BaseService
         $coupon_amount_total = 0;
         $logistics_fee = 0; // 运费金额
         foreach ($order_prescription_product as $item){
-            if (!empty($item['Product']['product_price'])){
-                $amount_total += $item['Product']['product_price'];
+            $params = array();
+            $params['product_id'] = $item['product_id'];
+            $product = Product::getWithAmountOne($params);
+            if (empty($product)) {
+                return fail(HttpEnumCode::HTTP_ERROR, "处方存在未知药品");
             }
+
+            // 检测商品库存
+            if (!empty($product['ProductPlatformAmount'])) {
+                if ($item['prescription_product_num'] > $product['ProductPlatformAmount']['real_stock']) {
+                    // 库存不足
+                    continue;
+                }
+            }
+
+            $amount_total += $product['product_price'];
         }
 
         // 获取运费金额
diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php
index 98f3cdc..d5e7676 100644
--- a/app/Services/UserDoctorService.php
+++ b/app/Services/UserDoctorService.php
@@ -640,7 +640,7 @@ class UserDoctorService extends BaseService
             return fail();
         }
 
-        $order_evaluation = OrderEvaluation::getScorePage($params, $avg_score_params,$page,$per_page);
+        $order_evaluation = OrderEvaluation::getScorePage($params, $avg_score_params,['*'],$page,$per_page);
         if (!empty($order_evaluation['data'])) {
             foreach ($order_evaluation['data'] as &$item) {
                 $item['avg_score'] = floor($item['avg_score'] * 0.05);