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

conf/app.conf

 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
 readusername = test_users
-//readusername = sgj_users
+//readusername = test_users
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
 writeusername = test_users
-//writeusername = sgj_users
+//writeusername = test_users
 
 
 readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com

controllers/base_api_controller.go

 
 import (
 	"XT_New/enums"
-	//"XT_New/models"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 400
-		//userAdmin.Mobile = "13535547901"
-		//
-		////userAdmin.Id = 597
-		////userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 12
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 12
-		//adminUserInfo.CurrentAppId = 18
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 400
+		userAdmin.Mobile = "13535547901"
+
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 12
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 400
-		//userAdmin.Mobile = "13535547901"
-		////userAdmin.Id = 597
-		////userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 12
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 12
-		//adminUserInfo.CurrentAppId = 18
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 400
+		userAdmin.Mobile = "13535547901"
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 12
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/dialysis_api_controller.go

 	}
 
 	if assessment.ID > 0 {
-		//if appRole.UserType == 3 {
-		//	if assessment.Creater != adminUserInfo.AdminUser.Id && assessment.Creater != 0 {
-		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//		if getPermissionErr != nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//			return
-		//		} else if headNursePermission == nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//			return
-		//		}
-		//	}
-		//}
+
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessment.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessment.AssessmentTime = time.Now().Unix()
-
-		}
-		if assessment.Creater == 0 {
-			assessment.Modifier = adminUserInfo.AdminUser.Id
-			assessment.Creater = adminUserInfo.AdminUser.Id
-
 		} else {
-			assessment.Modifier = adminUserInfo.AdminUser.Id
-			assessment.Creater = assessment.Creater
-
+			if assessment.Creater == 0 {
+				assessment.Modifier = adminUserInfo.AdminUser.Id
+				assessment.Creater = adminUserInfo.AdminUser.Id
+			} else {
+				assessment.Modifier = adminUserInfo.AdminUser.Id
+			}
 		}
 
 		assessment.UpdatedTime = time.Now().Unix()
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			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
 		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 {
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			assessmentBeforeDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
 			assessmentBeforeDislysis.AssessmentTime = time.Now().Unix()
-		}
-
-		if evaluation.Creater == 0 {
-			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
-			assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
 		} else {
-			assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
-			assessmentBeforeDislysis.Creater = evaluation.Creater
+			if evaluation.Creater == 0 {
+				assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
+				assessmentBeforeDislysis.Creater = adminUserInfo.AdminUser.Id
+			} else {
+				assessmentBeforeDislysis.Modifier = adminUserInfo.AdminUser.Id
+			}
 		}
 
 		assessmentBeforeDislysis.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

 		IsEat:                        is_eat,
 	}
 
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	_, assessmentAfter := service.FindAssessmentAfterDislysisByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 	if assessmentAfter.ID == 0 { //新增
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
 
-		//} else {
-		assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
+		} else {
+			assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
 
-		//}
+		}
 
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 		if err == nil {
 			})
 		}
 	} else { //修改
-		//if appRole.UserType == 3 {
-		//	if assessmentAfter.Creater != adminUserInfo.AdminUser.Id && assessmentAfter.Creater != 0 {
-		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//		if getPermissionErr != nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//			return
-		//		} else if headNursePermission == nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//			return
-		//		}
-		//	}
-		//}
 
-		//TODO 根据角色判断
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
-		//} else {
-		assessmentAfterDislysis.Modifier = adminUserInfo.AdminUser.Id
-		if assessmentAfterDislysis.Creater == 0 {
-			assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			assessmentAfterDislysis.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			assessmentAfterDislysis.AssessmentTime = time.Now().Unix()
+		} else {
+			assessmentAfterDislysis.Modifier = adminUserInfo.AdminUser.Id
+			if assessmentAfterDislysis.Creater == 0 {
+				assessmentAfterDislysis.Creater = adminUserInfo.AdminUser.Id
+			}
 		}
-		//}
 
 		assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
 		assessmentAfterDislysis.ID = assessmentAfter.ID
 
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.Modifier = adminUserInfo.AdminUser.Id
-		prescription.Creater = dialysisPrescription.Creater
+		prescription.Creater = adminUserInfo.AdminUser.Id
 
 		prescription.PrescriptionDoctor = adminUserInfo.AdminUser.Id
 		prescription.ID = dialysisPrescription.ID

controllers/mobile_api_controllers/patient_api_controller.go

 		return
 	}
 	//templateInfo,_ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	var evaluation models.PredialysisEvaluation
 	if theEvaluation != nil {
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-
 		evaluation = *theEvaluation
-
-		//} else {
-		//	if theEvaluation.Creater != adminUserInfo.AdminUser.Id && theEvaluation.Creater != 0 {
-		//		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//		if getPermissionErr != nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//			return
-		//		} else if headNursePermission == nil {
-		//			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//			return
-		//		}
-		//	} else {
-		//		evaluation = *theEvaluation
-		//	}
-		//}
 	}
 
 	code := predialysisEvaluationFormData(&evaluation, c.Ctx.Input.RequestBody)
 		evaluation.AssessmentDate = theAssessmentDateTime
 		evaluation.PatientId = id
 		evaluation.UserOrgId = adminUserInfo.Org.Id
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		//	evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		//	evaluation.AssessmentTime = time.Now().Unix()
-		//} else {
-		evaluation.Creater = adminUserInfo.AdminUser.Id
-		//}
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			evaluation.AssessmentTime = time.Now().Unix()
+		} else {
+			evaluation.Creater = adminUserInfo.AdminUser.Id
+		}
 	} else {
 		evaluation.UpdatedTime = time.Now().Unix()
 		evaluation.Evaluator = adminUserInfo.AdminUser.Id
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		//	evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
-		//	evaluation.AssessmentTime = time.Now().Unix()
-		//} else {
-		evaluation.Modifier = adminUserInfo.AdminUser.Id
-		if evaluation.Creater == 0 {
-			evaluation.Creater = adminUserInfo.AdminUser.Id
+		if appRole.UserType == 2 || appRole.UserType == 1 {
+			evaluation.AssessmentDoctor = adminUserInfo.AdminUser.Id
+			evaluation.AssessmentTime = time.Now().Unix()
+		} else {
+			evaluation.Modifier = adminUserInfo.AdminUser.Id
+			if evaluation.Creater == 0 {
+				evaluation.Creater = adminUserInfo.AdminUser.Id
+			}
 		}
-		//}
 	}
 
 	//新增逻辑

controllers/new_mobile_api_controllers/home_api_controller.go

 	}
 	orgPhone := this.GetString("telephone")
 
