1

app/Services/UserDoctorService.php

@@ -1694,9 +1694,11 @@ class UserDoctorService extends BaseService
         $params = array();
         $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
         $order_prescription = OrderPrescription::getOne($params);
+        if (!empty($order_prescription)){
             if ($order_prescription['prescription_status'] == 1){
                 return fail(HttpEnumCode::HTTP_ERROR, "处方正在开具中，请您耐心等待，稍后取消");
             }
+        }
 
         Db::beginTransaction();
 
@@ -1730,7 +1732,7 @@ class UserDoctorService extends BaseService
             $imService = new ImService();
             $imService->inquiryEnd($order_inquiry,$user_info['user_id'],$order_inquiry['user_id']);
 
-            Db::commit();
+//            Db::commit();
         } catch (\Exception $e) {
             Db::rollBack();
             return fail(HttpEnumCode::SERVER_ERROR, $e->getMessage());