|
@@ -32,12 +32,11 @@ class AdminStatisticsController extends AdminBaseController{ |
|
@@ -32,12 +32,11 @@ class AdminStatisticsController extends AdminBaseController{ |
|
32
|
$where='';
|
32
|
$where='';
|
|
33
|
$where1=[];
|
33
|
$where1=[];
|
|
34
|
$where2=[];
|
34
|
$where2=[];
|
|
|
|
35
|
+ $note="";
|
|
35
|
if (!empty($param['hospital'])){
|
36
|
if (!empty($param['hospital'])){
|
|
36
|
$where="hospital='".$param['hospital']."' AND";
|
37
|
$where="hospital='".$param['hospital']."' AND";
|
|
37
|
$where1['hospital']=$param['hospital'];
|
38
|
$where1['hospital']=$param['hospital'];
|
|
38
|
$note=Db::name('equipment')->where(['hospital'=>$param['hospital'],'is_delete'=>0])->group('note')->select();
|
39
|
$note=Db::name('equipment')->where(['hospital'=>$param['hospital'],'is_delete'=>0])->group('note')->select();
|
|
39
|
- $this->assign('note_category',$note);
|
|
|
|
40
|
- var_dump($note);
|
|
|
|
41
|
}
|
40
|
}
|
|
42
|
if (!empty($param['note'])){
|
41
|
if (!empty($param['note'])){
|
|
43
|
$where2['note']=$param['note'];
|
42
|
$where2['note']=$param['note'];
|
|
@@ -131,7 +130,7 @@ class AdminStatisticsController extends AdminBaseController{ |
|
@@ -131,7 +130,7 @@ class AdminStatisticsController extends AdminBaseController{ |
|
131
|
|
130
|
|
|
132
|
|
131
|
|
|
133
|
$this->assign('interval',json_encode($interval));
|
132
|
$this->assign('interval',json_encode($interval));
|
|
134
|
-
|
133
|
+ $this->assign('note_category',$note);
|
|
135
|
$this->assign('hospital', isset($param['hospital']) ? $param['hospital'] : '');
|
134
|
$this->assign('hospital', isset($param['hospital']) ? $param['hospital'] : '');
|
|
136
|
$this->assign('note', isset($param['note']) ? $param['note'] : '');
|
135
|
$this->assign('note', isset($param['note']) ? $param['note'] : '');
|
|
137
|
return $this->fetch();
|
136
|
return $this->fetch();
|
