111

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9550
+httpport = 9588
 runmode = dev
 
 copyrequestbody = true
@@ -107,6 +107,19 @@ writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
 writeusername = sgj_users
 
+
+readchargehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
+readchargeport = 3306
+readchargeuser = root
+readchargepass = 1Q2W3e4r!@#$
+readchargename = kyy_charge
+
+writechargehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
+writechargeport = 3306
+writechargeuser = root
+writechargepass = 1Q2W3e4r!@#$
+writechargename = kyy_charge
+
 redishost = 120.77.235.13
 redisport = 6379
 redispasswrod = syh@#$%123456!

controllers/admin_api_controllers/admin_api_router_register.go

@@ -4,52 +4,61 @@ import "github.com/astaxie/beego"
 
 // 管理员后台路由，以 /admin/api 为前缀
 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/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/org/initdata", &OrgAPIController{}, "get:GetInitData")
-	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/login/pwd", &LoginAPIController{}, "get:LoginByPwd")
+	beego.Router("/admin/api/system/user", &SystemApiController{}, "get:GetUserList")
 	beego.Router("/admin/api/user/create", &SystemApiController{}, "post:CreateAdminUser")
+	beego.Router("/admin/api/user/info", &SystemApiController{}, "get:GetAdminUserInfo")
 	beego.Router("/admin/api/user/edit", &SystemApiController{}, "post:ModifyAdminUser")
 	beego.Router("/admin/api/user/delete", &SystemApiController{}, "post:DeleteAdminUser")
+	//beego.Router("/admin/api/orgs/list", &SystemApiController{}, "get:GetOrgs")
+
+	beego.Router("/admin/api/home/statistics", &AnalysisAPIController{}, "get:HomeStatistics")
+	beego.Router("/admin/api/custom/create", &CustomAPIController{}, "post:CreateCustom")
+	beego.Router("/admin/api/custom/edit", &CustomAPIController{}, "post:ModifyCustom")
+	beego.Router("/admin/api/custom/list", &CustomAPIController{}, "get:GetCustomList")
+	beego.Router("/admin/api/custom/get", &CustomAPIController{}, "get:GetCustom")
+	beego.Router("/admin/api/checkcustom/get", &CustomAPIController{}, "get:GetWaitCheckCustom")
 
-	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/paymentcollection/create", &CustomAPIController{}, "post:CreatePaymentCollection")
+	beego.Router("/admin/api/paymentcollection/get", &CustomAPIController{}, "get:GetPaymentCollection")
+	beego.Router("/admin/api/paymentcollection/list", &CustomAPIController{}, "get:GetPaymentCollectionList")
+	beego.Router("/admin/api/paymentcollection/edit", &CustomAPIController{}, "post:EditPaymentCollection")
+	beego.Router("/admin/api/paymentcollection/delete", &CustomAPIController{}, "post:DeletePaymentCollection")
+	beego.Router("/admin/api/paymentcollection/check", &CustomAPIController{}, "post:CheckPaymentCollection")
 
-	beego.Router("/admin/api/follow/edit", &SystemApiController{}, "post:ModifyFollowInfo")
-	beego.Router("/admin/api/unfollow", &SystemApiController{}, "post:PostUnFollow")
+	beego.Router("/admin/api/contact/create", &CustomAPIController{}, "post:CreateContactInfo")
+	beego.Router("/admin/api/contact/get", &CustomAPIController{}, "get:GetContactInfo")
+	beego.Router("/admin/api/contact/list", &CustomAPIController{}, "get:GetContactInfoList")
+	beego.Router("/admin/api/contact/edit", &CustomAPIController{}, "post:EditContactInfo")
+	beego.Router("/admin/api/contact/delete", &CustomAPIController{}, "post:DeleteContactInfo")
+	beego.Router("/admin/api/contact/check", &CustomAPIController{}, "post:CheckContactInfo")
 
-	beego.Router("/admin/api/user/get", &SystemApiController{}, "get:GetAdminUserById")
-	beego.Router("/admin/api/follow/cancel", &SystemApiController{}, "post:CancelFollowInfo")
+	beego.Router("/admin/api/contract/create", &CustomAPIController{}, "post:CreateContractInfo")
+	beego.Router("/admin/api/contract/get", &CustomAPIController{}, "get:GetContractInfo")
+	beego.Router("/admin/api/contract/list", &CustomAPIController{}, "get:GetContractInfoList")
+	beego.Router("/admin/api/contract/edit", &CustomAPIController{}, "post:EditContractInfo")
+	beego.Router("/admin/api/contract/delete", &CustomAPIController{}, "post:DeleteContractInfo")
+	beego.Router("/admin/api/contract/check", &CustomAPIController{}, "post:CheckContractInfo")
 
-	beego.Router("/admin/api/followorg/list", &SystemApiController{}, "get:GetWaitFollowOrg")
-	beego.Router("/admin/api/unfolloworg/list", &SystemApiController{}, "get:GetAllFollowOrg")
+	beego.Router("/admin/api/follow/create", &CustomAPIController{}, "post:CreateFollowInfo")
+	beego.Router("/admin/api/follow/get", &CustomAPIController{}, "get:GetFollowInfo")
+	beego.Router("/admin/api/follow/list", &CustomAPIController{}, "get:GetFollowInfoList")
+	beego.Router("/admin/api/follow/edit", &CustomAPIController{}, "post:EditFollowInfo")
+	beego.Router("/admin/api/follow/delete", &CustomAPIController{}, "post:DeleteFollowInfo")
+	beego.Router("/admin/api/follow/check", &CustomAPIController{}, "post:CheckFollowInfo")
 
-	beego.Router("/admin/api/org/list", &OrgAPIController{}, "get:GetOrgListOther")
+	beego.Router("/admin/api/demand/create", &CustomAPIController{}, "post:CreateDemandInfo")
+	beego.Router("/admin/api/demand/get", &CustomAPIController{}, "get:GetDemandInfo")
+	beego.Router("/admin/api/demand/list", &CustomAPIController{}, "get:GetDemandInfoList")
+	beego.Router("/admin/api/demand/edit", &CustomAPIController{}, "post:EditDemandInfo")
+	beego.Router("/admin/api/demand/delete", &CustomAPIController{}, "post:DeleteDemandInfo")
+	beego.Router("/admin/api/demand/check", &CustomAPIController{}, "post:CheckDemandInfo")
 
-	beego.Router("/admin/api/activeorg/list", &OrgAPIController{}, "get:GetActiveOrgList")
-	beego.Router("/admin/api/newcreateorg/list", &OrgAPIController{}, "get:GetNewCreateOrgList")
-	beego.Router("/admin/api/newdoctornurse/list", &OrgAPIController{}, "get:GetNewDoctorNurseList")
-	beego.Router("/admin/api/newpatient/list", &OrgAPIController{}, "get:GetNewPatientList")
+	beego.Router("/admin/api/renewal/create", &CustomAPIController{}, "post:CreateRenewalInfo")
+	beego.Router("/admin/api/renewal/get", &CustomAPIController{}, "get:GetRenewalInfo")
+	beego.Router("/admin/api/renewal/list", &CustomAPIController{}, "get:GetRenewalInfoList")
+	beego.Router("/admin/api/renewal/edit", &CustomAPIController{}, "post:EditRenewalInfo")
+	beego.Router("/admin/api/renewal/delete", &CustomAPIController{}, "post:DeleteRenewalInfo")
+	beego.Router("/admin/api/renewal/check", &CustomAPIController{}, "post:CheckRenewalInfo")
 
 }

