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

修改了接诊次数

Browse Source
This commit is contained in:
wucongxing8150 2024-06-17 09:24:25 +08:00
parent 53acd30bf8
commit c3bafbb11c
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/dao/orderInquiry.go
View File

@ -461,6 +461,15 @@ func (r *OrderInquiryDao) GetOrderInquiryTimeList(maps interface{}, startTime, e
return m, nil return m, nil
} }
// GetOrderInquiryCreatedTimeList 获取问诊订单列表-创建时间
func (r *OrderInquiryDao) GetOrderInquiryCreatedTimeList(maps interface{}, startTime, endTime string) (m []*model.OrderInquiry, err error) {
err = global.Db.Where(maps).Where("created_at BETWEEN ? AND ?", startTime, endTime).Find(&m).Error
if err != nil {
return nil, err
}
return m, nil
}
// GetOrderInquiryForAccountPageSearch 获取账户关联问诊订单列表-分页 // GetOrderInquiryForAccountPageSearch 获取账户关联问诊订单列表-分页
func (r *OrderInquiryDao) GetOrderInquiryForAccountPageSearch(req requests.GetOrderInquiryForAccountPage, page, pageSize int) (m []*model.OrderInquiry, total int64, err error) { func (r *OrderInquiryDao) GetOrderInquiryForAccountPageSearch(req requests.GetOrderInquiryForAccountPage, page, pageSize int) (m []*model.OrderInquiry, total int64, err error) {
var totalRecords int64 var totalRecords int64

13
api/service/orderServicePackage.go
View File

@ -2,6 +2,7 @@ package service
import ( import (
"errors" "errors"
"fmt"
"hospital-admin-api/api/dao" "hospital-admin-api/api/dao"
"hospital-admin-api/api/dto" "hospital-admin-api/api/dto"
"hospital-admin-api/api/model" "hospital-admin-api/api/model"
@ -113,14 +114,18 @@ func (r *OrderServicePackageService) GetOrderServicePackageDetailInfo(orderServi
g.MonthInquiryCount = 1 g.MonthInquiryCount = 1
} else { } else {
// 获取服务包当月已问诊次数 // 获取服务包当月已问诊次数
g.MonthInquiryCount, err = r.GetCurrentMonthInquiryCount(g.OrderServiceType, orderServicePackage.UserId, orderServicePackage.DoctorId, CurrentMonthStartDate, CurrentMonthFinishDate) g.MonthInquiryCount, err = r.GetCurrentMonthInquiryCount(g.OrderServiceType, orderServicePackage.UserId, orderServicePackage.DoctorId, g.PayTime)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
fmt.Println(g.MonthInquiryCount)
// 获取服务包当月剩余问诊次数 // 获取服务包当月剩余问诊次数
g.RemainingInquiryCount = r.GetRemainingInquiryCount(orderServicePackageDetail.MonthlyFrequency, g.MonthInquiryCount) g.RemainingInquiryCount = r.GetRemainingInquiryCount(orderServicePackageDetail.MonthlyFrequency, g.MonthInquiryCount)
fmt.Println(g.RemainingInquiryCount)
} }
} }
@ -548,9 +553,11 @@ func (r *OrderServicePackageService) isFirstInquiryServicePackage(orderNo string
} }
// GetCurrentMonthInquiryCount 获取服务包当月已问诊次数 // GetCurrentMonthInquiryCount 获取服务包当月已问诊次数
func (r *OrderServicePackageService) GetCurrentMonthInquiryCount(orderServiceType int, userId, doctorId int64, startDate, endDate time.Time) (int, error) { func (r *OrderServicePackageService) GetCurrentMonthInquiryCount(orderServiceType int, userId, doctorId int64, startTime model.LocalTime) (int, error) {
orderInquiryDao := dao.OrderInquiryDao{} orderInquiryDao := dao.OrderInquiryDao{}
CurrentMonthStartDate, CurrentMonthFinishDate, err := r.getOrderServicePackageCurrentMonthDate(startTime)
maps := make(map[string]interface{}) maps := make(map[string]interface{})
maps["inquiry_type"] = 1 maps["inquiry_type"] = 1
@ -565,7 +572,7 @@ func (r *OrderServicePackageService) GetCurrentMonthInquiryCount(orderServiceTyp
maps["inquiry_refund_status"] = 0 maps["inquiry_refund_status"] = 0
maps["inquiry_pay_status"] = 2 maps["inquiry_pay_status"] = 2
maps["inquiry_status"] = []int{1, 2, 3, 4, 5, 6} maps["inquiry_status"] = []int{1, 2, 3, 4, 5, 6}
orderInquirys, err := orderInquiryDao.GetOrderInquiryTimeList(maps, startDate.Format("2006-01-02 15:04"), endDate.Format("2006-01-02 15:04:05")) orderInquirys, err := orderInquiryDao.GetOrderInquiryCreatedTimeList(maps, CurrentMonthStartDate.Format("2006-01-02 15:04:05"), CurrentMonthFinishDate.Format("2006-01-02 15:04:05"))
if err != nil { if err != nil {
return 0, err return 0, err
} }