|
|
@ -37,9 +37,10 @@ class PhysicalTestService extends BaseApiService |
|
|
$limit = $page_params['limit']; |
|
|
$limit = $page_params['limit']; |
|
|
|
|
|
|
|
|
$model = new PhysicalTest(); |
|
|
$model = new PhysicalTest(); |
|
|
|
|
|
|
|
|
//判断用没有员工id |
|
|
//判断用没有员工id |
|
|
if (!empty($where['resource_id'])) { |
|
|
if (!empty($where['student_id'])) { |
|
|
$model = $model->where('resource_id', $where['resource_id']); |
|
|
$model = $model->where('student_id', $where['student_id']); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
$data = $model |
|
|
$data = $model |
|
|
@ -56,15 +57,6 @@ class PhysicalTestService extends BaseApiService |
|
|
'page' => $page, |
|
|
'page' => $page, |
|
|
])->toArray(); |
|
|
])->toArray(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach ($data['data'] as &$v) { |
|
|
|
|
|
$age = $v['age'];//年龄 |
|
|
|
|
|
$gender = $v['customerResourcesHasOne']['gender'] == 'female' ? 2:1 ;//性别( 1:男,2:女) |
|
|
|
|
|
$height = $v['height'];//身高 |
|
|
|
|
|
$weight = $v['weight'];//体重 |
|
|
|
|
|
$v['calculateChildHealthScore'] = calculateChildHealthScore($age, $gender, $height, $weight);//综合评分 |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return $data; |
|
|
return $data; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -90,13 +82,6 @@ class PhysicalTestService extends BaseApiService |
|
|
|
|
|
|
|
|
if ($data) { |
|
|
if ($data) { |
|
|
$data = $data->toArray(); |
|
|
$data = $data->toArray(); |
|
|
|
|
|
|
|
|
$age = $data['age'];//年龄 |
|
|
|
|
|
$gender = $data['customerResourcesHasOne']['gender'] == 'female' ? 2 : 1;//性别( 1:男,2:女) |
|
|
|
|
|
$height = $data['height'];//身高 |
|
|
|
|
|
$weight = $data['weight'];//体重 |
|
|
|
|
|
$data['calculateChildHealthScore'] = calculateChildHealthScore($age, $gender, $height, $weight);//综合评分 |
|
|
|
|
|
|
|
|
|
|
|
$res = [ |
|
|
$res = [ |
|
|
'code' => 1, |
|
|
'code' => 1, |
|
|
'msg' => '操作成功', |
|
|
'msg' => '操作成功', |
|
|
@ -123,11 +108,10 @@ class PhysicalTestService extends BaseApiService |
|
|
try { |
|
|
try { |
|
|
$model = new PhysicalTest(); |
|
|
$model = new PhysicalTest(); |
|
|
|
|
|
|
|
|
// 设置基础数据 |
|
|
// 设置基础数据 - 根据新的数据库表结构调整 |
|
|
$physicalTestData = [ |
|
|
$physicalTestData = [ |
|
|
'resource_id' => $data['resource_id'], |
|
|
'resource_id' => $data['resource_id'], |
|
|
'student_id' => $data['student_id'], |
|
|
'student_id' => $data['student_id'], |
|
|
'age' => $data['age'], |
|
|
|
|
|
'height' => $data['height'], |
|
|
'height' => $data['height'], |
|
|
'weight' => $data['weight'], |
|
|
'weight' => $data['weight'], |
|
|
'coach_id' => $data['coach_id'] ?? null, |
|
|
'coach_id' => $data['coach_id'] ?? null, |
|
|
@ -135,18 +119,18 @@ class PhysicalTestService extends BaseApiService |
|
|
'updated_at' => date('Y-m-d H:i:s') |
|
|
'updated_at' => date('Y-m-d H:i:s') |
|
|
]; |
|
|
]; |
|
|
|
|
|
|
|
|
// 设置体测项目数据 |
|
|
// 数据库表结构已简化,移除体测项目字段的处理 |
|
|
$test_items = [ |
|
|
// $test_items = [ |
|
|
'seated_forward_bend', 'sit_ups', 'push_ups', 'flamingo_balance', |
|
|
// 'seated_forward_bend', 'sit_ups', 'push_ups', 'flamingo_balance', |
|
|
'thirty_sec_jump', 'standing_long_jump', 'agility_run', 'balance_beam', |
|
|
// 'thirty_sec_jump', 'standing_long_jump', 'agility_run', 'balance_beam', |
|
|
'tennis_throw', 'ten_meter_shuttle_run' |
|
|
// 'tennis_throw', 'ten_meter_shuttle_run' |
|
|
]; |
|
|
// ]; |
|
|
|
|
|
|
|
|
foreach ($test_items as $item) { |
|
|
// foreach ($test_items as $item) { |
|
|
if (isset($data[$item])) { |
|
|
// if (isset($data[$item])) { |
|
|
$physicalTestData[$item] = $data[$item]; |
|
|
// $physicalTestData[$item] = $data[$item]; |
|
|
} |
|
|
// } |
|
|
} |
|
|
// } |
|
|
|
|
|
|
|
|
// 处理体测报告附件 |
|
|
// 处理体测报告附件 |
|
|
if (!empty($data['physical_test_report'])) { |
|
|
if (!empty($data['physical_test_report'])) { |
|
|
@ -203,12 +187,9 @@ class PhysicalTestService extends BaseApiService |
|
|
'updated_at' => date('Y-m-d H:i:s') |
|
|
'updated_at' => date('Y-m-d H:i:s') |
|
|
]; |
|
|
]; |
|
|
|
|
|
|
|
|
// 允许更新的字段 |
|
|
// 允许更新的字段 - 根据新的数据库表结构调整 |
|
|
$allowed_fields = [ |
|
|
$allowed_fields = [ |
|
|
'age', 'height', 'weight', 'coach_id', |
|
|
'height', 'weight', 'coach_id' |
|
|
'seated_forward_bend', 'sit_ups', 'push_ups', 'flamingo_balance', |
|
|
|
|
|
'thirty_sec_jump', 'standing_long_jump', 'agility_run', 'balance_beam', |
|
|
|
|
|
'tennis_throw', 'ten_meter_shuttle_run' |
|
|
|
|
|
]; |
|
|
]; |
|
|
|
|
|
|
|
|
foreach ($allowed_fields as $field) { |
|
|
foreach ($allowed_fields as $field) { |
|
|
|