修改了返回数据的处理文件，修正为dto表示返回。新增了获取医生列表-分页接口。重构了获取医生详情、获取多点执业医生详情接口

api/controller/v1/userDoctor.go

@@ -3,9 +3,10 @@ package v1
 import (
 	"github.com/gin-gonic/gin"
 	"hospital-open-api/api/dao"
-	"hospital-open-api/api/requests/v1"
+	dtoV1 "hospital-open-api/api/dto/v1"
+	requestsV1 "hospital-open-api/api/requests/v1"
 	"hospital-open-api/api/responses"
-	"hospital-open-api/api/responses/v1/userDoctorResponse"
+	serviceV1 "hospital-open-api/api/service/v1"
 	"hospital-open-api/global"
 	"hospital-open-api/utils"
 )
@@ -14,54 +15,96 @@ type UserDoctor struct{}
 
 // GetMultiDoctor 获取多点执业医生详情
 func (r *UserDoctor) GetMultiDoctor(c *gin.Context) {
-	req := v1.UserDoctorRequest{}
-	if err := c.ShouldBind(&req.GetMultiDoctor); err != nil {
+	userDoctorRequest := requestsV1.UserDoctorRequest{}
+	req := userDoctorRequest.GetMultiDoctor
+
+	if err := c.ShouldBind(&req); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 参数验证
-	if err := global.Validate.Struct(req.GetMultiDoctor); err != nil {
+	if err := global.Validate.Struct(req); err != nil {
 		responses.FailWithMessage(utils.Translate(err), c)
 		return
 	}
 
-	// 获取数据
-	userDoctorDao := dao.UserDoctorDao{}
-	userDoctor, err := userDoctorDao.GetMultiUserDoctor(req.GetMultiDoctor)
-	if err != nil && userDoctor == nil {
-		responses.Ok(c)
+	// 业务处理
+	userDoctorService := serviceV1.UserDoctorService{}
+	getMultiDoctorResponses, err := userDoctorService.GetMultiDoctor(req)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
-	// 处理返回值
-	getMultiDoctorResponse := userDoctorResponse.GetMultiDoctorResponse(userDoctor)
-	responses.OkWithData(getMultiDoctorResponse, c)
+	responses.OkWithData(getMultiDoctorResponses, c)
 }
 
 // GetDoctor 获取医生详情
 func (r *UserDoctor) GetDoctor(c *gin.Context) {
-	req := v1.UserDoctorRequest{}
-	if err := c.ShouldBind(&req.GetDoctor); err != nil {
+	userDoctorRequest := requestsV1.UserDoctorRequest{}
+	req := userDoctorRequest.GetDoctor
+
+	if err := c.ShouldBind(&req); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 参数验证
-	if err := global.Validate.Struct(req.GetDoctor); err != nil {
+	if err := global.Validate.Struct(req); err != nil {
 		responses.FailWithMessage(utils.Translate(err), c)
 		return
 	}
 
-	// 获取数据
+	// 业务处理
+	userDoctorService := serviceV1.UserDoctorService{}
+	getDoctorResponses, err := userDoctorService.GetDoctor(req)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	responses.OkWithData(getDoctorResponses, c)
+}
+
+// GetUserDoctorPage 获取医生列表-分页
+func (r *UserDoctor) GetUserDoctorPage(c *gin.Context) {
+	userDoctorRequest := requestsV1.UserDoctorRequest{}
+	req := userDoctorRequest.GetUserDoctorPage
+
+	if err := c.ShouldBind(&req); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(req); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	if req.Page == 0 {
+		req.Page = 1
+	}
+
+	if req.PageSize == 0 {
+		req.PageSize = 20
+	}
+
 	userDoctorDao := dao.UserDoctorDao{}
-	userDoctor, err := userDoctorDao.GetUserDoctor(req.GetDoctor)
-	if err != nil && userDoctor == nil {
-		responses.Ok(c)
+	userDoctor, total, err := userDoctorDao.GetUserDoctorPageSearch(req, req.Page, req.PageSize)
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 处理返回值
-	getMultiDoctorResponse := userDoctorResponse.GetDoctorResponse(userDoctor)
-	responses.OkWithData(getMultiDoctorResponse, c)
+	getUserDoctorPageResponses := dtoV1.GetUserDoctorPageListDto(userDoctor)
+
+	result := make(map[string]interface{})
+	result["page"] = req.Page
+	result["page_size"] = req.PageSize
+	result["total"] = total
+	result["data"] = getUserDoctorPageResponses
+	responses.OkWithData(result, c)
 }