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

.idea/encodings.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

conf/app.conf

 appname = 血透
-httpport = 9529
+httpport = 9550
 runmode = dev
 
 copyrequestbody = true
 
 
 [prod]
-httpdomain = https://api.xt.kuyicloud.com
-sso_domain = https://sso.kuyicloud.com
-front_end_domain = "https://xt.kuyicloud.com/#"
+httpdomain = http://api.szjkhd.com
+
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 
 
 [dev]
-httpdomain = http://api.xt.test.sgjyun.com
-sso_domain = https://testsso.sgjyun.com
-front_end_domain = "http://xt.test.sgjyun.com/#"
+httpdomain = http://api.szjkhd.com
+
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/admin_api_controllers/admin_api_router_register.go

 func AdminAPIControllersRegisterRouters() {
 	beego.Router("/admin/api/login/pwd", &LoginAPIController{}, "post:LoginByPwd")
 
-	beego.Router("/admin/api/org/regist", &AnalysisAPIController{}, "get:RegistOrg")
-	beego.Router("/admin/api/org/active", &AnalysisAPIController{}, "get:ActiveOrg")
-	beego.Router("/admin/api/user/active", &AnalysisAPIController{}, "get:ActiveUser")
-	beego.Router("/admin/api/org/expiring", &AnalysisAPIController{}, "get:ExpiringOrg")
-	beego.Router("/admin/api/dialysis/analysis", &AnalysisAPIController{}, "get:DialysisAnalysis")
-	beego.Router("/admin/api/monitor/analysis", &AnalysisAPIController{}, "get:MonitorAnalysis")
-	beego.Router("/admin/api/patient/analysis", &AnalysisAPIController{}, "get:PatientAnalysis")
+	//beego.Router("/admin/api/org/regist", &AnalysisAPIController{}, "get:RegistOrg")
+	//beego.Router("/admin/api/org/active", &AnalysisAPIController{}, "get:ActiveOrg")
+	//beego.Router("/admin/api/user/active", &AnalysisAPIController{}, "get:ActiveUser")
+	//beego.Router("/admin/api/org/expiring", &AnalysisAPIController{}, "get:ExpiringOrg")
+	//beego.Router("/admin/api/dialysis/analysis", &AnalysisAPIController{}, "get:DialysisAnalysis")
+	//beego.Router("/admin/api/monitor/analysis", &AnalysisAPIController{}, "get:MonitorAnalysis")
+	//beego.Router("/admin/api/patient/analysis", &AnalysisAPIController{}, "get:PatientAnalysis")
 	beego.Router("/admin/api/home/statistics", &AnalysisAPIController{}, "get:HomeStatistics")
 	beego.Router("/admin/api/getdistrictsbyupid", &OrgAPIController{}, "get:GetDistrictsByUpid")
 	beego.Router("/admin/api/org", &OrgAPIController{}, "get:GetOrgList")
 	beego.Router("/admin/api/orginfo", &OrgAPIController{}, "get:GetOrgInfo")
 	beego.Router("/admin/api/org/statistics", &OrgAPIController{}, "get:GetOrgDialysisOrderStatistics")
 
+	beego.Router("/admin/api/org/patient", &OrgAPIController{}, "get:GetOrgPatientList")
+	beego.Router("/admin/api/org/role", &OrgAPIController{}, "get:GetOrgRoleList")
+	beego.Router("/admin/api/org/adminuser", &OrgAPIController{}, "get:GetOrgAdminUser")
+	beego.Router("/admin/api/org/zones", &OrgAPIController{}, "get:GetOrgZones")
+	beego.Router("/admin/api/org/group", &OrgAPIController{}, "get:GetOrgGroup")
+	beego.Router("/admin/api/org/bed", &OrgAPIController{}, "get:GetOrgBed")
+
+	beego.Router("admin/api/system/user", &SystemApiController{}, "get:GetUserList")
+	beego.Router("/admin/api/user/create", &SystemApiController{}, "post:CreateAdminUser")
+	beego.Router("/admin/api/user/edit", &SystemApiController{}, "post:ModifyAdminUser")
+	beego.Router("/admin/api/user/delete", &SystemApiController{}, "post:DeleteAdminUser")
+
+	beego.Router("/admin/api/user/init", &SystemApiController{}, "get:GetUserInitData")
+	beego.Router("/admin/api/user/followorg", &SystemApiController{}, "get:GetFollowOrg")
+	beego.Router("/admin/api/follow", &SystemApiController{}, "post:PostFollowInfo")
+
+	beego.Router("/admin/api/follow/edit", &SystemApiController{}, "post:ModifyFollowInfo")
+	beego.Router("/admin/api/unfollow", &SystemApiController{}, "post:PostUnFollow")
+
+	beego.Router("/admin/api/user/get", &SystemApiController{}, "get:GetAdminUserById")
+	beego.Router("/admin/api/follow/cancel", &SystemApiController{}, "post:CancelFollowInfo")
+
 }

controllers/admin_api_controllers/login_api_controller.go

 import (
 	"XT_Admin_Api/enums"
 	"XT_Admin_Api/service"
-	"fmt"
 )
 
 type LoginAPIController struct {
 		return
 	}
 
-	fmt.Println(admin)
-
 	this.SetSession("admin_info", &AdminInfo{
 		Admin: admin,
 	})

controllers/admin_api_controllers/org_api_controller.go

 }
 
 func (this *OrgAPIController) GetOrgList() {
-	active_status,_ := this.GetInt64("active_status")
-	depth_active_status,_ := this.GetInt64("depth_active_status")
+	active_status, _ := this.GetInt64("active_status")
+	depth_active_status, _ := this.GetInt64("depth_active_status")
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
-	province,_ := this.GetInt64("province")
-	city,_ := this.GetInt64("city")
-	district,_ := this.GetInt64("district")
-	follow,_ := this.GetInt64("follow")
+	province, _ := this.GetInt64("province")
+	city, _ := this.GetInt64("city")
+	district, _ := this.GetInt64("district")
+	follow, _ := this.GetInt64("follow")
 	keyword := this.GetString("keyword")
 	page, _ := this.GetInt64("page", 0)
 	limit, _ := this.GetInt64("limit", 0)
 		endTime = theTime.Unix()
 	}
 
-	adminInfo := this.GetAdminInfo()
-	if adminInfo.Admin.IsSuperAdmin == 1 {
-		list, err, total := service.GetAllOrgList(active_status,depth_active_status,startTime,endTime,province,city,district,follow,keyword,page,limit)
-		if err != nil {
+	list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit)
+	if err != nil {
 
-		} else {
-			this.ServeSuccessJSON(map[string]interface{}{
-				"list": list,
-				"total":total,
-			})
-		}
 	} else {
-
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
 	}
+
 }
 
 func (this *OrgAPIController) GetOrgInfo() {
-	org_id, _:=this.GetInt64("org_id",0)
+	org_id, _ := this.GetInt64("org_id", 0)
 	info, err := service.GetOrgDetailInfo(org_id)
 	province, _ := service.GetDistrictsById(info.Province)
 	city, _ := service.GetDistrictsById(info.City)
 		return
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"info": info,
-			"area":province.Name+city.Name+district.Name,
-			"org_type":orgType,
+			"info":     info,
+			"area":     province.Name + city.Name + district.Name,
+			"org_type": orgType,
 		})
 	}
 }
 
 func (this *OrgAPIController) GetOrgDialysisOrderStatistics() {
-	org_id, _:=this.GetInt64("org_id",0)
+	org_id, _ := this.GetInt64("org_id", 0)
 	range_data := this.GetString("range_data")
 	range_type, _ := this.GetInt64("range_type")
 	statistics_type, _ := this.GetInt64("type")
 	var parseDateErr error
 	var rangeTimeStamp int64
 
-
-
-
 	var orgDialysisOrderStatistics []*admin_models.Statistics
 
-	switch range_type{
+	switch range_type {
 	case 1: //今天
 		if len(range_data) > 0 {
 			rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
 			rangeTimeStamp = 0
 		}
 		now := time.Now().Unix()
-		count , err := service.GetOrgDialysisCount(statistics_type,org_id,rangeTimeStamp,now)
+		count, err := service.GetOrgDialysisCount(statistics_type, org_id, rangeTimeStamp, now)
 		if err != nil {
 			this.ErrorLog("错误：%v", err)
 			return
 			})
 		}
 		break
-	case 2:  //昨天
+	case 2: //昨天
 		if len(range_data) > 0 {
 			rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
 			if parseDateErr != nil {
 			rangeTimeStamp = 0
 		}
 		now := time.Now().Unix()
-		count , err := service.GetOrgDialysisCount(statistics_type,org_id,rangeTimeStamp,now)
+		count, err := service.GetOrgDialysisCount(statistics_type, org_id, rangeTimeStamp, now)
 		if err != nil {
 			this.ErrorLog("错误：%v", err)
 			return
 			})
 		}
 		break
