更新数据

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1579,6 +1579,19 @@ func (this *NewDialysisApiController) GetMyInformation() {
 	return
 }
 
+func (this *NewDialysisApiController) GetMyInformationThree() {
+	id, _ := this.GetInt64("id")
+	roleInfo, err := service.GetPositionOne(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"roleInfo": roleInfo,
+	})
+	return
+}
+
 func (this *NewDialysisApiController) GetPatientName() {
 	id, _ := this.GetInt64("id")
 	patients, _ := service.GetPatientDetailTwo(id)
@@ -2036,16 +2049,16 @@ func (this *NewDialysisApiController) SaveName() {
 	fmt.Println("id", ids)
 	name := this.GetString("name")
 	fmt.Println("name", name)
-	role := models.SgjUserAdminRole{
-		UserName: name,
+	admin := models.SgjUserAdmin{
+		Name: name,
 	}
-	err := service.SaveName(ids, &role)
+	err := service.SaveName(ids, &admin)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"role": role,
+		"admin": admin,
 	})
 }
 
@@ -2179,14 +2192,13 @@ func (this *NewDialysisApiController) EditOrg() {
 func (this *NewDialysisApiController) GetMyInforName() {
 
 	id, _ := this.GetInt64("id")
-	Rolename, err := service.GetMyInfoName(id)
-	Username, err := service.GetAdminName(Rolename.AdminUserId)
+	//Rolename, err := service.GetMyInfoName(id)
+	Username, err := service.GetAdminName(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"Rolename": Rolename,
 		"Username": Username,
 	})
 }
@@ -2290,3 +2302,33 @@ func (this *NewDialysisApiController) UpdatedBed() {
 		"number": number,
 	})
 }
+
+func (this *NewDialysisApiController) GetMyOrgInformation() {
+	creator, _ := this.GetInt64("creator")
+	fmt.Println("cretor", creator)
+	information, err := service.GetMyOrgInformation(creator)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+	})
+}
+
+func (this *NewDialysisApiController) SaveNameTwo() {
+	id, _ := this.GetInt64("id")
+	name := this.GetString("name")
+	fmt.Println("name------------------", name)
+	role := models.SgjUserAdminRole{
+		UserName: name,
+	}
+	err := service.SaveNameTwo(id, &role)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -102,6 +102,7 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getallinspection", &NewDialysisApiController{}, "Get:GetAllInspection")
 	beego.Router("/m/api/patient/getinspection", &NewDialysisApiController{}, "Get:GetInspection")
 	beego.Router("/m/api/patient/getmyinformation", &NewDialysisApiController{}, "Get:GetMyInformation")
+	beego.Router("/m/api/patient/getmyinformationThree", &NewDialysisApiController{}, "Get:GetMyInformationThree")
 	beego.Router("/m/api/patient/getpatientname", &NewDialysisApiController{}, "Get:GetPatientName")
 	beego.Router("/m/api/patient/getinspectiondetail", &NewDialysisApiController{}, "Get:GetInspectionDetail")
 	beego.Router("/m/api/patient/savefeed", &NewDialysisApiController{}, "Get:SaveFeed")
@@ -141,4 +142,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/updategroup", &NewDialysisApiController{}, "Get:UpdateGroup")
 	beego.Router("/m/api/patient/getbeddetail", &NewDialysisApiController{}, "Get:GetBedDetail")
 	beego.Router("/m/api/patient/updatebed", &NewDialysisApiController{}, "Get:UpdatedBed")
+	beego.Router("/m/api/patient/getmyorginformation", &NewDialysisApiController{}, "Get:GetMyOrgInformation")
+	beego.Router("/m/api/patient/savenametwo", &NewDialysisApiController{}, "Get:SaveNameTwo")
 }

models/admin_user_models.go

@@ -1,5 +1,30 @@
 package models
 