controllers/admin_api_controllers/org_api_controller.go

@@ -55,7 +55,7 @@ func (this *OrgAPIController) GetOrgList() {
 		endTime = theTime.Unix()
 	}
 
-	list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit, this.GetAdminInfo().Admin.IsSuperAdmin)
+	list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit, this.GetAdminInfo().Admin.IsAdmin)
 	if err != nil {
 
 	} else {

controllers/admin_api_controllers/system_api_controller.go

@@ -2,13 +2,9 @@ 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"
 )
 
@@ -16,7 +12,23 @@ type SystemApiController struct {
 	AdminBaseAPIAuthController
 }
 
+//	func (this *SystemApiController) GetOrgs() {
+//		list, _ := service.GetAllAdmin()
+//		this.ServeSuccessJSON(map[string]interface{}{
+//			"list": list,
+//		})
+//
+// }
+func (this *SystemApiController) GetAdminUserInfo() {
+	id, _ := this.GetInt64("id")
+	admin, _ := service.FindAdminById(id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"admin": admin,
+	})
+}
+
 func (this *SystemApiController) GetUserList() {
+	fmt.Println(this.GetAdminInfo().Admin)
 	list, _ := service.GetAllAdmin()
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
@@ -28,22 +40,25 @@ func (this *SystemApiController) CreateAdminUser() {
 	name := this.GetString("name")
 	mobile := this.GetString("mobile")
 	password := this.GetString("password")
+	role_type, _ := this.GetInt64("type")
+	remark := this.GetString("remark")
+
 	admin := &admin_models.AdminAccount{
-		Account:      mobile,
-		Pwd:          password,
-		Name:         name,
-		Status:       1,
-		IsSuperAdmin: 2,
-		Ctime:        time.Now().Unix(),
-		Mtime:        time.Now().Unix(),
+		Mobile:   mobile,
+		Password: password,
+		RoleType: role_type,
+		Name:     name,
+		Status:   1,
+		Remark:   remark,
+		IsAdmin:  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{}{
@@ -57,22 +72,25 @@ func (this *SystemApiController) ModifyAdminUser() {
 	name := this.GetString("name")
 	mobile := this.GetString("mobile")
 	password := this.GetString("password")
-	status, _ := this.GetInt64("status")
+	role_type, _ := this.GetInt64("type")
+	remark := this.GetString("remark")
 
 	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(),
-	}
-
-	if admins.Account != mobile {
+		ID:       admins.ID,
+		Mobile:   mobile,
+		Password: password,
+		Name:     name,
+		Status:   1,
+		RoleType: role_type,
+		IsAdmin:  2,
+		Ctime:    admins.Ctime,
+		Remark:   remark,
+		Mtime:    time.Now().Unix(),
+	}
+
+	if admins.Mobile != mobile {
 		info, _ := service.FindUserInfoByAccount(mobile)
 		if info.ID > 0 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNameException)
@@ -89,345 +107,32 @@ func (this *SystemApiController) ModifyAdminUser() {
 
 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 {
+	item_type, _ := this.GetInt64("type") //1.删除，2恢复
+	if item_type == 1 {
+		err := service.DeleteAdmin(id)
+		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"msg": "提交成功",
+				"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)
-				}
-			}
-		}
-	}
-	//防止数据冗余，先查出之前被删的数据是否存在，存在则直接改变删除状态，不插入新数据
-	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 {
+		err := service.UpdateAdminTwo(id)
+		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
-				"msg": "提交成功",
+				"msg": "恢复成功",
 			})
-
 		}
-	} else {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"msg": "提交成功",
-		})
-	}
-
-}
 
-func (this *SystemApiController) GetWaitFollowOrg() {
-	admin_id, _ := this.GetInt64("admin_id", 0)
-	keyword := this.GetString("keyword")
-	page, _ := this.GetInt64("page", 0)
-	limit, _ := this.GetInt64("limit", 0)
-	if page <= 0 {
-		page = 1
-	}
-	if limit <= 0 {
-		limit = 7
-	}
-
-	list, err, total := service.GetAllWaitFollowOrgList(keyword, page, limit, admin_id)
-	if err != nil {
-
-	} else {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"list":  list,
-			"total": total,
-		})
 	}
 
 }
 
-func (this *SystemApiController) GetAllFollowOrg() {
-	admin_id, _ := this.GetInt64("admin_id", 0)
-	keyword := this.GetString("keyword")
-	page, _ := this.GetInt64("page", 0)
-	limit, _ := this.GetInt64("limit", 0)
-	if page <= 0 {
-		page = 1
-	}
-	if limit <= 0 {
-		limit = 7
-	}
-
-	list, err, total := service.FindAllFollowOrg(keyword, page, limit, admin_id)
-	fmt.Println(list)
-	fmt.Println(err)
-	fmt.Println(total)
-
-	if err != nil {
-
-	} else {
+func (this *SystemApiController) GetAdminUserById() {
+	id, _ := this.GetInt64("id")
+	account, err := service.FindAdminById(id)
+	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":  list,
-			"total": total,
+			"account": account,
 		})
 	}
-
 }

models/admin_models/admin_models.go

@@ -3,16 +3,18 @@
 package admin_models
 
 type AdminAccount struct {
-	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"`
+	ID       int64  `gorm:"column:id" json:"id" form:"id"`
+	Name     string `gorm:"column:name" json:"name" form:"name"`
+	RoleType int64  `gorm:"column:role_type" json:"role_type" form:"role_type"`
+	Mobile   string `gorm:"column:mobile" json:"mobile" form:"mobile"`
+	Password string `gorm:"column:password" json:"password" form:"password"`
+	Remark   string `gorm:"column:remark" json:"remark" form:"remark"`
+	IsAdmin  int64  `gorm:"column:is_admin" json:"is_admin" form:"is_admin"`
+	Status   int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime    int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime    int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
 }
 
 func (AdminAccount) TableName() string {
-	return "sgj_admin"
+	return "kyy_charge_admin"
 }

models/custom.go

