Forráskód Böngészése

修改数据库表名称

lgy 6 éve
szülő
commit
6717660994

+ 29 - 25
.idea/workspace.xml

@@ -55,8 +55,8 @@
       <file leaf-file-name="Report.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-7.193548">
-              <caret line="94" column="280" selection-start-line="94" selection-start-column="280" selection-end-line="94" selection-end-column="280" />
+            <state vertical-scroll-proportion="-8.612904">
+              <caret line="69" column="67" selection-start-line="69" selection-start-column="67" selection-end-line="69" selection-end-column="67" />
               <folding>
                 <marker date="1539143677187" expanded="true" signature="3289:3599" placeholder="SELECT a.id,... exam" />
                 <marker date="1539143677187" expanded="true" signature="3653:3965" placeholder="SELECT a.id,... exam" />
@@ -70,11 +70,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/public/index.html">
+      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.15304348">
-              <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+            <state vertical-scroll-proportion="0.69391304">
+              <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -615,13 +615,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -665,13 +658,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -741,10 +727,28 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/public/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15304348">
+          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.27304348">
+          <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
+          <folding>
+            <marker date="1538980832890" expanded="true" signature="895:939" placeholder="select count... templates" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.193548">
-          <caret line="94" column="280" selection-start-line="94" selection-start-column="280" selection-end-line="94" selection-end-column="280" />
+        <state vertical-scroll-proportion="-8.612904">
+          <caret line="69" column="67" selection-start-line="69" selection-start-column="67" selection-end-line="69" selection-end-column="67" />
           <folding>
             <marker date="1539143677187" expanded="true" signature="3289:3599" placeholder="SELECT a.id,... exam" />
             <marker date="1539143677187" expanded="true" signature="3653:3965" placeholder="SELECT a.id,... exam" />
@@ -757,10 +761,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/index.html">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15304348">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.69391304">
+          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
           <folding />
         </state>
       </provider>

+ 8 - 8
application/inter/controller/Application.php

@@ -20,7 +20,7 @@ class Application extends Base
             if(isset($_REQUEST['is_remote']) && $_REQUEST['is_remote']==1){
                 $is_remote = 1;
             }
-            $info = DB::table('exam')->where('id',$id)->field('id,study_id,patient_id,register_datetime,exam_class,exam_sub_class,exam_project,device,exam_datetime')->find();
+            $info = DB::table('exams')->where('id',$id)->field('id,study_id,patient_id,register_datetime,exam_class,exam_sub_class,exam_project,device,exam_datetime')->find();
             $exam_class = DB::table('constant')->where('id',$info['exam_class'])->field('constant_value')->find();
             $exam_subclass = DB::table('exam_subclass')->where('id',$info['exam_sub_class'])->cache(300)->find();
             $exam_project = DB::table('exam_project')->where('id',$info['exam_project'])->cache(300)->find();
@@ -29,7 +29,7 @@ class Application extends Base
             $info['exam_subclass_name'] = $exam_subclass['name'];
             $info['exam_project_name'] = $exam_project['name'];
             $info['device_name'] = $device['name'];
-            $patient_info = DB::table('patient_info')->where('id',$info['patient_id'])->field(['id','name','sex','age','birthday'])->find();
+            $patient_info = DB::table('patient_infos')->where('id',$info['patient_id'])->field(['id','name','sex','age','birthday'])->find();
             $info['pid'] = $patient_info['id'];
             $info['name'] = $patient_info['name'];
             $info['sex'] = $patient_info['sex'];
@@ -61,7 +61,7 @@ class Application extends Base
             }
             $info['department_name'] = $dep['department_name'];
             if(empty($application)){
-                $exam_application = DB::table('exam')->where('id',$id)->field(['illness_desc','phys_sign','clin_symp','remark','clin_diag','anamnesis','family_ill'])->find();
+                $exam_application = DB::table('exams')->where('id',$id)->field(['illness_desc','phys_sign','clin_symp','remark','clin_diag','anamnesis','family_ill'])->find();
                 $info['application'] = $exam_application;
             }else{
                 $info['application'] = $application;
@@ -84,7 +84,7 @@ class Application extends Base
                 return json_encode(['status'=>'fail','code'=>'1029','msg'=>'没有操作权限']);
             }
             $param = $_REQUEST['param'];
