|
@@ -84,7 +84,7 @@ class OrderController extends AuthController
|
|
|
$order_sn = build_sn($order['id']);
|
|
$order_sn = build_sn($order['id']);
|
|
|
Order::where('id', $order['id'])->update(['order_sn' => $order_sn]);
|
|
Order::where('id', $order['id'])->update(['order_sn' => $order_sn]);
|
|
|
//保存订单患者信息
|
|
//保存订单患者信息
|
|
|
- $addPatient = Patient::select(['name', 'sex', 'avatar', 'birthday', 'relationship', 'info', 'card_type', 'card_number'])->where('id', $req['patient_id'])->first()->toArray();
|
|
|
|
|
|
|
+ $addPatient = Patient::select(['name', 'sex', 'avatar', 'birthday', 'relationship_type', 'info', 'card_type', 'card_number'])->where('id', $req['patient_id'])->first()->toArray();
|
|
|
$addPatient['order_id'] = $order['id'];
|
|
$addPatient['order_id'] = $order['id'];
|
|
|
$addPatient['patient_id'] = $req['patient_id'];
|
|
$addPatient['patient_id'] = $req['patient_id'];
|
|
|
if ($req['product_type'] == 1) {
|
|
if ($req['product_type'] == 1) {
|
|
@@ -218,7 +218,7 @@ class OrderController extends AuthController
|
|
|
$order_sn = build_sn($order['id']);
|
|
$order_sn = build_sn($order['id']);
|
|
|
Order::where('id', $order['id'])->update(['order_sn' => $order_sn]);
|
|
Order::where('id', $order['id'])->update(['order_sn' => $order_sn]);
|
|
|
//保存订单患者信息
|
|
//保存订单患者信息
|
|
|
- $addPatient = Patient::select(['name', 'sex', 'avatar', 'birthday', 'relationship', 'info', 'card_type', 'card_number'])->where('id', $req['patient_id'])->first()->toArray();
|
|
|
|
|
|
|
+ $addPatient = Patient::select(['name', 'sex', 'avatar', 'birthday', 'relationship_type', 'info', 'card_type', 'card_number'])->where('id', $req['patient_id'])->first()->toArray();
|
|
|
$addPatient['order_id'] = $order['id'];
|
|
$addPatient['order_id'] = $order['id'];
|
|
|
$addPatient['patient_id'] = $req['patient_id'];
|
|
$addPatient['patient_id'] = $req['patient_id'];
|
|
|
$addPatient['organization_id'] = $req['organization_id'];
|
|
$addPatient['organization_id'] = $req['organization_id'];
|
|
@@ -351,7 +351,7 @@ class OrderController extends AuthController
|
|
|
$order_sn = build_sn($order['id']);
|
|
$order_sn = build_sn($order['id']);
|
|
|
Order::where('id', $order['id'])->update(['order_sn' => $order_sn]);
|
|
Order::where('id', $order['id'])->update(['order_sn' => $order_sn]);
|
|
|
//保存订单患者信息
|
|
//保存订单患者信息
|
|
|
- $addPatient = Patient::select(['name', 'sex', 'avatar', 'birthday', 'relationship', 'info', 'card_type', 'card_number'])->where('id', $req['patient_id'])->first()->toArray();
|
|
|
|
|
|
|
+ $addPatient = Patient::select(['name', 'sex', 'avatar', 'birthday', 'relationship_type', 'info', 'card_type', 'card_number'])->where('id', $req['patient_id'])->first()->toArray();
|
|
|
$addPatient['order_id'] = $order['id'];
|
|
$addPatient['order_id'] = $order['id'];
|
|
|
$addPatient['patient_id'] = $req['patient_id'];
|
|
$addPatient['patient_id'] = $req['patient_id'];
|
|
|
OrderPatient::create($addPatient);
|
|
OrderPatient::create($addPatient);
|
zilong