-	case 3://一周
+	case 3: //一周
 		var err error
 		orgDialysisOrderStatistics, err = service.GetWeekOrgDialysisCount(statistics_type, org_id)
 		if err != nil {
 			})
 		}
 		break
-	case 4://一个月
+	case 4: //一个月
 		var err error
 		orgDialysisOrderStatistics, err = service.GetMonthOrgDialysisCount(statistics_type, org_id)
 		if err != nil {
 			})
 		}
 		break
-	case 5://三个月
+	case 5: //三个月
 		var err error
 		orgDialysisOrderStatistics, err = service.GetThreeMonthOrgDialysisCount(statistics_type, org_id)
 		if err != nil {
 			})
 		}
 		break
-	case 6://半年
+	case 6: //半年
 		var err error
 		orgDialysisOrderStatistics, err = service.GetSixMonthOrgDialysisCount(statistics_type, org_id)
 		if err != nil {
 			})
 		}
 		break
-	case 7://一年
+	case 7: //一年
 		var err error
 		orgDialysisOrderStatistics, err = service.GetYearOrgDialysisCount(statistics_type, org_id)
 		if err != nil {
 	return
 }
 
-
-func (this *OrgAPIController)GetInitData(){
+func (this *OrgAPIController) GetInitData() {
 	provinces, _ := service.GetDistrictsByUpid(0)
+	follower, _ := service.FindAllFollower()
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"provinces": provinces,
+		"follower":  follower,
+	})
+}
+
+func (this *OrgAPIController) GetOrgPatientList() {
+	org_id, _ := this.GetInt64("org_id", 0)
+	page, _ := this.GetInt64("page", 0)
+	limit, _ := this.GetInt64("limit", 0)
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 7
+	}
+
+	patients, _, total := service.FindPatientById(org_id, page, limit)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patients": patients,
+		"total":    total,
+	})
+
+}
+func (this *OrgAPIController) GetOrgRoleList() {
+	org_id, _ := this.GetInt64("org_id")
+	page, _ := this.GetInt("page")
+	if page <= 0 {
+		page = 1
+	}
+	appType, _ := service.GetAppTypeByOrgId(org_id)
+	roles, total, getRoleErr := service.GetRoles(org_id, appType.Id, page, 10)
+	if getRoleErr != nil {
+		//beego.Error("获取角色列表失败:", getRoleErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"roles":       roles,
+			"total_count": total,
+		})
+	}
+}
+func (this *OrgAPIController) GetOrgAdminUser() {
+	org_id, _ := this.GetInt64("org_id", 0)
+	page, _ := this.GetInt64("page", 0)
+	limit, _ := this.GetInt64("limit", 0)
+	if page <= 0 {
+		page = 1
+	}
+	if limit <= 0 {
+		limit = 7
+	}
+	appType, _ := service.GetAppTypeByOrgId(org_id)
+
+	viewModels, total, getAdminsErr := service.GetAdminUsersAndLoginInfo(org_id, appType.Id, page, 10)
+
+	if getAdminsErr != nil {
+		//beego.Error("获取管理员列表失败:", getAdminsErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"admins":      viewModels,
+			"total_count": total,
+		})
+	}
+
+}
+
+func (this *OrgAPIController) GetOrgZones() {
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	zones, getZonesErr := service.GetAllValidDeviceZones(org_id)
+	if getZonesErr != nil {
+		this.ErrorLog("获取设备分区列表失败:%v", getZonesErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zones": zones,
+	})
+
+}
+func (this *OrgAPIController) GetOrgGroup() {
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	groups, getGroupsErr := service.GetAllValidDeviceGroups(org_id)
+	if getGroupsErr != nil {
+		//beego.Error("获取设备分组列表失败:", getGroupsErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"groups": groups,
+	})
+}
+
+func (this *OrgAPIController) GetOrgBed() {
+	org_id, _ := this.GetInt64("org_id", 0)
+
+	numbers, getNumbersErr := service.GetAllValidDeviceNumbers(org_id)
+	if getNumbersErr != nil {
+		//beego.Error("获取机号列表失败:", getNumbersErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"numbers": numbers,
 	})
 }

controllers/admin_api_controllers/system_api_controller.go