-            $exam_info =  DB::table('exam')->where('id',$param['id'])->field('exam_status')->find();
+            $exam_info =  DB::table('exams')->where('id',$param['id'])->field('exam_status')->find();
             if($exam_info['exam_status'] != 3 && $exam_info['exam_status'] != 5){
                 // 3 检查完毕 5已驳回
 //                 return json_encode(['status'=>'fail','code'=>'1029','msg'=>'未到达申请的步骤,没有操作权限']);
@@ -117,7 +117,7 @@ class Application extends Base
             $application_info['attachment'] = isset($param['attachment']) ? $param['attachment'] : '';
             if(isset($param['apply']) && !empty($param['apply'])){
                 //保存  未申请
-                DB::table('exam')->where('id',$param['id'])->update(['status'=>4]);
+                DB::table('exams')->where('id',$param['id'])->update(['status'=>4]);
             }
             $remote_application = DB::table('remote_application')->where('exam_id',$param['id'])->select();
             // 申请远程
@@ -134,7 +134,7 @@ class Application extends Base
                 log::record('修改远程申请');
                 DB::table('remote_application')->where('exam_id',$param['id'])->update($application_info);
             }
-            DB::table('exam')->where('id',$param['id'])->update(['exam_status'=>4]);
+            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>4]);
             return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
@@ -184,7 +184,7 @@ class Application extends Base
         $did = DB::table('remote_application')->where('exam_id',$id)->field('req_doctor_id,local_institution_id')->find();
         $message['doctor_id'] = $did['req_doctor_id'];
         $message['institution_id'] = $did['local_institution_id'];
-        DB::table('exam')->where('id',$id)->update(['exam_status'=>5]);
+        DB::table('exams')->where('id',$id)->update(['exam_status'=>5]);
         return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);
     }
 
@@ -192,7 +192,7 @@ class Application extends Base
         $sessionid = $_REQUEST['sessionid'];
 //        $doctor = Cache::get($sessionid);
         $id = $_REQUEST['id'];
-        DB::table('exam')->where('id',$id)->update(['exam_status'=>6]);
+        DB::table('exams')->where('id',$id)->update(['exam_status'=>6]);
         return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);
     }
 }

+ 8 - 8
application/inter/controller/Inspectregister.php