@@ -0,0 +1,248 @@
+package models
+
+type KyyChargeCustomTwo struct {
+	ID                            int64  `gorm:"column:id" json:"id" form:"id"`
+	Name                          string `gorm:"column:name" json:"name" form:"name"`
+	XtOrgId                       int64  `gorm:"column:xt_org_id" json:"xt_org_id" form:"xt_org_id"`
+	Status                        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator                       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                      int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	CustomType                    int64  `gorm:"column:custom_type" json:"custom_type" form:"custom_type"`
+	Salesperson                   string `gorm:"column:salesperson" json:"salesperson" form:"salesperson"`
+	SignTime                      string `gorm:"column:sign_time" json:"sign_time" form:"sign_time"`
+	ContractPrice                 string `gorm:"column:contract_price" json:"contract_price" form:"contract_price"`
+	SoftwarePrice                 string `gorm:"column:software_price" json:"software_price" form:"software_price"`
+	HardwarePrice                 string `gorm:"column:hardware_price" json:"hardware_price" form:"hardware_price"`
+	YearCostPrice                 string `gorm:"column:year_cost_price" json:"year_cost_price" form:"year_cost_price"`
+	Address                       string `gorm:"column:address" json:"address" form:"address"`
+	IsImplement                   int64  `gorm:"column:is_implement" json:"is_implement" form:"is_implement"`
+	LisStatus                     int64  `gorm:"column:lis_status" json:"lis_status" form:"lis_status"`
+	LisContact                    string `gorm:"column:lis_contact" json:"lis_contact" form:"lis_contact"`
+	LisTime                       string `gorm:"column:lis_time" json:"lis_time" form:"lis_time"`
+	LisRemark                     string `gorm:"column:lis_remark" json:"lis_remark" form:"lis_remark"`
+	QcStatus                      int64  `gorm:"column:qc_status" json:"qc_status" form:"qc_status"`
+	YbStatus                      int64  `gorm:"column:yb_status" json:"yb_status" form:"yb_status"`
+	Remark                        string `gorm:"column:remark" json:"remark" form:"remark"`
+	WeightScaleStatus             int64  `gorm:"column:weight_scale_status" json:"weight_scale_status" form:"weight_scale_status"`
+	WeightScaleBrand              string `gorm:"column:weight_scale_brand" json:"weight_scale_brand" form:"weight_scale_brand"`
+	WeightScaleRemark             string `gorm:"column:weight_scale_remark" json:"weight_scale_remark" form:"weight_scale_remark"`
+	SphygmomanometerStatus        int64  `gorm:"column:sphygmomanometer_status" json:"sphygmomanometer_status" form:"sphygmomanometer_status"`
+	SphygmomanometerBrand         string `gorm:"column:sphygmomanometer_brand" json:"sphygmomanometer_brand" form:"sphygmomanometer_brand"`
+	SphygmomanometerRemark        string `gorm:"column:sphygmomanometer_remark" json:"sphygmomanometer_remark" form:"sphygmomanometer_remark"`
+	ScannerStatus                 int64  `gorm:"column:scanner_status" json:"scanner_status" form:"scanner_status"`
+	ScannerBrand                  string `gorm:"column:scanner_brand" json:"scanner_brand" form:"scanner_brand"`
+	ScannerRemark                 string `gorm:"column:scanner_remark" json:"scanner_remark" form:"scanner_remark"`
+	FacialRecognitionDeviceStatus int64  `gorm:"column:facial_recognition_device_status" json:"facial_recognition_device_status" form:"facial_recognition_device_status"`
+	FacialRecognitionDeviceBrand  string `gorm:"column:facial_recognition_device_brand" json:"facial_recognition_device_brand" form:"facial_recognition_device_brand"`
+	FacialRecognitionDeviceRemark string `gorm:"column:facial_recognition_device_remark" json:"facial_recognition_device_remark" form:"facial_recognition_device_remark"`
+	PrinterStatus                 int64  `gorm:"column:printer_status" json:"printer_status" form:"printer_status"`
+	PrinterBrand                  string `gorm:"column:printer_brand" json:"printer_brand" form:"printer_brand"`
+	PrinterRemark                 string `gorm:"column:printer_remark" json:"printer_remark" form:"printer_remark"`
+	HardwareRemark                string `gorm:"column:hardware_remark" json:"hardware_remark" form:"hardware_remark"`
+	ImplementTime                 string `gorm:"column:implement_time" json:"implement_time" form:"implement_time"`
+	ImplementPerson               string `gorm:"column:implement_person" json:"implement_person" form:"implement_person"`
+	ImplementRemark               string `gorm:"column:implement_remark" json:"implement_remark" form:"implement_remark"`
+	YbTime                        string `gorm:"column:yb_time" json:"yb_time" form:"yb_time"`
+	YbPerson                      string `gorm:"column:yb_person" json:"yb_person" form:"yb_person"`
+	YbRemark                      string `gorm:"column:yb_remark" json:"yb_remark" form:"yb_remark"`
+	QcTime                        string `gorm:"column:qc_time" json:"qc_time" form:"qc_time"`
+	QcPerson                      string `gorm:"column:qc_person" json:"qc_person" form:"qc_person"`
+	QcRemark                      string `gorm:"column:qc_remark" json:"qc_remark" form:"qc_remark"`
+}
+
+func (KyyChargeCustomTwo) TableName() string {
+	return "kyy_charge_custom"
+}
+
+type KyyChargeCustom struct {
+	ID                            int64                         `gorm:"column:id" json:"id" form:"id"`
+	Name                          string                        `gorm:"column:name" json:"name" form:"name"`
+	XtOrgId                       int64                         `gorm:"column:xt_org_id" json:"xt_org_id" form:"xt_org_id"`
+	Status                        int64                         `gorm:"column:status" json:"status" form:"status"`
+	Ctime                         int64                         `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                         int64                         `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator                       int64                         `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                      int64                         `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	CustomType                    int64                         `gorm:"column:custom_type" json:"custom_type" form:"custom_type"`
+	Salesperson                   string                        `gorm:"column:salesperson" json:"salesperson" form:"salesperson"`
+	SignTime                      string                        `gorm:"column:sign_time" json:"sign_time" form:"sign_time"`
+	ContractPrice                 string                        `gorm:"column:contract_price" json:"contract_price" form:"contract_price"`
+	SoftwarePrice                 string                        `gorm:"column:software_price" json:"software_price" form:"software_price"`
+	HardwarePrice                 string                        `gorm:"column:hardware_price" json:"hardware_price" form:"hardware_price"`
+	YearCostPrice                 string                        `gorm:"column:year_cost_price" json:"year_cost_price" form:"year_cost_price"`
+	Address                       string                        `gorm:"column:address" json:"address" form:"address"`
+	IsImplement                   int64                         `gorm:"column:is_implement" json:"is_implement" form:"is_implement"`
+	LisStatus                     int64                         `gorm:"column:lis_status" json:"lis_status" form:"lis_status"`
+	LisContact                    string                        `gorm:"column:lis_contact" json:"lis_contact" form:"lis_contact"`
+	LisTime                       string                        `gorm:"column:lis_time" json:"lis_time" form:"lis_time"`
+	LisRemark                     string                        `gorm:"column:lis_remark" json:"lis_remark" form:"lis_remark"`
+	QcStatus                      int64                         `gorm:"column:qc_status" json:"qc_status" form:"qc_status"`
+	YbStatus                      int64                         `gorm:"column:yb_status" json:"yb_status" form:"yb_status"`
+	Remark                        string                        `gorm:"column:remark" json:"remark" form:"remark"`
+	WeightScaleStatus             int64                         `gorm:"column:weight_scale_status" json:"weight_scale_status" form:"weight_scale_status"`
+	WeightScaleBrand              string                        `gorm:"column:weight_scale_brand" json:"weight_scale_brand" form:"weight_scale_brand"`
+	WeightScaleRemark             string                        `gorm:"column:weight_scale_remark" json:"weight_scale_remark" form:"weight_scale_remark"`
+	SphygmomanometerStatus        int64                         `gorm:"column:sphygmomanometer_status" json:"sphygmomanometer_status" form:"sphygmomanometer_status"`
+	SphygmomanometerBrand         string                        `gorm:"column:sphygmomanometer_brand" json:"sphygmomanometer_brand" form:"sphygmomanometer_brand"`
+	SphygmomanometerRemark        string                        `gorm:"column:sphygmomanometer_remark" json:"sphygmomanometer_remark" form:"sphygmomanometer_remark"`
+	ScannerStatus                 int64                         `gorm:"column:scanner_status" json:"scanner_status" form:"scanner_status"`
+	ScannerBrand                  string                        `gorm:"column:scanner_brand" json:"scanner_brand" form:"scanner_brand"`
+	ScannerRemark                 string                        `gorm:"column:scanner_remark" json:"scanner_remark" form:"scanner_remark"`
+	FacialRecognitionDeviceStatus int64                         `gorm:"column:facial_recognition_device_status" json:"facial_recognition_device_status" form:"facial_recognition_device_status"`
+	FacialRecognitionDeviceBrand  string                        `gorm:"column:facial_recognition_device_brand" json:"facial_recognition_device_brand" form:"facial_recognition_device_brand"`
+	FacialRecognitionDeviceRemark string                        `gorm:"column:facial_recognition_device_remark" json:"facial_recognition_device_remark" form:"facial_recognition_device_remark"`
+	PrinterStatus                 int64                         `gorm:"column:printer_status" json:"printer_status" form:"printer_status"`
+	PrinterBrand                  string                        `gorm:"column:printer_brand" json:"printer_brand" form:"printer_brand"`
+	PrinterRemark                 string                        `gorm:"column:printer_remark" json:"printer_remark" form:"printer_remark"`
+	HardwareRemark                string                        `gorm:"column:hardware_remark" json:"hardware_remark" form:"hardware_remark"`
+	ImplementTime                 string                        `gorm:"column:implement_time" json:"implement_time" form:"implement_time"`
+	ImplementPerson               string                        `gorm:"column:implement_person" json:"implement_person" form:"implement_person"`
+	ImplementRemark               string                        `gorm:"column:implement_remark" json:"implement_remark" form:"implement_remark"`
+	YbTime                        string                        `gorm:"column:yb_time" json:"yb_time" form:"yb_time"`
+	YbPerson                      string                        `gorm:"column:yb_person" json:"yb_person" form:"yb_person"`
+	YbRemark                      string                        `gorm:"column:yb_remark" json:"yb_remark" form:"yb_remark"`
+	QcTime                        string                        `gorm:"column:qc_time" json:"qc_time" form:"qc_time"`
+	QcPerson                      string                        `gorm:"column:qc_person" json:"qc_person" form:"qc_person"`
+	QcRemark                      string                        `gorm:"column:qc_remark" json:"qc_remark" form:"qc_remark"`
+	KyyChargePaymentCollection    []*KyyChargePaymentCollection `gorm:"ForeignKey:ID;AssociationForeignKey:CustomId" json:"cpc"`
+	KyyChargeContact              []*KyyChargeContact           `gorm:"ForeignKey:ID;AssociationForeignKey:CustomId" json:"cc"`
+	KyyChargeContract             []*KyyChargeContract          `gorm:"ForeignKey:ID;AssociationForeignKey:CustomId" json:"chargeContract"`
+	KyyChargeDemand               []*KyyChargeDemand            `gorm:"ForeignKey:ID;AssociationForeignKey:CustomId" json:"cd"`
+	KyyChargeFollow               []*KyyChargeFollow            `gorm:"ForeignKey:ID;AssociationForeignKey:CustomId" json:"cf"`
+	KyyChargeRenewal              []*KyyChargeRenewal           `gorm:"ForeignKey:ID;AssociationForeignKey:CustomId" json:"cr"`
+}
+
+func (KyyChargeCustom) TableName() string {
+	return "kyy_charge_custom"
+}
+
+type KyyChargePaymentCollection struct {
+	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
+	XtOrgId                 int64  `gorm:"column:xt_org_id" json:"xt_org_id" form:"xt_org_id"`
+	CustomId                int64  `gorm:"column:custom_id" json:"custom_id" form:"custom_id"`
+	CustomName              string `gorm:"column:custom_name" json:"custom_name" form:"custom_name"`
+	PaymentCollectionType   int64  `gorm:"column:payment_collection_type" json:"payment_collection_type" form:"payment_collection_type"`
+	PaymentCollectionSumamt string `gorm:"column:payment_collection_sumamt" json:"payment_collection_sumamt" form:"payment_collection_sumamt"`
+	SoftwareSumamt          string `gorm:"column:software_sumamt" json:"software_sumamt" form:"software_sumamt"`
+	HardwareSumamt          string `gorm:"column:hardware_sumamt" json:"hardware_sumamt" form:"hardware_sumamt"`
+	PaymentCollectionDate   string `gorm:"column:payment_collection_date" json:"payment_collection_date" form:"payment_collection_date"`
+	PaymentCollectionRole   string `gorm:"column:payment_collection_role" json:"payment_collection_role" form:"payment_collection_role"`
+	Url                     string `gorm:"column:url" json:"url" form:"url"`
+	Remark                  string `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator                 int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier                int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
+	IsCheck                 int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+}
+
+func (KyyChargePaymentCollection) TableName() string {
+	return "kyy_charge_payment_collection"
+}
+
+type KyyChargeContact struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	XtOrgId       int64  `gorm:"column:xt_org_id" json:"xt_org_id" form:"xt_org_id"`
+	CustomId      int64  `gorm:"column:custom_id" json:"custom_id" form:"custom_id"`
+	ContactName   string `gorm:"column:contact_name" json:"contact_name" form:"contact_name"`
+	ContactPhone  string `gorm:"column:contact_phone" json:"contact_phone" form:"contact_phone"`
+	ContactDuties string `gorm:"column:contact_duties" json:"contact_duties" form:"contact_duties"`
+	IsDecision    string `gorm:"column:is_decision" json:"is_decision" form:"is_decision"`
+	Remark        string `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier      int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsCheck       int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	ContactWay    string `gorm:"column:contact_way" json:"contact_way" form:"contact_way"`
+}
+
+func (KyyChargeContact) TableName() string {
+	return "kyy_charge_contact"
+}
+
+type KyyChargeContract struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	XtOrgId       int64  `gorm:"column:xt_org_id" json:"xt_org_id" form:"xt_org_id"`
+	CustomId      int64  `gorm:"column:custom_id" json:"custom_id" form:"custom_id"`
+	Code          string `gorm:"column:code" json:"code" form:"code"`
+	Name          string `gorm:"column:name" json:"name" form:"name"`
+	CustomName    string `gorm:"column:custom_name" json:"custom_name" form:"custom_name"`
+	Sumamt        string `gorm:"column:sumamt" json:"sumamt" form:"sumamt"`
+	StartTime     string `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime       string `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	SigningPerson string `gorm:"column:signing_person" json:"signing_person" form:"signing_person"`
+	WordFileUrl   string `gorm:"column:word_file_url" json:"word_file_url" form:"word_file_url"`
+	PdfFileUrl    string `gorm:"column:pdf_file_url" json:"pdf_file_url" form:"pdf_file_url"`
+	Remark        string `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier      int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsCheck       int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (KyyChargeContract) TableName() string {
+	return "kyy_charge_contract"
+}
+
+type KyyChargeDemand struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	DemandType       int64  `gorm:"column:demand_type" json:"demand_type" form:"demand_type"`
+	DemandDesc       string `gorm:"column:demand_desc" json:"demand_desc" form:"demand_desc"`
+	DemandStatus     int64  `gorm:"column:demand_status" json:"demand_status" form:"demand_status"`
+	DemandCreator    string `gorm:"column:demand_creator" json:"demand_creator" form:"demand_creator"`
+	DemandCreateDate string `gorm:"column:demand_create_date" json:"demand_create_date" form:"demand_create_date"`
+	DemandDirector   string `gorm:"column:demand_director" json:"demand_director" form:"demand_director"`
+	Ctime            int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	CustomId         int64  `gorm:"column:custom_id" json:"custom_id" form:"custom_id"`
+	DemandFinishDate string `gorm:"column:demand_finish_date" json:"demand_finish_date" form:"demand_finish_date"`
+	IsCheck          int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	DemandDetail     string `gorm:"column:demand_detail" json:"demand_detail" form:"demand_detail"`
+}
+
+func (KyyChargeDemand) TableName() string {
+	return "kyy_charge_demand"
+}
+
+type KyyChargeFollow struct {
+	ID       int64  `gorm:"column:id" json:"id" form:"id"`
+	Ctime    int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime    int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator  int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	CustomId int64  `gorm:"column:custom_id" json:"custom_id" form:"custom_id"`
+	Desc     string `gorm:"column:desc" json:"desc" form:"desc"`
+	Status   int64  `gorm:"column:status" json:"status" form:"status"`
+	IsCheck  int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+}
+
+func (KyyChargeFollow) TableName() string {
+	return "kyy_charge_follow"
+}
+
+type KyyChargeRenewal struct {
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	Type            int64  `gorm:"column:type" json:"type" form:"type"`
+	StartTime       string `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	EndTime         string `gorm:"column:end_time" json:"end_time" form:"end_time"`
+	SigningPersonal string `gorm:"column:signing_personal" json:"signing_personal" form:"signing_personal"`
+	CustomId        int64  `gorm:"column:custom_id" json:"custom_id" form:"custom_id"`
+	SignTime        string `gorm:"column:sign_time" json:"sign_time" form:"sign_time"`
+	CheckPersonal   string `gorm:"column:check_personal" json:"check_personal" form:"check_personal"`
+	Ctime           string `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           string `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	Remark          string `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCheck         int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+}
+
+func (KyyChargeRenewal) TableName() string {
+	return "kyy_charge_renewal"
+}

service/admin_service.go

@@ -13,7 +13,7 @@ import (
 
 func GetAdminAccount(account string, password string) (*admin_models.AdminAccount, error) {
 	var model admin_models.AdminAccount
-	err := readUserDb.Where("account = ? AND pwd = ? AND status = 1", account, password).First(&model).Error
+	err := readChargeDb.Where("mobile = ? AND password = ? AND status = 1", account, password).First(&model).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -148,32 +148,32 @@ func GetActiveOrgTotalCount() (int64, error) {
 	return int64(len(org)), nil
 }
 
-//获取昨天的注册机构总量
+// 获取昨天的注册机构总量
 func GetYesterDayRegistedOrgCount() (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 1 DAY) = date(from_unixtime(sgj_user_org.ctime)) AND sgj_user_org.status = 1 AND sgj_user_org.import <> 1  GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近昨天的的机构活跃总量
+// 获取近昨天的的机构活跃总量
 func GetYesterDayActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	db := readUserDb.Raw(" Select count(DISTINCT(org_id)) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from sgj_user_admin_login_log log  JOIN  (Select d.user_org_id from (Select new_role.user_org_id from  (Select count(*) as count,org_id as user_org_id from  sgj_users.sgj_user_admin_role role  where  role.`user_type` = 2 OR role.`user_type` = 3 Group by role.org_id) new_role where new_role.count > 2) d  JOIN (Select user_org_id from (Select count(*) as count,user_org_id from sgj_xt.xt_patients  where  status = 1  Group by user_org_id) new_patient where new_patient.count > 3) c On d.user_org_id = c.user_org_id) new_user_org ON new_user_org.user_org_id = log.org_id  where DATE_SUB(CURDATE(), INTERVAL 1 DAY) = date(from_unixtime(ctime))  Group by date(from_unixtime(ctime))")
 	err = db.Scan(&weekStatistics).Error
 	return
 }
 
-//获取昨天的的机构活跃账号总量
+// 获取昨天的的机构活跃账号总量
 func GetYesterDayActiveAdminUserCount() (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 1 DAY) = date(from_unixtime(sgj_user_admin_login_log.ctime))  AND operate_type = 1 AND app_type = 3 GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
 }
 
-//获取昨天的的机构新增病人总量
+// 获取昨天的的机构新增病人总量
 func GetYesterDayNewPatientCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readDb.Raw("select count(DISTINCT(id_card_no)) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 1 DAY) = date(from_unixtime(created_time)) GROUP BY date(from_unixtime(created_time));").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近七天每天的注册机构总量
+// 获取近七天每天的注册机构总量
 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)) AND sgj_user_org.status = 1 AND sgj_user_org.import <> 1 GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
@@ -184,7 +184,7 @@ func GetWeekRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err e
 //	return
 //}
 
-//获取近七天每天的机构活跃总量
+// 获取近七天每天的机构活跃总量
 func GetWeekActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	//db := readDb.Raw("select count(DISTINCT(user_org_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 GROUP BY date(from_unixtime(created_time));")
 	db := readUserDb.Raw(" Select count(DISTINCT(org_id)) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from sgj_user_admin_login_log log  JOIN  (Select d.user_org_id from (Select new_role.user_org_id from  (Select count(*) as count,org_id as user_org_id from  sgj_users.sgj_user_admin_role role  where  role.`user_type` = 2 OR role.`user_type` = 3 Group by role.org_id) new_role where new_role.count > 2) d  JOIN (Select user_org_id from (Select count(*) as count,user_org_id from sgj_xt.xt_patients  where  status = 1  Group by user_org_id) new_patient where new_patient.count > 3) c On d.user_org_id = c.user_org_id) new_user_org ON new_user_org.user_org_id = log.org_id  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(ctime))  Group by date(from_unixtime(ctime))")
@@ -193,142 +193,155 @@ func GetWeekActiveOrgCount() (weekStatistics []*admin_models.Statistics, err err
 	return
 }
 
-//获取近七天每天的机构活跃账号总量
+// 获取近七天每天的机构活跃账号总量
 func GetWeekActiveAdminUserCount() (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 7 DAY) <= date(from_unixtime(sgj_user_admin_login_log.ctime))  AND operate_type = 1 AND app_type = 3 GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近七天每天的机构新增病人总量
+// 获取近七天每天的机构新增病人总量
 func GetWeekNewPatientCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readDb.Raw("select count(DISTINCT(id_card_no)) as count, DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m-%d') as times  from xt_patients  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= date(from_unixtime(created_time)) GROUP BY date(from_unixtime(created_time));").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近30天每天的注册机构总量
+// 获取近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)) AND sgj_user_org.status = 1 AND sgj_user_org.import <> 1 GROUP BY date(from_unixtime(ctime));").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近30天每天的机构活跃总量
+// 获取近30天每天的机构活跃总量
 func GetMonthActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw("Select count(DISTINCT(org_id)) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m-%d') as times  from sgj_user_admin_login_log log  JOIN  (Select d.user_org_id from (Select new_role.user_org_id from  (Select count(*) as count,org_id as user_org_id from  sgj_users.sgj_user_admin_role role  where  role.`user_type` = 2 OR role.`user_type` = 3 Group by role.org_id) new_role where new_role.count > 2) d  JOIN (Select user_org_id from (Select count(*) as count,user_org_id from sgj_xt.xt_patients  where  status = 1  Group by user_org_id) new_patient where new_patient.count > 3) c On d.user_org_id = c.user_org_id) new_user_org ON new_user_org.user_org_id = log.org_id  where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(from_unixtime(ctime))  Group by date(from_unixtime(ctime))").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近30天每天的机构活跃账号总量
+// 获取近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天每天的机构新增病人总量
+// 获取近30天每天的机构新增病人总量
 func GetMonthNewPatientCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readDb.Raw("select count(DISTINCT(id_card_no)) 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)) GROUP BY date(from_unixtime(created_time));").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近3个月每个月的注册机构总量
+// 获取近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') AND sgj_user_org.status = 1 AND sgj_user_org.import <> 1 group by times").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近3个月每个月的机构活跃账号总量
+// 获取近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个月每个月的机构活跃总量
+// 获取近3个月每个月的机构活跃总量
 func GetThreeMonthActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw(" Select count(DISTINCT(org_id)) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from sgj_user_admin_login_log log  JOIN  (Select d.user_org_id from (Select new_role.user_org_id from  (Select count(*) as count,org_id as user_org_id from  sgj_users.sgj_user_admin_role role  where  role.`user_type` = 2 OR role.`user_type` = 3 Group by role.org_id) new_role where new_role.count > 2) d  JOIN (Select user_org_id from (Select count(*) as count,user_org_id from sgj_xt.xt_patients  where  status = 1  Group by user_org_id) new_patient where new_patient.count > 3) c On d.user_org_id = c.user_org_id) new_user_org ON new_user_org.user_org_id = log.org_id  where  DATE_FORMAT(date(from_unixtime(ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') Group by times").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近3个月每个月机构新增病人总量
+// 获取近3个月每个月机构新增病人总量
 func GetThreeMonthNewPatientCount() (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 3 month),'%Y-%m') group by times").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近半年每个月的注册机构总量
+// 获取近半年每个月的注册机构总量
 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') AND sgj_user_org.status = 1 AND sgj_user_org.import <> 1 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 count(DISTINCT(org_id)) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from sgj_user_admin_login_log log  JOIN  (Select d.user_org_id from (Select new_role.user_org_id from  (Select count(*) as count,org_id as user_org_id from  sgj_users.sgj_user_admin_role role  where  role.`user_type` = 2 OR role.`user_type` = 3 Group by role.org_id) new_role where new_role.count > 2) d  JOIN (Select user_org_id from (Select count(*) as count,user_org_id from sgj_xt.xt_patients  where  status = 1  Group by user_org_id) new_patient where new_patient.count > 3) c On d.user_org_id = c.user_org_id) new_user_org ON new_user_org.user_org_id = log.org_id  where  DATE_FORMAT(date(from_unixtime(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
 }
 
-//获取近1年每个月的注册机构总量
+// 获取近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') AND sgj_user_org.status = 1 AND sgj_user_org.import <> 1 group by times").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近1年每个月的机构活跃账号总量
+// 获取近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年每个月的机构活跃总量
+// 获取近1年每个月的机构活跃总量
 func GetYearActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
 	err = readUserDb.Raw(" Select count(DISTINCT(org_id)) as count, DATE_FORMAT(date(from_unixtime(ctime)) ,'%Y-%m') as times  from sgj_user_admin_login_log log  JOIN  (Select d.user_org_id from (Select new_role.user_org_id from  (Select count(*) as count,org_id as user_org_id from  sgj_users.sgj_user_admin_role role  where  role.`user_type` = 2 OR role.`user_type` = 3 Group by role.org_id) new_role where new_role.count > 2) d  JOIN (Select user_org_id from (Select count(*) as count,user_org_id from sgj_xt.xt_patients  where  status = 1  Group by user_org_id) new_patient where new_patient.count > 3) c On d.user_org_id = c.user_org_id) new_user_org ON new_user_org.user_org_id = log.org_id  where  DATE_FORMAT(date(from_unixtime(ctime)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') Group by times").Scan(&weekStatistics).Error
 	return
 }
 
-//获取近1年每个月机构新增病人总量
+// 获取近1年每个月机构新增病人总量
 func GetYearNewPatientCount() (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 12 month),'%Y-%m') AND status > 0 group by times").Scan(&weekStatistics).Error
 	return
 }
 
+//func GetAllAdmin() (admin []*admin_models.AdminAccount, err error) {
+//	err = readChargeDb.Model(&admin_models.AdminAccount{}).Where("is_admin <> 1 AND (status = 1 OR status = 2)").Find(&admin).Error
+//	return
+//}
+
 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
+	err = readChargeDb.Model(&admin_models.AdminAccount{}).Where("is_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
+	err = readChargeDb.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 = ? AND status = 1", account).First(&admin).Error
+	err = readChargeDb.Model(&admin_models.AdminAccount{}).Where("account = ? AND status = 1", 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
+	err = readChargeDb.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
+	err = readChargeDb.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
-	err = readUserDb.Model(&models.OrgFollow{}).Where("admin_user_id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+	err = readChargeDb.Model(&admin_models.AdminAccount{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+	//err = readChargeDb.Model(&models.OrgFollow{}).Where("admin_user_id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return
+
+}
+
+func UpdateAdminTwo(id int64) (err error) {
+	err = readChargeDb.Model(&admin_models.AdminAccount{}).Where("id = ?", id).Updates(map[string]interface{}{"status": 1}).Error
+	//err = readChargeDb.Model(&models.OrgFollow{}).Where("admin_user_id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
 
 	return
 
@@ -485,3 +498,117 @@ func FindAllFollowOrg(keyword string, page int64, limit int64, admin_id int64) (
 	}
 
 }
+
+// 获取累积客户数
+func GetCustomCount() (int64, error) {
+	var count int64
+	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1").Count(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+// 本年新增收费客户
+func GetCurYearCustomCount() (int64, error) {
+	var count int64
+	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Count(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+// 统计本年新增标准版客户
+func GetCurYearStandCustomCount() (int64, error) {
+	var count int64
+	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 1").Count(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+// 统计本年新增尊享版客户
+func GetCurYearDeluxeCustomCount() (int64, error) {
+	var count int64
+	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 2").Count(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+// 统计本年新增专业版客户
+func GetCurYearProfessionalCustomCount() (int64, error) {
+	var count int64
+	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 3").Count(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+// 统计本年新增其他版客户
+func GetCurYearOtherCustomCount() (int64, error) {
+	var count int64
+	err := readUserDb.Model(&models.KyyChargeCustom{}).Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE()) and custom_type = 4").Count(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func GetCurYearContractPriceCount() (float64, error) {
+	var count float64
+	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func GetCurYearSoftwarePriceCount() (float64, error) {
+	var count float64
+	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(software_price) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func GetCurYearHardwarePriceCount() (float64, error) {
+	var count float64
+	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(hardware_price) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func GetCurYearPaymentCollectionSumamtPriceCount() (float64, error) {
+	var count float64
+	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(payment_collection_sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func GetCurYearPaymentCollectionSoftwarePriceCount() (float64, error) {
+	var count float64
+	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(software_sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func GetCurYearPaymentCollectionHardwarePriceCount() (float64, error) {
+	var count float64
+	err := readUserDb.Model(&models.KyyChargeContract{}).Select("sum(hardware_sumamt) as count").Where("status = 1 and YEAR(FROM_UNIXTIME(ctime)) = YEAR(CURDATE())").Find(&count).Error
+	if err != nil {
+		return 0, err
+	}
+	return count, nil
+}

service/custom_service.go

@@ -0,0 +1,130 @@
+package service
+
+import "XT_Admin_Api/models"
+
+func FindCustomInfo(org_id int64) (admin models.KyyChargeCustom, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeCustom{}).Where("xt_org_id = ? AND status = 1", org_id).First(&admin).Error
+	return
+}
+
+func CreateCustom(admin *models.KyyChargeCustom) (err error) {
+	err = ChargeWriteDB().Model(&models.KyyChargeCustom{}).Create(&admin).Error
+	return
+}
+
+func GetAllCustoms() (cus []*models.KyyChargeCustom, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeCustomTwo{}).Where("status = 1").Find(&cus).Error
+	return
+}
+
+func GetAllPaymentCollections() (cus []*models.KyyChargePaymentCollection, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargePaymentCollection{}).Where("status = 1").Find(&cus).Error
+	return
+}
+
+func GetAllChargeContacts() (cus []*models.KyyChargeContact, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeContact{}).Where("status = 1").Find(&cus).Error
+	return
+}
+
+func GetAllChargeContracts() (cus []*models.KyyChargeContract, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeContract{}).Where("status = 1").Find(&cus).Error
+	return
+}
+
+func GetAllChargeDemand() (cus []*models.KyyChargeDemand, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeDemand{}).Where("status = 1").Find(&cus).Error
+	return
+}
+
+func GetAllChargeFollow() (cus []*models.KyyChargeFollow, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeFollow{}).Where("status = 1").Find(&cus).Error
+	return
+}
+
+func GetAllChargeRenewal() (cus []*models.KyyChargeRenewal, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeRenewal{}).Where("status = 1").Find(&cus).Error
+	return
+}
+
+func FindCustomInfoByID(id int64) (admin models.KyyChargeCustom, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeCustom{}).
+		Preload("KyyChargePaymentCollection", "status = 1").
+		Preload("KyyChargeContact", "status = 1").
+		Preload("KyyChargeContract", "status = 1").
+		Preload("KyyChargeDemand", "status = 1").
+		Preload("KyyChargeFollow", "status = 1").
+		Preload("KyyChargeRenewal", "status = 1").
+		Where("id = ? AND status = 1", id).First(&admin).Error
+	return
+}
+
+func UpdateCustom(custom models.KyyChargeCustom) (err error) {
+	err = ChargeWriteDB().Save(custom).Error
+	return
+}
+
+func CreateChargePaymentCollection(cpc *models.KyyChargePaymentCollection) (err error) {
+	err = ChargeWriteDB().Save(cpc).Error
+	return
+}
+
+func SaveChargePaymentCollection(cpc *models.KyyChargePaymentCollection) (err error) {
+	err = ChargeWriteDB().Save(cpc).Error
+	return
+}
+
+func FindPaymentCollectionInfo(id int64) (cpc models.KyyChargePaymentCollection, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargePaymentCollection{}).Where("id = ? AND status = 1", id).First(&cpc).Error
+	return
+}
+
+func SaveChargeContact(chargeContact *models.KyyChargeContact) (err error) {
+	err = ChargeWriteDB().Save(chargeContact).Error
+	return
+}
+
+func FindChargeContactInfo(id int64) (cpc models.KyyChargeContact, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeContact{}).Where("id = ? AND status = 1", id).First(&cpc).Error
+	return
+}
+
+func SaveChargeContract(chargeContract *models.KyyChargeContract) (err error) {
+	err = ChargeWriteDB().Save(chargeContract).Error
+	return
+}
+
+func FindChargeContractInfo(id int64) (cpc models.KyyChargeContract, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeContract{}).Where("id = ? AND status = 1", id).First(&cpc).Error
+	return
+}
+
+func SaveChargeFollow(chargeFollow *models.KyyChargeFollow) (err error) {
+	err = ChargeWriteDB().Save(chargeFollow).Error
+	return
+}
+
+func FindChargeFollowInfo(id int64) (cf models.KyyChargeFollow, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeFollow{}).Where("id = ? AND status = 1", id).First(&cf).Error
+	return
+}
+
+func SaveChargeDemand(cd *models.KyyChargeDemand) (err error) {
+	err = ChargeWriteDB().Save(cd).Error
+	return
+}
+
+func FindChargeDemandInfo(id int64) (cd models.KyyChargeDemand, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeDemand{}).Where("id = ? AND status = 1", id).First(&cd).Error
+	return
+}
+
+func SaveChargeRenewal(chargeRenewal *models.KyyChargeRenewal) (err error) {
+	err = ChargeWriteDB().Save(chargeRenewal).Error
+	return
+}
+
+func FindChargeRenewalInfo(id int64) (chargeRenewal models.KyyChargeRenewal, err error) {
+	err = ChargeReadDB().Model(&models.KyyChargeRenewal{}).Where("id = ? AND status = 1", id).First(&chargeRenewal).Error
+	return
+}

service/db.go

@@ -29,6 +29,9 @@ var writeDb *gorm.DB
 var readUserDb *gorm.DB
 var writeUserDb *gorm.DB
 
+var readChargeDb *gorm.DB
+var writeChargeDb *gorm.DB
+
 var err error
 
 func ConnectDB() {
@@ -56,12 +59,27 @@ func ConnectDB() {
 	writeUserPass := beego.AppConfig.String("writeuserpass")
 	writeUserName := beego.AppConfig.String("writeusername")
 
+	readChargeHost := beego.AppConfig.String("readchargehost")
+	readChargePort := beego.AppConfig.String("readchargeport")
+	readChargeUser := beego.AppConfig.String("readchargeuser")
+	readChargePass := beego.AppConfig.String("readchargepass")
+	readChargeName := beego.AppConfig.String("readchargename")
+
+	writeChargeHost := beego.AppConfig.String("writechargehost")
+	writeChargePort := beego.AppConfig.String("writechargeport")
+	writeChargeUser := beego.AppConfig.String("writechargeuser")
+	writeChargePass := beego.AppConfig.String("writechargepass")
+	writeChargeName := beego.AppConfig.String("writechargename")
+
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
 
 	rudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUser, readUserPass, readUserHost, readUserPort, readUserName)
 	wudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUser, writeUserPass, writeUserHost, writeUserPort, writeUserName)
 
+	rcdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readChargeUser, readChargePass, readChargeHost, readChargePort, readChargeName)
+	wcdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeChargeUser, writeChargePass, writeChargeHost, writeChargePort, writeChargeName)
+
 	readDb, err = gorm.Open("mysql", rdsn)
 
 	//defer readDb.Close()
@@ -104,6 +122,24 @@ func ConnectDB() {
 	writeUserDb.DB().SetMaxOpenConns(20)
 	writeUserDb.LogMode(true)
 
+	readChargeDb, err = gorm.Open("mysql", rcdsn)
+	if err != nil {
+		//beego.Error(err)
+	}
+
+	readChargeDb.DB().SetMaxIdleConns(5)
+	readChargeDb.DB().SetMaxOpenConns(20)
+	readChargeDb.LogMode(true)
+
+	writeChargeDb, err = gorm.Open("mysql", wcdsn)
+	if err != nil {
+		//beego.Error(err)
+	}
+	//defer writeUserDb.Close()
+	writeChargeDb.DB().SetMaxIdleConns(5)
+	writeChargeDb.DB().SetMaxOpenConns(20)
+	writeChargeDb.LogMode(true)
+
 }
 
 func XTReadDB() *gorm.DB {
@@ -118,3 +154,10 @@ func UserReadDB() *gorm.DB {
 func UserWriteDB() *gorm.DB {
 	return writeUserDb
 }
+
+func ChargeReadDB() *gorm.DB {
+	return readChargeDb
+}
+func ChargeWriteDB() *gorm.DB {
+	return writeChargeDb
+}

service/function_service.go

@@ -5,11 +5,11 @@ import (
 	"XT_Admin_Api/models/function_models"
 )
 
-//病人管理
+// 病人管理
 func GetTodayInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath   from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JOIN sgj_user_district as d On d.id = u.city left JoIN sgj_admin as a On a.id = f.admin_user_id AND  a.status = 1 left join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1   GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	} else {
 		err = readUserDb.Raw("select *, a.name as admin_name, d.namepath as namepath  from sgj_users.sgj_user_org as u  join sgj_org_follow as f On f.org_id = u.id AND f.status = 1 AND f.admin_user_id = ? left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1  left JOIN sgj_user_district as d On d.id = u.city left join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1   GROUP BY x.user_org_id", admin.ID, to, ctime).Scan(&patientinfo).Error
@@ -24,12 +24,12 @@ func GetTodayInfo(to int64, ctime int64, page int64, limit int64, admin *admin_m
 	return patientinfo, total, err
 }
 
-//透析处方
+// 透析处方
 func GetTodayDialysisPatientsInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
 
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select * , a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -47,11 +47,11 @@ func GetTodayDialysisPatientsInfo(to int64, ctime int64, page int64, limit int64
 	return patientinfo, total, err
 }
 
-//接诊评估
+// 接诊评估
 func GetTodayReceivePatientsInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1 left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -72,7 +72,7 @@ func GetTodayReceivePatientsInfo(to int64, ctime int64, page int64, limit int64,
 // 透前评估
 func GetTodayBeforDislysisInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id left AND f.status = 1  JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -91,12 +91,12 @@ func GetTodayBeforDislysisInfo(to int64, ctime int64, page int64, limit int64, a
 	return patientinfo, total, err
 }
 
-//零食医嘱
+// 零食医嘱
 func GetTodayDoctorsOrderInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
 
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1 left JoIN sgj_admin as a On a.id = f.admin_user_id  AND a.status = 1 join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?  AND u.import <> 1 GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
@@ -115,11 +115,11 @@ func GetTodayDoctorsOrderInfo(to int64, ctime int64, page int64, limit int64, ad
 	return patientinfo, total, err
 }
 
-//双人核对
+// 双人核对
 func GetTodayDoubleCheckInfo(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_double_check as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -137,11 +137,11 @@ func GetTodayDoubleCheckInfo(to int64, ctime int64, page int64, limit int64, adm
 	return patientinfo, total, err
 }
 
-//透析上机
+// 透析上机
 func GetTodayDialysisMachinek(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 left join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -160,11 +160,11 @@ func GetTodayDialysisMachinek(to int64, ctime int64, page int64, limit int64, ad
 	return patientinfo, total, err
 }
 
-//透析检测
+// 透析检测
 func GetTodayDialysisExamination(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -181,11 +181,11 @@ func GetTodayDialysisExamination(to int64, ctime int64, page int64, limit int64,
 	return patientinfo, total, err
 }
 
-//透析下机
+// 透析下机
 func GetTodayBeforOrpenetration(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -202,10 +202,10 @@ func GetTodayBeforOrpenetration(to int64, ctime int64, page int64, limit int64,
 	return patientinfo, total, err
 }
 
-//透后评估
+// 透后评估
 func GetTodayPostAssessment(to int64, ctime int64, page int64, limit int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city left join sgj_org_follow as f On f.org_id = u.id  AND f.status = 1  left JoIN sgj_admin as a On a.id = f.admin_user_id AND a.status = 1 join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id left JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? AND u.import <> 1  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -225,7 +225,7 @@ func GetTodayPostAssessment(to int64, ctime int64, page int64, limit int64, admi
 
 func GetTodayEntrylist(to int64, ctime int64, limit int64, page int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u left JOIN sgj_user_district as d On d.id = u.city  join sgj_xt.xt_warehouse as x on x.org_id = u.id   LEFT JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id AND f.status = 1   LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id AND a.status = 1  where x.ctime >= ? AND x.ctime<= ? AND u.import <> 1  GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {
@@ -245,7 +245,7 @@ func GetTodayEntrylist(to int64, ctime int64, limit int64, page int64, admin *ad
 
 func GetTodayExitlist(to int64, ctime int64, limit int64, page int64, admin *admin_models.AdminAccount) (patientinfo []function_models.PatientInfo, total int64, err error) {
 	//offset := (page - 1) * limit
-	if admin.IsSuperAdmin == 1 {
+	if admin.IsAdmin == 1 {
 		err = readUserDb.Raw("select *, a.name as admin_name,  d.namepath as namepath  from sgj_users.sgj_user_org as u  left JOIN sgj_user_district as d On d.id = u.city join sgj_xt.xt_warehouse_out as x on x.org_id = u.id  LEFT JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id  AND f.status = 1  LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id AND a.status = 1   where x.ctime >= ? AND x.ctime<= ? AND u.import <> 1  GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
 
 	} else {