xg

application/inter/controller/Reciveremote.php

@@ -303,7 +303,7 @@ class Reciveremote extends Base
                     }
                 }
             }
-            $where = $where1." and ".$where2." and ".$where3.$queryWhere;
+            $where = $where1." and ".$where2." and ".$where3.$queryWhere.'and e.status=1' ;
             $listSql = "select ".$filed." from ".$table." where ".$where." order by ".$order." limit ".$limit;
             $countSql = "select count(*) as count from ".$table." where ".$where;
             log::record("----countSql----");

application/inter/controller/Report.php

@@ -128,6 +128,9 @@ class Report extends Base
                             if($v != 10 && !empty($v)){
                                 $where .= " and a.exam_status=".$v;
                             }
+                            if($v == 99){
+                                $where .= " and a.exam_status>2";
+                            }
                             break;
                         case 'exam_class' :
                             if(empty($v)){
@@ -164,7 +167,7 @@ class Report extends Base
                 $sql = '('.$sql1.') union ('.$sql2.') union ('.$sql3.')'.$limit;
             }else{*/
 
-                $sql = "SELECT a.id,a.severe,a.urgent,a.is_remote,a.accession_num,a.patient_num,a.exam_report,a.study_id,a.exam_datetime,a.exam_project,a.exam_status,a.exam_class,a.application_doctor,a.application_department,p.name,p.sex,p.age,ra.report_status FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id ".$where." order by a.createdAt desc".$limit;
+                $sql = "SELECT a.id,a.severe,a.urgent,a.is_remote,a.accession_num,a.patient_num,a.exam_report,a.study_id,a.exam_datetime,a.exam_project,a.exam_status,a.exam_class,a.application_doctor,a.application_department,p.name,p.sex,p.age,ra.report_status FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id and a.status=1 ".$where." order by a.createdAt desc".$limit;
 //            }
 
             if($doctor['institution_id'] == '13000003' and $page == 1 and empty($where)){
@@ -177,7 +180,7 @@ class Report extends Base
             }else{
                 $list = DB::query($sql);
             }
-            $csql = "SELECT count(1) FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id ".$where;
+            $csql = "SELECT count(1) FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id and a.status=1 ".$where;
             $count = DB::query($csql);
             log::record('请求的sql语句');
             log::record($sql);
@@ -245,4 +248,15 @@ class Report extends Base
 
     }
 
+    public function del()
+    {
+        $id = $_REQUEST['id'];
+        $info = DB::table('exams')->where('id',$id)->update(['status'=>0]);
+        if($info){
+            return json_encode(['status'=>'ok','code'=>'0000']);
+        }else{
+            return json_encode(['status'=>'fail','code'=>'2000','msg'=>'删除失败']);
+        }
+    }
+
 }

application/manage/view/manager/edit.html

@@ -17,10 +17,10 @@
             institutionsData.push(topInsData);
                 
             $(function(){
-                $('#parent_institution').combotree({
-                    required:true,multiple:true,cascadeCheck: false,
-                    valueField:'id',textField:'name',
-                    data:institutionsData
+                $('#institution_id').combotree({
+                    required:true,multiple:false,editable:false,
+                    valueField:'id',textField:'name',panelWidth:350,
+                    url:"/manage/doctors/insCombobox"
                 });
                 $('#role_id').combotree({
                     required:true,multiple:false,cascadeCheck: false,
@@ -75,7 +75,7 @@
             <tr>
                     <th height="32" align="right" >所在机构：</th>
                     <td colspan="3" >
-                    <input name="institution_id[]" id="parent_institution" type="text" size="55" value="{if  isset($manager) }{$manager.institution_id}{/if}" />
+                    <input name="institution_id[]" id="institution_id" type="text" size="55" value="{if  isset($manager) }{$manager.institution_id}{/if}" />
                     </td>
             </tr>
             <tr>