修改bug

controllers/admin_api_controllers/analysis_api_controller.go

@@ -1,7 +1,6 @@
 package admin_api_controllers
 
 import (
-	"XT_Admin_Api/models"
 	"XT_Admin_Api/models/admin_models"
 	"XT_Admin_Api/service"
 	"XT_Admin_Api/utils"
@@ -10,460 +9,6 @@ import (
 
 type AnalysisAPIController struct {
 	AdminBaseAPIAuthController
-	// AdminBaseAPIController
-}
-
-// /admin/api/org/regist [get] RegistOrg
-func (this *AnalysisAPIController) RegistOrg() {
-	totalOrg, getTotalOrgErr := service.GetTotalOrgCount()
-	if getTotalOrgErr != nil {
-		this.ErrorLog("获取总机构数失败:%v", getTotalOrgErr)
-	}
-
-	now := time.Now()
-	zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-	registOrgCountToday, getRegistOrgCountTodayErr := service.GetRegistedOrgCountFromDayToDay(zeroHourTimeOfToday, now)
-	if getRegistOrgCountTodayErr != nil {
-		this.ErrorLog("获取今日注册机构数失败:%v", getRegistOrgCountTodayErr)
-	}
-
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
-	registOrgCountThisWeek, getRegistOrgCountThisWeekErr := service.GetRegistedOrgCountFromDayToDay(monday, sunday)
-	if getRegistOrgCountThisWeekErr != nil {
-		this.ErrorLog("获取本周注册机构数失败:%v", getRegistOrgCountThisWeekErr)
-	}
-
-	thisYear := now.Year()
-	thisMonth := int(now.Month())
-	beginningOfMonth, endOfMonth := utils.MonthBeginningToEnd(thisYear, thisMonth)
-	registOrgCountThisMonth, getRegistOrgCountThisMonthErr := service.GetRegistedOrgCountFromDayToDay(beginningOfMonth, endOfMonth)
-	if getRegistOrgCountThisMonthErr != nil {
-		this.ErrorLog("获取本月注册机构数失败:%v", getRegistOrgCountThisMonthErr)
-	}
-
-	monthRegistOrgCounts := make([]map[string]interface{}, 0, 12)
-	for m := 1; m < 12; m++ {
-		if m > thisMonth {
-			break
-		}
-		if m == thisMonth {
-			monthRegistOrgCounts = append(monthRegistOrgCounts, map[string]interface{}{
-				"month": m,
-				"count": registOrgCountThisMonth,
-			})
-
-		} else {
-			BOM, EOM := utils.MonthBeginningToEnd(thisYear, m)
-			registOrgCount, getRegistOrgCountErr := service.GetRegistedOrgCountFromDayToDay(BOM, EOM)
-			if getRegistOrgCountErr != nil {
-				this.ErrorLog("获取%v月注册机构数失败:%v", m, getRegistOrgCountErr)
-			}
-			monthRegistOrgCounts = append(monthRegistOrgCounts, map[string]interface{}{
-				"month": m,
-				"count": registOrgCount,
-			})
-		}
-	}
-
-	registOrgsThisWeek, getRegistOrgThisWeekErr := service.GetRegistedOrgsFromDayToDay(monday, sunday)
-	if getRegistOrgThisWeekErr != nil {
-		this.ErrorLog("获取本周注册机构失败:%v", getRegistOrgThisWeekErr)
-		registOrgsThisWeek = make([]*models.Org, 0)
-	}
-
-	registOrgsThisMonth, getRegistOrgThisMonthErr := service.GetRegistedOrgsFromDayToDay(beginningOfMonth, endOfMonth)
-	if getRegistOrgThisMonthErr != nil {
-		this.ErrorLog("获取本月注册机构失败:%v", getRegistOrgThisMonthErr)
-		registOrgsThisMonth = make([]*models.Org, 0)
-	}
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"total_org_count":         totalOrg,
-		"regist_org_count_today":  registOrgCountToday,
-		"regist_org_count_week":   registOrgCountThisWeek,
-		"regist_org_count_month":  registOrgCountThisMonth,
-		"regist_org_count_months": monthRegistOrgCounts,
-		"regist_orgs_week":        registOrgsThisWeek,
-		"regist_orgs_month":       registOrgsThisMonth,
-	})
-}
-
-// /admin/api/org/active [get] ActiveOrg
-func (this *AnalysisAPIController) ActiveOrg() {
-	now := time.Now()
-	zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-	activeOrgCountToday, getActiveTodayErr := service.GetActiveOrgCountFromDayToDay(zeroHourTimeOfToday, now)
-	if getActiveTodayErr != nil {
-		this.ErrorLog("获取今日活跃机构数失败:%v", getActiveTodayErr)
-	}
-
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
-	activeOrgCountThisWeek, getActiveOrgCountThisWeekErr := service.GetActiveOrgCountFromDayToDay(monday, sunday)
-	if getActiveOrgCountThisWeekErr != nil {
-		this.ErrorLog("获取本周活跃机构数失败:%v", getActiveOrgCountThisWeekErr)
-	}
-
-	thisYear := now.Year()
-	thisMonth := int(now.Month())
-	beginningOfMonth, endOfMonth := utils.MonthBeginningToEnd(thisYear, thisMonth)
-	activeOrgCountThisMonth, getActiveOrgCountThisMonthErr := service.GetActiveOrgCountFromDayToDay(beginningOfMonth, endOfMonth)
-	if getActiveOrgCountThisMonthErr != nil {
-		this.ErrorLog("获取本月活跃机构数失败:%v", getActiveOrgCountThisMonthErr)
-	}
-
-	monthActiveOrgCounts := make([]map[string]interface{}, 0, 12)
-	for m := 1; m < 12; m++ {
-		if m > thisMonth {
-			break
-		}
-		if m == thisMonth {
-			monthActiveOrgCounts = append(monthActiveOrgCounts, map[string]interface{}{
-				"month": m,
-				"count": activeOrgCountThisMonth,
-			})
-
-		} else {
-			BOM, EOM := utils.MonthBeginningToEnd(thisYear, m)
-			activeOrgCount, getActiveOrgCountErr := service.GetActiveOrgCountFromDayToDay(BOM, EOM)
-			if getActiveOrgCountErr != nil {
-				this.ErrorLog("获取%v月活跃机构数失败:%v", m, getActiveOrgCountErr)
-			}
-			monthActiveOrgCounts = append(monthActiveOrgCounts, map[string]interface{}{
-				"month": m,
-				"count": activeOrgCount,
-			})
-		}
-	}
-
-	activeOrgsThisWeek, getActiveOrgThisWeekErr := service.GetActiveOrgsFromDayToDay(monday, sunday)
-	if getActiveOrgThisWeekErr != nil {
-		this.ErrorLog("获取本周活跃机构失败:%v", getActiveOrgThisWeekErr)
-		activeOrgsThisWeek = make([]*service.ActiveOrgListVM, 0)
-	}
-
-	activeOrgsThisMonth, getActiveOrgThisMonthErr := service.GetActiveOrgsFromDayToDay(beginningOfMonth, endOfMonth)
-	if getActiveOrgThisMonthErr != nil {
-		this.ErrorLog("获取本月活跃机构失败:%v", getActiveOrgThisMonthErr)
-		activeOrgsThisMonth = make([]*service.ActiveOrgListVM, 0)
-	}
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"active_org_count_today":  activeOrgCountToday,
-		"active_org_count_week":   activeOrgCountThisWeek,
-		"active_org_count_month":  activeOrgCountThisMonth,
-		"active_org_count_months": monthActiveOrgCounts,
-		"active_orgs_week":        activeOrgsThisWeek,
-		"active_orgs_month":       activeOrgsThisMonth,
-	})
-}
-
-// /admin/api/user/active [get] ActiveUser
-func (this *AnalysisAPIController) ActiveUser() {
-	now := time.Now()
-	zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-	activeAdminCountToday, getActiveTodayErr := service.GetActiveAdminUserCountFromDayToDay(zeroHourTimeOfToday, now)
-	if getActiveTodayErr != nil {
-		this.ErrorLog("获取今日活跃账户数失败:%v", getActiveTodayErr)
-	}
-
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
-	activeAdminCountThisWeek, getActiveAdminCountThisWeekErr := service.GetActiveAdminUserCountFromDayToDay(monday, sunday)
-	if getActiveAdminCountThisWeekErr != nil {
-		this.ErrorLog("获取本周活跃账户数失败:%v", getActiveAdminCountThisWeekErr)
-	}
-
-	thisYear := now.Year()
-	thisMonth := int(now.Month())
-	beginningOfMonth, endOfMonth := utils.MonthBeginningToEnd(thisYear, thisMonth)
-	activeAdminCountThisMonth, getActiveAdminCountThisMonthErr := service.GetActiveAdminUserCountFromDayToDay(beginningOfMonth, endOfMonth)
-	if getActiveAdminCountThisMonthErr != nil {
-		this.ErrorLog("获取本月活跃账户数失败:%v", getActiveAdminCountThisMonthErr)
-	}
-
-	monthActiveAdminCounts := make([]map[string]interface{}, 0, 12)
-	for m := 1; m < 12; m++ {
-		if m > thisMonth {
-			break
-		}
-		if m == thisMonth {
-			monthActiveAdminCounts = append(monthActiveAdminCounts, map[string]interface{}{
-				"month": m,
-				"count": activeAdminCountThisMonth,
-			})
-
-		} else {
-			BOM, EOM := utils.MonthBeginningToEnd(thisYear, m)
-			activeAdminCount, getActiveAdminCountErr := service.GetActiveAdminUserCountFromDayToDay(BOM, EOM)
-			if getActiveAdminCountErr != nil {
-				this.ErrorLog("获取%v月活跃账户数失败:%v", m, getActiveAdminCountErr)
-			}
-			monthActiveAdminCounts = append(monthActiveAdminCounts, map[string]interface{}{
-				"month": m,
-				"count": activeAdminCount,
-			})
-		}
-	}
-
-	activeAdminsThisWeek, getActiveAdminThisWeekErr := service.GetActiveAdminUsersFromDayToDay(monday, sunday)
-	if getActiveAdminThisWeekErr != nil {
-		this.ErrorLog("获取本周活跃账户失败:%v", getActiveAdminThisWeekErr)
-		activeAdminsThisWeek = make([]*service.ActiveAdminUserListVM, 0)
-	}
-
-	activeAdminsThisMonth, getActiveAdminThisMonthErr := service.GetActiveAdminUsersFromDayToDay(beginningOfMonth, endOfMonth)
-	if getActiveAdminThisMonthErr != nil {
-		this.ErrorLog("获取本月活跃账户失败:%v", getActiveAdminThisMonthErr)
-		activeAdminsThisMonth = make([]*service.ActiveAdminUserListVM, 0)
-	}
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"active_admin_count_today":  activeAdminCountToday,
-		"active_admin_count_week":   activeAdminCountThisWeek,
-		"active_admin_count_month":  activeAdminCountThisMonth,
-		"active_admin_count_months": monthActiveAdminCounts,
-		"active_admins_week":        activeAdminsThisWeek,
-		"active_admins_month":       activeAdminsThisMonth,
-	})
-}
-
-// /admin/api/org/expiring [get] ExpiringOrg
-func (this *AnalysisAPIController) ExpiringOrg() {
-	now := time.Now()
-	zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-	// endTimeOfToday := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 999, time.Local)
-	timeAfter15Days := zeroHourTimeOfToday.AddDate(0, 0, 15)
-	timeBefore15Days := zeroHourTimeOfToday.AddDate(0, 0, -15)
-
-	countOfWillExpireOrg, getWillExpireOrgCountErr := service.GetWillExpireOrgCountFromDayToDay(zeroHourTimeOfToday, timeAfter15Days)
-	if getWillExpireOrgCountErr != nil {
-		this.ErrorLog("获取即将到期机构数失败:%v", getWillExpireOrgCountErr)
-	}
-
-	countOfExpiredOrg, getExpiredOrgCountErr := service.GetDidExpiredOrgCountFromDayToDay(timeBefore15Days, zeroHourTimeOfToday)
-	if getExpiredOrgCountErr != nil {
-		this.ErrorLog("获取刚到期机构数失败:%v", getExpiredOrgCountErr)
-	}
-
-	willExpireOrgs, getWillExpireOrgsErr := service.GetWillExpireOrgsFromDayToDay(zeroHourTimeOfToday, timeAfter15Days)
-	if getWillExpireOrgsErr != nil {
-		this.ErrorLog("获取即将到期机构失败:%v", getWillExpireOrgsErr)
-		willExpireOrgs = make([]*service.ExpireOrgListVM, 0, 0)
-	}
-
-	expiredOrgs, getExpiredOrgsErr := service.GetDidExpireOrgsFromDayToDay(timeBefore15Days, zeroHourTimeOfToday)
-	if getExpiredOrgsErr != nil {
-		this.ErrorLog("获取已到期机构失败:%v", getExpiredOrgsErr)
-		expiredOrgs = make([]*service.ExpireOrgListVM, 0, 0)
-	}
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"will_expire_org_count": countOfWillExpireOrg,
-		"did_expired_org_count": countOfExpiredOrg,
-		"will_expire_orgs":      willExpireOrgs,
-		"did_expired_orgs":      expiredOrgs,
-	})
-}
-
-// /admin/api/dialysis/analysis [get] DialysisAnalysis
-func (this *AnalysisAPIController) DialysisAnalysis() {
-	now := time.Now()
-	zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-	endTimeOfToday := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 999, time.Local)
-
-	timesToday, getTimesTodayErr := service.GetDialysisTimesFromDayToDay(zeroHourTimeOfToday, endTimeOfToday)
-	if getTimesTodayErr != nil {
-		this.ErrorLog("获取今日透析次数失败:%v", getTimesTodayErr)
-	}
-
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
-	timesThisWeek, getTimesThisWeekErr := service.GetDialysisTimesFromDayToDay(monday, sunday)
-	if getTimesThisWeekErr != nil {
-		this.ErrorLog("获取本周透析次数失败:%v", getTimesThisWeekErr)
-	}
-
-	thisYear := now.Year()
-	thisMonth := int(now.Month())
-	beginningOfMonth, endOfMonth := utils.MonthBeginningToEnd(thisYear, thisMonth)
-	timesThisMonth, getTimesThisMonthErr := service.GetDialysisTimesFromDayToDay(beginningOfMonth, endOfMonth)
-	if getTimesThisMonthErr != nil {
-		this.ErrorLog("获取本月透析次数失败:%v", getTimesThisMonthErr)
-	}
-
-	monthTimes := make([]map[string]interface{}, 0, 12)
-	for m := 1; m < 12; m++ {
-		if m > thisMonth {
-			break
-		}
-		if m == thisMonth {
-			monthTimes = append(monthTimes, map[string]interface{}{
-				"month": m,
-				"count": timesThisMonth,
-			})
-
-		} else {
-			BOM, EOM := utils.MonthBeginningToEnd(thisYear, m)
-			times, getTimesErr := service.GetDialysisTimesFromDayToDay(BOM, EOM)
-			if getTimesErr != nil {
-				this.ErrorLog("获取%v月透析次数失败:%v", m, getTimesErr)
-			}
-			monthTimes = append(monthTimes, map[string]interface{}{
-				"month": m,
-				"count": times,
-			})
-		}
-	}
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"times_today":  timesToday,
-		"times_week":   timesThisWeek,
-		"times_month":  timesThisMonth,
-		"times_months": monthTimes,
-	})
-}
-
-// /admin/api/monitor/analysis [get] MonitorAnalysis
-func (this *AnalysisAPIController) MonitorAnalysis() {
-	now := time.Now()
-	zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-	endTimeOfToday := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 999, time.Local)
-
-	timesToday, getTimesTodayErr := service.GetMonitoringTimesFromDayToDay(zeroHourTimeOfToday, endTimeOfToday)
-	if getTimesTodayErr != nil {
-		this.ErrorLog("获取今日监控次数失败:%v", getTimesTodayErr)
-	}
-
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
-	timesThisWeek, getTimesThisWeekErr := service.GetMonitoringTimesFromDayToDay(monday, sunday)
-	if getTimesThisWeekErr != nil {
-		this.ErrorLog("获取本周监控次数失败:%v", getTimesThisWeekErr)
-	}
-
-	thisYear := now.Year()
-	thisMonth := int(now.Month())
-	beginningOfMonth, endOfMonth := utils.MonthBeginningToEnd(thisYear, thisMonth)
-	timesThisMonth, getTimesThisMonthErr := service.GetMonitoringTimesFromDayToDay(beginningOfMonth, endOfMonth)
-	if getTimesThisMonthErr != nil {
-		this.ErrorLog("获取本月监控次数失败:%v", getTimesThisMonthErr)
-	}
-
-	monthTimes := make([]map[string]interface{}, 0, 12)
-	for m := 1; m < 12; m++ {
-		if m > thisMonth {
-			break
-		}
-		if m == thisMonth {
-			monthTimes = append(monthTimes, map[string]interface{}{
-				"month": m,
-				"count": timesThisMonth,
-			})
-
-		} else {
-			BOM, EOM := utils.MonthBeginningToEnd(thisYear, m)
-			times, getTimesErr := service.GetMonitoringTimesFromDayToDay(BOM, EOM)
-			if getTimesErr != nil {
-				this.ErrorLog("获取%v月监控次数失败:%v", m, getTimesErr)
-			}
-			monthTimes = append(monthTimes, map[string]interface{}{
-				"month": m,
-				"count": times,
-			})
-		}
-	}
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"times_today":  timesToday,
-		"times_week":   timesThisWeek,
-		"times_month":  timesThisMonth,
-		"times_months": monthTimes,
-	})
-}
-
-// /admin/api/patient/analysis [get] PatientAnalysis
-func (this *AnalysisAPIController) PatientAnalysis() {
-	now := time.Now()
-	zeroHourTimeOfToday := utils.ZeroHourTimeOfDay(now)
-	newCountToday, getNewCountTodayErr := service.GetNewPatientCountFromDayToDay(zeroHourTimeOfToday, now)
-	if getNewCountTodayErr != nil {
-		this.ErrorLog("获取今日新增病人数失败:%v", getNewCountTodayErr)
-	}
-
-	monday, sunday := utils.GetMondayAndSundayOfWeekDate(&now)
-	newCountThisWeek, getNewCountThisWeekErr := service.GetNewPatientCountFromDayToDay(monday, sunday)
-	if getNewCountThisWeekErr != nil {
-		this.ErrorLog("获取本周新增病人数失败:%v", getNewCountThisWeekErr)
-	}
-
-	thisYear := now.Year()
-	thisMonth := int(now.Month())
-	beginningOfMonth, endOfMonth := utils.MonthBeginningToEnd(thisYear, thisMonth)
-	newCountThisMonth, getNewCountThisMonthErr := service.GetNewPatientCountFromDayToDay(beginningOfMonth, endOfMonth)
-	if getNewCountThisMonthErr != nil {
-		this.ErrorLog("获取本月新增病人数失败:%v", getNewCountThisMonthErr)
-	}
-
-	monthNewCounts := make([]map[string]interface{}, 0, 12)
-	for m := 1; m < 12; m++ {
-		if m > thisMonth {
-			break
-		}
-		if m == thisMonth {
-			monthNewCounts = append(monthNewCounts, map[string]interface{}{
-				"month": m,
-				"count": newCountThisMonth,
-			})
-
-		} else {
-			BOM, EOM := utils.MonthBeginningToEnd(thisYear, m)
-			newCount, getNewCountErr := service.GetNewPatientCountFromDayToDay(BOM, EOM)
-			if getNewCountErr != nil {
-				this.ErrorLog("获取%v月新增病人数失败:%v", m, getNewCountErr)
-			}
-			monthNewCounts = append(monthNewCounts, map[string]interface{}{
-				"month": m,
-				"count": newCount,
-			})
-		}
-	}
-
-	maleCount, femaleCount, unknowGenderCount, getGenderCountErr := service.GetPatientGenderDistribution()
-	if getGenderCountErr != nil {
-		this.ErrorLog("获取病人性别分布失败:%v", getGenderCountErr)
-	}
-
-	// 1乙肝 2丙肝 3艾滋病 4肺结核 5梅毒
-	// 不写错误日志了，累了
-	normalPCount, _ := service.GetInfectiousDiseasePatientCount(0)
-	type1PCount, _ := service.GetInfectiousDiseasePatientCount(1)
-	type2PCount, _ := service.GetInfectiousDiseasePatientCount(2)
-	type3PCount, _ := service.GetInfectiousDiseasePatientCount(3)
-	type4PCount, _ := service.GetInfectiousDiseasePatientCount(4)
-	type5PCount, _ := service.GetInfectiousDiseasePatientCount(5)
-
-	ageDistribution, getAgeDistributionErr := service.GetPatientAgeDistribution()
-	if getAgeDistributionErr != nil {
-		this.ErrorLog("获取病人年龄分布失败:%v", getAgeDistributionErr)
-		ageDistribution = make([]*service.PatientAgeCountStruct, 0, 0)
-	}
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"new_patient_count_today":  newCountToday,
-		"new_patient_count_week":   newCountThisWeek,
-		"new_patient_count_month":  newCountThisMonth,
-		"new_patient_count_months": monthNewCounts,
-
-		"male_count":   maleCount,
-		"female_count": femaleCount,
-		"total_count":  maleCount + femaleCount + unknowGenderCount,
-
-		"disease_type_0_count": normalPCount,
-		"disease_type_1_count": type1PCount,
-		"disease_type_2_count": type2PCount,
-		"disease_type_3_count": type3PCount,
-		"disease_type_4_count": type4PCount,
-		"disease_type_5_count": type5PCount,
-
-		"age_counts": ageDistribution,
-	})
 }
 
 func (this *AnalysisAPIController) HomeStatistics() {
@@ -486,15 +31,11 @@ func (this *AnalysisAPIController) HomeStatistics() {
 	now := time.Now().Unix()
 
 	newOrgCount, _ := service.GetRegistedOrgCount(rangeTimeStamp, now)
-
 	totalOrg, _ := service.GetTotalOrgCount()
-
 	activeOrgCount, _ := service.GetActiveOrgCount(rangeTimeStamp, now)
 	totalActiveOrg, _ := service.GetActiveOrgTotalCount()
-
 	activeAdminCount, _ := service.GetActiveAdminUserCount(rangeTimeStamp, now)
 	adminTotalCount, _ := service.GetAdminUserTotalCount()
-
 	patientCount, _ := service.GetNewPatientCount(rangeTimeStamp, now)
 	patientTotalCount, _ := service.GetPatientTotalCount()
 

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)
+	list, err, total := service.GetAllOrgList(active_status, depth_active_status, startTime, endTime, province, city, district, follow, keyword, page, limit, this.GetAdminInfo().Admin.IsSuperAdmin)
 	if err != nil {
 
 	} else {
@@ -210,10 +210,12 @@ func (c *OrgAPIController) GetDistrictsByUpid() {
 func (this *OrgAPIController) GetInitData() {
 	provinces, _ := service.GetDistrictsByUpid(0)
 	follower, _ := service.FindAllFollower()
+	orgType, _ := service.GetAllOrgType()
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"provinces": provinces,
 		"follower":  follower,
+		"org_type":  orgType,
 	})
 }
 

controllers/admin_api_controllers/system_api_controller.go

@@ -77,11 +77,8 @@ func (this *SystemApiController) ModifyAdminUser() {
 		if info.ID > 0 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNameException)
 			return
-
 		}
