xg

server/application/api/controller/apply/ApplyController.php

@@ -113,15 +113,15 @@ class ApplyController extends ZskkDefaultController
      */
     public function step2(ApplicationService $service)
     {
-        try{
+//        try{
             $params = $this->getParams();
             ApplicationValidate::checkId($params);
             $param =  $service->handle_save($params);
             $return = $service->save_application($param,Config::get('remote_status')['step3']);
             return $this->success($return);
-        }catch(\Exception $e){
-            $this->throwError($e->getMessage(),0001);
-        }
+//        }catch(\Exception $e){
+//            $this->throwError($e->getMessage(),0001);
+//        }
     }
 
     /**

server/application/api/controller/test/TestController.php

@@ -91,8 +91,12 @@ class TestController extends Controller
 
 
     public function testOne(TestService $test) {
-        phpinfo();die;
-        $a = (InstitutionModel::find());
+        try{
+            $a = (InstitutionModel::where('ids',1)->find());
+
+        }catch (Exception $e){
+            var_dump($e->getMessage());die;
+        }
         var_dump($a);
         die;
         $a = 'mGcripTrD+kUDwhjHsB8TfDeo4obPs4vDFVeTR/iHGFMfYqiBktDQ7BXrxMjQJUz/wUHnfZcKH2JjfffOVzfzAatupwpiGFqsnTyhxJ7kJYxMu8Wv5v6twocWPx6Eqb7';

server/application/api/servies/application/ApplicationService.php

@@ -292,7 +292,7 @@ class ApplicationService extends ZskkDefaultService
         $info['card_num'] = $param['card_num'];  //新增
         $info['exam_id'] = $param['exam_id'];
         $node = $this->application->getExam($param['exam_id'],'node_type');
-        $info['node_type'] = $node['node_type'];
+        $info['node_type'] = $node['node_type'] ?? '';
         $info['study_id'] = $param['study_id']; //新增
         $info['report_status'] = $status; //申请单状态
         $info['illness_desc'] = isset($param['illness_desc']) ? $param['illness_desc'] : '';// 患者主诉
@@ -307,7 +307,7 @@ class ApplicationService extends ZskkDefaultService
         $info['attachment'] = isset($param['attachment']) ? $param['attachment'] : ''; //补充资料
         $info['attachment_type'] = $param['attachment_type'] ?? 1;
         $hopitalized = $this->application->getExam($param['exam_id'],'hopitalized_no');
-        $info['hopitalized_no'] = $hopitalized['hopitalized_no'];
+        $info['hopitalized_no'] = $hopitalized['hopitalized_no'] ?? '';
         if (!empty($application_id)) {
             //存在则修改
             $return = $this->application->updateApplication($info, $application_id);

server/application/api/servies/xz/XzService.php

@@ -489,21 +489,21 @@ class XzService extends ZskkDefaultService {
 //                    $this->xz->saveSms($share);
 //                }
             }
-            if($params['institution_id'] ?? null){
-                log::record('开始回调');
-                $method = $this->xz->getApiAction($params['institution_id'],Config::get('api_action')['create']);
-                $action = $method.'Action';
-                log::record($action);
-                if(method_exists($this,$action)){
-                    $r = $this->$action($params,$exam,Config::get('api_action')['create']);
-//                    return $r;
-                }else{
-                    log::record('没有找到对应的action');
-                }
-
-            }else{
-                log::record('没有这个医院id'.$params['institution_id'] ?? null);
-            }
+//            if($params['institution_id'] ?? null){
+//                log::record('开始回调');
+//                $method = $this->xz->getApiAction($params['institution_id'],Config::get('api_action')['create']);
+//                $action = $method.'Action';
+//                log::record($action);
+//                if(method_exists($this,$action)){
+//                    $r = $this->$action($params,$exam,Config::get('api_action')['create']);
+////                    return $r;
+//                }else{
+//                    log::record('没有找到对应的action');
+//                }
+//
+//            }else{
+//                log::record('没有这个医院id'.$params['institution_id'] ?? null);
+//            }
         }
         $time2 = time();
         $time = $time2-$time1;

server/public/data.xml

@@ -1,20 +1,8 @@
 <?xml version="1.0"?>
 <data>
-    <w7CallBackIp>192.168.1.18:5236</w7CallBackIp>
-    <beast>b61c8314ad42d2391746028800644206873174d4c4</beast>
-
-<!--    <hostname>192.168.1.18</hostname>-->
-<!--    <database>YZWQ</database>-->
-<!--    <username>YZWQ</username>-->
-<!--    <password>123456789</password>-->
-<!--    <hostport>5236</hostport>-->
     <hostname>192.168.0.44</hostname>
-    <database>SYSDBA</database>
-    <username>SYSDBA</username>
-    <password>Yqwjw_202504</password>
+    <database>PACS</database>
+    <username>PACS</username>
+    <password>Pacs@1234</password>
     <hostport>5236</hostport>
-    <demomode>false</demomode>
-    <remote_ip>http://192.168.1.20:9603</remote_ip>
-    <client_ip>http://192.168.1.20:9603</client_ip>
-    <server_ip>http://192.168.1.20:9600</server_ip>
 </data>