-	if len(orgPhone) > 0 {
-		if utils.PhoneRegexp().MatchString(orgPhone) == false {
-			this.Data["json"] = enums.MakeFailResponseJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-			this.ServeJSON()
-			return
-		}
-	}
-
 	provinceID := 0
 	cityID := 0
 	districtID := 0
 		InitRoleAndPurviews(org)
 		//初始化设备管理
 		InitEquitMentInformation(org)
-
 		//初始化显示配置
+		//InitShowConfig(org)
 
 		if len(orgs) == 0 {
 			ip := utils.GetIP(this.Ctx.Request)

controllers/new_mobile_api_controllers/mobile_regist_controller.go

 		InitPatientAndSchedule(org)
 		//初始化透析方案
 		InitSystemPrescrption(org)
-		//初始化医嘱模版
-		//InitAdviceTemplate(org)
 		//初始化角色和权限
 		InitRoleAndPurviews(org)
 		//初始化设备管理org

controllers/new_mobile_api_controllers/role.json

       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
       "is_system": 3,
       "number": 9997,
       "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
-      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
+      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029,20055,20056,20052,20012"
     },
     {
       "role_name": "库存",
       "status": 1,
       "is_system": 0,
       "number": 9993,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
       "func_ids": ""
 
 

controllers/public_api_controller.go

 	//			continue
 	//		}
 	//
-	//
 	//		app.OrgId = apps.OrgId
 	//		app.Creator = int(org.Creator)
 	//		app.Pid = xt_temp_org_app.Id
 	//}
 	////护士医生
 	//app_roles2  := service.GetAllUserRoleByUserTypeOther()
-	//	//for _, item := range app_roles2{
-	//	//	var ids string
-	//	//	if len(item.RoleIds) == 0{
-	//	//		ids = strconv.FormatInt( item.RoleId,10)
-	//	//	}else{
-	//	//		ids = item.RoleIds + ","+strconv.FormatInt( item.RoleId,10)
-	//	//	}
-	//	//	if item.UserType == 2{
-	//	//		role := service.FindRoleByUserTypeOne(item.OrgId)
-	//	//		ids = ids +"," + strconv.FormatInt(role.Id,10)
-	//	//
-	//	//	} else if item.UserType == 3{
-	//	//		role := service.FindRoleByUserTypeTwo(item.OrgId)
-	//	//		ids = ids +"," + strconv.FormatInt(role.Id,10)
-	//	//	}
-	//	//	service.UpdateRoleIds(item.Id, ids)
-	//	//}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "ok",
-	})
+	//	for _, item := range app_roles2{
+	//		var ids string
+	//		if len(item.RoleIds) == 0{
+	//			ids = strconv.FormatInt( item.RoleId,10)
+	//		}else{
+	//			ids = item.RoleIds + ","+strconv.FormatInt( item.RoleId,10)
+	//		}
+	//		if item.UserType == 2{
+	//			role := service.FindRoleByUserTypeOne(item.OrgId)
+	//			ids = ids +"," + strconv.FormatInt(role.Id,10)
+	//
+	//		} else if item.UserType == 3{
+	//			role := service.FindRoleByUserTypeTwo(item.OrgId)
+	//			ids = ids +"," + strconv.FormatInt(role.Id,10)
+	//		}
+	//		service.UpdateRoleIds(item.Id, ids)
+	//	}
+	//c.ServeSuccessJSON(map[string]interface{}{
+	//	"msg": "ok",
+	//})
 
 }
 

