From 1140e9c7c62776c005ed9fa59bbf0544bbfe2279 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Sun, 23 Apr 2023 08:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Request/PatientFamilyRequest.php | 2 +-
 app/Services/PatientOrderService.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Request/PatientFamilyRequest.php b/app/Request/PatientFamilyRequest.php
index a83d6b4..481cbb5 100644
--- a/app/Request/PatientFamilyRequest.php
+++ b/app/Request/PatientFamilyRequest.php
@@ -113,7 +113,7 @@ class PatientFamilyRequest extends FormRequest
             'is_default' => ['sometimes',Rule::in(['0', '1'])],
             'height' => ['sometimes','numeric'], // 身高
             'weight' => ['sometimes','numeric'], // 体重
-            'marital_status' => ['sometimes',Rule::in(['0', '1'])], // 婚姻状况(0:未婚 1:已婚)
+            'marital_status' => ['sometimes',Rule::in(['0', '1','2'])], // 婚姻状况（0:未婚 1:已婚 2:离异）
             'is_allergy_history' => ['sometimes','numeric','min:0','max:1'],
             'is_family_history' => ['sometimes','numeric','min:0','max:1'],
 //            'is_pregnant' => ['sometimes','numeric','min:0','max:1'],
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 64d918f..7bd45f6 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -313,7 +313,7 @@ class PatientOrderService extends BaseService
             OrderInquiry::edit($params, $data);
 
             // 检测支付状态，判断是否需要退款处理
-            if ($order_inquiry['inquiry_pay_status'] == 2 && $order_inquiry['inquiry_refund_status'] != 3) {
+            if ($order_inquiry['inquiry_pay_status'] == 2 && $order_inquiry['inquiry_refund_status'] != 3 && $order_inquiry['payment_amount_total'] > 0) {
                 // 需退款
                 $inquiryService = new InquiryService();
                 $inquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "取消问诊");