diff --git a/app/Request/PatientFamilyRequest.php b/app/Request/PatientFamilyRequest.php index 481cbb5..0f9ec56 100644 --- a/app/Request/PatientFamilyRequest.php +++ b/app/Request/PatientFamilyRequest.php @@ -122,7 +122,7 @@ class PatientFamilyRequest extends FormRequest 'smoke_status' => ['sometimes','numeric','min:1','max:5'], 'chemical_compound_status' => ['sometimes','numeric','min:1','max:4'], 'family_id' => "required", - 'disease_class_id' => "required", +// 'disease_class_id' => "required", 'diagnosis_date' => ['sometimes','date'], ]; } @@ -169,7 +169,7 @@ class PatientFamilyRequest extends FormRequest 'chemical_compound_status.min' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'chemical_compound_status.max' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'family_id.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), - 'disease_class_id.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), +// 'disease_class_id.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'diagnosis_date.date' => "日期格式错误", ]; } diff --git a/app/Services/PatientFamilyService.php b/app/Services/PatientFamilyService.php index 1bcfc30..2f56dfe 100644 --- a/app/Services/PatientFamilyService.php +++ b/app/Services/PatientFamilyService.php @@ -839,23 +839,35 @@ class PatientFamilyService extends BaseService $data['family_id'] = $request_params['family_id']; $data['patient_id'] = $user_info['client_user_id']; - if (!empty($request_params['disease_class_id'])){ - // 疾病分类id-系统 - $data['disease_class_id'] = $request_params['disease_class_id']; + if (isset($request_params['disease_class_id'])){ + if (!empty($request_params['disease_class_id'])){ + // 疾病分类id-系统 + $data['disease_class_id'] = $request_params['disease_class_id']; - // 检测疾病是否正确 - $params = array(); - $params['disease_class_id'] = $request_params['disease_class_id']; - $disease_class = DiseaseClass::getOne($params); - if (empty($disease_class)){ - return fail(HttpEnumCode::HTTP_ERROR,"疾病数据错误"); + // 检测疾病是否正确 + $params = array(); + $params['disease_class_id'] = $request_params['disease_class_id']; + $disease_class = DiseaseClass::getOne($params); + if (empty($disease_class)){ + return fail(HttpEnumCode::HTTP_ERROR,"疾病数据错误"); + } + + $data['disease_class_name'] = $disease_class['disease_class_name']; + } + } + + if (isset($request_params['diagnosis_date'])){ + if (!empty($request_params['diagnosis_date'])){ + $data['diagnosis_date'] = $request_params['diagnosis_date']; + } + } + + if (isset($request_params['diagnosis_hospital'])){ + if (!empty($request_params['diagnosis_hospital'])){ + $data['diagnosis_hospital'] = $request_params['diagnosis_hospital']; } - - $data['disease_class_name'] = $disease_class['disease_class_name']; } - $data['diagnosis_date'] = $request_params['diagnosis_date']; - $data['diagnosis_hospital'] = $request_params['diagnosis_hospital']; if (isset($request_params['is_take_medicine'])){ $data['is_take_medicine'] = $request_params['is_take_medicine']; $data['drugs_name'] = $request_params['drugs_name']; diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index 7bd45f6..54e72ca 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -1347,7 +1347,7 @@ class PatientOrderService extends BaseService // 无默认地址,选择第一个 if (empty($user_ship_address)) { - $user_ship_address = $user_ship_addresss[0] ?? []; + $user_ship_address = $user_ship_addresss[0] ?? NULL; } $result = array();