-
 	}
-
 	err := service.UpdateAdmin(admin)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{

models/org_models.go

@@ -31,6 +31,7 @@ type Org struct {
 	AdminUserLoginLog AdminUserLoginLog `gorm:"ForeignKey:OrgId" json:"log"`
 	AdminUser         AdminUser         `gorm:"ForeignKey:Id;AssociationForeignKey:Creator" json:"admin"`
 	OrgFollow         []*OrgFollow      `gorm:"ForeignKey:OrgId" json:"follow"`
+	Citys             District          `gorm:"ForeignKey:Id;AssociationForeignKey:City" json:"citys"`
 }
 
 func (Org) TableName() string {

routers/router.go

@@ -10,7 +10,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		// AllowAllOrigins:  true,
-		AllowOrigins:     []string{"http://api.szjkhd.com", "http://admin.xt.test.szjkhd.com", "http://localhost:9527"},
+		AllowOrigins:     []string{"http://api.szjkhd.com", "http://admin.xt.test.szjkhd.com", "http://admin.xt.szjkhd.com", "http://localhost:9527"},
 		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"},

service/admin_service.go

@@ -7,10 +7,8 @@ import (
 	"XT_Admin_Api/models/admin_models"
 	"database/sql"
 	"fmt"
-	"strings"
-	"time"
-
 	"github.com/jinzhu/gorm"
+	"strings"
 )
 
 func GetAdminAccount(account string, password string) (*admin_models.AdminAccount, error) {
@@ -35,270 +33,6 @@ func GetTotalOrgCount() (int, error) {
 	return count, nil
 }
 
-// 获取一段时间内注册的机构数量
-func GetRegistedOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readUserDb.Model(&models.Org{}).Where("status <> 0 AND ctime >= ? AND ctime <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取一段时间内注册的机构
-func GetRegistedOrgsFromDayToDay(from time.Time, to time.Time) ([]*models.Org, error) {
-	var orgs []*models.Org
-	err := readUserDb.Model(&models.Org{}).Where("status <> 0 AND ctime >= ? AND ctime <= ?", from.Unix(), to.Unix()).Find(&orgs).Error
-	if err != nil {
-		return nil, err
-	}
-	return orgs, nil
-}
-
-// 获取一段时间内的活跃机构数
-func GetActiveOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT org_id) AS count FROM sgj_user_admin_login_log WHERE ctime >= ? AND ctime <= ?", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-type ActiveOrgListVM struct {
-	models.Org
-	ActiveTime int64 `gorm:"column:active_time" json:"active_time"`
-}
-
-// 获取一段时间内的活跃机构
-func GetActiveOrgsFromDayToDay(from time.Time, to time.Time) ([]*ActiveOrgListVM, error) {
-	var orgs []*ActiveOrgListVM
-	err := readUserDb.Raw("select * from (select log.org_id, org.*, log.ctime as active_time from sgj_user_admin_login_log as log left join sgj_user_org as org on log.org_id = org.id where log.ctime >= ? AND log.ctime <= ? AND org.status <> 0 order by log.ctime desc) as t group by t.org_id;", from.Unix(), to.Unix()).Scan(&orgs).Error
-	if err != nil {
-		return nil, err
-	}
-	return orgs, nil
-}
-
-// 获取一段时间内的活跃账户数
-func GetActiveAdminUserCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE ctime >= ? AND ctime <= ? AND operate_type = 1", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-type ActiveAdminUserListVM struct {
-	models.App_Role
-	OrgName    string `gorm:"column:org_name" json:"org_name"`
-	ActiveTime int64  `gorm:"column:active_time" json:"active_time"`
-}
-
-// 获取一段时间内的活跃账户
-func GetActiveAdminUsersFromDayToDay(from time.Time, to time.Time) ([]*ActiveAdminUserListVM, error) {
-	var users []*ActiveAdminUserListVM
-	err := readUserDb.Raw("select * from (select log.admin_user_id as uid, admin.*, org.org_name, log.ctime as active_time from sgj_user_admin_login_log as log left join sgj_user_admin_role as admin on log.admin_user_id = admin.admin_user_id left join sgj_user_org as org on log.org_id = org.id where log.ctime >= ? AND log.ctime <= ? AND log.operate_type = 1 AND admin.status > 0 order by log.ctime desc) as t group by t.uid;", from.Unix(), to.Unix()).Scan(&users).Error
-	if err != nil {
-		return nil, err
-	}
-	return users, nil
-}
-
-// 获取即将到期机构数
-func GetWillExpireOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT org_id) AS count FROM sgj_serve_subscibe WHERE period_end >= ? AND period_end <= ? AND state <> 9 GROUP BY org_id;", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-// 获取已到期机构数
-func GetDidExpiredOrgCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT org_id) AS count FROM sgj_serve_subscibe WHERE period_end >= ? AND period_end <= ? AND state <> 9 GROUP BY org_id;", from.Unix(), to.Unix()).Rows()
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
-}
-
-type ExpireOrgListVM struct {
-	OrgID      int64  `gorm:"column:org_id" json:"org_id"`
-	OrgName    string `gorm:"column:org_name" json:"org_name"`
-	PeriodEnd  int64  `gorm:"column:period_end" json:"period_end"`
-	Telephone  string `gorm:"column:telephone" json:"telephone"`
-	ExpireDays int    `gorm:"-" json:"expire_days"`
-}
-
-// 获取即将到期机构
-func GetWillExpireOrgsFromDayToDay(from time.Time, to time.Time) ([]*ExpireOrgListVM, error) {
-	var vms []*ExpireOrgListVM
-	err := readUserDb.Raw("select s_o.org_id, s_o.period_end, o.org_name, o.telephone from (select ss.* from (select s.org_id as org_id, s.id as sid, s.period_end from sgj_serve_subscibe as s where s.period_end <= ? AND s.period_end >= ? AND s.state <> 9 order by s.id desc) as ss group by ss.org_id) as s_o left join sgj_user_org as o on o.id = s_o.org_id", to.Unix(), from.Unix()).Scan(&vms).Error
-	if err != nil {
-		return nil, err
-	}
-	for _, vm := range vms {
-		vm.ExpireDays = time.Unix(vm.PeriodEnd, 0).Day() - from.Day()
-	}
-	return vms, nil
-}
-
-// 获取已到期机构
-func GetDidExpireOrgsFromDayToDay(from time.Time, to time.Time) ([]*ExpireOrgListVM, error) {
-	var vms []*ExpireOrgListVM
-	err := readUserDb.Raw("select s_o.org_id, s_o.period_end, o.org_name, o.telephone from (select ss.* from (select s.org_id as org_id, s.id as sid, s.period_end from sgj_serve_subscibe as s where s.period_end >= ? AND s.period_end <= ? AND s.state <> 9 order by s.id desc) as ss group by ss.org_id) as s_o left join sgj_user_org as o on o.id = s_o.org_id", from.Unix(), to.Unix()).Scan(&vms).Error
-	if err != nil {
-		return nil, err
-	}
-	for _, vm := range vms {
-		vm.ExpireDays = to.Day() - time.Unix(vm.PeriodEnd, 0).Day()
-	}
-	return vms, nil
-}
-
-// 获取一段时间内的透析次数
-func GetDialysisTimesFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readDb.Model(&models.DialysisOrder{}).Where("status > 0 AND dialysis_date >= ? AND dialysis_date <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取一段时间内的监控次数
-func GetMonitoringTimesFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readDb.Model(&models.MonitoringRecord{}).Where("status > 0 AND monitoring_date >= ? AND monitoring_date <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取一段时间内新增病人数量
-func GetNewPatientCountFromDayToDay(from time.Time, to time.Time) (int, error) {
-	var count int
-	err := readDb.Model(&models.Patients{}).Where("status > 0 AND created_time >= ? AND created_time <= ?", from.Unix(), to.Unix()).Count(&count).Error
-	if err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// 获取病人性别分布
-func GetPatientGenderDistribution() (int, int, int, error) {
-	var maleCount, femaleCount, unknowGenderCount int
-	rows, err := readDb.Raw("SELECT count(id), gender FROM xt_patients WHERE (status > 0) group by gender;").Rows()
-	if err != nil {
-		return 0, 0, 0, err
-	}
-	for rows.Next() {
-		var gender, count int
-		rows.Scan(&count, &gender)
-		if gender == 1 {
-			maleCount = count
-		} else if gender == 2 {
-			femaleCount = count
-		} else {
-			unknowGenderCount = count
-		}
-	}
-	return maleCount, femaleCount, unknowGenderCount, nil
-}
-
-// 获取某种传染病的病人数，diseaseType = 0时为没有传染病
-// 1乙肝 2丙肝 3艾滋病 4肺结核 5梅毒
-func GetInfectiousDiseasePatientCount(diseaseType int) (int, error) {
-	if diseaseType == 0 {
-		var count int
-		rows, err := readDb.Raw("select count(p.id) from xt_patients as p where id not in (select p_d.patient_id from xt_patients_infectious_diseases as p_d where status = 1 group by p_d.patient_id) and status = 1;").Rows()
-		if err != nil {
-			return 0, err
-		}
-		if rows.Next() {
-			rows.Scan(&count)
-		}
-		return count, nil
-
-	} else {
-		var count int
-		rows, err := readDb.Raw("select count(distinct patient_id) from xt_patients_infectious_diseases where status = 1 and disease_id = ?;", diseaseType).Rows()
-		if err != nil {
-			return 0, err
-		}
-		if rows.Next() {
-			rows.Scan(&count)
-		}
-		return count, nil
-	}
-}
-
-// 获取患者年龄分布
-func GetPatientAgeDistribution() ([]*PatientAgeCountStruct, error) {
-	var counts []*PatientAgeCountStruct
-	err := readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM (
-		SELECT
-			CASE
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d'))<10 THEN '10'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=10 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<20 THEN '20'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=20 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<30 THEN '30'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=30 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<40 THEN '40'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=40 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<50 THEN '50'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=50 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<60 THEN '60'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=60 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<70 THEN '70'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=70 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<80 THEN '80'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=80 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<90 THEN '90'
-				WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>=90 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + (DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<100 THEN '100'
-				ELSE '-1'
-			END
-		AS nnd FROM xt_patients where status=1
-	) a GROUP BY nnd;`).Scan(&counts).Error
-	if err != nil {
-		return nil, err
-	}
-	return counts, nil
-}
-
-func GetAdminUserElectronicSignature(orgID int64, appID int64, userID int64) (*models.AdminUserElectronicSignature, error) {
-	var es models.AdminUserElectronicSignature
-	err := readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("org_id=? and app_id=? and creator=? and status=1", orgID, appID, userID).First(&es).Error
-
-	if err == gorm.ErrRecordNotFound {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	return &es, nil
-}
-
-func CreateAdminUserElectronicSignature(es *models.AdminUserElectronicSignature) error {
-	err := writeUserDb.Create(es).Error
-	return err
-}
-
-func SaveAdminUserElectronicSignature(es *models.AdminUserElectronicSignature) error {
-	err := writeUserDb.Save(es).Error
-	return err
-}
-
 func GetAdminUserSpecialPermission(orgID int64, appID int64, adminUserID int64, permissionType models.SpecialPermissionType) (*models.AdminUserSpecialPermission, error) {
 	var record models.AdminUserSpecialPermission
 	err := readDb.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND admin_user_id = ? AND permission = ? AND status = 1", orgID, appID, adminUserID, permissionType).First(&record).Error
@@ -312,53 +46,14 @@ func GetAdminUserSpecialPermission(orgID int64, appID int64, adminUserID int64,
 	return &record, nil
 }
 
-func SaveAdminUserSpecialPermission(permission *models.AdminUserSpecialPermission) error {
-	err := writeDb.Save(permission).Error
-	return err
-}
-
-func GetAllValidAdminUsersWithSpecialPermission(orgID int64, appID int64, permissionType models.SpecialPermissionType) ([]*models.AdminUserSpecialPermission, error) {
-	var records []*models.AdminUserSpecialPermission
-	err := readDb.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND permission = ? AND status = 1", orgID, appID, permissionType).Find(&records).Error
-	if err != nil {
-		return nil, err
-	}
-	return records, nil
-}
-
-func GetAllSpecialPermissionAdminUsersWithoutStatus(orgID int64, appID int64, permissionType models.SpecialPermissionType) ([]*models.AdminUserSpecialPermission, error) {
-	var records []*models.AdminUserSpecialPermission
-	err := readDb.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND permission = ?", orgID, appID, permissionType).Find(&records).Error
-	if err != nil {
-		return nil, err
-	}
-	return records, nil
-}
-
-func CancelAllSpecialPermissionAdminUsers(orgID int64, appID int64, permissionType models.SpecialPermissionType) error {
-	tx := writeDb.Begin()
-	updateTime := time.Now().Unix()
-	err := tx.Model(&models.AdminUserSpecialPermission{}).Where("org_id = ? AND app_id = ? AND status = 1 AND permission = ?", orgID, appID, permissionType).Updates(map[string]interface{}{"status": 0, "mtime": updateTime}).Error
-	if err != nil {
-		tx.Rollback()
-		return err
-	}
-	tx.Commit()
-	return nil
-}
-
-func BatchSaveSpecialPermissionAdminUsers(users []*models.AdminUserSpecialPermission) error {
-	tx := writeDb.Begin()
-	for _, user := range users {
-		tx.Save(user)
-	}
-	return tx.Commit().Error
-}
-
 // 获取一段时间内新增病人数量
 func GetNewPatientCount(from int64, to int64) (int, error) {
 	var count int
-	rows, err := readDb.Raw("SELECT COUNT(DISTINCT id_card_no) AS count FROM xt_patients WHERE status > 0 AND created_time >= ? AND created_time <= ?", from, to).Rows()
+	db := readDb.Raw("SELECT COUNT(DISTINCT id_card_no) AS count FROM xt_patients WHERE status > 0 AND created_time >= ? AND created_time <= ?", from, to)
+	rows, err := db.Rows()
+	defer rows.Close()
+
+	//rows, err := readDb.Raw("SELECT COUNT(DISTINCT id_card_no) AS count FROM xt_patients WHERE status > 0 AND created_time >= ? AND created_time <= ?", from, to).Rows()
 	if err != nil {
 		return 0, err
 	}
@@ -372,7 +67,11 @@ func GetNewPatientCount(from int64, to int64) (int, error) {
 func GetPatientTotalCount() (int64, error) {
 
 	var count int64
-	rows, err := readDb.Raw("SELECT COUNT(DISTINCT id_card_no) AS count FROM xt_patients").Rows()
+	db := readDb.Raw("SELECT COUNT(DISTINCT id_card_no) AS count FROM xt_patients")
+	rows, err := db.Rows()
+	defer rows.Close()
+
+	//rows, err := readDb.Raw("SELECT COUNT(DISTINCT id_card_no) AS count FROM xt_patients").Rows()
 	if err != nil {
 		return 0, err
 	}
@@ -386,7 +85,11 @@ func GetPatientTotalCount() (int64, error) {
 // 获取一段时间内的活跃账户数
 func GetActiveAdminUserCount(from int64, to int64) (int64, error) {
 	var count int64
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE ctime >= ? AND ctime <= ? AND operate_type = 1 AND app_type = 3", from, to).Rows()
+	db := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE ctime >= ? AND ctime <= ? AND operate_type = 1 AND app_type = 3", from, to)
+	rows, err := db.Rows()
+	defer rows.Close()
+
+	//rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE ctime >= ? AND ctime <= ? AND operate_type = 1 AND app_type = 3", from, to).Rows()
 	if err != nil {
 		return 0, err
 	}
@@ -399,7 +102,11 @@ func GetActiveAdminUserCount(from int64, to int64) (int64, error) {
 // 获取所有机构账户数量
 func GetAdminUserTotalCount() (int64, error) {
 	var count int64
-	rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE operate_type = 1 AND app_type = 3").Rows()
+	db := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE operate_type = 1 AND app_type = 3")
+	rows, err := db.Rows()
+	defer rows.Close()
+
+	//rows, err := readUserDb.Raw("SELECT COUNT(DISTINCT admin_user_id) AS count FROM sgj_user_admin_login_log WHERE operate_type = 1 AND app_type = 3").Rows()
 	if err != nil {
 		return 0, err
 	}
@@ -413,7 +120,8 @@ func GetAdminUserTotalCount() (int64, error) {
 func GetRegistedOrgCount(from int64, to int64) (int64, error) {
 
 	var count int64
-	err := readUserDb.Model(&models.Org{}).Where("status <> 0 AND ctime >= ? AND ctime <= ? AND AND import <> 1", from, to).Count(&count).Error
+
+	err := readUserDb.Model(&models.Org{}).Where("status <> 0 AND ctime >= ? AND ctime <= ? AND  import <> 1", from, to).Count(&count).Error
 	if err != nil {
 		return 0, err
 	}
@@ -423,7 +131,11 @@ func GetRegistedOrgCount(from int64, to int64) (int64, error) {
 // 获取一段时间内的活跃机构数
 func GetActiveOrgCount(from int64, to int64) (int64, error) {
 	var count int64
-	rows, err := readDb.Raw("SELECT COUNT(DISTINCT user_org_id) AS count FROM  xt_dialysis_order where  created_time >= ? AND created_time <= ? AND status = 1 ", from, to).Rows()
+
+	db := readDb.Raw("SELECT COUNT(DISTINCT user_org_id) AS count FROM  xt_dialysis_order where  created_time >= ? AND created_time <= ? AND status = 1 ", from, to)
+	rows, err := db.Rows()
+	defer rows.Close()
+
 	if err != nil {
 		return 0, err
 	}
@@ -436,7 +148,11 @@ func GetActiveOrgCount(from int64, to int64) (int64, error) {
 // 获取所有活跃机构数
 func GetActiveOrgTotalCount() (int64, error) {
 	var count int64
-	rows, err := readDb.Raw("SELECT COUNT(DISTINCT user_org_id) AS count FROM sgj_xt.xt_dialysis_order Where status = 1").Rows()
+
+	db := readDb.Raw("SELECT COUNT(DISTINCT user_org_id) AS count FROM sgj_xt.xt_dialysis_order Where status = 1")
+	rows, err := db.Rows()
+	defer rows.Close()
+	//rows, err := readDb.Raw("SELECT COUNT(DISTINCT user_org_id) AS count FROM sgj_xt.xt_dialysis_order Where status = 1").Rows()
 	if err != nil {
 		return 0, err
 	}
@@ -608,7 +324,7 @@ func CreateAdmin(admin *admin_models.AdminAccount) (err error) {
 }
 
 func FindUserInfoByAccount(account string) (admin admin_models.AdminAccount, err error) {
-	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("account = ?", account).First(&admin).Error
+	err = readUserDb.Model(&admin_models.AdminAccount{}).Where("account = ? AND status = 1", account).First(&admin).Error
 	return
 }
 
@@ -717,13 +433,13 @@ func GetAllWaitFollowOrgList(keyword string, page int64, limit int64, id int64)
 	db := readUserDb
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
-		err = db.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 ) AND import <> 1 AND (sgj_user_org.org_name Like ? OR sgj_user_org.org_short_name Like ?)", id, likeKey, likeKey).Offset(offset).Limit(limit).Scan(&orgViewModel).Error
-		readUserDb.Raw("Select count(id) as count 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)  AND import <> 1 AND (sgj_user_org.org_name Like ? OR sgj_user_org.org_short_name Like ?)", id, likeKey, likeKey).Scan(&totals)
+		err = db.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 ) AND import <> 1 AND (sgj_user_org.org_name Like ? OR sgj_user_org.org_short_name Like ?) AND status = 1 ORDER BY sgj_user_org.ctime DESC", id, likeKey, likeKey).Offset(offset).Limit(limit).Scan(&orgViewModel).Error
+		readUserDb.Raw("Select count(id) as count 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)  AND import <> 1 AND (sgj_user_org.org_name Like ? OR sgj_user_org.org_short_name Like ?) AND status = 1", id, likeKey, likeKey).Scan(&totals)
 
 	} else {
-		db = db.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)  AND import <> 1", id)
+		db = db.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)  AND import <> 1 AND status = 1 ORDER BY sgj_user_org.ctime DESC", id)
 		err = db.Offset(offset).Limit(limit).Scan(&orgViewModel).Error
-		readUserDb.Raw("Select count(id) as count 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)  AND import <> 1", id).Scan(&totals)
+		readUserDb.Raw("Select count(id) as count 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)  AND import <> 1 AND status = 1", id).Scan(&totals)
 
 	}
 
@@ -743,8 +459,8 @@ func FindAllFollowOrg(keyword string, page int64, limit int64, admin_id int64) (
 		var rows *sql.Rows
 		var errs error
 		likeKey := "%" + keyword + "%"
-		rows, errs = 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 AND (org.org_name Like ? OR org.org_short_name Like ?) AND org.import <> 1 WHERE (follow.admin_user_id = ? AND follow.status = 1)", likeKey, likeKey, admin_id).Offset(offset).Limit(limit).Rows()
-		readUserDb.Raw("SELECT count(follow.id) as count FROM sgj_org_follow as follow join sgj_user_org as org on org.id = follow.org_id AND (org.org_name Like ? OR org.org_short_name Like ?) AND org.import <> 1  WHERE follow.admin_user_id = ? AND follow.status = 1", likeKey, likeKey, admin_id).Scan(&totals)
+		rows, errs = readUserDb.Raw("SELECT follow.*, org.org_name as org_name, org.ctime as time FROM sgj_org_follow as follow join sgj_user_org as org on org.id = follow.org_id AND (org.org_name Like ? OR org.org_short_name Like ?) AND org.import <> 1 AND org.status = 1  WHERE (follow.admin_user_id = ? AND follow.status = 1) ORDER BY time DESC", likeKey, likeKey, admin_id).Offset(offset).Limit(limit).Rows()
+		readUserDb.Raw("SELECT count(follow.id) as count FROM sgj_org_follow as follow join sgj_user_org as org on org.id = follow.org_id AND (org.org_name Like ? OR org.org_short_name Like ?) AND org.import <> 1 AND org.status = 1  WHERE follow.admin_user_id = ? AND follow.status = 1", likeKey, likeKey, admin_id).Scan(&totals)
 
 		defer rows.Close()
 		if errs != nil {
@@ -761,8 +477,8 @@ func FindAllFollowOrg(keyword string, page int64, limit int64, admin_id int64) (
 		var vms []*FollowViewModel = make([]*FollowViewModel, 0)
 		var rows *sql.Rows
 		var errs error
-		rows, errs = 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   AND org.import <> 1 WHERE follow.admin_user_id = ? AND follow.status = 1", admin_id).Offset(offset).Limit(limit).Rows()
-		readUserDb.Raw("SELECT count(follow.id) as count FROM sgj_org_follow as follow join sgj_user_org as org on org.id = follow.org_id  AND org.import <> 1  WHERE follow.admin_user_id = ? AND follow.status = 1", admin_id).Scan(&totals)
+		rows, errs = readUserDb.Raw("SELECT follow.*, org.org_name as org_name, org.ctime as time FROM sgj_org_follow as follow join sgj_user_org as org on org.id = follow.org_id   AND org.import <> 1  AND org.status = 1 WHERE follow.admin_user_id = ? AND follow.status = 1 ORDER BY time DESC", admin_id).Offset(offset).Limit(limit).Rows()
+		readUserDb.Raw("SELECT count(follow.id) as count FROM sgj_org_follow as follow join sgj_user_org as org on org.id = follow.org_id  AND org.import <> 1 AND org.status = 1  WHERE follow.admin_user_id = ? AND follow.status = 1", admin_id).Scan(&totals)
 
 		defer rows.Close()
 		if errs != nil {

service/db.go

@@ -63,35 +63,45 @@ func ConnectDB() {
 	wudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUser, writeUserPass, writeUserHost, writeUserPort, writeUserName)
 
 	readDb, err = gorm.Open("mysql", rdsn)
+
+	//defer readDb.Close()
 	if err != nil {
 		//beego.Error(err)
 	}
-	readDb.DB().SetMaxIdleConns(10)
-	readDb.DB().SetMaxOpenConns(100)
+	readDb.DB().SetMaxIdleConns(5)
+	readDb.DB().SetMaxOpenConns(20)
 	readDb.LogMode(true)
 
 	writeDb, err = gorm.Open("mysql", wdsn)
 	if err != nil {
 		//beego.Error(err)
 	}
-	writeDb.DB().SetMaxIdleConns(10)
-	writeDb.DB().SetMaxOpenConns(100)
+
+	//defer writeDb.Close()
+
+	writeDb.DB().SetMaxIdleConns(5)
+	writeDb.DB().SetMaxOpenConns(20)
 	writeDb.LogMode(true)
 
 	readUserDb, err = gorm.Open("mysql", rudsn)
 	if err != nil {
 		//beego.Error(err)
 	}
-	readUserDb.DB().SetMaxIdleConns(10)
-	readUserDb.DB().SetMaxOpenConns(100)
+
+	//defer readUserDb.Close()
+
+	readUserDb.DB().SetMaxIdleConns(5)
+	readUserDb.DB().SetMaxOpenConns(20)
 	readUserDb.LogMode(true)
 
 	writeUserDb, err = gorm.Open("mysql", wudsn)
 	if err != nil {
 		//beego.Error(err)
 	}
-	writeUserDb.DB().SetMaxIdleConns(10)
-	writeUserDb.DB().SetMaxOpenConns(100)
+	//defer writeUserDb.Close()
+
+	writeUserDb.DB().SetMaxIdleConns(5)
+	writeUserDb.DB().SetMaxOpenConns(20)
 	writeUserDb.LogMode(true)
 
 }

service/function_service.go

@@ -12,6 +12,7 @@ func GetTodayInfo(to int64, ctime int64, page int64, limit int64) (patientinfo [
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id left join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ?  GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
 	fmt.Println("rows是什么", rows)
+	defer rows.Close()
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -25,6 +26,8 @@ func GetTodayDialysisPatientsInfo(to int64, ctime int64, page int64, limit int64
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -38,6 +41,8 @@ func GetTodayReceivePatientsInfo(to int64, ctime int64, page int64, limit int64)
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -50,6 +55,8 @@ func GetTodayBeforDislysisInfo(to int64, ctime int64, page int64, limit int64) (
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -63,6 +70,8 @@ func GetTodayDoctorsOrderInfo(to int64, ctime int64, page int64, limit int64) (p
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -76,6 +85,8 @@ func GetTodayDoubleCheckInfo(to int64, ctime int64, page int64, limit int64) (pa
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_double_check as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -89,6 +100,8 @@ func GetTodayDialysisMachinek(to int64, ctime int64, page int64, limit int64) (p
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -102,6 +115,8 @@ func GetTodayDialysisExamination(to int64, ctime int64, page int64, limit int64)
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -115,6 +130,8 @@ func GetTodayBeforOrpenetration(to int64, ctime int64, page int64, limit int64)
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -127,6 +144,8 @@ func GetTodayPostAssessment(to int64, ctime int64, page int64, limit int64) (pat
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u left join sgj_org_follow as f On f.org_id = u.id left JoIN sgj_admin as a On a.id = f.admin_user_id 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 <= ? GROUP BY x.user_org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -138,6 +157,8 @@ func GetTodayEntrylist(to int64, ctime int64, limit int64, page int64) (patienti
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  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  LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id  where x.ctime >= ? AND x.ctime<= ? GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse as x on x.org_id = u.id where x.ctime >= ? AND x.ctime <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}
@@ -149,6 +170,8 @@ func GetTodayExitlist(to int64, ctime int64, limit int64, page int64) (patientin
 	offset := (page - 1) * limit
 	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  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  LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id  where x.ctime >= ? AND x.ctime<= ? GROUP BY x.org_id", to, ctime).Scan(&patientinfo).Error
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse_out as x on x.org_id = u.id where x.ctime >= ? AND x.ctime <= ?", to, ctime).Rows()
+	defer rows.Close()
+
 	if rows.Next() {
 		rows.Scan(&total)
 	}

service/org_service.go

@@ -9,7 +9,10 @@ import (
 	"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, is_super_admin int64) (list []*models.Org, err error, total int64) {
+	fmt.Println("--------- ")
+
+	fmt.Println(follow)
 	offset := (page - 1) * limit
 	fmt.Println(offset)
 	db := readUserDb.Model(&models.Org{})
@@ -80,11 +83,19 @@ func GetAllOrgList(active_status int64, depth_active_status int64, start_time in
 		}
 
 	}
-	err = db.Where("sgj_user_org.status = 1 AND sgj_user_org.import <> 1").Preload("OrgFollow", func(db *gorm.DB) *gorm.DB {
+	if is_super_admin == 1 {
+		db = db.Where("sgj_user_org.status = 1 AND sgj_user_org.import <> 1").Group("sgj_user_org.id")
+
+	} else {
+		db = db.Where("sgj_user_org.status = 1 AND sgj_user_org.import <> 1 AND DATE_SUB(CURDATE(), INTERVAL 15 DAY) <= date(from_unixtime(sgj_user_org.ctime))").Group("sgj_user_org.id")
+	}
+
+	db = db.Count(&total)
+	err = db.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
+	}).Preload("Citys").Offset(offset).Limit(limit).Order("sgj_user_org.ctime DESC").Find(&list).Error
 	return
 }
 
@@ -112,6 +123,7 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to 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()
+		defer rows.Close()
 		if err != nil {
 			return 0, err
 		}
@@ -121,6 +133,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -130,6 +144,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -139,6 +155,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -148,6 +166,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -157,6 +177,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -166,6 +188,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -176,6 +200,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 
 	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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -185,6 +211,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -194,6 +222,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -203,6 +233,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -212,6 +244,8 @@ func GetOrgDialysisCount(statices_type int64, org_id int64, from int64, to int64
 		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()
+		defer rows.Close()
+
 		if err != nil {
 			return 0, err
 		}
@@ -574,25 +608,6 @@ func GetRoles(orgID int64, appID int64, page int, count int) ([]*models.Role, in
 	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"`
@@ -629,12 +644,6 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int64, count int64
 		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
@@ -680,33 +689,3 @@ func GetAllValidDeviceNumbers(orgID int64) ([]*DeviceNumberViewModel, error) {
 	}
 	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
-//
-//
-//}