Compare commits

...

2 Commits

Author SHA1 Message Date
haomingming
919cda4ba7 Merge branch 'dev'
Some checks failed
Build Docker / build (push) Has been cancelled
2026-07-31 09:41:22 +08:00
haomingming
ca120cfdc2 处理 SQLSTATEI42S22]:
Some checks are pending
Build Docker / build (push) Waiting to run
Column not found:
2026-07-31 09:36:45 +08:00

View File

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