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

controllers/dialysis_api_controller.go

@@ -3084,10 +3084,17 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessment.AssessmentTime = time.Now().Unix()
 
-		} else {
+		}
+		if assessment.Creater == 0 {
 			assessment.Modifier = adminUserInfo.AdminUser.Id
 			assessment.Creater = adminUserInfo.AdminUser.Id
+
+		} else {
+			assessment.Modifier = adminUserInfo.AdminUser.Id
+			assessment.Creater = assessment.Creater
+
 		}
+
 		assessment.UpdatedTime = time.Now().Unix()
 		err = service.UpdateAssessmentAfterDislysisRecord(&assessment)
 	} else {
@@ -3095,10 +3102,8 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessment.AssessmentTime = time.Now().Unix()
 
-		} else {
-			assessment.Creater = adminUserInfo.AdminUser.Id
-
 		}
+		assessment.Creater = adminUserInfo.AdminUser.Id
 		assessment.CreatedTime = time.Now().Unix()
 		assessment.UpdatedTime = time.Now().Unix()
 		assessment.UserOrgId = adminUserInfo.CurrentOrgId
@@ -3246,10 +3251,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
-		} else {
-			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
 		}
 
+		assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
+
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
@@ -3277,10 +3282,15 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
-		} else {
+		}
+		if assessmentBeforeDislysis.Creater == 0 {
 			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
+		} else {
+			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
+			assessmentBeforeDislysis.Creater = evaluation.Creater
 		}
+
 		assessmentBeforeDislysis.UpdatedTime = time.Now().Unix()
 		assessmentBeforeDislysis.ID = evaluation.ID
 		assessmentBeforeDislysis.CreatedTime = evaluation.CreatedTime

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -95,7 +95,6 @@ func (this *NewRoleApiController) GetEditAdminInitData() {
 func (this *NewRoleApiController) GetAdminUserInfo() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	adminUserId, _ := this.GetInt64("uid")
-
 	var isSubSuperAdmin bool = false
 	app_role, _ := service.GetAppRoleById(adminUserInfo.AppRole.Id)
 	role_ids := strings.Split(app_role.RoleIds, ",")
@@ -128,8 +127,8 @@ func (this *NewRoleApiController) GetAdminUserInfo() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"user_info":          appRole,
-		"is_sub_super_admin": isSubSuperAdmin,
+		"user_info":       appRole,
+		"isSubSuperAdmin": isSubSuperAdmin,
 	})
 
 }