|
@@ -122,12 +122,14 @@ class Statistics extends Base {
|
|
|
->alias('ra')
|
|
|
->join(['report'=>'r'],'ra.id=r.remote_application_id')
|
|
|
->join(['exams'=>'e'],'ra.exam_id=e.id')
|
|
|
- ->join(["(select id,realname from doctors as d )"=>'reportd'],'reportd.id=r.report_doctor_id','left')
|
|
|
- ->join(["(select id,realname from doctors as d )"=>'reviewd'],'reviewd.id=r.review_doctor_id','left')
|
|
|
+ ->join(["(select id,realname from doctors )"=>'reportd'],'reportd.id=r.report_doctor_id','left')
|
|
|
+ ->join(["(select id,realname from doctors )"=>'reviewd'],'reviewd.id=r.review_doctor_id','left')
|
|
|
+ ->join(["(select id,name from institution )"=>'ins'],'ins.id=ra.local_institution_id','left')
|
|
|
+ ->join(["(select id,realname from doctors )"=>'req'],'req.id=ra.req_doctor_id','left')
|
|
|
->where('ra.remote_institution_id='.$institution_id)
|
|
|
->where('ra.report_status>7')
|
|
|
->where($search)
|
|
|
- ->field('ra.req_date_time,r.report_datetime,reportd.realname as rpname,reviewd.realname as rvname,r.review_datetime,e.exam_class')
|
|
|
+ ->field('ins.name as insname,req.realname as reqname,e.patient_num,e.exam_class,ra.req_date_time,r.report_datetime,reportd.realname as rpname,reviewd.realname as rvname,r.review_datetime')
|
|
|
->select();
|
|
|
echo json_encode($list);
|
|
|
|
|
@@ -240,19 +242,21 @@ class Statistics extends Base {
|
|
|
->alias('ra')
|
|
|
->join(['report'=>'r'],'ra.id=r.remote_application_id')
|
|
|
->join(['exams'=>'e'],'ra.exam_id=e.id')
|
|
|
- ->join(["(select id,realname from doctors as d )"=>'reportd'],'reportd.id=r.report_doctor_id','left')
|
|
|
- ->join(["(select id,realname from doctors as d )"=>'reviewd'],'reviewd.id=r.review_doctor_id','left')
|
|
|
+ ->join(["(select id,realname from doctors )"=>'reportd'],'reportd.id=r.report_doctor_id','left')
|
|
|
+ ->join(["(select id,realname from doctors )"=>'reviewd'],'reviewd.id=r.review_doctor_id','left')
|
|
|
+ ->join(["(select id,name from institution )"=>'ins'],'ins.id=ra.local_institution_id','left')
|
|
|
+ ->join(["(select id,realname from doctors )"=>'req'],'req.id=ra.req_doctor_id','left')
|
|
|
->where('ra.remote_institution_id='.$institution_id)
|
|
|
->where('ra.report_status>7')
|
|
|
->where($search)
|
|
|
- ->field('e.exam_class,ra.req_date_time,r.report_datetime,reportd.realname as rpname,reviewd.realname as rvname,r.review_datetime')
|
|
|
+ ->field('ins.name as insname,req.realname as reqname,e.patient_num,e.exam_class,ra.req_date_time,r.report_datetime,reportd.realname as rpname,reviewd.realname as rvname,r.review_datetime')
|
|
|
->select();
|
|
|
if($begin == $finish){
|
|
|
$filename = $begin."数据详情表";
|
|
|
}else{
|
|
|
$filename = $begin.'至'.$finish."数据详情表";
|
|
|
}
|
|
|
- $headArr = array("检查类型","申请时间", "报告时间","报告医生","审核医生","审核时间");
|
|
|
+ $headArr = array("申请医院","申请医生","病历号","检查类型","申请时间", "报告时间","报告医生","审核医生","审核时间");
|
|
|
$this->getExcels($filename, $headArr, $list);
|
|
|
}
|
|
|
|
|
@@ -279,6 +283,9 @@ class Statistics extends Base {
|
|
|
$objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(25);
|
|
|
$objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(25);
|
|
|
$objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(25);
|
|
|
+ $objPHPExcel->getActiveSheet()->getColumnDimension('G')->setWidth(25);
|
|
|
+ $objPHPExcel->getActiveSheet()->getColumnDimension('H')->setWidth(25);
|
|
|
+ $objPHPExcel->getActiveSheet()->getColumnDimension('I')->setWidth(25);
|
|
|
//设置表头
|
|
|
$key = ord("A");
|
|
|
foreach ($headArr as $v) {
|