|
@@ -106,6 +106,7 @@ class Counts extends Base {
|
|
|
->join(['user_bind'=>'u'],'u.patient_id=s.patient_id','left')
|
|
|
->join(['institution'=>'ins'],'ins.id=e.institution_id','left')
|
|
|
->where($institution_where)
|
|
|
+ ->where('e.status',1)
|
|
|
->where($search)
|
|
|
->count('DISTINCT e.id');
|
|
|
$list = DB::table('studies')
|
|
@@ -116,6 +117,7 @@ class Counts extends Base {
|
|
|
->join(['user_bind'=>'u'],'u.patient_id=s.patient_id','left')
|
|
|
->join(['institution'=>'ins'],'ins.id=e.institution_id','left')
|
|
|
->where($institution_where)
|
|
|
+ ->where('e.status',1)
|
|
|
->where($search)
|
|
|
->page($page, $pagesize)
|
|
|
->field('p.name,p.age,p.sex,s.studydate,s.createdAt,s.modality,u.exam_id,ins.name as institution_name,e.accession_num,e.register,e.del_time,e.del_doctor_name')
|
|
@@ -202,6 +204,7 @@ class Counts extends Base {
|
|
|
->join(['user_bind'=>'u'],'u.patient_id=s.patient_id','left')
|
|
|
->join(['institution'=>'ins'],'ins.id=e.institution_id','left')
|
|
|
->where($institution_where)
|
|
|
+ ->where('e.status',1)
|
|
|
->where($search)
|
|
|
->field('p.name,p.age,p.sex,s.studydate,s.createdAt,s.modality,u.exam_id,ins.name as institution_name,e.accession_num')
|
|
|
->order('s.createdAt desc')
|