gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改药品订单未支付取消为5分钟，修改处方详情药师审核字段

Browse Source
This commit is contained in:
wucongxing 2023-05-05 15:02:10 +08:00
parent 315be90517
commit dcb7f49c72
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Services/PatientOrderService.php
View File

@ -1114,7 +1114,7 @@ class PatientOrderService extends BaseService
$data['order_type'] = 2; $data['order_type'] = 2;
$message = new CancelUnpayOrdersDelayDirectProducer($data); $message = new CancelUnpayOrdersDelayDirectProducer($data);
$message->setDelayMs(1000 * 60 * 30); $message->setDelayMs(1000 * 60 * 5);
$producer = $this->container->get(Producer::class); $producer = $this->container->get(Producer::class);
$res = $producer->produce($message); $res = $producer->produce($message);
if (!$res) { if (!$res) {
@ -1170,7 +1170,7 @@ class PatientOrderService extends BaseService
$address['consignee_tel_mask'] = $order_product['consignee_tel_mask']; $address['consignee_tel_mask'] = $order_product['consignee_tel_mask'];
$result = array(); $result = array();
$result['logistics'] = $order_product['logistics_no'] ?: null; $result['logistics'] = null;
$result['address'] = $address; $result['address'] = $address;
// 获取物流数据 // 获取物流数据
@ -1178,6 +1178,12 @@ class PatientOrderService extends BaseService
$params['order_product_id'] = $order_product_id; $params['order_product_id'] = $order_product_id;
$order_product_logistics = OrderProductLogistic::getOne($params); $order_product_logistics = OrderProductLogistic::getOne($params);
if (empty($order_product_logistics)){ if (empty($order_product_logistics)){
$logistics = array();
$logistics['logistics_no'] = $order_product['logistics_no'] ?: "";
// 获取快递公司名称
return success($result); return success($result);
} }

2
app/Services/UserDoctorService.php
View File

@ -983,7 +983,7 @@ class UserDoctorService extends BaseService
$result['prescription_icd'] = $order_prescription_icd ?? [];// 处方诊断疾病 $result['prescription_icd'] = $order_prescription_icd ?? [];// 处方诊断疾病
$result['prescription']['doctor_advice'] = $order_prescription['doctor_advice'] ?? "";// 医嘱 $result['prescription']['doctor_advice'] = $order_prescription['doctor_advice'] ?? "";// 医嘱
$result['prescription']['prescription_status'] = $order_prescription['prescription_status'] ?? "";// 处方状态（1:待审核 2:待使用 3:已失效 4:已使用） $result['prescription']['prescription_status'] = $order_prescription['prescription_status'] ?? "";// 处方状态（1:待审核 2:待使用 3:已失效 4:已使用）
$result['prescription']['pharmacist_audit_status'] = $order_prescription['prescription_status'] ?? "";// 药师审核状态（0:审核中 1:审核成功 2:审核驳回） $result['prescription']['pharmacist_audit_status'] = $order_prescription['pharmacist_audit_status'] ?? "";// 药师审核状态（0:审核中 1:审核成功 2:审核驳回）
return success($result); return success($result);
} }

4
config/autoload/databases.php
View File

@ -24,8 +24,8 @@ return [
'collation' => env('DB_COLLATION', 'utf8_unicode_ci'), 'collation' => env('DB_COLLATION', 'utf8_unicode_ci'),
'prefix' => env('DB_PREFIX', ''), 'prefix' => env('DB_PREFIX', ''),
'pool' => [ 'pool' => [
'min_connections' => 20, 'min_connections' => 10,
'max_connections' => 100, 'max_connections' => 50,
'connect_timeout' => 10.0, 'connect_timeout' => 10.0,
'wait_timeout' => 5.0, 'wait_timeout' => 5.0,
'heartbeat' => -1, 'heartbeat' => -1,