controllers/role.json

       "status": 1,
       "is_system": 1,
       "number": 9999,
-      "purview_ids": "71,72,70,74,75,73,48,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,49,77,78,79,80,197,76,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,127,128,201,193,194,196,192,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,101,100,102",
       "func_ids": "20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20034,20035,20036,20038,20039,20055,20056,20040,20041,20042,20043,20054,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030"
     },
     {
       "is_system": 3,
       "number": 9997,
       "purview_ids": "71,72,70,74,75,73,127,128,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,77,78,79,80,197,76",
-      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029"
+      "func_ids": "20007,20008,20009,20010,20011,20051,20053,20013,20014,20016,20017,20019,20021,20022,20024,20025,20026,20027,20028,20029,20055,20056,20052,20012"
+    },{
+      "role_name": "库存",
+      "role_introduction": "库存角色负责透析耗材的日常管理，对耗材的入库、出库、退库的登记操作",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9996,
+      "purview_ids": "111,112,113,114,115,116,117,118,119,129,84",
+      "func_ids": ""
+
+
+
+    },{
+      "role_name": "运营",
+      "role_introduction": "运营角色能够在SCRM中管理微网站、使用营销工具、做会员管理和分销商品经营的操作",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9995,
+      "purview_ids": "48,110,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
+      "func_ids": ""
+
+
+
+    },{
+      "role_name": "技师",
+      "role_introduction": "技师角色能够进行设备的管理，日常维护维修记录等",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9994,
+      "purview_ids": "77,78,79,80,197,76",
+      "func_ids": ""
+
+
+    },
+    {
+      "role_name": "院长",
+      "role_introduction": "院长角色了解血透患者血液透析质量和相关的大数据，以及掌握透析中心整体运营情况",
+      "is_super_admin": false,
+      "status": 1,
+      "is_system": 0,
+      "number": 9993,
+      "purview_ids": "71,72,70,74,75,73,48,49,52,110,111,112,113,114,115,116,117,118,119,129,84,93,121,122,124,125,120,77,78,79,80,197,76,101,100,102,127,128,158,157,159,160,161,162,167,166,168,169,170,171,174,173,175,178,177,179,201",
+      "func_ids": ""
+
+
     }
   ]
 }

