Merge branch 'dev'
This commit is contained in:
commit
d249f314cd
@ -335,6 +335,7 @@ class TestController extends AbstractController
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function test_15(){
|
public function test_15(){
|
||||||
|
$a = new Data();
|
||||||
|
$a->product();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -594,6 +594,7 @@ class PatientDoctorService extends BaseService
|
|||||||
$data['doctor_title'] = empty($recommend_doctor['doctor_title']) ? "" : DoctorTitleCode::getMessage($recommend_doctor['doctor_title']);
|
$data['doctor_title'] = empty($recommend_doctor['doctor_title']) ? "" : DoctorTitleCode::getMessage($recommend_doctor['doctor_title']);
|
||||||
$data['department_custom_name'] = $recommend_doctor['department_custom_name'];
|
$data['department_custom_name'] = $recommend_doctor['department_custom_name'];
|
||||||
$data['is_online'] = $recommend_doctor['is_online'];
|
$data['is_online'] = $recommend_doctor['is_online'];
|
||||||
|
$data['is_img_expert_reception'] = $recommend_doctor['is_img_expert_reception'];
|
||||||
$data['is_img_welfare_reception'] = $recommend_doctor['is_img_welfare_reception'];
|
$data['is_img_welfare_reception'] = $recommend_doctor['is_img_welfare_reception'];
|
||||||
$data['be_good_at'] = $recommend_doctor['be_good_at'];
|
$data['be_good_at'] = $recommend_doctor['be_good_at'];
|
||||||
$data['hospital_name'] = $recommend_doctor['Hospital']['hospital_name'] ?? "";
|
$data['hospital_name'] = $recommend_doctor['Hospital']['hospital_name'] ?? "";
|
||||||
|
|||||||
@ -24,21 +24,21 @@ if ($appEnv == 'dev') {
|
|||||||
],
|
],
|
||||||
];
|
];
|
||||||
}else{
|
}else{
|
||||||
// $formatter = [
|
$formatter = [
|
||||||
// 'class' => Monolog\Formatter\JsonFormatter::class,
|
'class' => Monolog\Formatter\JsonFormatter::class,
|
||||||
// 'constructor' => [],
|
'constructor' => [],
|
||||||
// ];
|
];
|
||||||
|
|
||||||
// 暂时修改为正式
|
// 暂时修改为正式
|
||||||
$formatter = [
|
// $formatter = [
|
||||||
'class' => Monolog\Formatter\LineFormatter::class,
|
// 'class' => Monolog\Formatter\LineFormatter::class,
|
||||||
'constructor' => [
|
// 'constructor' => [
|
||||||
'format' => null,
|
// 'format' => null,
|
||||||
'dateFormat' => 'Y-m-d H:i:s',
|
// 'dateFormat' => 'Y-m-d H:i:s',
|
||||||
'allowInlineLineBreaks' => true,
|
// 'allowInlineLineBreaks' => true,
|
||||||
'includeStacktraces' => true,
|
// 'includeStacktraces' => true,
|
||||||
],
|
// ],
|
||||||
];
|
// ];
|
||||||
}
|
}
|
||||||
return [
|
return [
|
||||||
'default' => [
|
'default' => [
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user