@@ -41,7 +41,7 @@ class Inspectregister extends Base
         try{
             $sessionid = $_REQUEST['sessionid'];
             $examid = $_REQUEST['param']['id'];
-            $examinfo = DB::table('exam')->where('id',$examid)->field(['id','accession_num','exam_class','exam_sub_class','body_part','device','exam_datetime','anamnesis','family_ill','dept_id','charge','exam_project','illness_desc','phys_sign','clin_symp','remark','clin_diag','hopitalized_no','bed_no','patient_id'])->find();
+            $examinfo = DB::table('exams')->where('id',$examid)->field(['id','accession_num','exam_class','exam_sub_class','body_part','device','exam_datetime','anamnesis','family_ill','dept_id','charge','exam_project','illness_desc','phys_sign','clin_symp','remark','clin_diag','hopitalized_no','bed_no','patient_id'])->find();
             $exam_class = DB::table('constant')->where('id',$examinfo['exam_class'])->field('constant_value as name')->cache(300)->find();
             $department = DB::table('department')->where('id',$examinfo['dept_id'])->field('department_name')->find();
             $examinfo['dept_name'] = $department['department_name'];
@@ -54,7 +54,7 @@ class Inspectregister extends Base
             $examinfo['device_name'] = $device['name'];
             $exam_project = DB::table('exam_project')->where('id',$examinfo['exam_project'])->field('name')->find();
             $examinfo['exam_project_name'] = $exam_project['name'];
-            $patientinfo = DB::table('patient_info')->where('id',$examinfo['patient_id'])->field(['name','sex','age','phone','birthday','   temp_patient_id'])->find();
+            $patientinfo = DB::table('patient_infos')->where('id',$examinfo['patient_id'])->field(['name','sex','age','phone','birthday','   temp_patient_id'])->find();
             $info = array_merge($examinfo,$patientinfo);
             return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid]);
         }catch(\Exception $e ){
@@ -130,17 +130,17 @@ class Inspectregister extends Base
             }
             $exam_info = array();
             if(isset($param['exam_id']) && !empty($param['exam_id'])){
-                $pid = DB::table('exam')->where('id',$param['exam_id'])->field('patient_id')->find();
+                $pid = DB::table('exams')->where('id',$param['exam_id'])->field('patient_id')->find();
                 //存在并且有值 则修改
-                $patient = DB::table('patient_info')->where('temp_patient_id',$pid['patient_id'])->update($patient_info);
+                $patient = DB::table('patient_infos')->where('temp_patient_id',$pid['patient_id'])->update($patient_info);
             }else{
-                $p = DB::table('patient_info')->where('temp_patient_id',$param['pnum'])->find();
+                $p = DB::table('patient_infos')->where('temp_patient_id',$param['pnum'])->find();
                 if($p){
                     return json_encode(['status'=>'fail','code'=>'1030','msg'=>'病历号已存在,请更改']);
                 }
                 $patient_info['id'] = UUids::uuid16();
                 //不存在或者没有值则添加
-                $patient = DB::table('patient_info')->insert($patient_info);
+                $patient = DB::table('patient_infos')->insert($patient_info);
                 $exam_info['patient_id'] = $patient_info['id'];
         }
             //检查信息和申请信息
@@ -171,10 +171,10 @@ class Inspectregister extends Base
             $exam_info['register'] = $doctor['id'];
             $exam_info['ctime'] = date('Y-m-d H:i:s',time());
             if(isset($param['exam_id']) && !empty($param['exam_id'])){
-                $exam = DB::table('exam')->where('id',$param['exam_id'])->update($exam_info);
+                $exam = DB::table('exams')->where('id',$param['exam_id'])->update($exam_info);
             }else{
                 $exam_info['ctime'] = date('Y-m-d H:i:s',time());
-                $exam = DB::table('exam')->insert($exam_info);
+                $exam = DB::table('exams')->insert($exam_info);
             }
             return json_encode(['status'=>'ok','code'=>'0000','msg'=>'保存成功','sessionid'=>$sessionid]);
         }catch(\Exception $e ){

+ 4 - 4
application/inter/controller/Reciveremote.php

@@ -134,7 +134,7 @@ class Reciveremote extends Base
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
         $id = $_REQUEST['id'];
-        DB::table('exam')->where('id',$id)->update(['exam_status'=>6]);
+        DB::table('exams')->where('id',$id)->update(['exam_status'=>6]);
         DB::table('report')->where('exam_id',$id)->update(['report_doctor_id',$doctor['id']]);
         return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已接受']);
     }
@@ -144,7 +144,7 @@ class Reciveremote extends Base
         // $sessionid = $_REQUEST['sessionid'];
         // $doctor = Cache::get($sessionid);
         $id = $_REQUEST['id'];
-        DB::table('exam')->where('id',$id)->update(['exam_status'=>5]);
+        DB::table('exams')->where('id',$id)->update(['exam_status'=>5]);
         return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已驳回']);
 
     }
@@ -154,7 +154,7 @@ class Reciveremote extends Base
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
         $id = $_REQUEST['id'];
-        DB::table('exam')->where('id',$id)->update(['exam_status'=>9]);
+        DB::table('exams')->where('id',$id)->update(['exam_status'=>9]);
         DB::table('report')->where('exam_id',$id)->update(['confirm_doctor_id'=>$doctor['id'],'confirm_datetime'=>date('Y-m-d H:i:s')]);
         return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已确认']);
     }
