diff --git a/Laravel/app/Http/Controllers/API/PEISApiController.php b/Laravel/app/Http/Controllers/API/PEISApiController.php index 20ccfc0..5bccbc6 100644 --- a/Laravel/app/Http/Controllers/API/PEISApiController.php +++ b/Laravel/app/Http/Controllers/API/PEISApiController.php @@ -38,7 +38,7 @@ class PEISApiController extends Controller $api['修改用户预约时间'] = "{$url}/ExtAPI/SetAppointmentMoment?key=YmMxOGI2MDUxZmFh&{$code}"; $api['分诊查询体检号'] = "{$url}/PEISCommon/QueryEventNo?key=YmMxOGI2MDUxZmFh"; $api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup?key=YmMxOGI2MDUxZmFh"; - $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; + $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNos={$code}"; $api['弃检接口'] = "{$url}/Home/AbandonCheck"; $api['检后签到'] = "{$url}/Home/PostExamSignIn?eventNo={$code}"; @@ -61,7 +61,7 @@ class PEISApiController extends Controller $api['修改用户预约时间'] = "http://220.174.210.111:8888/ExtAPI/SetAppointmentMoment?key=YmMxOGI2MDUxZmFh&{$code}"; $api['分诊查询体检号'] = "{$url}/PEISCommon/QueryEventNo/{$code}"; $api['单位分组批次查询'] = "{$url}/PEISCommon/QueryBatchAndGroup/{$code}"; - $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNo={$code}"; + $api['报告时间计算'] = "{$url}/Home/CalcReportDays?eventNos={$code}"; $api['弃检接口'] = "{$url}/Home/AbandonCheck/{$code}"; $api['检后签到'] = "{$url}/Home/PostExamSignIn?eventNo={$code}"; diff --git a/Laravel/app/Http/Controllers/H5/FenzhenController.php b/Laravel/app/Http/Controllers/H5/FenzhenController.php index ba15c83..b856b18 100644 --- a/Laravel/app/Http/Controllers/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/H5/FenzhenController.php @@ -150,7 +150,20 @@ class FenzhenController extends Controller 'AI' => 'used_time', 'AJ' => 'timeout', ]; + //汇总信息 + $usercount=count($table_list3); + $biaozhun_timecount=0; + $shiji_timecount=0; + $chaoshi_timecount=0; + $weichaoshi_count=0; + foreach ($table_list3 as $table_list3_i) { + $biaozhun_timecount+=$table_list3_i['clinic_time']; + $shiji_timecount+=$table_list3_i['used_time']; + $chaoshi_timecount+=$table_list3_i['timeout']; + if($table_list3_i['timeout']<=0){ + $weichaoshi_count++; + } $peis = new PEISApiController(); $data = [ '电话号码' => "", @@ -170,7 +183,19 @@ class FenzhenController extends Controller } $row++; } - $worksheet->getStyle('AC3:AJ' . ($row - 1))->applyFromArray($styleArray); + $worksheet->setCellValueExplicit('AC' . $row, '汇总', \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AD' . $row, '客户总数', \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AE' . $row, $usercount, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AG' . $row, '总用时:', \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AH' . $row, $biaozhun_timecount, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AI' . $row, $shiji_timecount, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AJ' . $row, $chaoshi_timecount, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AD' . ($row+1), '未超时总数', \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AE' . ($row+1), $weichaoshi_count, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AD' . ($row+2), "体检准时率", \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + $worksheet->setCellValueExplicit('AE' . ($row+2),$weichaoshi_count/$usercount , \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + + $worksheet->getStyle('AC3:AJ' . ($row +2))->applyFromArray($styleArray); $file_name = Str::orderedUuid(); diff --git a/Laravel/app/Services/OrderService.php b/Laravel/app/Services/OrderService.php index f69a84f..886641c 100644 --- a/Laravel/app/Services/OrderService.php +++ b/Laravel/app/Services/OrderService.php @@ -19,9 +19,10 @@ class OrderService $is_checked_sign_in=false; if(isset($order->tj_number) and !empty($order->tj_number)){ $peis = new PEISApiController(); + $wait=$peis::Get($peis::Api('报告时间计算',$order->tj_number),$hospital->code,"报告时间计算"); - if(isset($wait['Data']['预计所需天数'])){ - $wait_day=$wait['Data']['预计所需天数']; + if(isset($wait['Data'][0]['预计所需天数'])){ + $wait_day=$wait['Data'][0]['预计所需天数']; } else { $wait_day=-1; //查询体检报告