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

application/inter/controller/Dcquery.php

@@ -136,7 +136,6 @@ class Dcquery extends Controller
                 Log::record('study_info');
                 Log::record($study_id);
                 $study_info = DB::table('studies')->where('id',$study_id)->field('id,studyuid,studyid,patient_id,studydate')->find();
-                
                 Log::record($study_info);
             } else if($study_uid) {
                 $study_info = DB::table('studies')->where('studyuid', $study_uid)->field('id,studyuid,studyid,patient_id,studydate')->find();
@@ -165,50 +164,18 @@ class Dcquery extends Controller
             foreach($series_list as $k=>$v){
                 $ids[] = $v['id'];
             }
-            $images_list = DB::table('images')->where('series_id','in',$ids)->field('frame,series_id,cineRate,remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
+            $images_list = DB::table('images')->whereNotNull('image_number')->where('series_id','in',$ids)->field('frame,series_id,cineRate,remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
             if(empty($images_list)){
                 return json_encode([
                     "error" => "series列表中影像为空"
                 ]);
             }
             $series = $this->testHandleSeires($series_list , $images_list , $url);
-
-//            foreach($series_list as $k=>$v){
-//                // image_number排序
-//                $image = DB::table('images')->where('series_id',$v['id'])->field('cineRate,remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
-//                if(empty($image)){
-//                    continue;
-//                }
-//                $error = 2;
-//                /*foreach($image as $key=>$value){
-//                    /*if(empty($url)){
-//                        if(substr($value['metadata'], 0, strlen('group')) === 'group'){
-//                            $image[$key]['url'] = "dicomweb://dcm.pacsonline.cn/".$value['metadata'];
-//                        }else{
-//                            $image[$key]['url'] = "dicomweb://static.dcm.pacsonline.cn/".$value['metadata'];
-//                        }
-//                    }else{
-//                        $image[$key]['url'] = $url.$value['metadata'];
-//                    }*/
-//                    $imageUrl = $this->generateUrl($value['url'],$url,$value['remote_url'],$value['local_url'],$value['status'],$value['metadata']);
-//                    if(!$imageUrl){
-//                        $file = ROOT_PATH . 'public' . DS . 'get_studiesinfo/'.date('Ymd').'-fail.log';
-//                        $log = 'url错误，传值为--'.$url;
-//                        file_put_contents($file, $log,FILE_APPEND);
-//                        continue;
-//                    }
-//                    $image[$key]['url'] = $imageUrl;
-//                    $image[$key]['imageNumber'] = $value['instanceNumber'];
-//
-//                }*/
-//                $series[$k]['instances'] = $image;
-//                $series[$k]['seriesInstanceUid'] = $v['seriesuid'];
-//                $series[$k]['seriesDescription'] = $v['description'];
-//                $series[$k]['seriesNumber'] = $v['series_num'];
-//            }
-//            if($error == 1){
-//                throw new \think\Exception('series列表为空');
-//            }
+            if(empty($series)) {
+                return json_encode([
+                    "error" => "series列表中影像为空"
+                ]);
+            }
             $info['seriesList'] = $series;
             $return  = array();
             $return['transactionId'] = $study_info['studyuid'];
@@ -395,20 +362,37 @@ class Dcquery extends Controller
             return $dicurl;
         }
     }
+    // public function testHandleSeires($series_list , $images_list , $url) {
+    //     $series = array();
+    //     $seriesIndexMap = array();
+    //     foreach($series_list as $k => $v) {
+    //         $series[$k] = $this->generateSerie($v);
+    //         $seriesIndexMap[$v['id']] = $k;
+    //     }
+    //     // foreach($images_list as $k=>$v){
+    //     //     if (strpos($v['url'], "zskk-dcm.oss-cn-beijing.aliyuncs.com")){
+    //     //         $images_list[$k]['url'] = str_replace('zskk-dcm.oss-cn-beijing.aliyuncs.com', $url.'/oss', $images_list[$k]['url']);
+    //     //     }
+    //     // }
+    //     foreach($images_list as $image) {
+    //         $series[$seriesIndexMap[$image['series_id']]]['instances'][] = $this->generateImage1($image, $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']));
+    //     }
+    //     return $series;
+    // }
+
     public function testHandleSeires($series_list , $images_list , $url) {
         $series = array();
-        $seriesIndexMap = array();
+        $seriesMap = array();
         foreach($series_list as $k => $v) {
-            $series[$k] = $this->generateSerie($v);
-            $seriesIndexMap[$v['id']] = $k;
+            $seriesMap[$v['id']] = $this->generateSerie($v);
         }
-        // foreach($images_list as $k=>$v){
-        //     if (strpos($v['url'], "zskk-dcm.oss-cn-beijing.aliyuncs.com")){
-        //         $images_list[$k]['url'] = str_replace('zskk-dcm.oss-cn-beijing.aliyuncs.com', $url.'/oss', $images_list[$k]['url']);
-        //     }
-        // }
         foreach($images_list as $image) {
-             $series[$seriesIndexMap[$image['series_id']]]['instances'][] = $this->generateImage1($image, $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']));
+            $seriesMap[$image['series_id']]['instances'][] = $this->generateImage1($image, $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']));
+        }
+        foreach($seriesMap as $serie) {
+            if(!empty($serie['instances'])) {
+                $series[] = $serie;
+            }
         }
         return $series;
     }

application/manage/controller/Institution.php

@@ -47,8 +47,19 @@ class Institution extends Base {
         if ($name != null) {
             $whereArr["name"] = array("like", "%" . $name . "%");
         }
-        $rs = Db::table("institution")->where($whereArr)->select();
-        echo json_encode($rs);
+        $page = empty($_GET["page"]) ? 1 : $_GET["page"];
+        $pagesize = empty($_GET["rows"]) ? 1 : $_GET["rows"];
+        if (empty($page) || $page < 1) {
+            $page = 1;
+        }
+        if (empty($pagesize) || $pagesize < 1) {
+            $pagesize = 30;
+        }
+        $rs = Db::table("institution")->where($whereArr)->page($page, $pagesize)->select();
+        $num = Db::table("institution")->where($whereArr)->count();
+        $data['total'] = $num;
+        $data['rows'] = $rs;
+        echo json_encode($data);
     }
 
     /**

application/manage/controller/Order.php

@@ -57,43 +57,73 @@ class Order extends Base {
     public function localdatas() {
         $request = Request::instance();
         $params = $request->param();
-//        $pid = isset($params["pid"]) ? $params["pid"] : null;
-//        $status = isset($params["status"]) ? $params["status"] : null;
-//        $name = isset($params["name"]) ? $params["name"] : null;
-//        $whereArr = array();
-//        if ($pid != null) {
-//            $whereArr["parent_institution"] = array("like", "%" . $pid . "%");
-//        }
-//        if ($status != null) {
-//            $whereArr["status"] = $status;
-//        }
-//        if ($name != null) {
-//            $whereArr["name"] = array("like", "%" . $name . "%");
-//        }
+        $ins = isset($params["ins"]) ? $params["ins"] : null;
+        $time1 = isset($params["time1"]) ? $params["time1"] : null;
+        $time2 = isset($params["time2"]) ? $params["time2"] : null;
+        $whereArr = array();
+        if ($ins != null) {
+            $whereArr["super_hospital_id"] = $ins;
+        }
+        $timeWhere = [];
+        if($time2 == $time1 && $time1 != null){
+            $timeWhere["createdAt"] =["between",[$time1." 00:00:00",$time2." 23:59:59"]];
+        }elseif($time2 ==  null && $time1 != null){
+            $timeWhere["createdAt"] = [">",$time1." 00:00:00"];
+        }elseif ($time1 ==  null && $time2 != null) {
+            $timeWhere["createdAt"] = ["<",$time2." 23:59:59"];
+        }elseif($time1 !=  null && $time2 != null && $time1<$time2){
+            $timeWhere["createdAt"] = ["between",[$time1." 00:00:00",$time2." 23:59:59"]];
+        }
         $manage = Session::get('session_manager');
-        $rs = Db::table("remote_order")->where('hospital_id',$manage['institution_id'])->select();
-        echo json_encode($rs);
+        $page = empty($_GET["page"]) ? 1 : $_GET["page"];
+        $pagesize = empty($_GET["rows"]) ? 1 : $_GET["rows"];
+        if (empty($page) || $page < 1) {
+            $page = 1;
+        }
+        if (empty($pagesize) || $pagesize < 1) {
+            $pagesize = 30;
+        }
+        $rs = Db::table("remote_order")->where('hospital_id','in',$manage['institution_id'])->where($whereArr)->where($timeWhere)->page($page, $pagesize)->select();
+        $row = Db::table("remote_order")->where('hospital_id','in',$manage['institution_id'])->where($whereArr)->where($timeWhere)->count();
+        $data['total'] = $row;
+        $data['rows'] = $rs;
+        echo json_encode($data);
     }
     public function remotedatas() {
         $request = Request::instance();
         $params = $request->param();
-//        $pid = isset($params["pid"]) ? $params["pid"] : null;
-//        $status = isset($params["status"]) ? $params["status"] : null;
-//        $name = isset($params["name"]) ? $params["name"] : null;
-//        $whereArr = array();
-//        if ($pid != null) {
-//            $whereArr["parent_institution"] = array("like", "%" . $pid . "%");
-//        }
-//        if ($status != null) {
-//            $whereArr["status"] = $status;
-//        }
-//        if ($name != null) {
-//            $whereArr["name"] = array("like", "%" . $name . "%");
-//        }
+        $ins = isset($params["ins"]) ? $params["ins"] : null;
+        $time1 = isset($params["time1"]) ? $params["time1"] : null;
+        $time2 = isset($params["time2"]) ? $params["time2"] : null;
+        $whereArr = array();
+        if ($ins != null) {
+            $whereArr["hospital_id"] = $ins;
+        }
+        $timeWhere = [];
+        if($time2 == $time1 && $time1 != null){
+            $timeWhere["createdAt"] =["between",[$time1." 00:00:00",$time2." 23:59:59"]];
+        }elseif($time2 ==  null && $time1 != null){
+            $timeWhere["createdAt"] = [">",$time1." 00:00:00"];
+        }elseif ($time1 ==  null && $time2 != null) {
+            $timeWhere["createdAt"] = ["<",$time2." 23:59:59"];
+        }elseif($time1 !=  null && $time2 != null && $time1<$time2){
+            $timeWhere["createdAt"] = ["between",[$time1." 00:00:00",$time2." 23:59:59"]];
+        }
         $manage = Session::get('session_manager');
-        $rs = Db::table("remote_order")->where('super_hospital_id',$manage['institution_id'])->select();
+        $page = empty($_GET["page"]) ? 1 : $_GET["page"];
+        $pagesize = empty($_GET["rows"]) ? 1 : $_GET["rows"];
+        if (empty($page) || $page < 1) {
+            $page = 1;
+        }
+        if (empty($pagesize) || $pagesize < 1) {
+            $pagesize = 30;
+        }
+        $rs = Db::table("remote_order")->where('super_hospital_id','in',$manage['institution_id'])->where($whereArr)->where($timeWhere)->page($page, $pagesize)->select();
+        $row = Db::table("remote_order")->where('super_hospital_id','in',$manage['institution_id'])->where($whereArr)->where($timeWhere)->count();
+        $data['total'] = $row;
+        $data['rows'] = $rs;
 //        foreach ()
-        echo json_encode($rs);
+        echo json_encode($data);
     }
 
     /**

application/manage/controller/Remote.php

@@ -59,8 +59,19 @@ class Remote extends Base {
             $whereArr["name"] = array("like", "%" . $name . "%");
         }*/
         $manage = Session::get('session_manager');
-        $rs = Db::table("remote_cost")->where('hospital_id',$manage['institution_id'])->select();
-        echo json_encode($rs);
+        $page = empty($_GET["page"]) ? 1 : $_GET["page"];
+        $pagesize = empty($_GET["rows"]) ? 1 : $_GET["rows"];
+        if (empty($page) || $page < 1) {
+            $page = 1;
+        }
+        if (empty($pagesize) || $pagesize < 1) {
+            $pagesize = 30;
+        }
+        $rs = Db::table("remote_cost")->where('hospital_id','in',$manage['institution_id'])->page($page, $pagesize)->select();
+        $num = Db::table("remote_cost")->where('hospital_id','in',$manage['institution_id'])->count();
+        $data['total'] = $num;
+        $data['rows'] = $rs;
+        echo json_encode($data);
     }
 
     public function remotedatas() {
@@ -80,8 +91,19 @@ class Remote extends Base {
             $whereArr["name"] = array("like", "%" . $name . "%");
         }*/
         $manage = Session::get('session_manager');
-        $rs = Db::table("remote_cost")->where('super_hospital_id',$manage['institution_id'])->select();
-        echo json_encode($rs);
+        $page = empty($_GET["page"]) ? 1 : $_GET["page"];
+        $pagesize = empty($_GET["rows"]) ? 1 : $_GET["rows"];
+        if (empty($page) || $page < 1) {
+            $page = 1;
+        }
+        if (empty($pagesize) || $pagesize < 1) {
+            $pagesize = 30;
+        }
+        $rs = Db::table("remote_cost")->where('super_hospital_id','in',$manage['institution_id'])->page($page, $pagesize)->select();
+        $num = Db::table("remote_cost")->where('super_hospital_id','in',$manage['institution_id'])->count();
+        $data['total'] = $num;
+        $data['rows'] = $rs;
+        echo json_encode($data);
     }
 
     /**

application/manage/view/manager/edit.html

@@ -18,7 +18,7 @@
                 
             $(function(){
                 $('#institution_id').combotree({
-                    required:true,multiple:false,editable:false,
+                    required:true,multiple:true,cascadeCheck: false,
                     valueField:'id',textField:'name',panelWidth:350,
                     url:"/manage/doctors/insCombobox"
                 });

application/manage/view/order/local.html

@@ -137,10 +137,6 @@
                 }
             
             function commandsFormatter(id,row){
-	    	var cmdEdit="<a href='#' onclick=\"javascript:showEditWin('"+row.id+"');\" >编辑</a>";
-                cmdEdit+="&nbsp;<a href='#' onclick=\"javascript:deleteRow('"+row.id+"');\" >删除</a>";
-                cmdEdit+="&nbsp;<a href='#' onclick=\"javascript:showDeptEditWin('"+row.id+"');\" >科室</a>";
-	    	return cmdEdit;
 	    }
             
             $(function(){
@@ -183,12 +179,12 @@
             
             function reload(){
                 var institution_id=$("#institution_id").combotree("getValue");
-                var status=$("#status").combobox("getValue");
-                var name=$("#name").textbox("getValue");
+                var time1=$("#time1").combobox("getValue");
+                var time2=$("#time2").textbox("getValue");
                 var queryParams = $('#dg').datagrid('options').queryParams;
-                queryParams.pid=institution_id;
-                queryParams.status=status;
-                queryParams.name=name;
+                queryParams.ins=institution_id;
+                queryParams.time1=time1;
+                queryParams.time2=time2;
                 $('#dg').datagrid('options').queryParams=queryParams;
                 $('#dg').datagrid("reload");
             }
@@ -245,9 +241,8 @@
                 });
                 $("#reset").click(function(){
                     $('#institution_id').combotree("setValue","");
-                    $('#status').combobox("setValue","");
-                    $('#username').textbox("setValue","");
-                    $("#name").textbox("setValue","");
+                    $('#time1').combotree("setValue","");
+                    $('#time2').textbox("setValue","");
                 });
             });
             
@@ -257,11 +252,8 @@
     <body>
         <table id="dg" class="easyui-datagrid" style="width:100%;height:auto;" ></table>
         <div id="tb" class="editform" style="display: none; padding-top: 1px;">&nbsp;
-            父机构：<input type="text" name="institution_id" id="institution_id" />&nbsp;
-            状态：<select id="status" name="status" class="easyui-combobox" style="width: 100px; " >
-            <option value="" >查询全部</option><option value="1" >可用</option><option value="2" >不可用</option>
-            </select>&nbsp;
-            名称：<input type="text" id="name" name="name" class="easyui-textbox" style="width: 200px; vertical-align: middle;" />&nbsp;
+            接收机构：<input type="text" name="institution_id" id="institution_id" />&nbsp;&nbsp;
+            订单创建时间：<input type="text" id="time1"  class="easyui-datebox" style="width: 120px;" />----<input type="text" id="time2" class="easyui-datebox" style="width: 120px;" />&nbsp;
             <a id="submit" href="#" class="easyui-linkbutton" data-options="iconCls:'icon-search'" style="width: 80px">查询</a>
             <a id="reset" href="#" class="easyui-linkbutton" data-options="iconCls:'icon-clear'" style="width: 80px" >重置</a>
             &nbsp;&nbsp;&nbsp;&nbsp;

application/manage/view/order/remote.html

@@ -137,10 +137,6 @@
                 }
             
             function commandsFormatter(id,row){
-	    	var cmdEdit="<a href='#' onclick=\"javascript:showEditWin('"+row.id+"');\" >编辑</a>";
-                cmdEdit+="&nbsp;<a href='#' onclick=\"javascript:deleteRow('"+row.id+"');\" >删除</a>";
-                cmdEdit+="&nbsp;<a href='#' onclick=\"javascript:showDeptEditWin('"+row.id+"');\" >科室</a>";
-	    	return cmdEdit;
 	    }
             
             $(function(){
@@ -183,12 +179,12 @@
             
             function reload(){
                 var institution_id=$("#institution_id").combotree("getValue");
-                var status=$("#status").combobox("getValue");
-                var name=$("#name").textbox("getValue");
+                var time1=$("#time1").combobox("getValue");
+                var time2=$("#time2").textbox("getValue");
                 var queryParams = $('#dg').datagrid('options').queryParams;
-                queryParams.pid=institution_id;
-                queryParams.status=status;
-                queryParams.name=name;
+                queryParams.ins=institution_id;
+                queryParams.time1=time1;
+                queryParams.time2=time2;
                 $('#dg').datagrid('options').queryParams=queryParams;
                 $('#dg').datagrid("reload");
             }
@@ -245,9 +241,8 @@
                 });
                 $("#reset").click(function(){
                     $('#institution_id').combotree("setValue","");
-                    $('#status').combobox("setValue","");
-                    $('#username').textbox("setValue","");
-                    $("#name").textbox("setValue","");
+                    $('#time1').combobox("setValue","");
+                    $('#time2').textbox("setValue","");
                 });
             });
             
@@ -257,11 +252,8 @@
     <body>
         <table id="dg" class="easyui-datagrid" style="width:100%;height:auto;" ></table>
         <div id="tb" class="editform" style="display: none; padding-top: 1px;">&nbsp;
-            父机构：<input type="text" name="institution_id" id="institution_id" />&nbsp;
-            状态：<select id="status" name="status" class="easyui-combobox" style="width: 100px; " >
-            <option value="" >查询全部</option><option value="1" >可用</option><option value="2" >不可用</option>
-            </select>&nbsp;
-            名称：<input type="text" id="name" name="name" class="easyui-textbox" style="width: 200px; vertical-align: middle;" />&nbsp;
+            发起机构：<input type="text" name="institution_id" id="institution_id" />&nbsp;
+            订单创建时间：<input type="text" id="time1" class="easyui-datebox" style="width: 120px;" />----<input type="text" id="time2" class="easyui-datebox" style="width: 120px;" />&nbsp;
             <a id="submit" href="#" class="easyui-linkbutton" data-options="iconCls:'icon-search'" style="width: 80px">查询</a>
             <a id="reset" href="#" class="easyui-linkbutton" data-options="iconCls:'icon-clear'" style="width: 80px" >重置</a>
             &nbsp;&nbsp;&nbsp;&nbsp;