@@ -162,7 +162,7 @@ class Reciveremote extends Base
     // 审核
     public function examine(){
         $id = $_REQUEST['id'];
-        DB::table('exam')->where('id',$id)->update(['exam_status'=>8]);
+        DB::table('exams')->where('id',$id)->update(['exam_status'=>8]);
         return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已审核']);
     }
 }

+ 11 - 11
application/inter/controller/Writereport.php

@@ -27,12 +27,12 @@ class WriteReport extends Base
             $institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name,report_subtitle')->find();
             $param = $_REQUEST['param'];
             $id = $param['id'];
-            $info = DB::table('exam')->where('id',$id)->field(['id','study_id','exam_class','exam_datetime','exam_sub_class','body_part','accession_num','patient_id'])->find();
+            $info = DB::table('exams')->where('id',$id)->field(['id','study_id','exam_class','exam_datetime','exam_sub_class','body_part','accession_num','patient_id'])->find();
             $exam_class = DB::table('constant')->where('id',$info['exam_class'])->field('constant_value')->find();
             $info['exam_class'] = $exam_class['constant_value'];
             $exam_subclass = DB::table('exam_subclass')->where('id',$info['exam_sub_class'])->field('name')->find();
             $info['exam_sub_class'] = $exam_subclass['name'];
-            $patient_info = DB::table('patient_info')->where('id',$info['patient_id'])->field(['id','temp_patient_id','name','sex','age'])->find();
+            $patient_info = DB::table('patient_infos')->where('id',$info['patient_id'])->field(['id','temp_patient_id','name','sex','age'])->find();
             $info['pid'] = $patient_info['temp_patient_id'];
             $info['name'] = $patient_info['name'];
             $info['sex'] = $patient_info['sex'];
@@ -98,13 +98,13 @@ class WriteReport extends Base
             $id = $this->uuids->uuid16();
             //初步报告生成
             $film_type = isset($param['film_type']) ? $param['film_type'] : '';
-            DB::table('exam')->where('id',$param['id'])->update(['exam_status'=>7,'film_type'=>$film_type]);
+            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>7,'film_type'=>$film_type]);
             $patient_info = array();
             $patient_info['id']       = isset($param['pid']) ? $param['pid'] : '';
             $patient_info['name']     = isset($param['name']) ? $param['name'] : '';
             $patient_info['age']      = isset($param['age']) ? $param['age'] : '';
             $patient_info['sex']      = isset($param['sex']) ? $param['sex'] : '';
-            $patient = DB::table('patient_info')->where('id',$param['pid'])->update($patient_info);
+            $patient = DB::table('patient_infos')->where('id',$param['pid'])->update($patient_info);
             $info = array();
             $info['exam_id'] = $param['id'];
             $info['impression']       = isset($param['impression']) ? $param['impression'] : '';
@@ -199,13 +199,13 @@ class WriteReport extends Base
             $sessionid = $_REQUEST['sessionid'];
             $doctor = Cache::get($sessionid);
             $id = $_REQUEST['id'];
-            $status = DB::table('exam')->where('id',$id)->field('exam_status')->find();
+            $status = DB::table('exams')->where('id',$id)->field('exam_status')->find();
             if($status['exam_status'] < 8 ){
                 return json_encode(['status'=>'fail','code'=>'1033','msg'=>'只能确认通过审核的报告']);
             }elseif($status['exam_status'] == 9){
                 return json_encode(['status'=>'fail','code'=>'1034','msg'=>'已经确认过该报告,不可再次确认']);
             }
-            DB::table('exam')->where('id',$id)->update(['exam_status'=>9]);
+            DB::table('exams')->where('id',$id)->update(['exam_status'=>9]);
             DB::table('report')->where('exam_id',$id)->update(['confirm_doctor_id'=>$doctor['id'],'confirm_datetime'=>date('Y-m-d H:i:s')]);
             // 添加  确认log日志
             $info = array();
