|
@@ -1081,7 +1081,7 @@ func GetNewHisOrderListTwo(user_org_id int64, start_time_timestamp int64, end_ti
|
1081
|
1081
|
if end_time_timestamp != 0 {
|
1082
|
1082
|
db = db.Where("his_order.settle_accounts_date<=?", end_time_timestamp)
|
1083
|
1083
|
}
|
1084
|
|
- db = db.Where("user_org_id = ?", user_org_id)
|
|
1084
|
+ db = db.Where("user_org_id = ? and order_status = 2 and status = 1", user_org_id)
|
1085
|
1085
|
err = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).Find(&order).Error
|
1086
|
1086
|
return
|
1087
|
1087
|
}
|