新增获取就诊人详情

api/controller/adminUser.go

@@ -14,10 +14,10 @@ import (
 	"time"
 )
 
-type User struct{}
+type AdminUser struct{}
 
 // GetUserPage 获取用户列表-分页
-func (r *User) GetUserPage(c *gin.Context) {
+func (r *AdminUser) GetUserPage(c *gin.Context) {
 	UserRequest := requests.UserRequest{}
 	if err := c.ShouldBind(&UserRequest.GetUserPage); err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -60,7 +60,7 @@ func (r *User) GetUserPage(c *gin.Context) {
 }
 
 // AddUser 新增用户
-func (r *User) AddUser(c *gin.Context) {
+func (r *AdminUser) AddUser(c *gin.Context) {
 	UserRequest := requests.UserRequest{}
 	if err := c.ShouldBind(&UserRequest.AddUser); err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -87,7 +87,7 @@ func (r *User) AddUser(c *gin.Context) {
 	}
 
 	// 业务处理
-	UserService := service.UserService{}
+	UserService := service.AdminUserService{}
 	_, err = UserService.AddUser(c, UserRequest.AddUser)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -97,7 +97,7 @@ func (r *User) AddUser(c *gin.Context) {
 }
 
 // GetUser 用户详情
-func (r *User) GetUser(c *gin.Context) {
+func (r *AdminUser) GetUser(c *gin.Context) {
 	id := c.Param("user_id")
 	if id == "" {
 		responses.FailWithMessage("缺少参数", c)
@@ -126,7 +126,7 @@ func (r *User) GetUser(c *gin.Context) {
 }
 
 // DeleteUser 删除用户-批量
-func (r *User) DeleteUser(c *gin.Context) {
+func (r *AdminUser) DeleteUser(c *gin.Context) {
 	userRequest := requests.UserRequest{}
 	if err := c.ShouldBindJSON(&userRequest.DeleteUser); err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -153,7 +153,7 @@ func (r *User) DeleteUser(c *gin.Context) {
 	}
 
 	// 业务处理
-	userService := service.UserService{}
+	userService := service.AdminUserService{}
 	_, err = userService.DeleteUser(c, userRequest.DeleteUser)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -163,7 +163,7 @@ func (r *User) DeleteUser(c *gin.Context) {
 }
 
 // PutUser 修改用户
-func (r *User) PutUser(c *gin.Context) {
+func (r *AdminUser) PutUser(c *gin.Context) {
 	UserRequest := requests.UserRequest{}
 	if err := c.ShouldBind(&UserRequest.PutUser); err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -190,7 +190,7 @@ func (r *User) PutUser(c *gin.Context) {
 	}
 
 	// 业务处理
-	userService := service.UserService{}
+	userService := service.AdminUserService{}
 	_, err = userService.PutUser(c, userId, UserRequest.PutUser)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -200,7 +200,7 @@ func (r *User) PutUser(c *gin.Context) {
 }
 
 // PutUserPassword 修改用户密码
-func (r *User) PutUserPassword(c *gin.Context) {
+func (r *AdminUser) PutUserPassword(c *gin.Context) {
 	UserRequest := requests.UserRequest{}
 	if err := c.ShouldBind(&UserRequest.PutUserPassword); err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -220,7 +220,7 @@ func (r *User) PutUserPassword(c *gin.Context) {
 	}
 
 	// 业务处理
-	userService := service.UserService{}
+	userService := service.AdminUserService{}
 	_, err := userService.PutUserPassword(userId, UserRequest.PutUserPassword)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -230,7 +230,7 @@ func (r *User) PutUserPassword(c *gin.Context) {
 }
 
 // LoginOut 退出登陆
-func (b *User) LoginOut(c *gin.Context) {
+func (b *AdminUser) LoginOut(c *gin.Context) {
 	userId := c.GetInt64("UserId")
 	if userId == 0 {
 		responses.FailWithMessage("用户错误", c)
@@ -266,7 +266,7 @@ func (b *User) LoginOut(c *gin.Context) {
 }
 
 // GetUserMenuList 获取用户菜单列表
-func (r *User) GetUserMenuList(c *gin.Context) {
+func (r *AdminUser) GetUserMenuList(c *gin.Context) {
 	roleId := c.GetInt64("RoleId")
 	if roleId == 0 {
 		responses.Fail(c)
@@ -298,7 +298,7 @@ func (r *User) GetUserMenuList(c *gin.Context) {
 }
 
 // GetUserButtonList 获取用户按钮列表
-func (r *User) GetUserButtonList(c *gin.Context) {
+func (r *AdminUser) GetUserButtonList(c *gin.Context) {
 	roleId := c.GetInt64("RoleId")
 	if roleId == 0 {
 		responses.Fail(c)

api/controller/base.go

@@ -13,12 +13,12 @@ type Api struct {
 
 // SysSetting 系统设置
 type sysSetting struct {
-	Role     // 角色数据
-	Menu     // 菜单数据
-	User     // 用户数据
-	AdminApi // 接口数据
-	Dept     // 部门数据
-	Post     // 岗位数据
+	Role      // 角色数据
+	Menu      // 菜单数据
+	AdminUser // 用户数据
+	AdminApi  // 接口数据
+	Dept      // 部门数据
+	Post      // 岗位数据
 }
 
 // 医生管理

api/controller/patientFamily.go

@@ -54,28 +54,28 @@ func (r *PatientFamily) GetPatientFamilyPage(c *gin.Context) {
 	responses.OkWithData(result, c)
 }
 
-// GetUserPatient 患者详情
-func (r *PatientFamily) GetUserPatient(c *gin.Context) {
-	id := c.Param("patient_id")
+// GetPatientFamily 就诊人详情
+func (r *PatientFamily) GetPatientFamily(c *gin.Context) {
+	id := c.Param("family_id")
 	if id == "" {
 		responses.FailWithMessage("缺少参数", c)
 		return
 	}
 
 	// 将 id 转换为 int64 类型
-	patientId, err := strconv.ParseInt(id, 10, 64)
+	familyId, err := strconv.ParseInt(id, 10, 64)
 	if err != nil {
 		responses.Fail(c)
 		return
 	}
 
 	// 业务处理
-	userPatientService := service.UserPatientService{}
-	getUserPatientResponses, err := userPatientService.GetUserPatient(patientId)
+	patientFamilyService := service.PatientFamilyService{}
+	getPatientFamilyResponse, err := patientFamilyService.GetPatientFamily(familyId)
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
-	responses.OkWithData(getUserPatientResponses, c)
+	responses.OkWithData(getPatientFamilyResponse, c)
 }