@@ -226,7 +226,7 @@ class WriteReport extends Base
     public function examine(){
         try{
             $id = $_REQUEST['id'];
-            $status = DB::table('exam')->where('id',$id)->field('exam_status')->find();
+            $status = DB::table('exams')->where('id',$id)->field('exam_status')->find();
             if($status['exam_status'] < 7){
                 return json_encode(['status'=>'fail','code'=>'1032','msg'=>'只能审核已提交的报告']);
             }elseif($status['exam_status']>7){
@@ -259,7 +259,7 @@ class WriteReport extends Base
             $info['description']      = isset($param['description']) ? $param['description'] : '';
             $info['report_id'] = $report['id'];
             DB::table('report_record')->insert($info);
-            DB::table('exam')->where('id',$id)->update(['exam_status'=>8]);
+            DB::table('exams')->where('id',$id)->update(['exam_status'=>8]);
             return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已审核']);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
@@ -345,7 +345,7 @@ class WriteReport extends Base
             $id = $_REQUEST['id'];
             $info = array();
             // 检查日期 住院号 床号
-            $exam_info = DB::table('exam')->where('id',$id)->field('id,exam_datetime,exam_class,hopitalized_no,bed_no,exam_project,patient_id')->find();
+            $exam_info = DB::table('exams')->where('id',$id)->field('id,exam_datetime,exam_class,hopitalized_no,bed_no,exam_project,patient_id')->find();
             $info['id'] = $exam_info['id'];
             if(!empty($exam_info['exam_datetime'])){
                 $datetime = explode(' ',$exam_info['exam_datetime']);
@@ -362,7 +362,7 @@ class WriteReport extends Base
             $exam_class = DB::table('constant')->where('id',$exam_info['exam_class'])->field('constant_value')->find();
             $info['exam_class'] = $exam_class['constant_value'];
             // 病历号 姓名 年龄 性别
-            $patient_info = DB::table('patient_info')->where('id',$exam_info['patient_id'])->field('temp_patient_id,name,sex,age')->find();
+            $patient_info = DB::table('patient_infos')->where('id',$exam_info['patient_id'])->field('temp_patient_id,name,sex,age')->find();
             $remote = DB::table('remote_application')->where('exam_id',$id)->field('req_doctor_id')->find();
             $info['pnumber'] = $patient_info['temp_patient_id'];
             $info['name'] = $patient_info['name'];
@@ -402,7 +402,7 @@ class WriteReport extends Base
     public function change_film(){
         $id = $_REQUEST['id'];
         $film = $_REQUEST['film_type'];
-        DB::table('exam')->where('id',$id)->update(['film_type'=>$film]);
+        DB::table('exams')->where('id',$id)->update(['film_type'=>$film]);
         return json_encode(['status'=>'ok','code'=>'0000']);
     }
 }

+ 3 - 3
application/manage/controller/Patientinfo.php

@@ -52,7 +52,7 @@ class Patientinfo extends Base {
             $pagesize = 30;
         }
         $resultArr = array();
-        $info = DB::table('patient_info')->where($wheres)->page($page, $pagesize)->select();
+        $info = DB::table('patient_infos')->where($wheres)->page($page, $pagesize)->select();
         if (!empty($info)) {
             foreach ($info as $key => $val) {
                 if (isset($insMap[$val["institution_id"]])) {
@@ -64,7 +64,7 @@ class Patientinfo extends Base {
             }
         }
 
-        $num = DB::table('patient_info')->where($wheres)->count();
+        $num = DB::table('patient_infos')->where($wheres)->count();
         $data = array();
         $data['total'] = $num;
         $data['rows'] = $resultArr;
@@ -99,7 +99,7 @@ class Patientinfo extends Base {
             if ($params["birthday"] == "") {
                 $params["birthday"] = null;
             }
-            $a = DB::table('patient_info')->where('id', $params['id'])->update($params);
+            $a = DB::table('patient_infos')->where('id', $params['id'])->update($params);
             SysLogs::log("patient_info", "U", 'id = ' . $params['id'] . " --> " . json_encode($params));
             if ($a) {
                 return 'success';