release

conf/app.conf

@@ -56,4 +56,43 @@ artdbpass = 1Q2W3e4r!@#$
 artdbname = shengws_test
 
 #appid = "wx25576346fbca6905"
-#appsecret="f6d53ccb4a529dc4d3bd543a7634b6bd"
+#appsecret="f6d53ccb4a529dc4d3bd543a7634b6bd"
+
+
+[prod]
+
+redishost = kuyicloud.redis.rds.aliyuncs.com
+redisport = 6379
+redispasswrod = 1Q2W3e4r!@#$
+redisdb = 4
+
+readmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
+readmysqlport = 3306
+readmysqluser = syh
+readmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
+readmysqlname = sws_xcx
+
+writemysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
+writemysqlport = 3306
+writemysqluser = syh
+writemysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
+writemysqlname = sws_xcx
+
+
+readuserhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
+readuserport = 3306
+readuseruser = syh
+readuserpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
+readusername = sgj_users
+
+readxthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
+readxtport = 3306
+readxtuser = syh
+readxtpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
+readxtname = sgj_xt
+
+artdbhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
+artdbport = 3306
+artdbuser = syh
+artdbpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
+artdbname = shengws

controllers/api_base_controller.go

@@ -23,6 +23,7 @@ func ApiControllersRegisterRouters() {
 	beego.Router("/xcx/api/device/emqmsg", &MessageApiControllor{}, "Post:PutEmqxMessage")
 
 	beego.Router("/xcx/api/user/login", &LoginApiController{}, "Post:WxXcxLogin")
+	beego.Router("/xcx/api/user/loginbyopenid", &LoginApiController{}, "Post:LoginByOpenId")
 
 	beego.Router("/xcx/api/user/updatephonebycode", &UserApiController{}, "Post:UpdatePhoneByCode")
 
@@ -57,6 +58,7 @@ func ApiControllersRegisterRouters() {
 	beego.Router("/xcx/api/article/getarticlebyid", &ArticleApiController{}, "Get:GetArticleByID")
 	beego.Router("/xcx/api/article/getarticlemenu", &ArticleApiController{}, "Get:GetArticleMenu")
 	beego.Router("/xcx/api/article/getramdonarticlelist", &ArticleApiController{}, "Get:GetRamdonArticleList")
+	beego.Router("/xcx/api/article/getcheckitemnews", &ArticleApiController{}, "Get:GetCheckItemNews")
 
 }
 

controllers/article_api_controller.go

@@ -32,6 +32,20 @@ func (c *ArticleApiController) GetArticleList() {
 	c.ServeSuccessPageJSON(arts, toltal)
 }
 
+// @Title GetCheckItemNews
+// @Description 获取检测项目说明
+// @Success 200 {array} models.CheckItemNewsVO success
+// @Failure 500 error
+// @router /getcheckitemnews [get]
+func (c *ArticleApiController) GetCheckItemNews() {
+	news, err := service.NewCheckItemService().GetCheckItemNews()
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	c.ServeSuccessJSON(news)
+}
+
 // @Title GetArticleByID
 // @Description 获取文章详情
 // @Param   id query int true "文章id"

controllers/check_record_api_controller.go

@@ -340,8 +340,8 @@ func analyzeCheckRecord(ritems []*models.CheckRecordItem, citems []*models.Check
 						detail.Alert = true
 					}
 					detail.ValueIndex = strconv.Itoa(ri.CheckValueIndex)
-					detail.ID = item.Id
-					detail.Value = scope.Value
+					detail.ID = item.CheckItemNumber
+					detail.Value = ri.CheckValue
 					detail.NameCn = item.NameCn
 					detail.NameEn = item.NameEn
 					detail.ReferenceValue = item.ReferenceValue

controllers/login_api_controllor.go

@@ -16,7 +16,7 @@ type LoginApiController struct {
 
 // @Title WxXcxLogin
 // @Description 微信小程序登录
-// @Param	body	body 	models.WxXcxLoginReq	true  "小程序登录请求参数"
+// @Param	body	body 	models.WxXcxLoginReq	true  "小程序登录code"
 // @Success	200	{object}	models.WxXcxLoginResp
 // @Failure 500 error
 // @router /login [post]
@@ -59,3 +59,33 @@ func (c *LoginApiController) WxXcxLogin() {
 	c.ServeSuccessJSON(models.WxXcxLoginResp{OpenId: u.OpenId, PatientId: u.PatientId, UserOrgId: u.UserOrgId, Token: t})
 
 }
+
+// @Title LoginByOpenId
+// @Description 微信小程序登录
+// @Param	body	body 	models.WxXcxLoginReq	true  "小程序登录openid"
+// @Success	200	{object}	models.WxXcxLoginResp
+// @Failure 500 error
+// @router /loginbyopenid [post]
+func (c *LoginApiController) LoginByOpenId() {
+
+	dataBody := models.WxXcxLoginReq{}
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody); err != nil || dataBody.Code == "" {
+
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+		return
+	}
+
+	s := service.NewXcxUserService()
+	u, err := s.GetByOpenId(dataBody.Code)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	t, err := c.BaseApiController.login(*u)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+	c.ServeSuccessJSON(models.WxXcxLoginResp{OpenId: u.OpenId, PatientId: u.PatientId, UserOrgId: u.UserOrgId, Token: t})
+
+}

controllers/user_api_controller.go

@@ -113,9 +113,34 @@ func (c *UserApiController) SaveUserInfo() {
 		return
 	}
 
+	h, err := service.NewUserHealthProfileService().GetUserHealthProfileByUserId(c.CurrentUser.Id)
+	if err != nil {
+		c.ServeDynamicFailJsonSend(err.Error())
+		return
+	}
+
+	if h != nil && h.InpatientRegPhone != req.InpatientRegPhone && req.InpatientRegPhone != "" {
+		if req.VerifyCode == "" {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeVerificationCodeWrong)
+			return
+		} else {
+			redisClient := service.RedisClient()
+			defer redisClient.Close()
+			cache_code, _ := redisClient.Get("code_msg_" + req.InpatientRegPhone).Result()
+			if cache_code != req.VerifyCode {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeVerificationCodeWrong)
+				return
+
+			} else {
+				// 验证成功后验证码就要使其失效
+				redisClient.Del("code_msg_" + req.InpatientRegPhone)
+			}
+		}
+	}
+
 	p, err1 := service.NewXcxUserService().GetMobilePatientInfo(req.InpatientRegPhone, req.RealName, req.IdCard)
 
