Merge branch 'pro' of http://code.pacsonline.cn/zskk_bg/yuanchengpasc into pro

application/index/controller/Index.php

@@ -15,7 +15,7 @@ class Index extends Controller
 {
     public function  index(){
         // echo "index";
-        return $this->redirect('http://work.pacsonline.cn',302);;
+        return $this->redirect('http://work.pacsonline.cn',302);
     }
     public function get_studiesinfo(){
         $study_id = $_REQUEST['study_id'];

application/inter/controller/Report.php

@@ -250,7 +250,9 @@ class Report extends Base
     public function del()
     {
         $id = $_REQUEST['id'];
-        $info = DB::table('exams')->where('id',$id)->update(['status'=>0]);
+        $sessionid = Request::instance()->param('sessionid');
+        $user = Cache::get($sessionid);
+        $info = DB::table('exams')->where('id',$id)->update(['status'=>0,'del_time'=>date('Y-m-d H:i:s',time()),'del_doctor_name'=>$user['realname']]);
         if($info){
             return json_encode(['status'=>'ok','code'=>'0000']);
         }else{

application/manage/controller/Counts.php

@@ -101,14 +101,13 @@ class Counts extends Base {
         }
         $count = DB::table('studies')
             ->alias('s')
-            ->distinct(true)
             ->join(['patient_infos'=>'p'],'p.id=s.patient_id')
             ->join(['exams'=>'e'],'e.study_id=s.id')
             ->join(['user_bind'=>'u'],'u.patient_id=s.patient_id','left')
             ->join(['institution'=>'ins'],'ins.id=e.institution_id','left')
             ->where($institution_where)
             ->where($search)
-            ->count();
+            ->count('DISTINCT e.id');
         $list = DB::table('studies')
             ->alias('s')
             ->distinct(true)
@@ -119,7 +118,7 @@ class Counts extends Base {
             ->where($institution_where)
             ->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')
+            ->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')
             ->order('s.createdAt desc')
             ->select();
         $data["total"] = $count;

application/manage/view/counts/index.html

@@ -109,10 +109,12 @@
                     {field:'sex',title:'患者性别',width:100 , formatter:sfromFormatter  },
                     {field:'age',title:'患者年龄', hidden:true,width:115  },
                     {field:'modality',title:'检查类型',width:135  },
-                    {field:'studydate',title:'检查时间',width:200  },
+                    {field:'studydate',title:'检查时间',width:100  },
                     {field:'accession_num',title:'检查号',width:200 },
-                    {field:'register',title:'操作上传技师',width:200 },
+                    {field:'register',title:'操作上传技师',width:100 },
                     {field:'createdAt',title:'上传时间',width:200 },
+                    {field:'del_doctor_name',title:'删除操作人',width:100 },
+                    {field:'del_time',title:'删除时间',width:100 },
                     {field:'exam_id',title:'是否绑定微信',width:115  , formatter:pfromFormatter  },
                 ]],
                 onDblClickRow :function(rowIndex,rowData){