|
@@ -224,8 +224,8 @@ func GetHisOrderBy10726Detail(start_time string, end_time string) ([]Results, er
|
224
|
224
|
psn_cash_pay AS 现金支付
|
225
|
225
|
`).Where("user_org_id = ?", 10726).
|
226
|
226
|
Where("order_status = ?", 2).
|
227
|
|
- Where("setl_time >= ?", start_time).
|
228
|
|
- Where("setl_time <= ?", end_time).
|
|
227
|
+ Where("setl_time >= ?", start_time+" 00:00:00").
|
|
228
|
+ Where("setl_time <= ?", end_time+" 23:59:59").
|
229
|
229
|
Where("is_medicine_insurance = ?", 1).
|
230
|
230
|
Where("status = ?", 1).
|
231
|
231
|
Scan(&result)
|
|
@@ -255,7 +255,7 @@ func GetHisOrderBy10726Summary(start_time string, end_time string) ([]SummaryRes
|
255
|
255
|
SUM(psn_cash_pay) AS 现金支付
|
256
|
256
|
`).
|
257
|
257
|
Where("user_org_id = ? AND order_status = ? AND setl_time >= ? AND setl_time <= ? AND is_medicine_insurance = ? AND status = ?",
|
258
|
|
- 10726, 2, start_time, end_time, 1, 1).
|
|
258
|
+ 10726, 2, start_time+" 00:00:00", end_time+" 23:59:59", 1, 1).
|
259
|
259
|
Group("insutype").
|
260
|
260
|
Scan(&result).Error
|
261
|
261
|
return result, err
|