+package admin_api_controllers
+
+import (
+	"XT_Admin_Api/enums"
+	"XT_Admin_Api/models"
+	"XT_Admin_Api/models/admin_models"
+	"XT_Admin_Api/service"
+	"XT_Admin_Api/utils"
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"time"
+)
+
+type SystemApiController struct {
+	AdminBaseAPIAuthController
+}
+
+func (this *SystemApiController) GetUserList() {
+	list, _ := service.GetAllAdmin()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+
+}
+
+func (this *SystemApiController) CreateAdminUser() {
+	name := this.GetString("name")
+	mobile := this.GetString("mobile")
+	password := this.GetString("password")
+	admin := &admin_models.AdminAccount{
+		Account:      mobile,
+		Pwd:          password,
+		Name:         name,
+		Status:       1,
+		IsSuperAdmin: 2,
+		Ctime:        time.Now().Unix(),
+		Mtime:        time.Now().Unix(),
+	}
+	admins, _ := service.FindUserInfoByAccount(mobile)
+	if admins.ID > 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNameException)
+		return
+
+	}
+
+	err := service.CreateAdmin(admin)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"admin": admin,
+		})
+	}
+}
+
+func (this *SystemApiController) ModifyAdminUser() {
+	id, _ := this.GetInt64("id")
+	name := this.GetString("name")
+	mobile := this.GetString("mobile")
+	password := this.GetString("password")
+	status, _ := this.GetInt64("status")
+
+	admins, _ := service.FindAdminById(id)
+
+	admin := &admin_models.AdminAccount{
+		ID:           admins.ID,
+		Account:      mobile,
+		Pwd:          password,
+		Name:         name,
+		Status:       status,
+		IsSuperAdmin: 2,
+		Ctime:        admins.Ctime,
+		Mtime:        time.Now().Unix(),
+	}
+
+	info, _ := service.FindUserInfoByAccount(mobile)
+	if info.ID > 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNameException)
+		return
+
+	}
+
+	err := service.UpdateAdmin(admin)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"admin": admin,
+		})
+	}
+}
+
+func (this *SystemApiController) DeleteAdminUser() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteAdmin(id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	}
+}
+
+func (this *SystemApiController) GetUserInitData() {
+	org, err := service.FindAllOrg()
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"org": org,
+		})
+	}
+}
+
+func (this *SystemApiController) GetFollowOrg() {
+	id, _ := this.GetInt64("admin_user_id")
+	FollowOrgs, err := service.FindFollowOrg(id)
+	unFollow, _ := service.FindUnFollowOrgByIds(id)
+
+	fmt.Println(FollowOrgs)
+	fmt.Println(unFollow)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"follows":  FollowOrgs,
+			"unFollow": unFollow,
+		})
+	}
+}
+
+func (this *SystemApiController) GetAdminUserById() {
+	id, _ := this.GetInt64("id")
+	account, err := service.FindAdminById(id)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"account": account,
+		})
+	}
+}
+
+func (this *SystemApiController) PostFollowInfo() {
+	time := time.Now().Unix()
+
+	var orgFollow []*models.OrgFollow
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if dataBody["Follow"] != nil && reflect.TypeOf(dataBody["Follow"]).String() == "[]interface {}" {
+		thisFollow, _ := dataBody["Follow"].([]interface{})
+		if len(thisFollow) > 0 {
+			for _, item := range thisFollow {
+				items := item.(map[string]interface{})
+				if items["org_id"] == nil || reflect.TypeOf(items["org_id"]).String() != "float64" {
+					utils.ErrorLog("org_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				org_id := int64(items["org_id"].(float64))
+
+				if items["admin_user_id"] == nil || reflect.TypeOf(items["admin_user_id"]).String() != "float64" {
+					utils.ErrorLog("admin_user_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				admin_user_id := int64(items["admin_user_id"].(float64))
+				follow := &models.OrgFollow{
+					Mtime:       time,
+					Status:      1,
+					Ctime:       time,
+					OrgId:       org_id,
+					AdminUserId: admin_user_id,
+				}
+				orgFollow = append(orgFollow, follow)
+			}
+		}
+	}
+
+	//防止数据冗余，先查出之前被删的数据是否存在，存在则直接改变删除状态，不插入新数据
+	for index, follow := range orgFollow {
+		info, err := service.FindFollowRecordByID(follow)
+
+		if err == nil { //存在，则修改删除状态
+			orgFollow = append(orgFollow[:index], orgFollow[index+1:]...)
+			if info.Status == 0 {
+				follow := &models.OrgFollow{
+					ID:          info.ID,
+					Mtime:       info.Mtime,
+					Status:      1,
+					Ctime:       info.Ctime,
+					OrgId:       info.OrgId,
+					AdminUserId: info.AdminUserId,
+				}
+				service.UpdateFollow(follow)
+			}
+
+		}
+	}
+
+	if len(orgFollow) > 0 {
+		errs := service.CreateFollowInfo(orgFollow)
+		if errs == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "提交成功",
+			})
+
+		}
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "提交成功",
+		})
+	}
+
+}
+
+func (this *SystemApiController) CancelFollowInfo() {
+	time := time.Now().Unix()
+
+	var orgFollow []*models.OrgFollow
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if dataBody["Follow"] != nil && reflect.TypeOf(dataBody["Follow"]).String() == "[]interface {}" {
+		thisFollow, _ := dataBody["Follow"].([]interface{})
+		if len(thisFollow) > 0 {
+			for _, item := range thisFollow {
+				items := item.(map[string]interface{})
+				if items["org_id"] == nil || reflect.TypeOf(items["org_id"]).String() != "float64" {
+					utils.ErrorLog("org_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				org_id := int64(items["org_id"].(float64))
+
+				if items["follow_id"] == nil || reflect.TypeOf(items["follow_id"]).String() != "float64" {
+					utils.ErrorLog("follow_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				follow_id := int64(items["follow_id"].(float64))
+
+				if items["admin_user_id"] == nil || reflect.TypeOf(items["admin_user_id"]).String() != "float64" {
+					utils.ErrorLog("admin_user_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				admin_user_id := int64(items["admin_user_id"].(float64))
+				follow := &models.OrgFollow{
+					ID:          follow_id,
+					Mtime:       time,
+					Status:      0,
+					Ctime:       time,
+					OrgId:       org_id,
+					AdminUserId: admin_user_id,
+				}
+				orgFollow = append(orgFollow, follow)
+			}
+		}
+	}
+	for _, follow := range orgFollow {
+		service.UpdateFollow(follow)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"follow": orgFollow,
+	})
+
+}
+
+func (this *SystemApiController) PostUnFollow() {
+	org_id, _ := this.GetInt64("org_id")
+	admin_user_id, _ := this.GetInt64("admin_user_id")
+
+	info, _ := service.FindFollowInfoById(org_id, admin_user_id)
+	follow := &models.OrgFollow{
+		ID:          info.ID,
+		Mtime:       time.Now().Unix(),
+		Status:      0,
+		Ctime:       info.Ctime,
+		OrgId:       org_id,
+		AdminUserId: info.AdminUserId,
+	}
+	err := service.UpdateFollow(follow)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+	}
+
+}
+
+func (this *SystemApiController) ModifyFollowInfo() {
+	time := time.Now().Unix()
+	var orgFollow []*models.OrgFollow
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	if dataBody["Follow"] != nil && reflect.TypeOf(dataBody["Follow"]).String() == "[]interface {}" {
+		thisFollow, _ := dataBody["Follow"].([]interface{})
+		if len(thisFollow) > 0 {
+			for _, item := range thisFollow {
+				items := item.(map[string]interface{})
+				if items["admin_user_id"] == nil || reflect.TypeOf(items["admin_user_id"]).String() != "float64" {
+					utils.ErrorLog("admin_user_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				admin_user_id := int64(items["admin_user_id"].(float64))
+
+				if items["org_id"] == nil || reflect.TypeOf(items["org_id"]).String() != "float64" {
+					utils.ErrorLog("org_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				org_id := int64(items["org_id"].(float64))
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if id == 0 {
+					follow := &models.OrgFollow{
+						Mtime:       time,
+						Status:      1,
+						Ctime:       time,
+						OrgId:       org_id,
+						AdminUserId: admin_user_id,
+					}
+					orgFollow = append(orgFollow, follow)
+				}
+			}
+		}
+	}
+
+	fmt.Println(orgFollow)
+
+	//防止数据冗余，先查出之前被删的数据是否存在，存在则直接改变删除状态，不插入新数据
+	for index, follow := range orgFollow {
+		info, err := service.FindFollowRecordByID(follow)
+
+		if err == nil { //存在，则修改删除状态
+			orgFollow = append(orgFollow[:index], orgFollow[index+1:]...)
+			if info.Status == 0 {
+				follow := &models.OrgFollow{
+					ID:          info.ID,
+					Mtime:       info.Mtime,
+					Status:      1,
+					Ctime:       info.Ctime,
+					OrgId:       info.OrgId,
+					AdminUserId: info.AdminUserId,
+				}
+				service.UpdateFollow(follow)
+			}
+
+		}
+	}
+
+	if len(orgFollow) > 0 {
+		errs := service.CreateFollowInfo(orgFollow)
+		if errs == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"msg": "提交成功",
+			})
+
+		}
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "提交成功",
+		})
+	}
+
+}

enums/error_code.go

 	ErrorCodePrescriptionPermissionDeniedModify = 200020
 
 	ErrorCodeAdvicePermissionDeniedModify = 200021
-	ErrorCodePrescriptionException    = 200022
-
+	ErrorCodePrescriptionException        = 200022
 
+	ErrorCodeNameException = 200023
 )
 
 var ErrCodeMsgs = map[int]string{
 
 	ErrorCodeDeleteDealerWrong:       "该经销商所属商品已入库无法删除",
 	ErrorCodeDeleteManufacturerWrong: "该厂商所属商品已入库无法删除",
-	ErrorCodeGoodTypeNameExistError: "该商品类型名字已存在",
-	ErrorCodeGoodInfoNameExistError: "该规格名称名字已存在",
+	ErrorCodeGoodTypeNameExistError:  "该商品类型名字已存在",
+	ErrorCodeGoodInfoNameExistError:  "该规格名称名字已存在",
 
 	ErrorCodePrescriptionPermissionDeniedModify: "您没有权限修改透析处方数据",
-	ErrorCodeAdvicePermissionDeniedModify: "您没有权限添加医嘱",
-	ErrorCodePrescriptionException: "上机失败,请先开处方",
+	ErrorCodeAdvicePermissionDeniedModify:       "您没有权限添加医嘱",
+	ErrorCodePrescriptionException:              "上机失败,请先开处方",
+
+	ErrorCodeNameException: "账号已经存在",
 }
 
 type SGJError struct {

models/admin_models/admin_models.go

 package admin_models
 
 type AdminAccount struct {
-	Id           int    `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
-	Account      string `json:"account"`
-	Pwd          string `json:"-"`
-	Status       int8   `json:"-"`                     // 状态 0.无效 1.有效
-	CreateTime   int64  `gorm:"column:ctime" json:"-"` // 创建时间
-	ModifyTime   int64  `gorm:"column:mtime" json:"-"` // 修改时间
+	ID           int64  `gorm:"column:id" json:"id"`
+	Account      string `gorm:"column:account" json:"account"`
+	Pwd          string `gorm:"column:pwd" json:"pwd"`
+	Status       int64  `gorm:"column:status" json:"status"`
+	Ctime        int64  `gorm:"column:ctime" json:"ctime"`
+	Mtime        int64  `gorm:"column:mtime" json:"mtime"`
 	IsSuperAdmin int64  `gorm:"column:is_super_admin" json:"is_super_admin"`
+	Name         string `gorm:"column:name" json:"name"`
 }
 
 func (AdminAccount) TableName() string {

models/admin_user_models.go

 	Status       int8   `json:"status"`                                      // 状态 0.无效 1.有效
 	CreateTime   int64  `gorm:"column:ctime" json:"ctime"`                   // 创建时间
 	ModifyTime   int64  `gorm:"column:mtime" json:"mtime"`                   // 修改时间
+	Name         string `gorm:"column:name" json:"name"`
 }
 
 func (AdminUser) TableName() string {

models/org_models.go

 package models
 
+import "XT_Admin_Api/models/admin_models"
+
 type Org struct {
 	Id                int64             `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"` // 机构 ID
 	Creator           int64             `json:"creator"`                              // 创建者，即管理员用户的 id
 	OrgGallery        []*OrgGallery     `gorm:"ForeignKey:OrgId" json:"org_gallery"`
 	AdminUserLoginLog AdminUserLoginLog `gorm:"ForeignKey:OrgId" json:"log"`
 	AdminUser         AdminUser         `gorm:"ForeignKey:Id" json:"admin"`
+	OrgFollow         []*OrgFollow      `gorm:"ForeignKey:OrgId" json:"follow"`
 }
 
 func (Org) TableName() string {
 func (UserOrgType) TableName() string {
 	return "sgj_user_org_type"
 }
+
+type DeviceZone struct {
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Name       string `json:"name"`
+	Type       int    `json:"type"`
+	Status     int8   `json:"-"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+}
+
+func (DeviceZone) TableName() string {
+	return "xt_device_zone"
+}
+
+type DeviceGroup struct {
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Name       string `json:"name"`
+	Status     int8   `json:"-"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+}
+
+func (DeviceGroup) TableName() string {
+	return "xt_device_group"
+}
+
+type DeviceNumber struct {
+	ID         int64  `gorm:"column:id" json:"id"`
+	OrgID      int64  `gorm:"column:org_id" json:"-"`
+	Number     string `json:"number"`
+	GroupID    int64  `gorm:"column:group_id" json:"group_id"`
+	ZoneID     int64  `gorm:"column:zone_id" json:"zone_id"`
+	Status     int8   `json:"-"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+}
+
+func (DeviceNumber) TableName() string {
+	return "xt_device_number"
+}
+
+type OrgFollow struct {
+	ID           int64                     `gorm:"column:id" json:"id"`
+	OrgId        int64                     `gorm:"column:org_id" json:"org_id"`
+	AdminUserId  int64                     `gorm:"column:admin_user_id" json:"admin_user_id"`
+	Ctime        int64                     `gorm:"column:ctime" json:"ctime"`
+	Mtime        int64                     `gorm:"column:mtime" json:"mtime"`
+	Status       int64                     `gorm:"column:status" json:"status"`
+	AdminAccount admin_models.AdminAccount `gorm:"ForeignKey:ID;AssociationForeignKey:AdminUserId" json:"account"`
+}
+
+func (OrgFollow) TableName() string {
+	return "sgj_org_follow"
+}

routers/router.go

 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		// AllowAllOrigins:  true,
-		AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9527", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com"},
+		AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9527", "http://xt.test.shengws.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://api.szjkhd.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 
 	// beego.Router("/", &controllers.MainController{})
 
-
 	admin_api.AdminAPIControllersRegisterRouters()
-    function_api.FunctionAPIControllersRegisterRouters()
+	function_api.FunctionAPIControllersRegisterRouters()
 }

service/admin_service.go

 import (
 	"XT_Admin_Api/models"
 	"XT_Admin_Api/models/admin_models"
+	"fmt"
+	"strings"
 	"time"
 
 	"github.com/jinzhu/gorm"
 	return count, nil
 }
 
-
-
 //获取近七天每天的注册机构总量
 func GetWeekRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select count(id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from sgj_user_org  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(sgj_user_org.ctime)) GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
 }
 
-
-
-
 //获取近七天每天的注册机构总量
-func GetWeekRegistedOrgTotalCount() (int64,  error) {
+func GetWeekRegistedOrgTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select count(id) as count  from sgj_user_org  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(sgj_user_org.ctime))").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 }
 
 //获取近七天每天的机构活跃账号总量
-func GetWeekActiveAdminUserTotalCount() (int64,  error) {
+func GetWeekActiveAdminUserTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select count(DISTINCT(admin_user_id)) as count  from sgj_user_admin_login_log  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(sgj_user_admin_login_log.ctime))  AND operate_type = 1 ").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 
 }
 
 //获取近七天新增病人总量
-func GetWeekPatientTotalCount() (int64,  error) {
+func GetWeekPatientTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readDb.Raw("select count(DISTINCT(id_card_no)) as count  from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time))").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 
 }
 
-
-
-
-
-
 //获取近30天每天的注册机构总量
 func GetMonthRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select count(id) as count,DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from sgj_user_org  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(sgj_user_org.ctime)) GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近30天每天的机构活跃总量
 func GetMonthActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times,count(DISTINCT(org_id)) as count From  (select ctime,org_id FROM sgj_user_admin_login_log where app_type = 3 AND org_id > 0 ) T  join sgj_xt.xt_dialysis_order ON sgj_xt.xt_dialysis_order.user_org_id = T.org_id AND  DATE_FORMAT(date(from_unixtime(T.ctime)) ,'%Y-%m') =DATE_FORMAT(date(from_unixtime(sgj_xt.xt_dialysis_order.dialysis_date)) ,'%Y-%m') where  DATE_FORMAT(date(from_unixtime(T.ctime)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 1 month),'%Y-%m') group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近30天每天的机构活跃账号总量
 func GetMonthActiveAdminUserCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select count(DISTINCT(admin_user_id)) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d')as times  from sgj_user_admin_login_log  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(sgj_user_admin_login_log.ctime)) AND sgj_user_admin_login_log.app_type = 3  AND sgj_user_admin_login_log.operate_type = 1 GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
 }
 
-
-
 //获取近30天每天的注册机构总量
-func GetMonthRegistedOrgTotalCount() (int64,  error) {
+func GetMonthRegistedOrgTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select count(id) as count from sgj_user_org  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(sgj_user_org.ctime))").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 }
 
-
 //获取近30天每天的机构活跃账号总量
-func GetMonthActiveAdminUserTotalCount() (int64,  error) {
+func GetMonthActiveAdminUserTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select count(DISTINCT(admin_user_id)) as count from sgj_user_admin_login_log  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(sgj_user_admin_login_log.ctime))  AND operate_type = 1 ").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 }
 
 //获取近30天每天的机构新增病人总量
-func GetMonthNewPatientTotalCount() (int64,  error) {
+func GetMonthNewPatientTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readDb.Raw("select count(DISTINCT(id_card_no)) as count from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) ").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 }
 
-
-
-
-
-
 //获取近3个月每个月的注册机构总量
 func GetThreeMonthRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)) ,'%Y-%m') as times,count(DISTINCT(id)) as count from sgj_user_org where  DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近3个月每个月的机构活跃账号总量
 func GetThreeMonthActiveAdminUserCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)) ,'%Y-%m') as times,count(DISTINCT(admin_user_id)) as count from sgj_user_admin_login_log where  DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m')  AND sgj_user_admin_login_log.app_type = 3  AND sgj_user_admin_login_log.operate_type = 1 group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近3个月每个月的注册机构总量
-func GetThreeMonthRegistedOrgTotalCount() (int64,  error) {
+func GetThreeMonthRegistedOrgTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select count(DISTINCT(id)) as count from sgj_user_org where  DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m')").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 
 }
 
-
 //获取近3个月每个月的机构活跃账号总量
-func GetThreeMonthActiveAdminUserTotalCount() (int64,  error) {
+func GetThreeMonthActiveAdminUserTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select count(DISTINCT(admin_user_id)) as count from sgj_user_admin_login_log where  DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m')  AND operate_type = 1 ").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 
 }
 
-
 //获取近3个月每个月机构新增病人总量
-func GetThreeMonthNewPatientTotalCount() (int64,  error) {
+func GetThreeMonthNewPatientTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readDb.Raw("select count(DISTINCT(id_card_no)) as count from xt_patients where  DATE_FORMAT(date(from_unixtime(xt_patients.created_time)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m')").Scan(&result).Error
-	return result.Count,err
+	return result.Count, err
 
 }
 
-
-
 //获取近半年每个月的注册机构总量
 func GetSixMonthRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)) ,'%Y-%m') as times,count(DISTINCT(id)) as count from sgj_user_org where  DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近半年每个月的机构活跃账号总量
 func GetSixMonthActiveAdminUserCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)) ,'%Y-%m') as times,count(DISTINCT(admin_user_id)) as count from sgj_user_admin_login_log where  DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') AND sgj_user_admin_login_log.app_type = 3  AND sgj_user_admin_login_log.operate_type = 1 group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近半年每个月的机构活跃总量
 func GetSixMonthActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times,count(DISTINCT(org_id)) as count From  (select ctime,org_id FROM sgj_user_admin_login_log where app_type = 3 AND org_id > 0 AND operate_type = 1  ) T  join sgj_xt.xt_dialysis_order ON sgj_xt.xt_dialysis_order.user_org_id = T.org_id AND  DATE_FORMAT(date(from_unixtime(T.ctime)) ,'%Y-%m') =DATE_FORMAT(date(from_unixtime(sgj_xt.xt_dialysis_order.dialysis_date)) ,'%Y-%m') where  DATE_FORMAT(date(from_unixtime(T.ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近半年每个月机构新增病人总量
 func GetSixMonthNewPatientCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readDb.Raw("select DATE_FORMAT(date(from_unixtime(xt_patients.created_time)) ,'%Y-%m') as times,count(DISTINCT(id_card_no)) as count from xt_patients where  DATE_FORMAT(date(from_unixtime(xt_patients.created_time)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近半年每个月的注册机构总量
-func GetSixMonthRegistedOrgTotalCount() (int64,  error) {
+func GetSixMonthRegistedOrgTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)) ,'%Y-%m') as times,count(DISTINCT(id)) as count from sgj_user_org where  DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m')").Scan(&result).Error
 	return result.Count, err
 }
 
-
-	//获取近半年每个月的机构活跃账号总量
-func GetSixMonthActiveAdminUserTotalCount() (int64,  error) {
+//获取近半年每个月的机构活跃账号总量
+func GetSixMonthActiveAdminUserTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)) ,'%Y-%m') as times,count(DISTINCT(admin_user_id)) as count from sgj_user_admin_login_log where  DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m')").Scan(&result).Error
 
 }
 
-
 //获取近半年每个月机构新增病人总量
-func GetSixMonthNewPatientTotalCount() (int64,  error) {
+func GetSixMonthNewPatientTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readDb.Raw("select DATE_FORMAT(date(from_unixtime(xt_patients.created_time)) ,'%Y-%m') as times,count(DISTINCT(id_card_no)) as count from xt_patients where  DATE_FORMAT(date(from_unixtime(xt_patients.created_time)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m')").Scan(&result).Error
 
 }
 
-
-
-
 //获取近1年每个月的注册机构总量
 func GetYearRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)) ,'%Y-%m') as times,count(DISTINCT(id)) as count from sgj_user_org where  DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近1年每个月的机构活跃账号总量
 func GetYearActiveAdminUserCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)) ,'%Y-%m') as times,count(DISTINCT(admin_user_id)) as count from sgj_user_admin_login_log where  DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') AND sgj_user_admin_login_log.app_type = 3  AND sgj_user_admin_login_log.operate_type = 1 group by times").Scan(&weekStatistics).Error
 	return
 }
 
-
 //获取近1年每个月的注册机构总量
-func GetYearRegistedOrgTotalCount() (int64,  error) {
+func GetYearRegistedOrgTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)) ,'%Y-%m') as times,count(DISTINCT(id)) as count from sgj_user_org where  DATE_FORMAT(date(from_unixtime(sgj_user_org.ctime)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m')").Scan(&result).Error
 
 }
 
-
 //获取近1年每个月的机构活跃账号总量
-func GetYearActiveAdminUserTotalCount() (int64,  error) {
+func GetYearActiveAdminUserTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readUserDb.Raw("select DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)) ,'%Y-%m') as times,count(DISTINCT(admin_user_id)) as count from sgj_user_admin_login_log where  DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m')").Scan(&result).Error
 	return result.Count, err
 }
 
-
 //获取近1年每个月机构新增病人总量
-func GetYearNewPatientTotalCount() (int64,  error) {
+func GetYearNewPatientTotalCount() (int64, error) {
 	var result admin_models.Count
 	var err error
 	err = readDb.Raw("select count(DISTINCT(id_card_no)) as count from xt_patients where  DATE_FORMAT(date(from_unixtime(xt_patients.created_time)),'%Y-%m')>DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') AND status > 0").Scan(&result).Error
 
 }
 
+func GetAllAdmin() (admin []*admin_models.AdminAccount, err error) {
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("is_super_admin <> 1 AND (status = 1 OR status = 2)").Find(&admin).Error
+	return
+}
 
+func CreateAdmin(admin *admin_models.AdminAccount) (err error) {
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Create(&admin).Error
+	return
+}
 
+func FindUserInfoByAccount(account string) (admin admin_models.AdminAccount, err error) {
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("account = ?", account).First(&admin).Error
+	return
+}
+
+func FindAdminById(id int64) (admin admin_models.AdminAccount, err error) {
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("id = ?", id).First(&admin).Error
+	return
+}
+
+func UpdateAdmin(admin *admin_models.AdminAccount) (err error) {
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Save(&admin).Error
+	return
+}
+
+func DeleteAdmin(id int64) (err error) {
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+	return
+}
+
+func FindAllOrg() (org []*models.Org, err error) {
+	err = readUserDb.Select("id, org_name").Where("status = 1").Find(&org).Error
+
+	return
+}
+
+type FollowViewModel struct {
+	models.OrgFollow
+	OrgName string `gorm:"column:org_name" json:"org_name"`
+}
+
+func FindFollowOrg(admin_id int64) ([]*FollowViewModel, error) {
+	var vms []*FollowViewModel = make([]*FollowViewModel, 0)
+	rows, err := readUserDb.Raw("SELECT follow.*, org.org_name as org_name FROM sgj_org_follow as follow join sgj_user_org as org on org.id = follow.org_id  WHERE (follow.admin_user_id = ? AND follow.status = 1)", admin_id).Rows()
+	defer rows.Close()
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		var vm FollowViewModel
+		readDb.ScanRows(rows, &vm)
+		vms = append(vms, &vm)
+	}
+	fmt.Println(vms)
+	return vms, nil
+}
+
+type OrgViewModel struct {
+	Id      int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"` // 机构 ID
+	OrgName string `gorm:"column:org_name" json:"org_name"`
+}
+
+func FindUnFollowOrgByIds(id int64) (orgViewModel []*OrgViewModel, err error) {
+	err = readUserDb.Raw("Select id, org_name From  sgj_user_org  Where NOT EXISTS (Select id, org_name FROM sgj_org_follow Where sgj_org_follow.org_id = sgj_user_org.id AND sgj_org_follow.admin_user_id = ? AND sgj_org_follow.status = 1)", id).Scan(&orgViewModel).Error
+	return
+
+}
+
+func CreateFollowInfo(Follows []*models.OrgFollow) (err error) {
+	if len(Follows) > 0 {
+		utx := writeUserDb.Begin()
+		if len(Follows) > 0 {
+			thisSQL := "INSERT INTO sgj_org_follow (org_id,admin_user_id,ctime,mtime,status) VALUES "
+			insertParams := make([]string, 0)
+			insertData := make([]interface{}, 0)
+			for _, info := range Follows {
+				insertParams = append(insertParams, "(?,?,?,?,?)")
+				insertData = append(insertData, info.OrgId)
+				insertData = append(insertData, info.AdminUserId)
+				insertData = append(insertData, info.Ctime)
+				insertData = append(insertData, info.Mtime)
+				insertData = append(insertData, info.Status)
+			}
+			thisSQL += strings.Join(insertParams, ", ")
+			err = utx.Exec(thisSQL, insertData...).Error
+			if err != nil {
+				utx.Rollback()
+				return
+			}
+		}
+		utx.Commit()
+	}
+	return
+
+}
+
+func UpdateFollow(follow *models.OrgFollow) (err error) {
+	err = readUserDb.Model(&models.OrgFollow{}).Save(follow).Error
+	return
+}
+
+func FindFollowRecordByID(follow *models.OrgFollow) (info models.OrgFollow, err error) {
+	err = readUserDb.Model(&models.OrgFollow{}).Where("org_id = ? AND admin_user_id = ?", follow.OrgId, follow.AdminUserId).First(&info).Error
+	return
+}
+
+func FindFollowInfoById(org_id int64, admin_user_id int64) (info models.OrgFollow, err error) {
+	err = readUserDb.Model(&models.OrgFollow{}).Where("org_id = ? AND status = 1 AND admin_user_id = ?", org_id, admin_user_id).First(&info).Error
+	return
+}

service/db.go

 
 }
 
-//func DisconnectDB() {
-//	if err := readDb.Close(); nil != err {
-//		beego.Error("Disconnect from database failed: " + err.Error())
-//	}
-//}
-
 func XTReadDB() *gorm.DB {
 	return readDb
 }

service/org_service.go

 	"time"
 )
 
-func GetAllOrgList(active_status int64,depth_active_status int64,start_time int64,end_time int64,province int64,city int64,district int64,follow int64,keyword string,page int64, limit int64) (list []*models.Org, err error, total int64){
+func GetAllOrgList(active_status int64, depth_active_status int64, start_time int64, end_time int64, province int64, city int64, district int64, follow int64, keyword string, page int64, limit int64) (list []*models.Org, err error, total int64) {
 	offset := (page - 1) * limit
 	fmt.Println(offset)
 	db := readUserDb.Model(&models.Org{})
-	if len(keyword) > 0{
+
+	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		db = db.Where("contact_name  LIKE ? Or org_name LIKE ? Or org_short_name Like ? ",likeKey,likeKey,likeKey)
-	}else{
+		db = db.Where("contact_name  LIKE ? Or org_name LIKE ? Or org_short_name Like ? ", likeKey, likeKey, likeKey)
+	} else {
 
 		switch active_status {
 		case 1:
 			now := time.Now()
 			zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-			db = db.Joins("JOIN sgj_user_admin_login_log on sgj_user_admin_login_log.org_id = sgj_user_org.id AND sgj_user_admin_login_log.ctime >= ? AND sgj_user_admin_login_log.ctime <= ? AND sgj_user_admin_login_log.app_type = 3",zeroHourTimeOfToday.Unix(),now.Unix())
+			db = db.Joins("JOIN sgj_user_admin_login_log on sgj_user_admin_login_log.org_id = sgj_user_org.id AND sgj_user_admin_login_log.ctime >= ? AND sgj_user_admin_login_log.ctime <= ? AND sgj_user_admin_login_log.app_type = 3", zeroHourTimeOfToday.Unix(), now.Unix())
 			break
 		case 2:
 			db = db.Joins("JOIN sgj_user_admin_login_log on sgj_user_admin_login_log.org_id = sgj_user_org.id AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(sgj_user_admin_login_log.ctime)) AND sgj_user_admin_login_log.app_type = 3 AND sgj_user_admin_login_log.operate_type = 1 ")
 		case 1:
 			now := time.Now()
 			zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-			db = db.Joins("JOIN sgj_user_admin_login_log on sgj_user_admin_login_log.org_id = sgj_user_org.id AND sgj_user_admin_login_log.ctime >= ? AND sgj_user_admin_login_log.ctime <= ? AND sgj_user_admin_login_log.app_type = 3 AND sgj_user_admin_login_log.operate_type = 1 ",zeroHourTimeOfToday.Unix(),now.Unix())
+			db = db.Joins("JOIN sgj_user_admin_login_log on sgj_user_admin_login_log.org_id = sgj_user_org.id AND sgj_user_admin_login_log.ctime >= ? AND sgj_user_admin_login_log.ctime <= ? AND sgj_user_admin_login_log.app_type = 3 AND sgj_user_admin_login_log.operate_type = 1 ", zeroHourTimeOfToday.Unix(), now.Unix())
 			db = db.Joins("JOIN sgj_xt.xt_dialysis_order on sgj_xt.xt_dialysis_order.user_org_id = sgj_user_org.id AND DATE_FORMAT(date(from_unixtime(sgj_user_admin_login_log.ctime)) ,'%Y-%m-%d') = DATE_FORMAT(date(from_unixtime(sgj_xt.xt_dialysis_order.dialysis_date)) ,'%Y-%m-%d') AND sgj_user_admin_login_log.app_type = 3 AND sgj_user_admin_login_log.operate_type = 1 ")
 
 			break
 
 			break
 		}
-		if province > 0{
-			db = db.Where("sgj_user_org.province = ?",province)
+		if province > 0 {
+			db = db.Where("sgj_user_org.province = ?", province)
 		}
 
-		if city > 0{
-			db = db.Where("sgj_user_org.city = ?",city)
+		if city > 0 {
+			db = db.Where("sgj_user_org.city = ?", city)
 		}
 
-		if district > 0{
-			db = db.Where("sgj_user_org.district = ?",district)
+		if district > 0 {
+			db = db.Where("sgj_user_org.district = ?", district)
 		}
 
 		if start_time != 0 {
 			db = db.Where("sgj_user_org.ctime<=?", end_time)
 		}
 
+		if follow != 0 {
+			db = db.Joins("JOIN sgj_org_follow on sgj_org_follow.org_id = sgj_user_org.id AND sgj_org_follow.admin_user_id = ? AND sgj_org_follow.status = 1", follow)
+		}
+
 	}
-	err = db.Where("sgj_user_org.status = 1").Preload("AdminUserLoginLog", func(db *gorm.DB) *gorm.DB {
+	err = db.Where("sgj_user_org.status = 1").Preload("OrgFollow", func(db *gorm.DB) *gorm.DB {
+		return db.Model(&models.OrgFollow{}).Where("status = 1").Preload("AdminAccount", "status = 1")
+	}).Preload("AdminUserLoginLog", func(db *gorm.DB) *gorm.DB {
 		return db.Model(&models.AdminUserLoginLog{}).Where("id = (SELECT max(id))")
 	}).Count(&total).Offset(offset).Limit(limit).Group("id").Find(&list).Error
 	return
 }
 
-
-func GetOrgDetailInfo(org_id int64) (info models.Org, err error){
-	err = readUserDb.Model(&models.Org{}).Where("id = ? AND status = 1",org_id).Preload("AdminUserLoginLog", func(db *gorm.DB) *gorm.DB {
+func GetOrgDetailInfo(org_id int64) (info models.Org, err error) {
+	err = readUserDb.Model(&models.Org{}).Where("id = ? AND status = 1", org_id).Preload("AdminUserLoginLog", func(db *gorm.DB) *gorm.DB {
 		return db.Model(&models.AdminUserLoginLog{}).Where("id = (SELECT max(id))")
-	}).Preload("AdminUser","status = 1").Find(&info).Error
+	}).Preload("AdminUser", "status = 1").Find(&info).Error
 	return
 }
 
-func GetDistrictsById(id int64)(district models.District, err error){
+func GetDistrictsById(id int64) (district models.District, err error) {
 	err = readUserDb.Model(&models.District{}).Where("id = ? ", id).First(&district).Error
 	return
 }
 
-func GetAllOrgType()(types []*models.OrgType, err error){
+func GetAllOrgType() (types []*models.OrgType, err error) {
 	err = readUserDb.Model(&models.OrgType{}).Find(&types).Error
 	return
 }
+
 //设置今天和昨天的数据
-func GetOrgDialysisCount(statices_type int64, org_id int64, from int64,to int64) (count int64, err error){
+func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64) (count int64, err error) {
 	var counts int64
 
 	switch statices_type {
 	case 1: //病人管理
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_patients WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_patients WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 2: //透析处方
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_dialysis_prescription WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_dialysis_prescription WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 3: //接诊评估
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_receive_treatment_asses WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_receive_treatment_asses WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 4: //透前评估
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_assessment_before_dislysis WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_assessment_before_dislysis WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 			rows.Scan(&counts)
 		}
 		break
-	case 5://临时医嘱
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT patient_id) AS count FROM xt_doctor_advice WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+	case 5: //临时医嘱
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT patient_id) AS count FROM xt_doctor_advice WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 6: //双人核对
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_double_check WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_double_check WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 7: //透析上机
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_dialysis_order WHERE user_org_id = ? AND created_time >= ? AND created_time <= ?  AND status = 1 AND (stage = 2 OR stage = 1)",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_dialysis_order WHERE user_org_id = ? AND created_time >= ? AND created_time <= ?  AND status = 1 AND (stage = 2 OR stage = 1)", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		break
 
 	case 8: //透析监测
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT patient_id) AS count FROM xt_monitoring_record WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT patient_id) AS count FROM xt_monitoring_record WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 9: //透析下机
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_dialysis_order WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND  stage = 2  AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_dialysis_order WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND  stage = 2  AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 10: //透后评估
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_assessment_after_dislysis WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_assessment_after_dislysis WHERE user_org_id = ? AND created_time >= ? AND created_time <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 11: //入库单
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_warehouse WHERE org_id = ? AND ctime >= ? AND mtime <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_warehouse WHERE org_id = ? AND ctime >= ? AND mtime <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 		}
 		break
 	case 12: //出库单
-		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_warehouse_out WHERE org_id = ? AND ctime >= ? AND mtime <= ? AND status = 1",org_id ,from, to).Rows()
+		rows, err := readDb.Raw("SELECT COUNT(DISTINCT id) AS count FROM xt_warehouse_out WHERE org_id = ? AND ctime >= ? AND mtime <= ? AND status = 1", org_id, from, to).Rows()
 		if err != nil {
 			return 0, err
 		}
 }
 
 //获取近七天的数据
-func GetWeekOrgDialysisCount(statices_type int64,org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
+func GetWeekOrgDialysisCount(statices_type int64, org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
 	fmt.Println(statices_type)
 
 	switch statices_type {
 
 		break
 	case 2: //透析处方
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 3: //接诊评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 4: //透前评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
-	case 5://临时医嘱
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+	case 5: //临时医嘱
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 6: //双人核对
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 7: //透析上机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1)  GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1)  GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
 	case 8: //透析监测
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ?  GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ?  GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 9: //透析下机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 10: //透后评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 11: //入库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ?  GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ?  GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 12: //出库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	}
 
 	return
 }
 
-
-
-func GetMonthOrgDialysisCount(statices_type int64,org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
+func GetMonthOrgDialysisCount(statices_type int64, org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
 	switch statices_type {
 	case 1: //病人管理
 		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 2: //透析处方
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 3: //接诊评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 4: //透前评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
-	case 5://临时医嘱
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+	case 5: //临时医嘱
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 6: //双人核对
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 7: //透析下机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ?  AND (stage = 2 OR stage = 1) GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ?  AND (stage = 2 OR stage = 1) GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
 	case 8: //透析监测
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ?  GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ?  GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 9: //透析下机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 10: //透后评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 11: //入库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ?  GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ?  GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 12: //出库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	}
 	return
 }
 
-
-func GetThreeMonthOrgDialysisCount(statices_type int64,org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
+func GetThreeMonthOrgDialysisCount(statices_type int64, org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
 	switch statices_type {
 	case 1: //病人管理
 		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 2: //透析处方
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 3: //接诊评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 4: //透前评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
-	case 5://临时医嘱
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(),INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+	case 5: //临时医嘱
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(),INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 6: //双人核对
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 7: //透析上机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1) GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1) GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
 	case 8: //透析监测
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times ",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times ", org_id).Scan(&weekStatistics).Error
 		break
 	case 9: //透析下机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 10: //透后评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(),INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(),INTERVAL 3 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 11: //入库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times ",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times ", org_id).Scan(&weekStatistics).Error
 		break
 	case 12: //出库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	}
 	return
 }
 
-
-
-func GetSixMonthOrgDialysisCount(statices_type int64,org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
+func GetSixMonthOrgDialysisCount(statices_type int64, org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
 	switch statices_type {
 	case 1: //病人管理
 		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 2: //透析处方
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 3: //接诊评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 4: //透前评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
-	case 5://临时医嘱
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(),INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+	case 5: //临时医嘱
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(),INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 6: //双人核对
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 7: //透析上机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1) GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1) GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
 	case 8: //透析监测
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times ",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times ", org_id).Scan(&weekStatistics).Error
 		break
 	case 9: //透析下机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 10: //透后评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(),INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(),INTERVAL 6 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 11: //入库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times ",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times ", org_id).Scan(&weekStatistics).Error
 		break
 	case 12: //出库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 6 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	}
 	return
 }
 
-
-
-
-func GetYearOrgDialysisCount(statices_type int64,org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
+func GetYearOrgDialysisCount(statices_type int64, org_id int64) (weekStatistics []*admin_models.Statistics, err error) {
 	switch statices_type {
 	case 1: //病人管理
 		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 2: //透析处方
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_prescription  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 3: //接诊评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_receive_treatment_asses  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 4: //透前评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_before_dislysis  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
-	case 5://临时医嘱
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(),INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+	case 5: //临时医嘱
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_doctor_advice  where DATE_SUB(CURDATE(),INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 6: //双人核对
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_double_check  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 7: //透析上机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1) GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time))  AND status = 1  AND user_org_id = ? AND (stage = 2 OR stage = 1) GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 
 	case 8: //透析监测
-		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times ",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct patient_id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_monitoring_record  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1 AND user_org_id = ? GROUP BY times ", org_id).Scan(&weekStatistics).Error
 		break
 	case 9: //透析下机
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_dialysis_order  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND stage = 2 AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 
 		break
 	case 10: //透后评估
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(),INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times  from xt_assessment_after_dislysis  where DATE_SUB(CURDATE(),INTERVAL 12 MONTH) <= date(from_unixtime(created_time)) AND status = 1  AND user_org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	case 11: //入库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times ",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times ", org_id).Scan(&weekStatistics).Error
 		break
 	case 12: //出库单
-		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times",org_id).Scan(&weekStatistics).Error
+		err = readDb.Raw("select count(distinct id) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from xt_warehouse_out  where DATE_SUB(CURDATE(), INTERVAL 12 MONTH) <= date(from_unixtime(ctime)) AND status = 1 AND org_id = ? GROUP BY times", org_id).Scan(&weekStatistics).Error
 		break
 	}
 	return
 	err = readUserDb.Model(&models.District{}).Where("upid=?", id).Find(&dis).Error
 	return
 }
+
+func FindAllFollower() (follower []*admin_models.AdminAccount, err error) {
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("status = 1 AND is_super_admin <> 1").Find(&follower).Error
+	return
+
+}
+
+func FindPatientById(id int64, page int64, limit int64) (patients []*models.Patients, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.Patients{}).Where("user_org_id=? AND status = 1", id)
+	db = db.Count(&total)
+	err = db.Offset(offset).Limit(limit).Find(&patients).Error
+	return
+}
+
+func GetAppTypeByOrgId(org_id int64) (appType models.OrgApp, err error) {
+	err = readUserDb.Model(&models.OrgApp{}).Where("app_type = 3 AND org_id = ?", org_id).First(&appType).Error
+	return
+}
+
+func GetRoles(orgID int64, appID int64, page int, count int) ([]*models.Role, int, error) {
+	var roles []*models.Role
+	var totalCount int
+	err := readUserDb.Model(&models.Role{}).
+		Where("org_id = ? AND app_id = ?", orgID, appID).
+		Count(&totalCount).
+		Order("ctime asc").Limit(count).Offset((page - 1) * count).
+		Find(&roles).
+		Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return make([]*models.Role, 0), 0, nil
+		} else {
+			return nil, 0, err
+		}
+	}
+	return roles, totalCount, nil
+}
+
+func GetAdminUser(orgID int64, page int, count int) ([]*models.AdminUser, int, error) {
+	var roles []*models.AdminUser
+	var totalCount int
+	err := readUserDb.Model(&models.AdminUser{}).
+		Where("org_id = ? ", orgID).
+		Count(&totalCount).
+		Order("ctime asc").Limit(count).Offset((page - 1) * count).
+		Find(&roles).
+		Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return make([]*models.AdminUser, 0), 0, nil
+		} else {
+			return nil, 0, err
+		}
+	}
+	return roles, totalCount, nil
+}
+
+type AdminUserManageViewModel struct {
+	AdminUserId int    `gorm:"admin_user_id" json:"user_id"`
+	UserName    string `gorm:"user_name" json:"user_name"`
+	RoleName    string `gorm:"role_name" json:"role_name"`
+	UserTitle   int    `gorm:"user_title" json:"user_title"`
+	Ip          string `gorm:"ip" json:"ip"`
+	Ctime       int64  `gorm:"ctime" json:"last_login_time"`
+	Status      int    `gorm:"status" json:"status"`
+
+	// LastLoginTimeStr string `gorm:"-" json:"last_login_time_formatted"`
+	TitleName string `gorm:"-" json:"title_name"`
+}
+
+func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int64, count int64) ([]*AdminUserManageViewModel, int, error) {
+	if count <= 0 {
+		return []*AdminUserManageViewModel{}, 0, nil
+	}
+	if page < 1 {
+		page = 1
+	}
+	var viewModels []*AdminUserManageViewModel = make([]*AdminUserManageViewModel, 0)
+	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_r.role_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status FROM sgj_user_admin_role AS u_a_r INNER JOIN sgj_user_role AS u_r ON u_a_r.org_id = u_r.org_id AND u_a_r.app_id = u_r.app_id AND u_r.id = u_a_r.role_id LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ? ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
+	defer rows.Close()
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return viewModels, 0, nil
+		} else {
+			return nil, 0, err
+		}
+	}
+	for rows.Next() {
+		var viewModel AdminUserManageViewModel
+		readUserDb.ScanRows(rows, &viewModel)
+		title, _ := models.UserTitle[viewModel.UserTitle]
+		viewModel.TitleName = title
+		// if viewModel.Ctime == 0 {
+		// 	viewModel.LastLoginTimeStr = ""
+		// } else {
+		// 	loginTime := time.Unix(viewModel.Ctime, 0)
+		// 	viewModel.LastLoginTimeStr = loginTime.Format("2006-01-02 15:04")
+		// }
+		viewModels = append(viewModels, &viewModel)
+	}
+	total := 0
+	readUserDb.Table("sgj_user_admin_role as u_a_r").Joins("join sgj_user_role as u_r on u_r.org_id = u_a_r.org_id AND u_r.app_id = u_a_r.app_id AND u_r.id = u_a_r.role_id").Where("u_a_r.org_id = ? AND u_a_r.app_id = ?", orgID, appID).Count(&total)
+	return viewModels, total, nil
+}
+
+func GetAllValidDeviceZones(orgID int64) ([]*models.DeviceZone, error) {
+	var zones []*models.DeviceZone
+	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ? AND status = 1", orgID).Find(&zones).Error
+	if err != nil {
+		return nil, err
+	}
+	return zones, nil
+}
+
+func GetAllValidDeviceGroups(orgID int64) ([]*models.DeviceGroup, error) {
+	var groups []*models.DeviceGroup
+	err := readDb.Model(&models.DeviceGroup{}).Where("org_id = ? AND status = 1", orgID).Find(&groups).Error
+	if err != nil {
+		return nil, err
+	}
+	return groups, nil
+}
+
+type DeviceNumberViewModel struct {
+	models.DeviceNumber
+	ZoneName  string `gorm:"column:zone_name" json:"zone_name"`
+	GroupName string `gorm:"column:group_name" json:"group_name"`
+}
+
+func GetAllValidDeviceNumbers(orgID int64) ([]*DeviceNumberViewModel, error) {
+	var vms []*DeviceNumberViewModel = make([]*DeviceNumberViewModel, 0)
+	rows, err := readDb.Raw("SELECT n.*, z.name as zone_name, g.name as group_name FROM xt_device_number as n join xt_device_zone as z on z.id = n.zone_id join xt_device_group as g on g.id = n.group_id WHERE (n.org_id = ? AND n.status = 1)", orgID).Rows()
+	defer rows.Close()
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		var vm DeviceNumberViewModel
+		readDb.ScanRows(rows, &vm)
+		vms = append(vms, &vm)
+	}
+	return vms, nil
+}
+
+//func GetSpecialAdminUser(org_id int64, app_id int64,  page int64, count int64) ([]*AdminUserManageViewModel, error){
+//
+//	if count <= 0 {
+//		return []*AdminUserManageViewModel{}, nil
+//	}
+//	if page < 1 {
+//		page = 1
+//	}
+//	var viewModels []*AdminUserManageViewModel = make([]*AdminUserManageViewModel, 0)
+//	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_r.role_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status FROM sgj_user_admin_role AS u_a_r INNER JOIN sgj_user_role AS u_r ON u_a_r.org_id = u_r.org_id AND u_a_r.app_id = u_r.app_id AND u_r.id = u_a_r.role_id LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ? ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id INNER JOIN sgj_xt.xt_admin_user_special_permission AS xt_p ON  u_a_r.org_id = xt_p.org_id AND u_a_r.app_id = xt_p.app_id AND u_a_r.admin_user_id = xt_p.admin_user_id   WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
+//	defer rows.Close()
+//	if err != nil {
+//		if err == gorm.ErrRecordNotFound {
+//			return viewModels, nil
+//		} else {
+//			return nil, err
+//		}
+//	}
+//	for rows.Next() {
+//		var viewModel AdminUserManageViewModel
+//		readUserDb.ScanRows(rows, &viewModel)
+//		title, _ := models.UserTitle[viewModel.UserTitle]
+//		viewModel.TitleName = title
+//		viewModels = append(viewModels, &viewModel)
+//	}
+//	return viewModels, nil
+//
+//
+//}