1
This commit is contained in:
parent
ee35d26821
commit
7bcf4e9fb7
@ -412,7 +412,6 @@ class DetectionService extends BaseService
|
||||
$data['detection_no'] = "D" . $generator->generate(); // 系统订单编号
|
||||
$data['amount_total'] = $detection_project['detection_project_price']; // 订单金额
|
||||
$data['coupon_amount_total'] = 0;// 优惠卷总金额
|
||||
$data['payment_amount_total'] = $detection_project['detection_project_price'];// 实际付款金额
|
||||
$data['patient_name'] = $patient_family['card_name'];// 患者姓名-就诊人
|
||||
$data['patient_name_mask'] = $patient_family['card_name_mask'];// 患者姓名-就诊人(掩码)
|
||||
$data['patient_sex'] = $patient_family['sex'];// 患者性别-就诊人(0:未知 1:男 2:女)
|
||||
|
||||
@ -678,7 +678,7 @@ class PatientOrderService extends BaseService
|
||||
|
||||
// 获取订单金额
|
||||
$result = array();
|
||||
$result['amount_total'] = 0; // 订单金额
|
||||
$result['amount_total'] = 0; // 订单总额
|
||||
$result['payment_amount_total'] = 0; // 实际订单金额
|
||||
$result['coupon_amount_total'] = 0; // 优惠金额
|
||||
$result['order_no'] = $order_no; // 订单编号
|
||||
@ -851,7 +851,7 @@ class PatientOrderService extends BaseService
|
||||
|
||||
// 获取订单金额
|
||||
$result['amount_total'] = $order_detection['amount_total']; // 订单金额
|
||||
$result['payment_amount_total'] = $order_detection['amount_total']; // 实际订单金额
|
||||
$result['payment_amount_total'] = $order_detection['amount_total'] - 0; // 实际订单金额
|
||||
$result['coupon_amount_total'] = 0; // 优惠金额
|
||||
|
||||
if ($order_detection['payment_amount_total'] > 0) {
|
||||
@ -1585,9 +1585,6 @@ class PatientOrderService extends BaseService
|
||||
'patient_age',
|
||||
'created_at',
|
||||
];
|
||||
dump($params);
|
||||
dump($detection_status_params);
|
||||
dump($fields);
|
||||
$order_detection = OrderDetection::getPatientOrderDetectionPage($params, $detection_status_params, $fields, $page, $per_page);
|
||||
if (empty($order_detection['data'])) {
|
||||
return success($order_detection);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user