From adad73a9b7c34f3a9374e3b68246fd6665f3bb56 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 17 Oct 2023 10:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9im=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/controller/inquiryConfig.go | 39 +++++++++++++++++++++++++++++++++ api/controller/orderInquiry.go | 15 +------------ api/requests/inquiryConfig.go | 17 ++++++++++++++ api/requests/orderInquiry.go | 5 +++-- api/router/router.go | 2 +- 5 files changed, 61 insertions(+), 17 deletions(-) diff --git a/api/controller/inquiryConfig.go b/api/controller/inquiryConfig.go index 6a619a9..2567673 100644 --- a/api/controller/inquiryConfig.go +++ b/api/controller/inquiryConfig.go @@ -81,3 +81,42 @@ func (r *InquiryConfig) GetDoctorInquiryConfig(c *gin.Context) { responses.OkWithData(getUserDoctorResponses, c) } + +// PutDoctorInquiryConfig 修改医生问诊配置 +func (r *InquiryConfig) PutDoctorInquiryConfig(c *gin.Context) { + // inquiryConfigRequest := requests.InquiryConfigRequest{} + // req := inquiryConfigRequest.PutDoctorInquiryConfig + // if err := c.ShouldBindJSON(&req); err != nil { + // responses.FailWithMessage(err.Error(), c) + // return + // } + // + // // 参数验证 + // if err := global.Validate.Struct(req); err != nil { + // responses.FailWithMessage(utils.Translate(err), c) + // return + // } + // + // id := c.Param("doctor_id") + // if id == "" { + // responses.FailWithMessage("缺少参数", c) + // return + // } + // + // // 将 id 转换为 int64 类型 + // doctorId, err := strconv.ParseInt(id, 10, 64) + // if err != nil { + // responses.Fail(c) + // return + // } + // + // // 业务处理 + // userDoctorService := service.UserDoctorService{} + // _, err = userDoctorService.PutUserDoctor(doctorId, req) + // if err != nil { + // responses.FailWithMessage(err.Error(), c) + // return + // } + + responses.Ok(c) +} diff --git a/api/controller/orderInquiry.go b/api/controller/orderInquiry.go index fbe6675..d476812 100644 --- a/api/controller/orderInquiry.go +++ b/api/controller/orderInquiry.go @@ -197,19 +197,6 @@ func (r *OrderInquiry) GetOrderInquiryRecord(c *gin.Context) { // GetOrderInquiryImPage 获取问诊订单im内容列表-分页 func (r *OrderInquiry) GetOrderInquiryImPage(c *gin.Context) { - id := c.Param("order_inquiry_id") - if id == "" { - responses.FailWithMessage("缺少参数", c) - return - } - - // 将 id 转换为 int64 类型 - orderInquiryId, err := strconv.ParseInt(id, 10, 64) - if err != nil { - responses.Fail(c) - return - } - req := requests.OrderInquiryRequest{} if err := c.ShouldBind(&req.GetOrderInquiryImPage); err != nil { responses.FailWithMessage(err.Error(), c) @@ -231,7 +218,7 @@ func (r *OrderInquiry) GetOrderInquiryImPage(c *gin.Context) { } messageImDao := dao.MessageImDao{} - messageIm, total, err := messageImDao.GetMessageImPageSearch(orderInquiryId, req.GetOrderInquiryImPage.Page, req.GetOrderInquiryImPage.PageSize) + messageIm, total, err := messageImDao.GetMessageImPageSearch(req.GetOrderInquiryImPage.OrderInquiryId, req.GetOrderInquiryImPage.Page, req.GetOrderInquiryImPage.PageSize) if err != nil { responses.FailWithMessage(err.Error(), c) return diff --git a/api/requests/inquiryConfig.go b/api/requests/inquiryConfig.go index 7516681..48f42ca 100644 --- a/api/requests/inquiryConfig.go +++ b/api/requests/inquiryConfig.go @@ -14,3 +14,20 @@ type GetDoctorInquiryConfigPage struct { InquiryMode *int `json:"inquiry_mode" form:"inquiry_mode" label:"问诊方式"` // 1:图文 2:视频 3:语音 4:电话 5:会员 IsEnable *int `json:"is_enable" form:"is_enable" label:"是否启用"` // 0:否 1:是 } + +// PutDoctorInquiryConfig 修改医生问诊配置 +type PutDoctorInquiryConfig struct { + DoctorId int `json:"doctor_id" form:"doctor_id"` // 医生id + 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:会员 + WorkNumDay *int `json:"work_num_day" label:"每日接诊数量"` + IsEnable *int `json:"is_enable" form:"is_enable" label:"是否启用"` // 0:否 1:是 + PutDoctorInquiryTime []*putDoctorInquiryTime `json:"doctor_inquiry_time" form:"doctor_inquiry_time" label:"医生问诊配置-时间配置"` +} + +// putDoctorInquiryConfigByTime 医生问诊配置-时间配置 +type putDoctorInquiryTime struct { + InquiryDate string `json:"inquiry_date" form:"inquiry_date" label:"坐班日期"` + StartTime string `json:"start_time" form:"start_time" label:"开始时间"` + EndTime string `json:"end_time" form:"end_time" label:"结束时间"` +} diff --git a/api/requests/orderInquiry.go b/api/requests/orderInquiry.go index 5a85fe3..fd24f5b 100644 --- a/api/requests/orderInquiry.go +++ b/api/requests/orderInquiry.go @@ -62,6 +62,7 @@ type GetOrderInquiryRecordPage struct { // GetOrderInquiryImPage 获取问诊订单im内容列表-分页 type GetOrderInquiryImPage struct { - Page int `json:"page" form:"page" label:"页码"` - PageSize int `json:"page_size" form:"page_size" label:"每页个数"` + Page int `json:"page" form:"page" label:"页码"` + PageSize int `json:"page_size" form:"page_size" label:"每页个数"` + OrderInquiryId int64 `json:"order_inquiry_id" form:"order_inquiry_id" label:"订单id"` } diff --git a/api/router/router.go b/api/router/router.go index d0657fc..8335984 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -478,7 +478,7 @@ func privateRouter(r *gin.Engine, api controller.Api) { doctorGroup.GET("/:inquiry_config_id", api.InquiryConfig.GetDoctorInquiryConfig) // 修改医生问诊配置 - doctorGroup.PUT("/:doctor_id", api.UserDoctor.PutUserDoctor) + doctorGroup.PUT("/:inquiry_config_id", api.InquiryConfig.PutDoctorInquiryConfig) // 新增医生问诊配置 doctorGroup.POST("", api.UserDoctor.AddUserDoctor)