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

conf/app.conf

@@ -44,14 +44,14 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10028
+org_id = 9504
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
 call_domain = https://hf.sgjyun.com
 front_end_domain = "https://xt.kuyicloud.com/#"
-url  = "http://192.168.1.228:17001/szsi-portal/transData"
-#url = "http://192.168.1.88:6666/szsi-portal/transData"
+#url  = "http://192.168.1.228:17001/szsi-portal/transData"
+url = "http://192.168.1.88:6666/szsi-portal/transData"
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = syh

controllers/base_api_controller.go

@@ -4,7 +4,6 @@ import (
 	"gdyb/enums"
 	"gdyb/models"
 	"github.com/astaxie/beego"
-
 	//"XT_New/models"
 
 	//"XT_New/models"
@@ -96,83 +95,65 @@ func (this *BaseAuthAPIController) Prepare() {
 		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		this.SetSession("admin_user_info", &adminUserInfo)
-
 	}
 
-	//if this.Ctx.Request.Method != "GET" {
-	//	adminUserInfo := this.GetAdminUserInfo()
-	//
-	//	err := service.GetOrgSubscibeState(adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId])
-	//	if err != nil || adminUserInfo.Subscibes[adminUserInfo.CurrentOrgId].State == 3 {
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotSubscibe)
-	//		this.StopRun()
-	//	}
-	//}
-
-	//if this.Ctx.Request.Header.Get("Permission") == "1" {
-	//	isPermission := false
-	//
-	//	//adminUserInfo := this.GetAdminUserInfo()
-	//
-	//	//service.GetUserAllRole(adminUserInfo.CurrentOrgId)
-	//
-	//
-	//
+	//if this.Ctx.Request.Header.Get("Permission") == "5" { //医保相关权限
+	//	org_id, _ := beego.AppConfig.Int64("org_id")
+	//	org, _ := service.GetOrgById(org_id)
+	//	admin_user_id, _ := this.GetInt64("admin_user_id")
+	//	if admin_user_id != org.Creator { //超级管理员不受此限制
+	//		isPermission := false
+	//		//该机构下该用户有多少个
+	//		role, _ := service.GetUserAllRole(org_id, admin_user_id)
+	//		var roles []string
+	//		if len(role.RoleIds) <= 0 { //该用户没有设置角色
 	//
-	//	roles := []int64{1,2}		//模拟该用户有多少角色
-	//	var targetRole models.RolePurview
-	//	var userRolePurview []string
-	//
-	//	//用户角色1对应的权限
-	//	role1 := models.RolePurview{PurviewIds:"11,12,13"}
-	//
-	//	//用户角色2对应的权限
-	//	role2 := models.RolePurview{PurviewIds:"11,15,16"}
-	//
-	//
-	//	//模拟角色2
-	//	//判断该用户有多少个角色，合并最大角色权限
-	//	if len(roles) == 1{ //单个
-	//		targetRole = role1
-	//		userRolePurview = strings.Split(targetRole.PurviewIds, ",")
-	//
-	//	}else{ //多个
-	//		targetRole = role1
-	//		targetRole.PurviewIds = targetRole.PurviewIds + "," + role2.PurviewIds
-	//		userRolePurview = strings.Split(targetRole.PurviewIds, ",")
-	//	}
-	//
-	//	userRolePurview = RemoveRepeatedElement2(userRolePurview)
+	//		} else {
+	//			roles = strings.Split(role.RoleIds, ",")
+	//		}
+	//		fmt.Println(roles)
 	//
