diff --git a/app/Model/OrderServicePackageCase.php b/app/Model/OrderServicePackageCase.php index 78228b1..4b21e1b 100644 --- a/app/Model/OrderServicePackageCase.php +++ b/app/Model/OrderServicePackageCase.php @@ -31,8 +31,10 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property string $allergy_history 过敏史描述 * @property int $is_family_history 是否存在家族病史(0:否 1:是) * @property string $family_history 家族病史描述 - * @property Carbon $created_at 创建时间 - * @property Carbon $updated_at 修改时间 + * @property int $is_pregnant 是否备孕、妊娠、哺乳期(0:否 1:是) + * @property string $pregnant 备孕、妊娠、哺乳期描述 + * @property \Carbon\Carbon $created_at 创建时间 + * @property \Carbon\Carbon $updated_at 修改时间 */ class OrderServicePackageCase extends Model { @@ -46,7 +48,7 @@ class OrderServicePackageCase extends Model /** * The attributes that are mass assignable. */ - protected array $fillable = ['order_service_case_id', 'user_id', 'patient_id', 'order_id', 'order_service_id', 'family_id', 'disease_class_id', 'relation', 'status', 'name', 'sex', 'age', 'disease_class_name', 'diagnosis_date', 'disease_desc', 'diagnose_images', 'is_allergy_history', 'allergy_history', 'is_family_history', 'family_history', 'created_at', 'updated_at']; + protected array $fillable = ['order_service_case_id', 'user_id', 'patient_id', 'order_id', 'order_service_id', 'family_id', 'disease_class_id', 'relation', 'status', 'name', 'sex', 'age', 'disease_class_name', 'diagnosis_date', 'disease_desc', 'diagnose_images', 'is_allergy_history', 'allergy_history', 'is_family_history', 'family_history', 'is_pregnant', 'pregnant', 'created_at', 'updated_at']; protected string $primaryKey = "order_service_id"; diff --git a/app/Request/OrderServicePackageRequest.php b/app/Request/OrderServicePackageRequest.php index 2b99086..8d380e4 100644 --- a/app/Request/OrderServicePackageRequest.php +++ b/app/Request/OrderServicePackageRequest.php @@ -31,6 +31,7 @@ class OrderServicePackageRequest extends FormRequest 'inquiry_type', // 订单类型(1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药) 'inquiry_mode', // 订单问诊方式(1:图文 2:视频 3:语音 4:电话 5:会员) 'client_type', // 客户端类型(1:手机 2:电脑) + 'is_pregnant',// 备孕、妊娠、哺乳期 ], 'addServiceInquiryOrder' => [ // 创建服务包问诊订单 'order_no', @@ -60,7 +61,7 @@ class OrderServicePackageRequest extends FormRequest 'disease_desc' => 'required', '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'], + 'is_pregnant' => ['sometimes',Rule::in([0,1,null])], 'client_type' => 'required|integer|min:1|max:2', 'service_type' => ['required','integer',Rule::in([1,2])], 'doctor_id' => 'required', @@ -104,6 +105,7 @@ class OrderServicePackageRequest extends FormRequest 'service_type.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'service_type.integer' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'service_type.in' => "服务包类型错误", + 'is_pregnant.in' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), 'order_no.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR), ]; } diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php index 4c3e23c..4e3e8e1 100644 --- a/app/Services/OrderServicePackageService.php +++ b/app/Services/OrderServicePackageService.php @@ -491,6 +491,13 @@ class OrderServicePackageService extends BaseService } } + // 是否备孕、妊娠、哺乳期(0:否 1:是) + if (array_key_exists("is_pregnant", $request_params)) { + if ($request_params['is_pregnant'] !== null) { + $data['is_pregnant'] = $request_params['is_pregnant']; // 是否备孕、妊娠、哺乳期(0:否 1:是) + } + } + $order_service_package_case = OrderServicePackageCase::addOrderServicePackageCase($data); if (empty($order_service_package_case)) { Db::rollBack();