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

.idea/workspace.xml

@@ -22,11 +22,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
+      <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="0.34434783">
-              <caret line="53" column="65" selection-start-line="53" selection-start-column="65" selection-end-line="53" selection-end-column="65" />
+            <state vertical-scroll-proportion="-4.2580647">
+              <caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" />
               <folding>
                 <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
                 <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
@@ -35,6 +35,48 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="Inspectregister.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-4.967742">
+              <caret line="144" column="41" selection-start-line="144" selection-start-column="41" selection-end-line="144" selection-end-column="41" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-4.967742">
+              <caret line="118" column="38" selection-start-line="118" selection-start-column="38" selection-end-line="118" selection-end-column="38" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Insdoctors.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.4173913">
+              <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Login.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-17.451612">
+              <caret line="117" column="10" selection-start-line="117" selection-start-column="10" selection-end-line="117" selection-end-column="10" />
+              <folding>
+                <marker date="1544611032376" expanded="true" signature="4066:4237" placeholder="SELECT m.id,... menu" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="IdeDocumentHistory">
@@ -63,10 +105,8 @@
         <option value="$PROJECT_DIR$/application/admin/command/Api.php" />
         <option value="$PROJECT_DIR$/application/manage/view/examsubclass/edit.html" />
         <option value="$PROJECT_DIR$/application/manage/controller/Examsubclass.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
         <option value="$USER_HOME$/Desktop/oss_callbacks.sql" />
         <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
         <option value="$USER_HOME$/Desktop/version.sql" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion" />
         <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
@@ -84,13 +124,15 @@
         <option value="$PROJECT_DIR$/application/common/versionsql/Version3" />
         <option value="$PROJECT_DIR$/application/database.php" />
         <option value="$PROJECT_DIR$/application/manage/view/insdoctors/edit.html" />
-        <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
         <option value="$PROJECT_DIR$/application/manage/view/doctors/edit.html" />
-        <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
       </list>
     </option>
   </component>
@@ -199,7 +241,33 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="common" />
+              <option name="myItemId" value="manage" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="manage" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controller" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -426,13 +494,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.129032">
-          <caret line="76" column="31" selection-start-line="76" selection-start-column="31" selection-end-line="76" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/filter.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3506261">
@@ -503,13 +564,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.027523">
-          <caret line="402" column="41" selection-start-line="402" selection-start-column="28" selection-end-line="402" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/manage/controller/Remoteapplication.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4921739">
@@ -554,20 +608,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="5" column="21" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31023103">
-          <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="47" />
-        </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="-9.935484">
@@ -620,14 +660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.387097">
-          <caret line="88" column="9" selection-start-line="88" selection-start-column="9" selection-end-line="88" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-5.451613">
@@ -660,34 +692,42 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39449543">
-          <caret line="101" column="2" selection-start-line="101" selection-start-column="2" selection-end-line="103" selection-end-column="44" />
+        <state vertical-scroll-proportion="0.15826087">
+          <caret line="29" column="29" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15826087">
-          <caret line="29" column="29" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.31023103">
+          <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version3">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.036303632">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="66" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.18151815">
+          <caret line="5" column="38" selection-start-line="5" selection-start-column="38" selection-end-line="5" selection-end-column="38" />
           <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="0.34434783">
-          <caret line="53" column="65" selection-start-line="53" selection-start-column="65" selection-end-line="53" selection-end-column="65" />
+        <state vertical-scroll-proportion="-4.2580647">
+          <caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" />
           <folding>
             <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
             <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
@@ -695,6 +735,40 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-17.451612">
+          <caret line="117" column="10" selection-start-line="117" selection-start-column="10" selection-end-line="117" selection-end-column="10" />
+          <folding>
+            <marker date="1544611032376" expanded="true" signature="4066:4237" placeholder="SELECT m.id,... menu" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.967742">
+          <caret line="144" column="41" selection-start-line="144" selection-start-column="41" selection-end-line="144" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.967742">
+          <caret line="118" column="38" selection-start-line="118" selection-start-column="38" selection-end-line="118" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.4173913">
+          <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

application/inter/controller/Login.php

@@ -73,7 +73,7 @@ class Login extends Controller
                 return json_encode(['status'=>'fail','code'=>'1101','msg'=>'密码不能为空']);
             }
             //医生信息
