gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改处方订单详情，收货地址字段格式，修改家庭成员修改验证问题

Browse Source
This commit is contained in:
wucongxing 2023-04-23 09:25:37 +08:00
parent 1140e9c7c6
commit 30695418a6
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Request/PatientFamilyRequest.php
View File

@ -122,7 +122,7 @@ class PatientFamilyRequest extends FormRequest
'smoke_status' => ['sometimes','numeric','min:1','max:5'], 'smoke_status' => ['sometimes','numeric','min:1','max:5'],
'chemical_compound_status' => ['sometimes','numeric','min:1','max:4'], 'chemical_compound_status' => ['sometimes','numeric','min:1','max:4'],
'family_id' => "required", 'family_id' => "required",
'disease_class_id' => "required", // 'disease_class_id' => "required",
'diagnosis_date' => ['sometimes','date'], '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.min' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR),
'chemical_compound_status.max' => 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), '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' => "日期格式错误", 'diagnosis_date.date' => "日期格式错误",
]; ];
} }

38
app/Services/PatientFamilyService.php
View File

@ -839,23 +839,35 @@ class PatientFamilyService extends BaseService
$data['family_id'] = $request_params['family_id']; $data['family_id'] = $request_params['family_id'];
$data['patient_id'] = $user_info['client_user_id']; $data['patient_id'] = $user_info['client_user_id'];
if (!empty($request_params['disease_class_id'])){ if (isset($request_params['disease_class_id'])){
// 疾病分类id-系统 if (!empty($request_params['disease_class_id'])){
$data['disease_class_id'] = $request_params['disease_class_id']; // 疾病分类id-系统
$data['disease_class_id'] = $request_params['disease_class_id'];
// 检测疾病是否正确 // 检测疾病是否正确
$params = array(); $params = array();
$params['disease_class_id'] = $request_params['disease_class_id']; $params['disease_class_id'] = $request_params['disease_class_id'];
$disease_class = DiseaseClass::getOne($params); $disease_class = DiseaseClass::getOne($params);
if (empty($disease_class)){ if (empty($disease_class)){
return fail(HttpEnumCode::HTTP_ERROR,"疾病数据错误"); 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'])){ if (isset($request_params['is_take_medicine'])){
$data['is_take_medicine'] = $request_params['is_take_medicine']; $data['is_take_medicine'] = $request_params['is_take_medicine'];
$data['drugs_name'] = $request_params['drugs_name']; $data['drugs_name'] = $request_params['drugs_name'];

2
app/Services/PatientOrderService.php
View File

@ -1347,7 +1347,7 @@ class PatientOrderService extends BaseService
// 无默认地址，选择第一个 // 无默认地址，选择第一个
if (empty($user_ship_address)) { if (empty($user_ship_address)) {
$user_ship_address = $user_ship_addresss[0] ?? []; $user_ship_address = $user_ship_addresss[0] ?? NULL;
} }
$result = array(); $result = array();