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="Upgrade.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Upgrade.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.375969">
-              <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
+            <state vertical-scroll-proportion="-8.612904">
+              <caret line="57" column="67" selection-start-line="57" selection-start-column="67" selection-end-line="57" selection-end-column="67" />
               <folding>
                 <element signature="e#36#62#0#PHP" expanded="true" />
               </folding>
@@ -34,6 +34,26 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="version1" pinned="false" current-in-tab="true">
+        <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="50" column="62" selection-start-line="50" selection-start-column="62" selection-end-line="50" selection-end-column="62" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="database.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/database.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-5.032258">
+              <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="Registerlist.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -145,7 +165,6 @@
         <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/database.php" />
         <option value="$PROJECT_DIR$/application/common/controller/Version.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
@@ -155,9 +174,10 @@
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
         <option value="$USER_HOME$/Desktop/version.sql" />
-        <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion" />
+        <option value="$PROJECT_DIR$/application/database.php" />
         <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
+        <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
       </list>
     </option>
   </component>
@@ -248,80 +268,6 @@
               <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="inter" />
-              <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="inter" />
-              <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>
-          <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="common" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="versionsql" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="yczd" />
@@ -365,10 +311,6 @@
               <option name="myItemId" value="admin" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="command" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -752,13 +694,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/database.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03826087">
-          <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.69391304">
@@ -834,14 +769,6 @@
         </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.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </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="-30.516129">
@@ -856,14 +783,30 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.375969">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
+        <state vertical-scroll-proportion="-8.612904">
+          <caret line="57" column="67" selection-start-line="57" selection-start-column="67" selection-end-line="57" selection-end-column="67" />
           <folding>
             <element signature="e#36#62#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/database.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-5.032258">
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
+          <folding />
+        </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="50" column="62" selection-start-line="50" selection-start-column="62" selection-end-line="50" selection-end-column="62" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

application/admin/command/Upgrade.php

@@ -30,51 +30,38 @@ class Upgrade extends Command
         $oldversion = Version::getVersion();
         $output->writeln($version);
         if($version['version'] < $oldversion){
-            $output->writeln('存在版本差异');
+            $output->writeln('have version');
             $errarr = array();
             $ver = '';
             // 新版本大于旧版本
             for($version['version'];$version['version'] < $oldversion;$version['version']++){
                 $name = "Version".$version['version'];
-                $output->writeln("版本更新中...");
+                $output->writeln("upgrading...");
                 if(file_exists(__DIR__."/../../common/versionsql/".$name)){
                     $info = file_get_contents(__DIR__."/../../common/versionsql/".$name);
                     if(empty($info)){
-                        $output->writeln("找到版本文件");
+                        $output->writeln("\e[31m have no info \e[0m");
                         continue;
                     }else{
-                        $output->writeln("\033[31m 没有找到对应文件 \033[0m");
+                        $output->writeln("find the document");
                     }
                     $sqlarr = explode(';',$info);
                     foreach ($sqlarr as $k => $v) {
                         if(empty($v)){
                             continue;
                         }
-                        $output->writeln("执行版本文件");
                         try{
+                            $output->writeln($v);
                             $result = DB::execute($v);
-                            if($result == 0){
-                                // 执行成功
-                                $output->writeln("执行成功，版本");
-                            }else{
-                                $errarr[] = $v;
-                                $output->writeln("\033[31m 执行失败 \033[0m");
-                            }
+                            $output->writeln("success");
                         }catch(\Exception $e){
-                            $output->writeln("\033[31m SQL错误，".$e->getMessage()." \033[0m");
+                            $output->writeln("\033[31m SQL error，--".$e->getMessage()." \033[0m");
                         }
                     }
+                    DB::table('version')->where('id',1)->update(['version'=>($version['version']+1)]);
                 }else{
-                    $output->writeln("\033[31m 未找到版本更新文件 \033[0m");
+                    $output->writeln("\033[31m document id not find \033[0m");
                 }
-                $ver = $oldversion;
-            }
-            if(empty($errarr)){
-                //  没有执行错误
-                // 数据库版本更新
-                DB::table('version')->where('id',1)->update(['version'=>$ver]);
-            }else{
-                $output->writeln("\033[31m $errarr \033[0m");
             }
         }
     }

application/common/versionsql/version1

@@ -52,7 +52,6 @@ ALTER  TABLE  `images`  ADD  INDEX images_owner (  `owner`  );
 ALTER  TABLE  `images`  ADD  INDEX images_institution_id (  `institution_id`  );
 ALTER  TABLE  `images`  ADD  INDEX images_url (  `url`  );
 ALTER  TABLE  `images`  ADD  INDEX images_series_id (  `series_id`  );
-ALTER  TABLE  `manager`  ADD  INDEX institution (  `institution_id`  );
 ALTER  TABLE  `operating`  ADD  INDEX month (  `month`  );
 ALTER  TABLE  `patient_infos`  ADD  INDEX card_num (  `card_num`  );
 ALTER  TABLE  `patient_infos`  ADD  INDEX patient_infos_institution_id (  `institution_id`  );
@@ -64,4 +63,5 @@ ALTER  TABLE  `studies`  ADD  INDEX studies_studydate (  `studydate`  );
 ALTER  TABLE  `studies`  ADD  INDEX studies_modality (  `modality`  );
 ALTER  TABLE  `studies`  ADD  INDEX studies_status (  `status`  );
 ALTER  TABLE  `studies`  ADD  INDEX studies_studyid (  `studyid`  );
-ALTER  TABLE  `studies`  ADD  INDEX studies_accession_num (  `accession_num`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_accession_num (  `accession_num`  );
+delete from patient_infos where id not in (select patient_id from exams);