lgy 1 month ago
parent
commit
d723968b00

+ 15 - 0
.idea/encodings.xml

@@ -1,8 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/drballsuper.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/haizeimn.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/jinzhou.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/lieren.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/menghuan.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/moyu215.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/fashen.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/faye.php" charset="GBK" />
     <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/goldFinger.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/jinhua.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/movie.php" charset="GBK" />
     <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/overallWorld.php" charset="GBK" />
     <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/oversaikiu.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/over/sxmb.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/super035白银项链.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/xiaodian158.php" charset="GBK" />
+    <file url="file://$USER_HOME$/Desktop/新建文件夹/text/xingkong113.php" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/../../Extensions/php/php7.3.4nts/ext/pdo73_dm.dll" charset="UTF-8" />
   </component>
 </project>

+ 19 - 128
.idea/guochanhua.iml

@@ -2,138 +2,29 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$/../cybManage" />
-    <content url="file://$MODULE_DIR$">
+    <content url="file://$MODULE_DIR$/jcjyhr" />
+    <content url="file://$MODULE_DIR$/server">
       <sourceFolder url="file://$MODULE_DIR$/server/application" isTestSource="false" packagePrefix="app\" />
       <sourceFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/lib" isTestSource="false" packagePrefix="Aliyun\" />
       <sourceFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/tests" isTestSource="false" packagePrefix="Aliyun\Test\" />
-      <sourceFolder url="file://$MODULE_DIR$/zskk_new_manage/application" isTestSource="false" packagePrefix="app" />
-      <sourceFolder url="file://$MODULE_DIR$/zskk_new_manage/application/common/library/api_sdk/lib" isTestSource="false" packagePrefix="Aliyun" />
-      <sourceFolder url="file://$MODULE_DIR$/zskk_new_manage/application/common/library/api_sdk/tests" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/zskk_new_manage/extend" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/zskk_new_manage/extend/phpSpreadsheet/src" isTestSource="false" packagePrefix="PhpOffice" />
-      <sourceFolder url="file://$MODULE_DIR$/zskk_new_manage/spec" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/zskk_new_manage/thinkphp/library/think" isTestSource="false" packagePrefix="think\" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/doctrine/instantiator" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpdocumentor/reflection-common" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpdocumentor/reflection-docblock" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpdocumentor/type-resolver" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpspec/prophecy" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpunit/php-code-coverage" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpunit/php-file-iterator" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpunit/php-text-template" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpunit/php-timer" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpunit/php-token-stream" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpunit/phpunit" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/phpunit/phpunit-mock-objects" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/sebastian/comparator" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/sebastian/diff" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/sebastian/environment" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/sebastian/exporter" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/sebastian/global-state" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/sebastian/recursion-context" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/sebastian/version" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/symfony/yaml" />
-      <excludeFolder url="file://$MODULE_DIR$/server/application/common/library/api_sdk/vendor/webmozart/assert" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/aliyuncs/oss-sdk-php" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/aws/aws-sdk-php" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/doctrine/instantiator" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/guzzlehttp/guzzle" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/guzzlehttp/promises" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/guzzlehttp/psr7" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/mpdf/mpdf" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/mtdowling/jmespath.php" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/myclabs/deep-copy" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/paragonie/random_compat" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phar-io/manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phar-io/version" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpdocumentor/reflection-common" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpdocumentor/reflection-docblock" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpdocumentor/type-resolver" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpmailer/phpmailer" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpoffice/phpexcel" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpspec/prophecy" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpunit/php-code-coverage" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpunit/php-file-iterator" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpunit/php-text-template" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpunit/php-timer" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpunit/php-token-stream" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpunit/phpunit" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/phpunit/phpunit-mock-objects" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/predis/predis" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/psr/http-client" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/psr/http-message" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/ralouphie/getallheaders" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/code-unit-reverse-lookup" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/comparator" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/diff" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/environment" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/exporter" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/global-state" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/object-enumerator" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/object-reflector" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/recursion-context" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/resource-operations" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/sebastian/version" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/setasign/fpdi" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/symfony/deprecation-contracts" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/symfony/dom-crawler" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/symfony/polyfill-ctype" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/theseer/tokenizer" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/topthink/think-helper" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/topthink/think-installer" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/topthink/think-oracle" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/topthink/think-testing" />
-      <excludeFolder url="file://$MODULE_DIR$/server/vendor/webmozart/assert" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/doctrine/cache" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/endroid/qr-code" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/ezyang/htmlpurifier" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/guzzlehttp/guzzle" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/guzzlehttp/promises" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/guzzlehttp/psr7" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/karsonzhang/fastadmin-addons" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/laminas/laminas-escaper" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/maennchen/zipstream-php" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/markbaker/complex" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/markbaker/matrix" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/monolog/monolog" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/mpdf/mpdf" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/mtdowling/cron-expression" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/myclabs/deep-copy" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/myclabs/php-enum" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/overtrue/pinyin" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/overtrue/socialite" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/overtrue/wechat" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/paragonie/random_compat" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/php-http/message-factory" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/phpmailer/phpmailer" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/phpoffice/phpspreadsheet" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/phpoffice/phpword" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/pimple/pimple" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/psr/container" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/psr/http-client" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/psr/http-factory" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/psr/http-message" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/psr/simple-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/ralouphie/getallheaders" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/setasign/fpdi" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/http-foundation" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/options-resolver" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/polyfill-intl-idn" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/polyfill-intl-normalizer" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/polyfill-mbstring" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/polyfill-php70" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/polyfill-php72" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/symfony/psr-http-message-bridge" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/tecnickcom/tcpdf" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/topthink/think-captcha" />
-      <excludeFolder url="file://$MODULE_DIR$/zskk_new_manage/vendor/topthink/think-installer" />
+      <sourceFolder url="file://$MODULE_DIR$/server/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/aliyuncs/oss-sdk-php/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/mtdowling/jmespath.php/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/phpunit/php-code-coverage/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/phpunit/php-timer/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/phpunit/php-token-stream/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/phpunit/phpunit-mock-objects/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/sebastian/code-unit-reverse-lookup/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/sebastian/diff/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/sebastian/environment/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/sebastian/exporter/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/server/vendor1/sebastian/recursion-context/tests" isTestSource="true" />
     </content>
