🐛 fix bug

api/v1/app/todos.go

@@ -7,19 +7,28 @@ import (
 	"miniapp/global"
 	"miniapp/model/app"
 	"miniapp/model/common"
+	"miniapp/model/common/request"
 	r "miniapp/model/common/response"
+	"strconv"
 )
 
 type TodosApi struct{}
 
 func (t TodosApi) GetUserTodos(ctx *gin.Context) {
+	var p request.GetUserNotes
+	if err := ctx.ShouldBind(&p); err != nil {
+		r.FailWithMessage("参数错误:"+err.Error(), ctx)
+		global.GVA_LOG.Error("参数错误", zap.Error(err))
+		return
+	}
 
 	var ue app.User
 	if api.GetUser(ctx, &ue, false, true); ctx.IsAborted() {
 		return
 	}
 
-	list, err := todosService.GetUserTodos(ue.ID)
+	p.UserId = strconv.Itoa(int(ue.ID))
+	list, err := todosService.GetUserTodos(&p)
 	if err != nil {
 		r.FailWithMessage("获取Todo列表失败:"+err.Error(), ctx)
 		global.GVA_LOG.Error("获取Todo列表失败", zap.Error(err))

api/v1/app/user.go

@@ -4,12 +4,12 @@ import (
 	"git.echol.cn/loser/logger/log"
 	"github.com/gin-gonic/gin"
 	"miniapp/api"
-	"miniapp/global"
 	"miniapp/model/app"
 	"miniapp/model/app/request"
 	"miniapp/model/app/response"
 	r "miniapp/model/common/response"
 	"miniapp/utils"
+	"strconv"
 	"strings"
 )
 
@@ -116,15 +116,20 @@ func (u *UserApi) UpdateUserHospital(ctx *gin.Context) {
 
 // GetInfo 获取用户信息
 func (u *UserApi) GetInfo(ctx *gin.Context) {
-	id := ctx.Param("id")
-	if id == "" {
-		global.GVA_LOG.Error("参数错误")
-		r.FailWithMessage("参数错误", ctx)
+	//id := ctx.Param("id")
+	//if id == "" {
+	//	global.GVA_LOG.Error("参数错误")
+	//	r.FailWithMessage("参数错误", ctx)
+	//	return
+	//}
+
+	var ue app.User
+	if api.GetUser(ctx, &ue, false, true); ctx.IsAborted() {
 		return
 	}
 
 	// 获取用户信息
-	userInfo, err := userService.GetUserInfo(id)
+	userInfo, err := userService.GetUserInfo(strconv.Itoa(int(ue.ID)))
 	if err != nil {
 		log.Errorf("获取用户信息失败：%s", err.Error())
 		r.FailWithMessage("获取用户信息失败"+err.Error(), ctx)

api/v1/system/hospital.go

@@ -2,6 +2,8 @@ package system
 
 import (
 	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+	"miniapp/global"
 	"miniapp/model/common"
 	"miniapp/model/common/request"
 	r "miniapp/model/common/response"
@@ -97,3 +99,23 @@ func (h HospitalApi) GetHospitalById(ctx *gin.Context) {
 
 	r.OkWithDetailed(hospitalResult, "获取成功", ctx)
 }
+
+// GetHospitalNotes 根据id获取医院注意事项
+func (h HospitalApi) GetHospitalNotes(ctx *gin.Context) {
+	p := request.GetHospitalNotes{}
+	if err := ctx.ShouldBind(&p); err != nil {
+		global.GVA_LOG.Error("参数错误", zap.Error(err))
+		r.FailWithMessage("参数错误"+err.Error(), ctx)
+		return
+	}
+
+	notes, err := hospitalService.GetHospitalNotes(p)
+
+	if err != nil {
+		global.GVA_LOG.Error("获取医院注意事项失败", zap.Error(err))
+		r.FailWithMessage("获取医院注意事项失败"+err.Error(), ctx)
+		return
+	}
+
+	r.OkWithData(notes, ctx)
+}