From 08192db50d36c790a56177d404ea1c3ebf5d7b40 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 9 May 2023 11:14:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=AE=B6?=
 =?UTF-8?q?=E5=BA=AD=E6=88=90=E5=91=98=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A9=9A?=
 =?UTF-8?q?=E5=A7=BB=E7=8A=B6=E6=80=81=E4=B8=BA=E5=95=86=E5=AE=9A=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Request/PatientFamilyRequest.php b/app/Request/PatientFamilyRequest.php
index 0f9ec56..6ab5d27 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','2'])], // 婚姻状况（0:未婚 1:已婚 2:离异）
+            'marital_status' => ['sometimes',Rule::in([0,1,2,null])], // 婚姻状况（0:未婚 1:已婚 2:离异 null:未选择）
             '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/PatientFamilyService.php b/app/Services/PatientFamilyService.php
index 07efc0e..99ca732 100644
--- a/app/Services/PatientFamilyService.php
+++ b/app/Services/PatientFamilyService.php
@@ -212,7 +212,13 @@ class PatientFamilyService extends BaseService
                 $data['weight'] = $request_params['weight'];
             }
 
-            $data['marital_status'] = $request_params['marital_status'] ?? 0;
+            if (isset($request_params['marital_status'])){
+                if ($request_params['marital_status'] != null){
+                    $data['marital_status'] = $request_params['marital_status'];
+                }
+            }
+
+
             if (!empty($request_params['nation_id'])){
                 $data['nation_id'] = $request_params['nation_id'];
                 $data['nation_name'] = $nation['nation_name'];