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

结束订单排序问题

Browse Source
This commit is contained in:
wucongxing 2023-08-30 13:44:25 +08:00
parent 132f066f7c
commit 3b8681034a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Model/OrderInquiry.php
View File

@ -446,7 +446,7 @@ class OrderInquiry extends Model
*/
public static function getInquiryEndPage(array $params, array $fields = ["*"], int $page = null, ?int $per_page = 10): array
{
$query = self::select("user_id")
$query = self::select(["user_id","family_id"])
->whereNotIn('user_id', function ($query) use ($params){
$query->select('user_id')
->from('order_inquiry')
@ -457,7 +457,8 @@ class OrderInquiry extends Model
->whereIn('inquiry_status', [5,6])
->where($params)
->orderBy('complete_time')
->groupBy(["user_id"]);
->groupBy(["user_id","family_id"]);
$result = $query->paginate($per_page, $fields, "page", $page);

2
app/Services/InquiryService.php
View File

@ -869,11 +869,13 @@ class InquiryService extends BaseService
$params = array();
$params['doctor_id'] = $user_info['client_user_id'];
$params['user_id'] = $item['user_id'];
$params['family_id'] = $item['family_id'];
$inquiry_status_params = [5,6];
$order_inquiry = OrderInquiry::getInquiryStatusLastOne($params,$inquiry_status_params,$fields);
unset($item['user_id']);
unset($item['family_id']);
if (!empty($order_inquiry)){
$item = $order_inquiry->toArray();