Merge branch 'dev'

app/Controller/TestController.php

@@ -89,12 +89,6 @@ class TestController extends AbstractController
     // 疾病名称
     protected string $icd_name;
 
-    public function testError()
-    {
-        // 模拟触发 SQLSTATE[42S22]: Column not found 数据库报错
-        Db::select("SELECT nonexistent_column_test FROM gdxz_user_ca_cert LIMIT 1");
-    }
-
     public function test(){
 //        $this->test_8();
 //        $this->test_3();

app/Services/CaService.php

@@ -528,31 +528,30 @@ class CaService extends BaseService
         $CaOnline = new CaOnline();
 
         // 检测是否已添加签章配置
-        // $params = array();
-        // $params['cert_serial_number'] = $this->cert_serial_number;
-        // $user_ca_cert = UserCaCert::getOne($params);
-        // if (empty($user_ca_cert)){
-        //     // Mock empty cert to bypass check when CA is skipped
-        //     $user_ca_cert = ['is_sign_config' => 1, 'cert_id' => 0];
-        // }
+        $params = array();
+        $params['cert_serial_number'] = $this->cert_serial_number;
+        $user_ca_cert = UserCaCert::getOne($params);
+        if (empty($user_ca_cert)){
+            // Mock empty cert to bypass check when CA is skipped
+            $user_ca_cert = ['is_sign_config' => 1, 'cert_id' => 0];
+        }
 
-        // if ($user_ca_cert['is_sign_config'] == 0){
-        //     // 添加签章配置
-        //     $data = array();
-        //     $data['sign_param'] = json_encode($sign_param);
-        //     $data['seal_img'] = $sign_image;
+        if ($user_ca_cert['is_sign_config'] == 0){
+            // 添加签章配置
+            $data = array();
+            $data['sign_param'] = json_encode($sign_param);
+            $data['seal_img'] = $sign_image;
 
-        //     $CaOnline->addUserSignConfig($this->entity_id,$this->card_num,$data);
+            $CaOnline->addUserSignConfig($this->entity_id,$this->card_num,$data);
 
-        //     $params = array();
-        //     $params['cert_id'] = $user_ca_cert['cert_id'];
-
-        //     $data = array();
-        //     $data['sign_config'] = json_encode($sign_param);
-        //     $data['is_sign_config'] = 1;
-        //     UserCaCert::edit($params,$data);
-        // }
+            $params = array();
+            $params['cert_id'] = $user_ca_cert['cert_id'];
 
+            $data = array();
+            $data['sign_config'] = json_encode($sign_param);
+            $data['is_sign_config'] = 1;
+            UserCaCert::edit($params,$data);
+        }
 
         // 打开处方pdf文件
         $pdf_file = fopen($this->prescription_pdf_local_path, 'r');

app/Utils/Auth.php

@@ -39,7 +39,6 @@ class Auth
             "/basic/keyword/search" => "get", // 获取热门搜索关键词
             "/test/uninquiry" => "get", // 获取未接诊的医生
             "/test/refund" => "post", // 测试退款
-            "/test/error" => "get", // 测试报错
             "/test" => "get", // 测试
             "/callback/detection" => "post", // 检测所结果回调
             "/callback/video/trtc" => "post", // 音视频回调

config/routes.php

@@ -912,7 +912,6 @@ Router::addGroup('/case', function () {
 // 测试使用
 Router::addGroup('/test', function () {
     Router::get('', [TestController::class, 'test']);
-    Router::get('/error', [TestController::class, 'testError']);
 
     // 获取未接诊的医生
     Router::get('/uninquiry', [TestController::class, 'uninquiry']);