新增医生列表

api/controller/base.go

@@ -2,19 +2,13 @@ package controller
 
 // Api api接口
 type Api struct {
-	Basic    // 基础数据
-	Role     // 角色数据
-	Menu     // 菜单数据
-	User     // 用户数据
-	AdminApi // 接口数据
-	Dept     // 部门数据
-	Post     // 岗位数据
-	UserDoctor
+	Basic            // 基础数据
+	sysSetting       // 系统设置
+	userDoctorManage // 医生管理
 }
 
 // SysSetting 系统设置
 type sysSetting struct {
-	Basic    // 基础数据
 	Role     // 角色数据
 	Menu     // 菜单数据
 	User     // 用户数据

api/controller/user.go

@@ -6,7 +6,7 @@ import (
 	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
-	"hospital-admin-api/api/responses/userResponse"
+	"hospital-admin-api/api/responses/adminUserResponse"
 	"hospital-admin-api/api/service"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
@@ -50,7 +50,7 @@ func (r *User) GetUserPage(c *gin.Context) {
 	}
 
 	// 处理返回值
-	getUserPageResponses := userResponse.GetUserPageResponse(adminUser)
+	getUserPageResponses := adminUserResponse.GetUserPageResponse(adminUser)
 
 	result := make(map[string]interface{})
 	result["page"] = UserRequest.GetUserPage.Page
@@ -121,7 +121,7 @@ func (r *User) GetUser(c *gin.Context) {
 	}
 
 	// 处理返回值
-	getUserResponses := userResponse.GetUserResponse(adminUser)
+	getUserResponses := adminUserResponse.GetUserResponse(adminUser)
 
 	responses.OkWithData(getUserResponses, c)
 }

api/controller/userDoctor.go

@@ -1,11 +1,11 @@
 package controller
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
+	"hospital-admin-api/api/responses/userDoctorResponse"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
 )
@@ -42,15 +42,13 @@ func (r *UserDoctor) GetUserDoctorPage(c *gin.Context) {
 		return
 	}
 
-	fmt.Println(total)
+	// 处理返回值
+	getUserDoctorPageResponses := userDoctorResponse.GetUserDoctorPageResponse(userDoctor)
 
-	// // 处理返回值
-	// getUserPageResponses := userResponse.GetUserPageResponse(userDoctor)
-	//
-	// result := make(map[string]interface{})
-	// result["page"] = userDoctorRequest.GetUserDoctorPage.Page
-	// result["page_size"] = userDoctorRequest.GetUserDoctorPage.PageSize
-	// result["total"] = total
-	// result["data"] = getUserPageResponses
-	responses.OkWithData(userDoctor, c)
+	result := make(map[string]interface{})
+	result["page"] = userDoctorRequest.GetUserDoctorPage.Page
+	result["page_size"] = userDoctorRequest.GetUserDoctorPage.PageSize
+	result["total"] = total
+	result["data"] = getUserDoctorPageResponses
+	responses.OkWithData(result, c)
 }