Compare commits

..

No commits in common. "919cda4ba7ddeab0c49190645d42f0368724b524" and "8308d500e7e0f23a45aca110fa6e6886d043a0b9" have entirely different histories.

View File

@ -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');