-	//	fmt.Println(userRolePurview)
-	//	//所有权限列表
-	//	allPermission := []models.Purview{{Id:10,Urlfor:"/m/api/dialysis/dialysisPrescription-/api/dialysis/prescription"},
-	//		{Id:11,Urlfor:"/m/api/dialysis/dialysisPrescription1-/api/dialysis/prescription1"},
-	//		{Id:12,Urlfor:"/m/api/dialysis/dialysisPrescription2-/api/dialysis/prescription2"},
-	//		{Id:13,Urlfor:"/m/api/dialysis/dialysisPrescription3-/api/dialysis/prescription3"},
-	//		{Id:14,Urlfor:"/m/api/dialysis/dialysisPrescription4-/api/dialysis/prescription4"},
-	//		{Id:15,Urlfor:"/m/api/dialysis/dialysisPrescription5-/api/dialysis/prescription5"},
-	//		{Id:16,Urlfor:"/m/api/dialysis/dialysisPrescription6-/api/dialysis/prescription6"}}
-	//	for _, item := range allPermission {
-	//		//判断当前路由是否在权限路由列表里面
-	//		if strings.Split(item.Urlfor, "-")[1] == strings.Split(this.Ctx.Request.RequestURI , "?")[0]{
-	//			fmt.Println(strings.Split(this.Ctx.Request.RequestURI , "?")[0])
+	//		//获取该用户下所有角色的权限总集
+	//		var userRolePurviews string
+	//		var userRolePurviewsArr []string
+	//		for _, item := range roles {
+	//			role_id, _ := strconv.ParseInt(item, 10, 64)
+	//			purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+	//			if len(userRolePurviews) == 0 {
+	//				userRolePurviews = purviews
+	//			} else {
+	//				userRolePurviews = userRolePurviews + "," + purviews
+	//			}
+	//		}
+	//		//该用户所拥有角色的权限的总集
+	//		userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+	//		fmt.Println(userRolePurviewsArr)
+	//		//系统所记录的权限列表
+	//		allPermission, _ := service.GetAllFunctionPurview()
 	//
+	//		for _, item := range allPermission {
 	//			//获取该角色的所有权限
-	//			for _, items := range userRolePurview{
+	//			for _, items := range userRolePurviewsArr {
 	//				id, _ := strconv.ParseInt(items, 10, 64)
-	//				if id == item.Id{
+	//				if id == item.ID {
 	//					isPermission = true
 	//				}
 	//			}
-	//			if !isPermission{
-	//				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreExist)
+	//			if !isPermission {
+	//				msg, _ := service.FindErrorMsgByStr(item.ID)
+	//				json := make(map[string]interface{})
+	//				json["msg"] = msg
+	//				json["code"] = 0
+	//				json["state"] = 0
+	//				this.Data["json"] = json
+	//				this.ServeJSON()
 	//				this.StopRun()
 	//			}
-	//		}
 	//
+	//		}
 	//	}
 	//}
+
 }
 
 type BaseServeAPIController struct {
@@ -182,16 +163,10 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//org_id, _ := beego.AppConfig.Int64("org_id")
 		org_id, _ := beego.AppConfig.Int64("org_id")
-
-		//org_id, _ := this.GetInt64("org_id")
 		var userAdmin models.AdminUser
 		userAdmin.Id = 1448
 		userAdmin.Mobile = "13318599895"
-
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
 		userAdmin.IsSuperAdmin = false
 		userAdmin.Status = 1
 		userAdmin.CreateTime = 1530786071
@@ -213,21 +188,62 @@ func (this *BaseServeAPIController) Prepare() {
 		this.SetSession("admin_user_info", &adminUserInfo)
 	}
 
-	//if adminUserInfo.AppRole != nil {
-	//	if adminUserInfo.AppRole.Id > 0 {
-	//		app_role, _ := service.FindAppRoleById(adminUserInfo.AppRole.Id)
-	//		if app_role != nil {
-	//			if app_role.Status != 1 {
-	//				this.DelSession("mobile_admin_user_info")
-	//				this.Ctx.SetCookie("token_cookie", "")
-	//				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeForbidden)
+	//if this.Ctx.Request.Header.Get("Permission") == "5" { //医保相关权限
+	//	org_id, _ := beego.AppConfig.Int64("org_id")
+	//	org, _ := service.GetOrgById(org_id)
+	//	admin_user_id, _ := this.GetInt64("admin_user_id")
+	//	if admin_user_id != org.Creator { //超级管理员不受此限制
+	//		isPermission := false
+	//		//该机构下该用户有多少个
+	//		role, _ := service.GetUserAllRole(org_id, admin_user_id)
+	//		var roles []string
+	//		if len(role.RoleIds) <= 0 { //该用户没有设置角色
+	//
+	//		} else {
+	//			roles = strings.Split(role.RoleIds, ",")
+	//		}
+	//		fmt.Println(roles)
+	//
+	//		//获取该用户下所有角色的权限总集
+	//		var userRolePurviews string
+	//		var userRolePurviewsArr []string
+	//		for _, item := range roles {
+	//			role_id, _ := strconv.ParseInt(item, 10, 64)
+	//			purviews, _ := service.GetRoleFuncPurviewIds(role_id)
+	//			if len(userRolePurviews) == 0 {
+	//				userRolePurviews = purviews
+	//			} else {
+	//				userRolePurviews = userRolePurviews + "," + purviews
+	//			}
+	//		}
+	//		//该用户所拥有角色的权限的总集
+	//		userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
+	//		fmt.Println(userRolePurviewsArr)
+	//		//系统所记录的权限列表
+	//		allPermission, _ := service.GetAllFunctionPurview()
+	//
+	//		for _, item := range allPermission {
+	//			//获取该角色的所有权限
+	//			for _, items := range userRolePurviewsArr {
+	//				id, _ := strconv.ParseInt(items, 10, 64)
+	//				if id == item.ID {
+	//					isPermission = true
+	//				}
+	//			}
+	//			if !isPermission {
+	//				msg, _ := service.FindErrorMsgByStr(item.ID)
+	//				json := make(map[string]interface{})
+	//				json["msg"] = msg
+	//				json["code"] = 0
+	//				json["state"] = 0
+	//				this.Data["json"] = json
+	//				this.ServeJSON()
 	//				this.StopRun()
 	//			}
+	//
 	//		}
 	//	}
-	//
 	//}
-	//fmt.Println("222222222")
 
 }
 

