新增问诊记录列表
This commit is contained in:
parent
848cffdda2
commit
f8fe37b353
@ -124,3 +124,47 @@ func (r *OrderInquiry) CancelOrderInquiry(c *gin.Context) {
|
||||
|
||||
responses.Ok(c)
|
||||
}
|
||||
|
||||
// GetOrderInquiryRecordPage 获取问诊记录列表-分页
|
||||
func (r *OrderInquiry) GetOrderInquiryRecordPage(c *gin.Context) {
|
||||
req := requests.OrderInquiryRequest{}
|
||||
if err := c.ShouldBind(&req.GetOrderInquiryRecordPage); err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
// 参数验证
|
||||
if err := global.Validate.Struct(req.GetOrderInquiryRecordPage); err != nil {
|
||||
responses.FailWithMessage(utils.Translate(err), c)
|
||||
return
|
||||
}
|
||||
|
||||
if req.GetOrderInquiryRecordPage.Page == 0 {
|
||||
req.GetOrderInquiryRecordPage.Page = 1
|
||||
}
|
||||
|
||||
if req.GetOrderInquiryRecordPage.PageSize == 0 {
|
||||
req.GetOrderInquiryRecordPage.PageSize = 20
|
||||
}
|
||||
|
||||
orderInquiryDao := dao.OrderInquiryDao{}
|
||||
orderInquiry, total, err := orderInquiryDao.GetOrderInquiryRecordPageSearch(req.GetOrderInquiryRecordPage, req.GetOrderInquiryRecordPage.Page, req.GetOrderInquiryRecordPage.PageSize)
|
||||
if err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
// 处理返回值
|
||||
GetOrderInquiryPageResponses := dto.GetOrderInquiryRecordListDto(orderInquiry)
|
||||
if err != nil {
|
||||
responses.FailWithMessage(err.Error(), c)
|
||||
return
|
||||
}
|
||||
|
||||
result := make(map[string]interface{})
|
||||
result["page"] = req.GetOrderInquiryPage.Page
|
||||
result["page_size"] = req.GetOrderInquiryPage.PageSize
|
||||
result["total"] = total
|
||||
result["data"] = GetOrderInquiryPageResponses
|
||||
responses.OkWithData(result, c)
|
||||
}
|
||||
|
||||
@ -274,3 +274,203 @@ func (r *OrderInquiryDao) GetOrderInquiryPageSearch(req requests.GetOrderInquiry
|
||||
}
|
||||
return m, totalRecords, nil
|
||||
}
|
||||
|
||||
// GetOrderInquiryRecordPageSearch 获取问诊记录列表-分页
|
||||
func (r *OrderInquiryDao) GetOrderInquiryRecordPageSearch(req requests.GetOrderInquiryRecordPage, page, pageSize int) (m []*model.OrderInquiry, total int64, err error) {
|
||||
var totalRecords int64
|
||||
|
||||
// 构建查询条件
|
||||
query := global.Db.Model(&model.OrderInquiry{})
|
||||
|
||||
// 医生
|
||||
query = query.Preload("UserDoctor", func(db *gorm.DB) *gorm.DB {
|
||||
return db.Omit("open_id", "union_id", "wx_session_key")
|
||||
})
|
||||
|
||||
// 医生姓名
|
||||
if req.DoctorName != "" {
|
||||
subQuery := global.Db.Model(&model.UserDoctor{}).
|
||||
Select("doctor_id").
|
||||
Where("user_name LIKE ?", "%"+req.DoctorName+"%")
|
||||
|
||||
query = query.Where(gorm.Expr("doctor_id IN (?)", subQuery))
|
||||
}
|
||||
|
||||
// 用户
|
||||
query = query.Preload("User", func(db *gorm.DB) *gorm.DB {
|
||||
return db.Select("user_id", "user_name", "mobile")
|
||||
})
|
||||
|
||||
// 订单类型
|
||||
if req.InquiryType != nil {
|
||||
query = query.Where("inquiry_type = ?", req.InquiryType)
|
||||
}
|
||||
|
||||
// 订单问诊方式
|
||||
if req.InquiryMode != nil {
|
||||
query = query.Where("inquiry_mode = ?", req.InquiryMode)
|
||||
}
|
||||
|
||||
// 问诊订单状态
|
||||
if req.InquiryStatus != nil {
|
||||
query = query.Where("inquiry_status = ?", req.InquiryStatus)
|
||||
}
|
||||
|
||||
// 问诊订单退款状态
|
||||
if req.InquiryRefundStatus != nil {
|
||||
query = query.Where("inquiry_refund_status = ?", req.InquiryRefundStatus)
|
||||
}
|
||||
|
||||
// 支付渠道
|
||||
if req.InquiryPayChannel != nil {
|
||||
query = query.Where("inquiry_pay_channel = ?", req.InquiryPayChannel)
|
||||
}
|
||||
|
||||
// 支付状态
|
||||
if req.InquiryPayStatus != nil {
|
||||
query = query.Where("inquiry_pay_status = ?", req.InquiryPayStatus)
|
||||
}
|
||||
|
||||
// 系统订单编号
|
||||
if req.InquiryNo != "" {
|
||||
query = query.Where("inquiry_no = ?", req.InquiryNo)
|
||||
}
|
||||
|
||||
// 第三方支付流水号
|
||||
if req.EscrowTradeNo != "" {
|
||||
query = query.Where("escrow_trade_no = ?", req.EscrowTradeNo)
|
||||
}
|
||||
|
||||
// 支付时间
|
||||
if req.PayTime != "" {
|
||||
payTime := strings.Split(req.PayTime, "&")
|
||||
if len(payTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", payTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", payTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("pay_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 接诊时间
|
||||
if req.ReceptionTime != "" {
|
||||
receptionTime := strings.Split(req.ReceptionTime, "&")
|
||||
if len(receptionTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", receptionTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", receptionTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("reception_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 订单完成时间
|
||||
if req.CompleteTime != "" {
|
||||
completeTime := strings.Split(req.CompleteTime, "&")
|
||||
if len(completeTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", completeTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", completeTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("complete_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 订单结束时间
|
||||
if req.FinishTime != "" {
|
||||
finishTime := strings.Split(req.FinishTime, "&")
|
||||
if len(finishTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", finishTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", finishTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("finish_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 是否提现
|
||||
if req.IsWithdrawal != nil {
|
||||
query = query.Where("is_withdrawal = ?", req.IsWithdrawal)
|
||||
}
|
||||
|
||||
// 订单取消时间
|
||||
if req.CancelTime != "" {
|
||||
cancelTime := strings.Split(req.CancelTime, "&")
|
||||
if len(cancelTime) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", cancelTime[0])
|
||||
endTime, _ := time.Parse("2006-01-02", cancelTime[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("cancel_time BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 创建时间
|
||||
if req.CreatedAt != "" {
|
||||
createdAt := strings.Split(req.CreatedAt, "&")
|
||||
if len(createdAt) == 2 {
|
||||
startTime, _ := time.Parse("2006-01-02", createdAt[0])
|
||||
endTime, _ := time.Parse("2006-01-02", createdAt[1])
|
||||
|
||||
if startTime == endTime {
|
||||
endTime = endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
}
|
||||
|
||||
query = query.Where("created_at BETWEEN ? AND ?", startTime, endTime)
|
||||
}
|
||||
}
|
||||
|
||||
// 患者姓名-就诊人
|
||||
if req.PatientName != "" {
|
||||
query = query.Where("patient_name LIKE ?", "%"+req.PatientName+"%")
|
||||
}
|
||||
|
||||
// 手机号-医生/患者
|
||||
if req.Mobile != "" {
|
||||
// 患者
|
||||
patientSubQuery := global.Db.Model(&model.User{}).
|
||||
Select("user_id").
|
||||
Where("mobile = ?", req.Mobile)
|
||||
|
||||
// 医生
|
||||
doctorUserSubQuery := global.Db.Model(&model.User{}).
|
||||
Select("user_id").
|
||||
Where("mobile = ?", req.Mobile)
|
||||
|
||||
doctorSubQuery := global.Db.Model(&model.UserDoctor{}).
|
||||
Select("doctor_id").
|
||||
Where(gorm.Expr("user_id IN (?)", doctorUserSubQuery))
|
||||
|
||||
query = query.Where("user_id IN (?)", patientSubQuery).Or("doctor_id IN (?)", doctorSubQuery)
|
||||
}
|
||||
|
||||
// 排序
|
||||
query = query.Order("created_at desc")
|
||||
|
||||
// 查询总数量
|
||||
if err := query.Count(&totalRecords).Error; err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
err = query.Scopes(model.Paginate(page, pageSize)).Find(&m).Error
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
return m, totalRecords, nil
|
||||
}
|
||||
|
||||
@ -150,6 +150,55 @@ func GetOrderInquiryListDto(m []*model.OrderInquiry) []*OrderInquiryDto {
|
||||
return responses
|
||||
}
|
||||
|
||||
func GetOrderInquiryRecordListDto(m []*model.OrderInquiry) []*OrderInquiryDto {
|
||||
// 处理返回值
|
||||
responses := make([]*OrderInquiryDto, len(m))
|
||||
|
||||
if len(m) > 0 {
|
||||
for i, v := range m {
|
||||
response := &OrderInquiryDto{
|
||||
OrderInquiryId: fmt.Sprintf("%d", v.OrderInquiryId),
|
||||
UserId: fmt.Sprintf("%d", v.UserId),
|
||||
PatientId: fmt.Sprintf("%d", v.PatientId),
|
||||
DoctorId: fmt.Sprintf("%d", v.DoctorId),
|
||||
FamilyId: fmt.Sprintf("%d", v.FamilyId),
|
||||
InquiryType: v.InquiryType,
|
||||
InquiryMode: v.InquiryMode,
|
||||
InquiryStatus: v.InquiryStatus,
|
||||
IsDelete: v.IsDelete,
|
||||
InquiryRefundStatus: v.InquiryRefundStatus,
|
||||
InquiryPayChannel: v.InquiryPayChannel,
|
||||
InquiryPayStatus: v.InquiryPayStatus,
|
||||
InquiryNo: v.InquiryNo,
|
||||
EscrowTradeNo: v.EscrowTradeNo,
|
||||
ReceptionTime: v.ReceptionTime,
|
||||
CompleteTime: v.CompleteTime,
|
||||
FinishTime: v.FinishTime,
|
||||
CancelTime: v.CancelTime,
|
||||
CancelReason: v.CancelReason,
|
||||
CancelRemarks: v.CancelRemarks,
|
||||
PatientName: v.PatientName,
|
||||
PatientNameMask: v.PatientNameMask,
|
||||
PatientSex: v.PatientSex,
|
||||
PatientAge: v.PatientAge,
|
||||
PatientMobile: v.User.Mobile,
|
||||
CreatedAt: v.CreatedAt,
|
||||
UpdatedAt: v.UpdatedAt,
|
||||
}
|
||||
|
||||
// 加载医生名称
|
||||
if v.UserDoctor != nil {
|
||||
response = response.LoadDoctorName(v.UserDoctor)
|
||||
}
|
||||
|
||||
// 将转换后的结构体添加到新切片中
|
||||
responses[i] = response
|
||||
}
|
||||
}
|
||||
|
||||
return responses
|
||||
}
|
||||
|
||||
// LoadDoctorName 加载医生名称
|
||||
func (r *OrderInquiryDto) LoadDoctorName(m *model.UserDoctor) *OrderInquiryDto {
|
||||
if m != nil {
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
package requests
|
||||
|
||||
type OrderInquiryRequest struct {
|
||||
GetOrderInquiryPage // 获取问诊订单列表-分页
|
||||
CancelOrderInquiry // 取消问诊订单
|
||||
GetOrderInquiryPage // 获取问诊订单列表-分页
|
||||
CancelOrderInquiry // 取消问诊订单
|
||||
GetOrderInquiryRecordPage // 获取问诊记录列表-分页
|
||||
}
|
||||
|
||||
// GetOrderInquiryPage 获取问诊订单列表-分页
|
||||
@ -33,3 +34,27 @@ type GetOrderInquiryPage struct {
|
||||
type CancelOrderInquiry struct {
|
||||
CancelRemarks string `json:"cancel_remarks" form:"cancel_remarks" validate:"required" label:"取消订单备注"`
|
||||
}
|
||||
|
||||
// GetOrderInquiryRecordPage 获取问诊记录列表-分页
|
||||
type GetOrderInquiryRecordPage struct {
|
||||
Page int `json:"page" form:"page" label:"页码"`
|
||||
PageSize int `json:"page_size" form:"page_size" label:"每页个数"`
|
||||
DoctorName string `json:"doctor_name" form:"doctor_name" label:"医生姓名"`
|
||||
InquiryType *int `json:"inquiry_type" form:"inquiry_type" label:"订单类型"` // （1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药 5:检测）
|
||||
InquiryMode *int `json:"inquiry_mode" form:"inquiry_mode" label:"订单问诊方式"` // （1:图文 2:视频 3:语音 4:电话 5:会员）
|
||||
InquiryStatus *int `json:"inquiry_status" form:"inquiry_status" label:"问诊订单状态"` // 1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消
|
||||
InquiryRefundStatus *int `json:"inquiry_refund_status" form:"inquiry_refund_status" label:"问诊订单退款状态"` // （0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭 6:退款异常）
|
||||
InquiryPayChannel *int `json:"inquiry_pay_channel" form:"inquiry_pay_channel" label:"支付渠道"` // （1:小程序支付 2:微信扫码支付 3:模拟支付）
|
||||
InquiryPayStatus *int `json:"inquiry_pay_status" form:"inquiry_pay_status" label:"支付状态"` // （1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
|
||||
InquiryNo string `json:"inquiry_no" form:"inquiry_no" label:"系统订单编号"`
|
||||
EscrowTradeNo string `json:"escrow_trade_no" form:"escrow_trade_no" label:"第三方支付流水号"`
|
||||
PayTime string `json:"pay_time" form:"pay_time" label:"支付时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
ReceptionTime string `json:"reception_time" form:"reception_time" label:"接诊时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
CompleteTime string `json:"complete_time" form:"complete_time" label:"订单完成时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
FinishTime string `json:"finish_time" form:"finish_time" label:"订单结束时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
IsWithdrawal *int `json:"is_withdrawal" form:"is_withdrawal" label:"是否提现"` // 0:否 1:是 2:提现中
|
||||
CancelTime string `json:"cancel_time" form:"cancel_time" label:"订单取消时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
CreatedAt string `json:"created_at" form:"created_at" label:"订单创建时间"` // 时间区间，数组形式，下标0为开始时间，下标1为结束时间
|
||||
PatientName string `json:"patient_name" form:"patient_name" label:"患者姓名-就诊人"`
|
||||
Mobile string `json:"mobile" form:"mobile" label:"手机号-医生/患者"`
|
||||
}
|
||||
|
||||
@ -398,6 +398,16 @@ func privateRouter(r *gin.Engine, api controller.Api) {
|
||||
|
||||
// 上报监管平台
|
||||
}
|
||||
|
||||
// 问诊记录-继承问诊订单路由
|
||||
inquiryRecordGroup := inquiryGroup.Group("/record")
|
||||
{
|
||||
// 获取问诊记录列表-分页
|
||||
inquiryRecordGroup.GET("", api.OrderInquiry.GetOrderInquiryRecordPage)
|
||||
|
||||
// 问诊记录详情
|
||||
inquiryRecordGroup.GET("/:order_inquiry_id", api.OrderInquiry.GetOrderInquiry)
|
||||
}
|
||||
}
|
||||
|
||||
// 病例管理
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user