-	err := c.updateCurrentUser(func(u *models.XcxUser) {
+	err = c.updateCurrentUser(func(u *models.XcxUser) {
 		u.Avatar = req.Avatar
 		u.Email = req.Email
 		u.NickName = req.NickName

models/dbmodels.go

@@ -90,6 +90,7 @@ type Device struct {
 	Ctime                time.Time `json:"ctime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP; COMMENT:'创建时间'" description:"创建时间"`
 	Mtime                time.Time `json:"mtime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP; COMMENT:'更新时间 '" description:"更新时间 "`
 	DeleteFlag           int       `json:"delete_flag" gorm:"type:int(11); DEFAULT:'0'; COMMENT:'删除标志'" description:"删除标志"`
+	OrgID                int64     `json:"org_id" gorm:"type:bigint(20); NOT NULL; default:0; COMMENT:'所属机构'" description:"所属机构"`
 }
 
 func (Device) TableName() string {
@@ -120,6 +121,7 @@ type DeviceRelate struct {
 	Ctime      time.Time `json:"ctime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP; COMMENT:'创建时间'" description:"创建时间"`
 	Mtime      time.Time `json:"mtime" gorm:"type:datetime; DEFAULT: CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP; COMMENT:'更新时间 '" description:"更新时间 "`
 	DeleteFlag int       `json:"delete_flag" gorm:"type:int(11); DEFAULT:'0'; COMMENT:'删除标志(解绑时标记为删除)'" description:"删除标志(解绑时标记为删除)"`
+	OrgID      int64     `json:"org_id" gorm:"type:bigint(20); NOT NULL; default:0; COMMENT:'所属机构'" description:"所属机构"`
 }
 
 func (DeviceRelate) TableName() string {
@@ -149,18 +151,18 @@ type UserHealthProfile struct {
 	InpatientRegPhone   string    `json:"inpatient_reg_phone" gorm:"type:varchar(32); COMMENT:'住院登记手机号'" description:"住院登记手机号"`
 	Gender              int       `json:"gender" gorm:"type:int(11); DEFAULT:'0'; COMMENT:'性别（0：未知 1：男 2：女）'" description:"性别（0：未知 1：男 2：女）"`
 	Height              int       `json:"height" gorm:"type:int(11); COMMENT:'身高'" description:"身高"`
-	Weight              int       `json:"weight" gorm:"type:int(11); COMMENT:'体重'" description:"体重"`
+	Weight              float64   `json:"weight" gorm:"COMMENT:'体重'" description:"体重"`
 	BloodType           string    `json:"blood_type" gorm:"type:varchar(32); COMMENT:'血型'" description:"血型"`
 	Birthday            time.Time `json:"birthday" gorm:"type:datetime; COMMENT:'生日'" description:"生日"`
 	IllnessState        string    `json:"illness_state" gorm:"type:varchar(255); COMMENT:'病情'" description:"病情"`
 	RenalFunctionStatus int       `json:"renal_function_status" gorm:"type:int(11); COMMENT:'肾功能情况(0:未透析,1: 血液透析,2:腹膜透析，3:肾脏移植)'" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析，3:肾脏移植)"`
-	Creatinine          int       `json:"creatinine" gorm:"type:int(11); NOT NULL; DEFAULT:'0'; COMMENT:'血肌酐'" description:"血肌酐"`
+	Creatinine          float64   `json:"creatinine" gorm:"DEFAULT:'0'; COMMENT:'血肌酐'" description:"血肌酐"`
 	CreatinineUnit      string    `json:"creatinine_unit" gorm:"type:varchar(32); COMMENT:'肌酐单位(umol/L,mg/dl)'" description:"肌酐单位(umol/L,mg/dl)"`
 	CreatineTime        time.Time `json:"creatine_time" gorm:"type:datetime; COMMENT:'肌酐检测时间'" description:"肌酐检测时间"`
 	UrineProtein24hUnit string    `json:"urine_protein_24h_unit" gorm:"column:urine_protein_24h_unit; type:varchar(32); COMMENT:'24小时尿蛋白单位(g/24h,mg/24h)'" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
-	UrineProtein24h     int       `json:"urine_protein_24h" gorm:"column:urine_protein_24h;type:int(11); NOT NULL; DEFAULT:'0'; COMMENT:'24小时尿蛋白'" description:"24小时尿蛋白"`
+	UrineProtein24h     float64   `json:"urine_protein_24h" gorm:"column:urine_protein_24h;NOT NULL; DEFAULT:'0'; COMMENT:'24小时尿蛋白'" description:"24小时尿蛋白"`
 	UrineProtein24hTime time.Time `json:"urine_protein_24h_time" gorm:"column:urine_protein_24h_time;type:datetime; COMMENT:'24小时尿蛋白检测时间'" description:"24小时尿蛋白检测时间"`
-	UrineProtein        int       `json:"urine_protein" gorm:"type:int(11); NOT NULL; DEFAULT:'0'; COMMENT:'尿蛋白'" description:"尿蛋白"`
+	UrineProtein        float64   `json:"urine_protein" gorm:" NOT NULL; DEFAULT:'0'; COMMENT:'尿蛋白'" description:"尿蛋白"`
 	UrineProteinUnit    string    `json:"urine_protein_unit" gorm:"column:urine_protein_unit; type:varchar(32); COMMENT:'尿蛋白单位(g,mg)'" description:"尿蛋白单位(g,mg)"`
 	UrineProteinTime    time.Time `json:"urine_protein_time" gorm:"column:urine_protein_time;type:datetime; COMMENT:'尿蛋白检测时间'" description:"尿蛋白检测时间"`
 	Status              int       `json:"status" gorm:"type:int(11); DEFAULT:'1'; COMMENT:'状态（１：有效　０：无效 ）'" description:"状态（１：有效　０：无效 ）"`
@@ -354,3 +356,29 @@ type SyhArticlesComment struct {
 	CommentNum uint      `json:"comment_num" gorm:"column:comment_num; type:int(10) unsigned; not null; default:'0'; comment:'评论数'" description:"评论数"`
 	CommentID  uint      `json:"comment_id" gorm:"column:comment_id; type:int(10) unsigned; not null; default:'0'; comment:'在评论详情页面时用'" description:"评论ID"`
 }
+
+// CheckItemNews 表示新闻条目的结构体
+type CheckItemNews struct {
+	ID              int64     `gorm:"column:id;primary_key;auto_increment:false" json:"id" description:"主键，唯一标识每条记录"`
+	AuthorID        int64     `gorm:"column:author_id" json:"author_id" description:"新闻作者的ID"`
+	Title           string    `gorm:"column:title" json:"title" description:"新闻标题"`
+	Introduction    string    `gorm:"column:introduction" json:"introduction" description:"新闻简介或摘要"`
+	Tags            string    `gorm:"column:tags" json:"tags" description:"新闻标签，用以分类或检索"`
+	ReadingQuantity int       `gorm:"column:reading_quantity" json:"reading_quantity" description:"阅读量"`
+	ContentImages   string    `gorm:"column:content_images" json:"content_images" description:"存储新闻内容中的图片路径，可能为逗号分隔的字符串或JSON格式"`
+	CommentCount    int       `gorm:"column:comment_count" json:"comment_count" description:"评论数"`
+	LikeCount       int       `gorm:"column:like_count" json:"like_count" description:"点赞数"`
+	CollectCount    int       `gorm:"column:collect_count" json:"collect_count" description:"收藏数"`
+	Content         string    `gorm:"column:content" json:"content" description:"新闻正文内容"`
+	Status          int       `gorm:"column:status" json:"status" description:"新闻状态（例如，草稿、已发布等）"`
+	DeleteFlag      int       `gorm:"column:delete_flag" json:"delete_flag" description:"删除标记，0表示未删除，1表示已删除"`
+	StyleType       int       `gorm:"column:style_type" json:"style_type" description:"显示样式类型，可能用于控制前端展示效果"`
+	SortInTag       string    `gorm:"column:sort_in_tag" json:"sort_in_tag" description:"在特定标签内的排序规则"`
+	UpdateTime      time.Time `gorm:"column:update_time;default:CURRENT_TIMESTAMP;on_update:CURRENT_TIMESTAMP" json:"update_time" description:"记录最后更新的时间，自动更新"`
+	CreateTime      time.Time `gorm:"column:create_time;default:CURRENT_TIMESTAMP" json:"create_time" description:"创建时间"`
+}
+
+// TableName 返回表名
+func (CheckItemNews) TableName() string {
+	return "check_item_news"
+}

models/httpmodels.go

@@ -53,6 +53,8 @@ type SaveUserInfoReq struct {
 	RealName          string `json:"real_name" description:"真实姓名"`
 	IdCard            string `json:"id_card" description:"身份证号"`
 	InpatientRegPhone string `json:"inpatient_reg_phone" description:"住院登记手机号"`
+
+	VerifyCode string `json:"verify_code" description:"手机验证码"`
 }
 
 type UserInfoResp struct {
@@ -82,22 +84,22 @@ type UserInfoResp struct {
 }
 
 type SaveHealthProfileReq struct {
-	Gender              int    `json:"gender" description:"性别(0:未知 1:男 2:女)"`
-	Height              int    `json:"height" description:"身高"`
-	Weight              int    `json:"weight" description:"体重"`
-	BloodType           string `json:"blood_type" description:"血型"`
-	Birthday            string `json:"birthday" description:"生日 yyyy-MM-dd HH:mm:ss"`
-	IllnessState        string `json:"illness_state" description:"病情"`
-	RenalFunctionStatus int    `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
-	Creatinine          int    `json:"creatinine" description:"血肌酐"`
-	CreatinineUnit      string `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
-	CreatineTime        string `json:"creatine_time" description:"肌酐检测时间 yyyy-MM-dd HH:mm:ss"`
-	UrineProtein24hUnit string `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
-	UrineProtein24h     int    `json:"urine_protein_24h" description:"24小时尿蛋白"`
-	UrineProtein24hTime string `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间 yyyy-MM-dd HH:mm:ss"`
-	UrineProtein        int    `json:"urine_protein" description:"尿蛋白"`
-	UrineProteinUnit    string `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
-	UrineProteinTime    string `json:"urine_protein_time" description:"尿蛋白检测时间 yyyy-MM-dd HH:mm:ss"`
+	Gender              int     `json:"gender" description:"性别(0:未知 1:男 2:女)"`
+	Height              int     `json:"height" description:"身高"`
+	Weight              float64 `json:"weight" description:"体重"`
+	BloodType           string  `json:"blood_type" description:"血型"`
+	Birthday            string  `json:"birthday" description:"生日 yyyy-MM-dd HH:mm:ss"`
+	IllnessState        string  `json:"illness_state" description:"病情"`
+	RenalFunctionStatus int     `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
+	Creatinine          float64 `json:"creatinine" description:"血肌酐"`
+	CreatinineUnit      string  `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
+	CreatineTime        string  `json:"creatine_time" description:"肌酐检测时间 yyyy-MM-dd HH:mm:ss"`
+	UrineProtein24hUnit string  `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
+	UrineProtein24h     float64 `json:"urine_protein_24h" description:"24小时尿蛋白"`
+	UrineProtein24hTime string  `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间 yyyy-MM-dd HH:mm:ss"`
+	UrineProtein        float64 `json:"urine_protein" description:"尿蛋白"`
+	UrineProteinUnit    string  `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
+	UrineProteinTime    string  `json:"urine_protein_time" description:"尿蛋白检测时间 yyyy-MM-dd HH:mm:ss"`
 }
 
 type HealthProfileResp struct {
@@ -106,25 +108,25 @@ type HealthProfileResp struct {
 	//RealName            string    `json:"real_name" description:"真实姓名"`
 	//IdCard              string    `json:"id_card" description:"身份证号"`
 	//InpatientRegPhone   string    `json:"inpatient_reg_phone" description:"住院登记手机号"`
-	Gender              int    `json:"gender" description:"性别(0:未知 1:男 2:女)"`
-	Height              int    `json:"height" description:"身高"`
-	Weight              int    `json:"weight" description:"体重"`
-	BloodType           string `json:"blood_type" description:"血型"`
-	Birthday            Time   `json:"birthday" description:"生日"`
-	IllnessState        string `json:"illness_state" description:"病情"`
-	RenalFunctionStatus int    `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
-	Creatinine          int    `json:"creatinine" description:"血肌酐"`
-	CreatinineUnit      string `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
-	CreatineTime        Time   `json:"creatine_time" description:"肌酐检测时间"`
-	UrineProtein24hUnit string `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
-	UrineProtein24h     int    `json:"urine_protein_24h" description:"24小时尿蛋白"`
-	UrineProtein24hTime Time   `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间"`
-	UrineProtein        int    `json:"urine_protein" description:"尿蛋白"`
-	UrineProteinUnit    string `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
-	UrineProteinTime    Time   `json:"urine_protein_time" description:"尿蛋白检测时间"`
-	Status              int    `json:"status" description:"状态(1:有效 0:无效 )"`
-	Ctime               Time   `json:"ctime" description:"创建时间"`
-	Mtime               Time   `json:"mtime" description:"更新时间 "`
+	Gender              int     `json:"gender" description:"性别(0:未知 1:男 2:女)"`
+	Height              int     `json:"height" description:"身高"`
+	Weight              float64 `json:"weight" description:"体重"`
+	BloodType           string  `json:"blood_type" description:"血型"`
+	Birthday            Time    `json:"birthday" description:"生日"`
+	IllnessState        string  `json:"illness_state" description:"病情"`
+	RenalFunctionStatus int     `json:"renal_function_status" description:"肾功能情况(0:未透析,1: 血液透析,2:腹膜透析,3:肾脏移植)"`
+	Creatinine          float64 `json:"creatinine" description:"血肌酐"`
+	CreatinineUnit      string  `json:"creatinine_unit" description:"肌酐单位(umol/L,mg/dl)"`
+	CreatineTime        Time    `json:"creatine_time" description:"肌酐检测时间"`
+	UrineProtein24hUnit string  `json:"urine_protein_24h_unit" description:"24小时尿蛋白单位(g/24h,mg/24h)"`
+	UrineProtein24h     float64 `json:"urine_protein_24h" description:"24小时尿蛋白"`
+	UrineProtein24hTime Time    `json:"urine_protein_24h_time" description:"24小时尿蛋白检测时间"`
+	UrineProtein        float64 `json:"urine_protein" description:"尿蛋白"`
+	UrineProteinUnit    string  `json:"urine_protein_unit" description:"尿蛋白单位(g,mg)"`
+	UrineProteinTime    Time    `json:"urine_protein_time" description:"尿蛋白检测时间"`
+	Status              int     `json:"status" description:"状态(1:有效 0:无效 )"`
+	Ctime               Time    `json:"ctime" description:"创建时间"`
+	Mtime               Time    `json:"mtime" description:"更新时间 "`
 }
 
 type DicResp struct {
@@ -273,3 +275,23 @@ type SyhArticlesCommentVO struct {
 	CommentNum uint   `json:"comment_num" gorm:"column:comment_num; type:int(10) unsigned; not null; default:'0'; comment:'评论数'" description:"评论数"`
 	CommentID  uint   `json:"comment_id" gorm:"column:comment_id; type:int(10) unsigned; not null; default:'0'; comment:'在评论详情页面时用'" description:"评论ID"`
 }
+
+type CheckItemNewsVO struct {
+	ID              int64  `gorm:"column:id;primary_key;auto_increment:false" json:"id" description:"主键，唯一标识每条记录"`
+	AuthorID        int64  `gorm:"column:author_id" json:"author_id" description:"新闻作者的ID"`
+	Title           string `gorm:"column:title" json:"title" description:"新闻标题"`
+	Introduction    string `gorm:"column:introduction" json:"introduction" description:"新闻简介或摘要"`
+	Tags            string `gorm:"column:tags" json:"tags" description:"新闻标签，用以分类或检索"`
+	ReadingQuantity int    `gorm:"column:reading_quantity" json:"reading_quantity" description:"阅读量"`
+	ContentImages   string `gorm:"column:content_images" json:"content_images" description:"存储新闻内容中的图片路径，可能为逗号分隔的字符串或JSON格式"`
+	CommentCount    int    `gorm:"column:comment_count" json:"comment_count" description:"评论数"`
+	LikeCount       int    `gorm:"column:like_count" json:"like_count" description:"点赞数"`
+	CollectCount    int    `gorm:"column:collect_count" json:"collect_count" description:"收藏数"`
+	Content         string `gorm:"column:content" json:"content" description:"新闻正文内容"`
+	Status          int    `gorm:"column:status" json:"status" description:"新闻状态（例如，草稿、已发布等）"`
+	DeleteFlag      int    `gorm:"column:delete_flag" json:"delete_flag" description:"删除标记，0表示未删除，1表示已删除"`
+	StyleType       int    `gorm:"column:style_type" json:"style_type" description:"显示样式类型，可能用于控制前端展示效果"`
+	SortInTag       string `gorm:"column:sort_in_tag" json:"sort_in_tag" description:"在特定标签内的排序规则"`
+	UpdateTime      Time   `gorm:"column:update_time;default:CURRENT_TIMESTAMP;on_update:CURRENT_TIMESTAMP" json:"update_time" description:"记录最后更新的时间，自动更新"`
+	CreateTime      Time   `gorm:"column:create_time;default:CURRENT_TIMESTAMP" json:"create_time" description:"创建时间"`
+}

service/checkitemservice.go

@@ -44,3 +44,9 @@ func (s *CheckItemService) GetCheckItemByNumber(number int, lang, deviceType str
 	}
 	return
 }
+
+func (s *CheckItemService) GetCheckItemNews() (items []*models.CheckItemNewsVO, err error) {
+
+	err = s.rdb.Model(&models.CheckItemNews{}).Where("delete_flag = ?", 0).Order("sort_in_tag asc").Limit(50).Scan(&items).Error
+	return
+}

service/checkrecordservice.go

@@ -45,7 +45,7 @@ func (s *CheckRecordService) GetCheckRecordList(pageNum, pageSize int, userid ui
 		}
 		mcn := make(map[int]models.CheckItem, len(cnItems))
 		for _, item := range cnItems {
-			mcn[item.Id] = *item
+			mcn[item.CheckItemNumber] = *item
 		}
 
 		vos = make([]models.AppCheckRecordVO, len(records))
@@ -66,8 +66,8 @@ func (s *CheckRecordService) GetCheckRecordList(pageNum, pageSize int, userid ui
 				names := make([]string, len(ids))
 				for j, id := range ids {
 
-					ii, _ := strconv.Atoi(id)
-					if item, ok := mcn[ii]; ok {
+					n, _ := strconv.Atoi(id)
+					if item, ok := mcn[n]; ok {
 						names[j] = item.NameCn
 					}
 
@@ -98,7 +98,7 @@ func (s *CheckRecordService) GetCheckRecordItemReport(dataNum, itemNum int, user
 
 	var items []*models.CheckRecordItem
 
-	err = s.rdb.Raw("select i.* from  check_record_item as i inner join check_record as c on i.check_id=c.id where i.check_item_id = ? and c.user_id = ? and c.delete_flag=0", item.Id, userid).Order("id desc").Limit(dataNum).Scan(&items).Error
+	err = s.rdb.Raw("select i.* from  check_record_item as i inner join check_record as c on i.check_id=c.id where i.check_item_id = ? and c.user_id = ? and c.delete_flag=0", item.CheckItemNumber, userid).Order("id desc").Limit(dataNum).Scan(&items).Error
 
 	if len(items) > 0 {
 		var scopes []*models.CheckItemScopeVO
@@ -110,15 +110,16 @@ func (s *CheckRecordService) GetCheckRecordItemReport(dataNum, itemNum int, user
 			report.CheckValueIndex = ci.CheckValueIndex
 			report.Unit = item.Unit
 			report.Date = models.Time(ci.Ctime)
-			for _, scope := range scopes {
-				if scope.Index == ci.CheckValueIndex {
-					if scope.Num != "" {
-						report.Value = scope.Num
-					} else {
-						report.Value = scope.Value
-					}
-				}
-			}
+			report.Value = ci.CheckValue
+			// for _, scope := range scopes {
+			// 	if scope.Index == ci.CheckValueIndex {
+			// 		if scope.Num != "" {
+			// 			report.Value = scope.Num
+			// 		} else {
+			// 			report.Value = scope.Value
+			// 		}
+			// 	}
+			// }
 			reports[i] = &report
 		}
 	}

service/userservice.go

@@ -39,6 +39,15 @@ func (s *XcxUserService) GetOrCreate(openId string, unionId string) (*models.Xcx
 
 }
 
+func (s *XcxUserService) GetByOpenId(openId string) (*models.XcxUser, error) {
+
+	user := &models.XcxUser{}
+	db := writeDb.Where("open_id = ?", openId)
+	db.First(user)
+	return user, db.Error
+
+}
+
 func (s *XcxUserService) UpdateUser(user *models.XcxUser) error {
 
 	user.Mtime = time.Now()

swagger/swagger.json

@@ -128,6 +128,29 @@
                 }
             }
         },
+        "/api/article/getcheckitemnews": {
+            "get": {
+                "tags": [
+                    "api/article"
+                ],
+                "description": "获取检测项目说明\n\u003cbr\u003e",
+                "operationId": "ArticleApiController.GetCheckItemNews",
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.CheckItemNewsVO"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                }
+            }
+        },
         "/api/article/getramdonarticlelist": {
             "get": {
                 "tags": [
@@ -633,7 +656,38 @@
                     {
                         "in": "body",
                         "name": "body",
-                        "description": "小程序登录请求参数",
+                        "description": "小程序登录code",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.WxXcxLoginReq"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/models.WxXcxLoginResp"
+                        }
+                    },
+                    "500": {
+                        "description": "error"
+                    }
+                }
+            }
+        },
+        "/api/user/loginbyopenid": {
+            "post": {
+                "tags": [
+                    "api/user"
+                ],
+                "description": "微信小程序登录\n\u003cbr\u003e",
+                "operationId": "LoginApiController.LoginByOpenId",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "小程序登录openid",
                         "required": true,
                         "schema": {
                             "$ref": "#/definitions/models.WxXcxLoginReq"
@@ -1020,6 +1074,89 @@
                 }
             }
         },
+        "models.CheckItemNewsVO": {
+            "title": "CheckItemNewsVO",
+            "type": "object",
+            "properties": {
+                "author_id": {
+                    "description": "新闻作者的ID",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "collect_count": {
+                    "description": "收藏数",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "comment_count": {
+                    "description": "评论数",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "content": {
+                    "description": "新闻正文内容",
+                    "type": "string"
+                },
+                "content_images": {
+                    "description": "存储新闻内容中的图片路径，可能为逗号分隔的字符串或JSON格式",
+                    "type": "string"
+                },
+                "create_time": {
+                    "$ref": "#/definitions/models.Time",
+                    "description": "创建时间"
+                },
+                "delete_flag": {
+                    "description": "删除标记，0表示未删除，1表示已删除",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "id": {
+                    "description": "主键，唯一标识每条记录",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "introduction": {
+                    "description": "新闻简介或摘要",
+                    "type": "string"
+                },
+                "like_count": {
+                    "description": "点赞数",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "reading_quantity": {
+                    "description": "阅读量",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "sort_in_tag": {
+                    "description": "在特定标签内的排序规则",
+                    "type": "string"
+                },
+                "status": {
+                    "description": "新闻状态（例如，草稿、已发布等）",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "style_type": {
+                    "description": "显示样式类型，可能用于控制前端展示效果",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "tags": {
+                    "description": "新闻标签，用以分类或检索",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "新闻标题",
+                    "type": "string"
+                },
+                "update_time": {
+                    "$ref": "#/definitions/models.Time",
+                    "description": "记录最后更新的时间，自动更新"
+                }
+            }
+        },
         "models.CheckItemScopeVO": {
             "title": "CheckItemScopeVO",
             "type": "object",
@@ -1114,6 +1251,11 @@
                     "type": "integer",
                     "format": "int64"
                 },
+                "org_id": {
+                    "description": "所属机构",
+                    "type": "integer",
+                    "format": "int64"
+                },
                 "paper_check": {
                     "description": "试纸检查状态",
                     "type": "integer",
@@ -1190,8 +1332,8 @@
                 },
                 "creatinine": {
                     "description": "血肌酐",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 },
                 "creatinine_unit": {
                     "description": "肌酐单位(umol/L,mg/dl)",
@@ -1236,13 +1378,13 @@
                 },
                 "urine_protein": {
                     "description": "尿蛋白",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 },
                 "urine_protein_24h": {
                     "description": "24小时尿蛋白",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 },
                 "urine_protein_24h_time": {
                     "$ref": "#/definitions/models.Time",
@@ -1262,8 +1404,8 @@
                 },
                 "weight": {
                     "description": "体重",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 }
             }
         },
@@ -1285,8 +1427,8 @@
                 },
                 "creatinine": {
                     "description": "血肌酐",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 },
                 "creatinine_unit": {
                     "description": "肌酐单位(umol/L,mg/dl)",
@@ -1313,13 +1455,13 @@
                 },
                 "urine_protein": {
                     "description": "尿蛋白",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 },
                 "urine_protein_24h": {
                     "description": "24小时尿蛋白",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 },
                 "urine_protein_24h_time": {
                     "description": "24小时尿蛋白检测时间 yyyy-MM-dd HH:mm:ss",
@@ -1339,8 +1481,8 @@
                 },
                 "weight": {
                     "description": "体重",
-                    "type": "integer",
-                    "format": "int64"
+                    "type": "number",
+                    "format": "double"
                 }
             }
         },
@@ -1375,6 +1517,10 @@
                 "real_name": {
                     "description": "真实姓名",
                     "type": "string"
+                },
+                "verify_code": {
+                    "description": "手机验证码",
+                    "type": "string"
                 }
             }
         },

swagger/swagger.yml

@@ -93,6 +93,23 @@ paths:
               $ref: '#/definitions/models.SyhArticlesMenu'
         "500":
           description: error
+  /api/article/getcheckitemnews:
+    get:
+      tags:
+      - api/article
+      description: |-
+        获取检测项目说明
+        <br>
+      operationId: ArticleApiController.GetCheckItemNews
+      responses:
+        "200":
+          description: success
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/models.CheckItemNewsVO'
+        "500":
+          description: error
   /api/article/getramdonarticlelist:
     get:
       tags:
@@ -449,7 +466,29 @@ paths:
       parameters:
       - in: body
         name: body
-        description: 小程序登录请求参数
+        description: 小程序登录code
+        required: true
+        schema:
+          $ref: '#/definitions/models.WxXcxLoginReq'
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/models.WxXcxLoginResp'
+        "500":
+          description: error
+  /api/user/loginbyopenid:
+    post:
+      tags:
+      - api/user
+      description: |-
+        微信小程序登录
+        <br>
+      operationId: LoginApiController.LoginByOpenId
+      parameters:
+      - in: body
+        name: body
+        description: 小程序登录openid
         required: true
         schema:
           $ref: '#/definitions/models.WxXcxLoginReq'
@@ -728,6 +767,70 @@ definitions:
       unit:
         description: 单位
         type: string
+  models.CheckItemNewsVO:
+    title: CheckItemNewsVO
+    type: object
+    properties:
+      author_id:
+        description: 新闻作者的ID
+        type: integer
+        format: int64
+      collect_count:
+        description: 收藏数
+        type: integer
+        format: int64
+      comment_count:
+        description: 评论数
+        type: integer
+        format: int64
+      content:
+        description: 新闻正文内容
+        type: string
+      content_images:
+        description: 存储新闻内容中的图片路径，可能为逗号分隔的字符串或JSON格式
+        type: string
+      create_time:
+        $ref: '#/definitions/models.Time'
+        description: 创建时间
+      delete_flag:
+        description: 删除标记，0表示未删除，1表示已删除
+        type: integer
+        format: int64
+      id:
+        description: 主键，唯一标识每条记录
+        type: integer
+        format: int64
+      introduction:
+        description: 新闻简介或摘要
+        type: string
+      like_count:
+        description: 点赞数
+        type: integer
+        format: int64
+      reading_quantity:
+        description: 阅读量
+        type: integer
+        format: int64
+      sort_in_tag:
+        description: 在特定标签内的排序规则
+        type: string
+      status:
+        description: 新闻状态（例如，草稿、已发布等）
+        type: integer
+        format: int64
+      style_type:
+        description: 显示样式类型，可能用于控制前端展示效果
+        type: integer
+        format: int64
+      tags:
+        description: 新闻标签，用以分类或检索
+        type: string
+      title:
+        description: 新闻标题
+        type: string
+      update_time:
+        $ref: '#/definitions/models.Time'
+        description: 记录最后更新的时间，自动更新
   models.CheckItemScopeVO:
     title: CheckItemScopeVO
     type: object
@@ -800,6 +903,10 @@ definitions:
         description: 厂商（0：自营  1：艾玛OEM）
         type: integer
         format: int64
+      org_id:
+        description: 所属机构
+        type: integer
+        format: int64
       paper_check:
         description: 试纸检查状态
         type: integer
@@ -857,8 +964,8 @@ definitions:
         description: 肌酐检测时间
       creatinine:
         description: 血肌酐
-        type: integer
-        format: int64
+        type: number
+        format: double
       creatinine_unit:
         description: 肌酐单位(umol/L,mg/dl)
         type: string
@@ -893,12 +1000,12 @@ definitions:
         format: int64
       urine_protein:
         description: 尿蛋白
-        type: integer
-        format: int64
+        type: number
+        format: double
       urine_protein_24h:
         description: 24小时尿蛋白
-        type: integer
-        format: int64
+        type: number
+        format: double
       urine_protein_24h_time:
         $ref: '#/definitions/models.Time'
         description: 24小时尿蛋白检测时间
@@ -913,8 +1020,8 @@ definitions:
         type: string
       weight:
         description: 体重
-        type: integer
-        format: int64
+        type: number
+        format: double
   models.SaveHealthProfileReq:
     title: SaveHealthProfileReq
     type: object
@@ -930,8 +1037,8 @@ definitions:
         type: string
       creatinine:
         description: 血肌酐
-        type: integer
-        format: int64
+        type: number
+        format: double
       creatinine_unit:
         description: 肌酐单位(umol/L,mg/dl)
         type: string
@@ -952,12 +1059,12 @@ definitions:
         format: int64
       urine_protein:
         description: 尿蛋白
-        type: integer
-        format: int64
+        type: number
+        format: double
       urine_protein_24h:
         description: 24小时尿蛋白
-        type: integer
-        format: int64
+        type: number
+        format: double
       urine_protein_24h_time:
         description: 24小时尿蛋白检测时间 yyyy-MM-dd HH:mm:ss
         type: string
@@ -972,8 +1079,8 @@ definitions:
         type: string
       weight:
         description: 体重
-        type: integer
-        format: int64
+        type: number
+        format: double
   models.SaveUserInfoReq:
     title: SaveUserInfoReq
     type: object
@@ -999,6 +1106,9 @@ definitions:
       real_name:
         description: 真实姓名
         type: string
+      verify_code:
+        description: 手机验证码
+        type: string
   models.SyhArticlesMenu:
     title: SyhArticlesMenu
     type: object

tests/gendb_test.go

@@ -125,3 +125,15 @@ func TestStr(t *testing.T) {
 	strArr := strings.Split(str, "")
 	t.Log(strArr)
 }
+
+func TestCheckRecordService_GetCheckRecordList(t *testing.T) {
+	s := service.NewCheckRecordService()
+	vos, total, err := s.GetCheckRecordList(1, 2, 2)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	t.Log(total)
+	t.Logf("%+v", vos)
+
+}