-            $info = DB::table('doctors')->where('username',$param['userName'])->field('id,attachment,username,password,login_time,login_failure,realname,email,phone,doctor_title,institution_id,department_id,doctor_role,is_report')->find();
+            $info = DB::table('doctors')->where('username',$param['userName'])->field('id,exam_class,attachment,username,password,login_time,login_failure,realname,email,phone,doctor_title,institution_id,department_id,doctor_role,is_report')->find();
             log::record($info);
             if(!$info){
                 return json_encode(['status'=>'fail','code'=>'1004','msg'=>'用户名'.$param['userName'].'或密码错误']);

application/inter/controller/Registerlist.php

@@ -56,20 +56,17 @@ class Registerlist extends Base
             }
             log::record($doctor);
             log::record('-------------doctor-------------------');
-            $search = array();
             $where = '';
-            if(isset($_REQUEST['param'])){
-                $search = $_REQUEST['param'];
-                foreach ($search as $k => $v) {
-                    /*if($k == 'name' && !empty($v)){
-                        $where .= ' and p.name like \''.$v.'%\'';
-                    }elseif($k == 'exam_datetime' && !empty($v)){
-                        $where .= " and e.exam_datetime between '$v[0]' and '$v[1]'";
-                    }else{
-                        if(!empty($v)){
-                            $where .= ' and e.'.$k.'=\''.$v.'\'';
-                        }
-                    }*/
+            $page =  $_REQUEST['page'];
+            $num =  $_REQUEST['num'];
+            $fnum = ($page-1)*$num;
+            $limit = " limit ".$fnum.",".$num;
+                if(isset($_REQUEST['param'])){
+                $param = $_REQUEST['param'];
+                if(!empty($param['exam_status'])){
+                    $where = ' and e.exam_status = '.$param['exam_status'];
+                }
+                /*foreach ($search as $k => $v) {
                     switch($k){
                         case 'name':
                             if(empty($v)){
@@ -93,7 +90,11 @@ class Registerlist extends Base
                             if(empty($v)){
                                 break;
                             }
-                            $ex = implode('\',\'',$v);
+                            if(is_array($v)){
+                                $ex = implode('\',\'',$v);
+                            }else{
+                                $ex = $v;
+                            }
                             $where .= " and e.exam_class in ('".$ex."')";
                             break;
                         default:
@@ -103,14 +104,20 @@ class Registerlist extends Base
                             $where .= ' and e.'.$k.'=\''.$v.'\'';
                             break;
                     }
-                }
+                }*/
             }
-            $page =  $_REQUEST['page'];
-            $num =  $_REQUEST['num'];
-            $fnum = ($page-1)*$num;
-            $limit = " limit ".$fnum.",".$num;
-            log::record("SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_class,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where);
-            $sql = "SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_class,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where." order by e.createdAt desc,e.urgent desc ".$limit;
+            $sql1 = "SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_class,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id";
+            //
+            if(isset($param['search']) && !empty($param['search'])){
+                // 姓名  病历号  检查号
+                $search1 = ' and p.name like \'%'.$param['search'].'%\' ';
+                $search2 = ' and e.patient_num=\''.$param['search'].'\' ';
+                $search3 = ' and e.accession_num=\''.$param['search'].'\' ';
+                $sql = ($sql1.$search1). ' union '. ($sql1.$search2) .' union '. ($sql1.$search3).$limit;
+            }else{
+                $sql = $sql1.$where." order by e.createdAt desc,e.urgent desc ".$limit;
+            }
+            log::record('预约登记的sql是--'.$sql);
             $list = DB::query($sql);
             foreach ($list as $k => $v) {
                 $report_info = DB::table('report')->where('exam_id',$v['id'])->field(['report_datetime','report_doctor_id'])->find();

application/manage/controller/Doctors.php

@@ -114,8 +114,10 @@ class Doctors extends Base {
         unset($params["doctorcla"]);
         $params['doctor_role'] = implode(',', $params['doctor_role']);
         $password = $params['password'];
-        $params['exam_class'] = implode(',',$params['examcla']);
-        unset($params['examcla']);
+        if(isset($params['examcla'])){
+            $params['exam_class'] = implode(',',$params['examcla']);
+            unset($params['examcla']);
+        }
         if (!empty($password) && strlen($password) < 30) {
             $params['password'] = md5($password);
         } else {

application/manage/controller/Insdoctors.php

@@ -127,8 +127,10 @@ class Insdoctors extends Base {
         $info['doctor_role'] = implode(',', $_GET['doctor_role']);
         $info['password'] = md5($_GET['password']);
         $info["institution_id"] = $insId;
-        $info['exam_class'] = implode(',',$info['examcla']);
-        unset($info['examcla']);
+        if(isset($info['examcla'])){
+            $info['exam_class'] = implode(',',$info['examcla']);
+            unset($info['examcla']);
+        }
         if (empty($_GET['id'])) {
             unset($_GET['id']);
             $id = UUIDs::uuid16();