service/app_version.go

 
 func GetAllAppOrg() ([]*models.OrgApp, error) {
 	var app []*models.OrgApp
-	err := readUserDbT.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
+	err := readUserDb.Model(&models.OrgApp{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
 
 func GetAppByType(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
 }
 
 func CreateOrgApp(app *models.OrgApp) {
-	writeUserDbT.Create(&app)
+	writeUserDb.Create(&app)
 
 }
 
 }
 
 func GetAllUserRoleByUserTypeOne(org_id int) (appRole []*models.App_Role) {
-	readUserDbT.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
+	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type = 1").Find(&appRole)
 	return
 }
 
 	//app, _ := GetOrgApp(int64(org_id), 3)
 
 	//if org_id == 0 {
-	readUserDbT.Model(&models.App_Role{}).Where("status = 1 AND user_type > 1").Find(&appRole)
+	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND user_type > 1").Find(&appRole)
 	//
 	//} else {
 	//	readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ?  AND user_type > 1 AND app_id = ? ", org_id, app.Id).Find(&appRole)
 }
 
 func FindRoleByUserTypeOne(org_id int64) (role models.Role) {
-	readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
+	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 2 AND role_name = '医生'", org_id).First(&role)
 	return
 }
 
 func FindRoleByUserTypeTwo(org_id int64) (role models.Role) {
-	readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
+	readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id = ? AND is_system = 3 AND role_name = '护士'", org_id).First(&role)
 	return
 }
 
 func GetAllRole() ([]*models.Role, error) {
 	var app []*models.Role
-	err := readUserDbT.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
+	err := readUserDb.Model(&models.Role{}).Where("status = 1 AND org_id > 0").Group("org_id").Find(&app).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
 }
 
 func UpdateRoleIds(id int64, ids string) {
-	writeUserDbT.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
+	writeUserDb.Model(&models.App_Role{}).Where("status = 1 AND id = ?", id).Updates(map[string]interface{}{"role_ids": ids, "mtime": time.Now().Unix()})
 
 }
 
 func GetOrgAppA(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
 
 func GetOrgByIdB(orgID int64) (*models.Org, error) {
 	var org models.Org
-	err := readUserDbT.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
+	err := readUserDb.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
 
 func GetOrgAppB(orgID int64, app_type int) (*models.OrgApp, error) {
 	var apps models.OrgApp
-	err := readUserDbT.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
+	err := readUserDb.Where("app_type = ? AND org_id = ? AND status = 1", app_type, orgID).First(&apps).Error
 	if err != nil {
 		return nil, err
 	}
 }
 
 func CreateOrgRoleB(role *models.Role) (err error) {
-	err = writeUserDbT.Create(&role).Error
+	err = writeUserDb.Create(&role).Error
 	return
 }
 
 func CreateRolePurviewB(purview *models.RolePurview) (err error) {
-	err = writeUserDbT.Create(&purview).Error
+	err = writeUserDb.Create(&purview).Error
 	return
 }
 
 func CreateFuncRolePurviewB(purview *models.SgjUserRoleFuncPurview) (err error) {
-	err = writeUserDbT.Create(&purview).Error
+	err = writeUserDb.Create(&purview).Error
 	return
 }

service/gobal_config_service.go

 }
 
 func FindAllHideFiledConfig(template_id int64) (err error, config []*models.FiledConfig) {
-	err = readDb.Model(&models.FiledConfig{}).Where("sys_module = 0  AND is_show = 2", template_id).Find(&config).Error
+	err = readDb.Model(&models.FiledConfig{}).Where("sys_module = ?  AND is_show = 2", template_id).Find(&config).Error
 	return
 }