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

controllers/mobile_api_controllers/admin_user_api_controller.go

@@ -18,8 +18,9 @@ type AdminUserApiController struct {
 func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
 
 	adminUserInfo := c.GetMobileAdminUserInfo()
-	orgId, _ := service.GetCreatByOrgId(adminUserInfo.Org.Id)
-	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, orgId.Creator)
+	//orgId, _ := service.GetCreatByOrgId(adminUserInfo.Org.Id)
+	id := adminUserInfo.AdminUser.Id
+	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, id)
 	if es != nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"state":                1,
@@ -34,6 +35,7 @@ func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
 }
 
 func (c *AdminUserApiController) SaveAdminUserElectronicSignature() {
+
 	adminUserInfo := c.GetMobileAdminUserInfo()
 
 	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2445,7 +2445,7 @@ func (this *NewDialysisApiController) SumitForm() {
 	fmt.Println("mobile", mobile)
 	address := this.GetString("address")
 	fmt.Println("address", address)
-	positon := this.GetString("position")
+	positon, _ := this.GetInt64("position")
 	fmt.Println("职位", positon)
 	hospitalName := this.GetString("hospitalName")
 	fmt.Println("医院名称", hospitalName)
@@ -2502,9 +2502,24 @@ func (this *NewDialysisApiController) SumitForm() {
 	}
 }
 
+func (this *NewDialysisApiController) GetMobile() {
+	fmt.Println("--------------触发了没有")
+	adminInfo := this.GetMobileAdminUserInfo()
+	id := adminInfo.AdminUser.Id
+
+	mobile, err := service.GetMobile(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"mobile": mobile,
+	})
+}
+
 func (this *NewDialysisApiController) GetRolePosition() {
 
-	adminInfo := this.GetAdminUserInfo()
+	adminInfo := this.GetMobileAdminUserInfo()
 	cretor := adminInfo.AdminUser.Id
 	cretorPosition, err := service.GetRolePosition(cretor)
 	fmt.Println("cretorPosition", cretorPosition.RoleName)

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -152,4 +152,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/org/getMyMobile", &NewDialysisApiController{}, "Get:GetMyMobile")
 	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")
 }

models/patient_models.go

@@ -819,7 +819,7 @@ type KyActivityTable struct {
 	Name         string `gorm:"column:name" json:"name" form:"name"`
 	Phone        string `gorm:"column:phone" json:"phone" form:"phone"`
 	Address      string `gorm:"column:address" json:"address" form:"address"`
-	Position     string `gorm:"column:position" json:"position" form:"position"`
+	Position     int64  `gorm:"column:position" json:"position" form:"position"`
 	HospitalName string `gorm:"column:hospital_name" json:"hospital_name" form:"hospital_name"`
 	IsUser       int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	IsThink      int64  `gorm:"column:is_think" json:"is_think" form:"is_think"`

service/manage_service.go

@@ -1092,3 +1092,9 @@ func GetRolePosition(id int64) (models.SgjUserRole, error) {
 	err := UserReadDB().Where("id = ? And status =1", id).Find(&role).Error
 	return role, err
 }
+
+func GetMobile(id int64) (models.SgjUserAdmin, error) {
+	admin := models.SgjUserAdmin{}
+	err := UserReadDB().Where("id=? and status = 1", id).Find(&admin).Error
+	return admin, err
+}