Merge branch 'master' of http://git.shengws.com/csx/XT_New

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 

controllers/dialysis_api_controller.go

@@ -2885,7 +2885,8 @@ func (c *DialysisApiController) PostReceiveTreatmentAsses() {
 	psychological_assessment_other := c.GetString("psychological_assessment_other")
 	sick_condition_other := c.GetString("sick_condition_other")
 
-	precaution, _ := c.GetInt64("precaution", 0)
+	//precaution, _ := c.GetInt64("precaution", 0)
+	precaution := c.GetString("precaution")
 	precaution_other := c.GetString("precaution_other")
 	psychological_other := c.GetString("psychological_other")
 	admission_number := c.GetString("admission_number")

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -637,7 +637,8 @@ func (c *DialysisAPIController) PostAcceptsAssessment() {
 	score := c.GetString("score")
 	sick_condition_other := c.GetString("sick_condition_other")
 
-	precaution, _ := c.GetInt64("precaution", 0)
+	//precaution, _ := c.GetInt64("precaution", 0)
+	precaution := c.GetString("precaution")
 	precaution_other := c.GetString("precaution_other")
 	psychological_other := c.GetString("psychological_other")
 

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1803,6 +1803,7 @@ func (this *NewDialysisApiController) GetRoleName() {
 	//跟剧机构ID获取APPID
 	app, _ := service.GetAppId(orgid)
 	name, err := service.GetRoleName(id, orgid, app.Id)
+
 	//获取管理员
 	admin, err := service.GetAdmin(id)
 	positionName, err := service.GetPositionName(id, orgid, app.Id)
@@ -1815,7 +1816,7 @@ func (this *NewDialysisApiController) GetRoleName() {
 			names = role.RoleName + "," + names
 		}
 	}
-	fmt.Println("role_ids--------------", role_ids)
+	//fmt.Println("role_ids--------------", role_ids)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -2503,7 +2504,6 @@ func (this *NewDialysisApiController) SumitForm() {
 }
 
 func (this *NewDialysisApiController) GetMobile() {
-	fmt.Println("--------------触发了没有")
 	adminInfo := this.GetMobileAdminUserInfo()
 	id := adminInfo.AdminUser.Id
 
@@ -2521,13 +2521,38 @@ func (this *NewDialysisApiController) GetRolePosition() {
 
 	adminInfo := this.GetMobileAdminUserInfo()
 	cretor := adminInfo.AdminUser.Id
-	cretorPosition, err := service.GetRolePosition(cretor)
-	fmt.Println("cretorPosition", cretorPosition.RoleName)
+	orgid := adminInfo.Org.Id
+
+	//去查角色
+	role, err := service.GetAdminUserRole(cretor, orgid)
+	fmt.Println("role----------------", role.RoleIds)
+	role_ids := strings.Split(role.RoleIds, ",")
+	var names = ""
+	for _, item := range role_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		role, _ := service.GetRole(id)
+		if len(role.RoleName) != 0 {
+			names = role.RoleName + "," + names
+		}
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"names": names,
+	})
+}
+
+func (this *NewDialysisApiController) GetOrgs() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	fmt.Println("a---------")
+	orgs, err := service.GetOrgs(adminInfo.AdminUser.Id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"cretorPosition": cretorPosition,
+		"orgs": orgs,
 	})
 }

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -153,4 +153,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/sumitform", &NewDialysisApiController{}, "Get:SumitForm")
 	beego.Router("/m/api/patient/getroleposition", &NewDialysisApiController{}, "Get:GetRolePosition")
 	beego.Router("/m/api/patient/getmobile", &NewDialysisApiController{}, "Get:GetMobile")
+	beego.Router("/m/api/patient/getorgs", &NewDialysisApiController{}, "Get:GetOrgs")
+
 }

models/dialysis.go

@@ -782,7 +782,7 @@ type ReceiveTreatmentAsses struct {
 	PsychologicalAssessmentOther string `gorm:"column:psychological_assessment_other" json:"psychological_assessment_other"`
 	Score                        string `gorm:"column:score" json:"score"`
 	SickConditionOther           string `gorm:"column:sick_condition_other" json:"sick_condition_other"`
-	Precaution                   int64  `gorm:"column:precaution" json:"precaution"`
+	Precaution                   string `gorm:"column:precaution" json:"precaution"`
 	PrecautionOther              string `gorm:"column:precaution_other" json:"precaution_other"`
 	PsychologicalOther           string `gorm:"column:psychological_other" json:"psychological_other"`
 	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution"`
@@ -824,6 +824,10 @@ type SgjUserAdminRole struct {
 	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
 	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
 	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
+	OrgLogo       string `gorm:"column:org_logo" json:"org_logo" form:"org_logo"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
 }
 
 func (SgjUserAdminRole) TableName() string {

service/manage_service.go

@@ -1087,6 +1087,12 @@ func CreateTable(table *models.KyActivityTable) error {
 	return err
 }
 
+func GetAdminUserRole(id int64, orgid int64) (models.SgjUserAdminRole, error) {
+	role := models.SgjUserAdminRole{}
+	err := UserReadDB().Where("admin_user_id = ? and org_id = ? and status = 1", id, orgid).Find(&role).Error
+	return role, err
+}
+
 func GetRolePosition(id int64) (models.SgjUserRole, error) {
 	role := models.SgjUserRole{}
 	err := UserReadDB().Where("id = ? And status =1", id).Find(&role).Error
@@ -1098,3 +1104,11 @@ func GetMobile(id int64) (models.SgjUserAdmin, error) {
 	err := UserReadDB().Where("id=? and status = 1", id).Find(&admin).Error
 	return admin, err
 }
+
+func GetOrgs(id int64) (roles []*models.SgjUserAdminRole, err error) {
+
+	db := UserReadDB().Table("sgj_user_admin_role as s").Where("s.status = 1")
+	err = db.Group("s.org_id").Select("s.id,s.admin_user_id,s.org_id,s.app_id,s.role_id,s.user_name,s.avatar,s.user_type,s.user_title,s.intro,s.user_title_name,s.role_ids,s.message,s.sex,s.birthday,x.org_name,x.org_logo,x.creator").Where("s.admin_user_id = ?", id).Joins("left join sgj_user_org as x on x.id = s.org_id").Scan(&roles).Error
+
+	return roles, err
+}