修改新增家庭成员接口,婚姻状态为商定格式

This commit is contained in:
2023-05-09 11:14:24 +08:00
parent 47a9976326
commit 08192db50d
2 changed files with 8 additions and 2 deletions
+1 -1
View File
@@ -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'],
+7 -1
View File
@@ -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'];