+    <content url="file://$MODULE_DIR$/../pet_sys" />
+    <content url="file://$MODULE_DIR$/../phy_exam" />
+    <content url="file://$MODULE_DIR$/../wechat_newris" />
+    <content url="file://$MODULE_DIR$/../zskk_new_manage" />
+    <content url="file://$MODULE_DIR$/../zskk_new_server" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

+ 1 - 1
.idea/php.xml

@@ -139,7 +139,7 @@
       <path value="$PROJECT_DIR$/zskk_new_manage/vendor/karsonzhang/fastadmin-addons" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.0">
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>
   <component name="PhpStan">

+ 5 - 0
.idea/vcs.xml

@@ -3,5 +3,10 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../cybManage" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../pet_sys" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../phy_exam" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../w7chinese" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../wechat_newris" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../zskk_new_server" vcs="Git" />
   </component>
 </project>

+ 4 - 4
jcjyhr/app/admin/controller/auth/Group.php

@@ -326,13 +326,13 @@ class Group extends Backend
 
         // 获取第一个权限的名称供列表显示-s
         foreach ($data as &$datum) {
-            if ($datum['rules']) {
-                if ($datum['rules'] == '*') {
+            if ($datum['RULES']) {
+                if ($datum['RULES'] == '*') {
                     $datum['rules'] = __('Super administrator');
                 } else {
-                    $rules = explode(',', $datum['rules']);
+                    $rules = explode(',', $datum['RULES']);
                     if ($rules) {
-                        $rulesFirstTitle = AdminRule::where('id', $rules[0])->value('title');
+                        $rulesFirstTitle = AdminRule::where('id', $rules[0])->value('TITLE');
                         $datum['rules']  = count($rules) == 1 ? $rulesFirstTitle : $rulesFirstTitle . '等 ' . count($rules) . ' 项';
                     }
                 }

+ 9 - 9
jcjyhr/app/admin/controller/institution/Institution.php

@@ -158,7 +158,7 @@ class Institution extends Backend
         $institution = [];
         foreach ($ins as $k=>$v)
         {
-            $institution[$v['parent_institution_id']][] = $v;
+            $institution[$v['PARENT_INSTITUTION_ID']][] = $v;
         }
         if(!empty($id))
         {
@@ -175,25 +175,25 @@ class Institution extends Backend
     public function makeInsData($institution,$organization): array
     {
         $data = [];
-        if($organization['name'] ?? '')
+        if($organization['NAME'] ?? '')
         {
-            $data[] = ['label'=>$organization['name']];
+            $data[] = ['label'=>$organization['NAME']];
             return $data;
         }
         foreach ($organization as $k=>$v)
         {
-            if(!empty($institution[$v['id']]))
+            if(!empty($institution[$v['ID']]))
             {
-                $child = $this->makeInsData($institution,$institution[$v['id']]);
+                $child = $this->makeInsData($institution,$institution[$v['ID']]);
                 $data[] = [
-                    'label'=>$v['name'],
-                    'id'=>$v['id'],
+                    'label'=>$v['NAME'],
+                    'id'=>$v['ID'],
                     'children'=>$child
                 ];
             }else{
                 $data[] = [
-                    'label'=>$v['name'],
-                    'id'=>$v['id'],
+                    'label'=>$v['NAME'],
+                    'id'=>$v['ID'],
                     'children'=>[]
                 ];
             }

+ 1 - 1
server/composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "ext-json": "*",
-        "php": ">=7.0",
+        "php": ">=8.0",
         "topthink/framework": "5.1.*",
         "topthink/think-testing": "2.0.*",
         "predis/predis": "^1.1",

+ 1 - 1
server/public/data.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <hostname>192.168.0.44</hostname>
+    <hostname>10.200.199.44</hostname>
     <database>PACS</database>
     <username>PACS</username>
     <password>Pacs@1234</password>

+ 1 - 1
server/runtime/cache/think/20/7451d8092dbe54df9ca47c54527c19.php

@@ -1,4 +1,4 @@
 <?php
 //000000043200
  exit();?>
-think_serialize:a:16:{i:0;a:1:{s:6:"numrow";i:1;}i:1;a:1:{s:6:"numrow";i:2;}i:2;a:1:{s:6:"numrow";i:3;}i:3;a:1:{s:6:"numrow";i:4;}i:4;a:1:{s:6:"numrow";i:5;}i:5;a:1:{s:6:"numrow";i:6;}i:6;a:1:{s:6:"numrow";i:7;}i:7;a:1:{s:6:"numrow";i:8;}i:8;a:1:{s:6:"numrow";i:9;}i:9;a:1:{s:6:"numrow";i:10;}i:10;a:1:{s:6:"numrow";i:11;}i:11;a:1:{s:6:"numrow";i:12;}i:12;a:1:{s:6:"numrow";i:13;}i:13;a:1:{s:6:"numrow";i:14;}i:14;a:1:{s:6:"numrow";i:15;}i:15;a:1:{s:6:"numrow";i:16;}}
+think_serialize:a:16:{i:0;a:2:{s:4:"name";s:3:"BFS";s:6:"numrow";i:1;}i:1;a:2:{s:4:"name";s:2:"CR";s:6:"numrow";i:2;}i:2;a:2:{s:4:"name";s:2:"CT";s:6:"numrow";i:3;}i:3;a:2:{s:4:"name";s:2:"DR";s:6:"numrow";i:4;}i:4;a:2:{s:4:"name";s:2:"DX";s:6:"numrow";i:5;}i:5;a:2:{s:4:"name";s:3:"ECG";s:6:"numrow";i:6;}i:6;a:2:{s:4:"name";s:2:"ES";s:6:"numrow";i:7;}i:7;a:2:{s:4:"name";s:2:"LS";s:6:"numrow";i:8;}i:8;a:2:{s:4:"name";s:2:"MG";s:6:"numrow";i:9;}i:9;a:2:{s:4:"name";s:2:"MR";s:6:"numrow";i:10;}i:10;a:2:{s:4:"name";s:2:"OT";s:6:"numrow";i:11;}i:11;a:2:{s:4:"name";s:5:"PETCT";s:6:"numrow";i:12;}i:12;a:2:{s:4:"name";s:2:"PT";s:6:"numrow";i:13;}i:13;a:2:{s:4:"name";s:2:"RF";s:6:"numrow";i:14;}i:14;a:2:{s:4:"name";s:2:"US";s:6:"numrow";i:15;}i:15;a:2:{s:4:"name";s:2:"XA";s:6:"numrow";i:16;}}

+ 14 - 0
server/vendor/topthink/think-oracle/src/W7Connection.php

@@ -333,7 +333,21 @@ class W7Connection extends BaseConnection
 
         return $resultSet;
     }
+    /**
+     * 获取缓存数据
+     * @access protected
+     * @param  Query     $query   查询对象
+     * @param  mixed     $cache   缓存设置
+     * @param  array     $options 缓存
+     * @return mixed
+     */
+    protected function getCacheData(Query $query, $cache, $data, &$key = null)
+    {
+        // 判断查询缓存
+        $key = is_string($cache['key']) ? $cache['key'] : $this->getCacheKey($query, $data);
 
+        return Container::get('cache')->get($key);
+    }
 
     /**
      * 执行查询 返回数据集

+ 1 - 1
zskk_new_manage/.env

@@ -7,7 +7,7 @@ debug = true
 trace = true
 
 [database]
- hostname = 192.168.0.44
+ hostname = 10.200.199.44
  database = PACS
  username = PACS
  password = Pacs@1234