+type AdminUsers struct {
+	Id           int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"` // 管理员用户 ID
+	Mobile       string `json:"mobile"`
+	Password     string `json:"password"`
+	IsSuperAdmin bool   `gorm:"column:is_super_admin" json:"is_super_admin"` // 是否为超级管理员
+	Status       int8   `json:"status"`                                      // 状态 0.无效 1.有效
+	CreateTime   int64  `gorm:"column:ctime" json:"ctime"`                   // 创建时间
+	ModifyTime   int64  `gorm:"column:mtime" json:"mtime"`                   // 修改时间
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	AdminUserId  int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId        int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId       int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName     string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar       string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType     int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle    int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro        string `gorm:"column:intro" json:"intro" form:"intro"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Message      string `gorm:"column:message" json:"message" form:"message"`
+	Sex          int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday     int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+}
+
 type AdminUser struct {
 	Id           int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"` // 管理员用户 ID
 	Mobile       string `json:"mobile"`

models/dialysis.go

@@ -825,3 +825,22 @@ type SgjUserAdminRole struct {
 func (SgjUserAdminRole) TableName() string {
 	return "sgj_user_admin_role"
 }
+
+type SgjUserAdmin struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	Mobile       string `gorm:"column:mobile" json:"mobile" form:"mobile"`
+	Password     string `gorm:"column:password" json:"password" form:"password"`
+	IsSuperAdmin int64  `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Source       int64  `gorm:"column:source" json:"source" form:"source"`
+	Ttype        int64  `gorm:"column:ttype" json:"ttype" form:"ttype"`
+	Ttid         int64  `gorm:"column:ttid" json:"ttid" form:"ttid"`
+	Tuid         int64  `gorm:"column:tuid" json:"tuid" form:"tuid"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+}
+
+func (SgjUserAdmin) TableName() string {
+	return "sgj_user_admin"
+}

service/patientmanage_service.go

@@ -1034,17 +1034,17 @@ func DeleteChildInspection(name string, date int64, orgid int64) error {
 
 func SaveMessage(id int64, role *models.SgjUserAdminRole) error {
 
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"message": role.Message, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
 func SaveSex(id int64, role *models.SgjUserAdminRole) error {
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"sex": role.Sex, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"sex": role.Sex, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
 func SaveBirthday(id int64, role *models.SgjUserAdminRole) error {
-	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id = ?", id).Update(map[string]interface{}{"birthday": role.Birthday, "mtime": time.Now().Unix()}).Error
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id = ?", id).Update(map[string]interface{}{"birthday": role.Birthday, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1161,9 +1161,9 @@ func GetBloodPatient(orgid int64) (patients []*models.XtPatientsNew, err error)
 	return patients, err
 }
 
-func SaveName(id int64, role *models.SgjUserAdminRole) error {
+func SaveName(id int64, admin *models.SgjUserAdmin) error {
 
-	err = UserWriteDB().Model(models.SgjUserAdminRole{}).Where("id=?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
+	err = UserWriteDB().Model(models.SgjUserAdmin{}).Where("id=?", id).Update(map[string]interface{}{"name": admin.Name, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1229,9 +1229,14 @@ func GetMyInfoName(id int64) (models.SgjUserAdminRole, error) {
 	return role, err
 }
 
-func GetAdminName(id int64) (models.AdminUser, error) {
-	user := models.AdminUser{}
-	err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
+func GetAdminName(id int64) (models.AdminUsers, error) {
+	user := models.AdminUsers{}
+	//err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
+	//return user, err
+	db := UserReadDB().Table("sgj_user_admin as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Println("table", table)
+	err := db.Select("x.id,x.mobile,x.password,x.is_super_admin,x.source,x.name,r.admin_user_id,r.org_id,r.app_id,r.role_id,r.user_name,r.avatar,r.message,r.sex,r.birthday").Where("x.id = ?", id).Joins("left join sgj_user_admin_role as r on r.admin_user_id = x.id").Scan(&user).Error
 	return user, err
 }
 
@@ -1297,3 +1302,22 @@ func GetPosition(id int64) (models.SgjUserAdminRole, error) {
 	err = UserReadDB().Model(&roles).Where("id=? and status = 1", id).Find(&roles).Error
 	return roles, err
 }
+
+func GetPositionOne(id int64) (models.SgjUserAdmin, error) {
+
+	admin := models.SgjUserAdmin{}
+	err = UserReadDB().Model(&admin).Where("id=? and status = 1", id).Find(&admin).Error
+	return admin, err
+}
+
+func GetMyOrgInformation(id int64) (models.SgjUserAdminRole, error) {
+	admin := models.SgjUserAdminRole{}
+	err := UserReadDB().Model(&admin).Where("admin_user_id=? and status = 1", id).Find(&admin).Error
+	return admin, err
+}
+
+func SaveNameTwo(id int64, role *models.SgjUserAdminRole) error {
+
+	err := UserWriteDB().Model(models.SgjUserAdminRole{}).Where("admin_user_id =?", id).Update(map[string]interface{}{"user_name": role.UserName, "mtime": time.Now().Unix()}).Error
+	return err
+}