models/gdyb_models.go

@@ -9,7 +9,12 @@ type GdybPsnRecord struct {
 	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	Status        int64  `gorm:"column:status" json:"status" form:"status"`
 	IsCancel      int64  `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	TrtDclaDetlSn string `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	TrtDclaDetlSn int64  `gorm:"column:trt_dcla_detl_sn" json:"trt_dcla_detl_sn" form:"trt_dcla_detl_sn"`
+	DoctorId      int64  `gorm:"column:doctor_id" json:"doctor_id" form:"doctor_id"`
+	DepartmentId  int64  `gorm:"column:department_id" json:"department_id" form:"department_id"`
+	Insutype      string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SickType      int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	OrgName       string `gorm:"column:org_name" json:"org_name" form:"org_name"`
 }
 
 func (GdybPsnRecord) TableName() string {

service/sz_his_service.go

@@ -762,7 +762,7 @@ func SetSZDrugMessage(doctor string, doctor_code string, fixmedins_code string)
 	inputMessage["transReturnCode"] = ""                                           //
 	inputMessage["transReturnMessage"] = ""                                        //
 	inputMessage["transTime"] = year + month + day + hour + min + sec + ":" + msec //
-	inputMessage["transVersion"] = "V0.3"                                          //   //
+	inputMessage["transVersion"] = "V0.2"                                          //   //
 	inputMessage["transChannel"] = "10"                                            //
 
 	return inputMessage

service/user_service.go

@@ -164,3 +164,47 @@ func GetAllHisDoctor(orgid int64) (appRole []*models.App_Role, err error) {
 	err = UserReadDB().Where("org_id = ?  AND status = 1 AND  (user_type = ? OR user_type = ?) ", orgid, 2, 1).Find(&appRole).Error
 	return appRole, err
 }
+
+func GetOrgById(orgID int64) (*models.Org, error) {
+	var org models.Org
+	err := readUserDb.Model(&models.Org{}).Where("id = ?", orgID).First(&org).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &org, nil
+}
+
+func GetUserAllRole(org_id int64, admin_user_id int64) (role models.App_Role, err error) {
+	err = readUserDb.Model(&models.App_Role{}).Where("status = 1 AND org_id = ? AND admin_user_id = ?", org_id, admin_user_id).First(&role).Error
+	return
+}
+
+func GetAllFunctionPurview() (purview []models.SgjUserOperatePurview, err error) {
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("status = 1 ").Order("number asc").Find(&purview).Error
+	return
+}
+
+func GetRoleFuncPurviewIds(roleID int64) (string, error) {
+	var rolePurview models.SgjUserRoleFuncPurview
+	err := readUserDb.Where("role_id = ?", roleID).First(&rolePurview).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return "", nil
+		} else {
+			return "", err
+		}
+	}
+	return rolePurview.PurviewIds, nil
+}
+
+func FindErrorMsgByStr(id int64) (string, error) {
+	var purview models.SgjUserOperatePurview
+	var err error
+	err = readUserDb.Model(&models.SgjUserOperatePurview{}).Where("id = ?", id).First(&purview).Error
+	return purview.ErrorMsg, err
+
+}