|
|
@@ -52,8 +52,10 @@ class DiagnosisOrderController
|
|
|
['remarks'],
|
|
|
]);
|
|
|
$address = get_address($data['hospital']);
|
|
|
+ if (empty($data['type'])) return app('json')->fail('传入type');
|
|
|
+
|
|
|
if ($data['type'] == 1){
|
|
|
- if (!strstr($data['hospital'], $address['city'])){
|
|
|
+ if (!strstr($data['transfer_address'], $address['city'])){
|
|
|
return app('json')->fail('接送地址和医院不在同一个市');
|
|
|
}
|
|
|
}
|
|
|
@@ -65,7 +67,7 @@ class DiagnosisOrderController
|
|
|
foreach ($data['cate'] as $item){
|
|
|
$da = date('w');
|
|
|
if ($da == 0) $da = 7;
|
|
|
- $equity = UserEquity::where('c_id', $item)->order('number DESC')->where('use', 1)->where('start_week', '<=', $da)->where('end_week', '>=', $da)->find();
|
|
|
+ $equity = UserEquity::where('c_id', $item)->where('uid', $request->uid())->order('number DESC')->where('use', 1)->where('start_week', '<=', $da)->where('end_week', '>=', $da)->find();
|
|
|
$cate = DiagnosisCate::where('id', $item)->find();
|
|
|
if ($equity){
|
|
|
$price += 0;
|