修改活跃机构统计

controllers/admin_api_controllers/admin_api_router_register.go

@@ -47,6 +47,8 @@ func AdminAPIControllersRegisterRouters() {
 
 	beego.Router("/admin/api/org/list", &OrgAPIController{}, "get:GetOrgListOther")
 
+	beego.Router("/admin/api/activeorg/list", &OrgAPIController{}, "get:GetActiveOrgList")
+
 	//beego.Router("/admin/api/unfolloworg/list", &SystemApiController{}, "get:GetAllFollowOrg")
 
 }

controllers/admin_api_controllers/org_api_controller.go

@@ -335,3 +335,30 @@ func (this *OrgAPIController) GetOrgListOther() {
 		})
 	}
 }
+
+func (this *OrgAPIController) GetActiveOrgList() {
+	range_data := this.GetString("range_data")
+	var rangeDate *time.Time
+	var parseDateErr error
+	var rangeTimeStamp int64
+
+	if len(range_data) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			return
+		}
+		rangeTimeStamp = rangeDate.Unix()
+	} else {
+		rangeTimeStamp = 0
+	}
+	now := time.Now().Unix()
+	list, err := service.GetActiveOrgList(rangeTimeStamp, now)
+	if err != nil {
+	} else {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	}
+
+}

service/admin_service.go

@@ -130,36 +130,22 @@ func GetRegistedOrgCount(from int64, to int64) (int64, error) {
 
 // 获取一段时间内的活跃机构数
 func GetActiveOrgCount(from int64, to int64) (int64, error) {
-	var count int64
-
-	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()
+	var org []*Org
+	//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 ctime >= ? AND ctime <= ?  Group by log.org_id", from, to).Scan(&org)
+	readUserDb.Raw("Select org_id  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 ctime >= ? AND ctime <= ?   Group by log.org_id", from, to).Scan(&org)
+	return int64(len(org)), nil
+}
 
-	if err != nil {
-		return 0, err
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
+type Org struct {
+	OrgId int64
 }
 
 // 获取所有活跃机构数
 func GetActiveOrgTotalCount() (int64, error) {
-	var count int64
-
-	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
-	}
-	if rows.Next() {
-		rows.Scan(&count)
-	}
-	return count, nil
+	var org []*Org
+	readUserDb.Raw("Select org_id  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  Group by log.org_id").Scan(&org)
+	fmt.Println(org)
+	return int64(len(org)), nil
 }
 
 //获取昨天的注册机构总量
@@ -170,7 +156,7 @@ func GetYesterDayRegistedOrgCount() (weekStatistics []*admin_models.Statistics,
 
 //获取近昨天的的机构活跃总量
 func GetYesterDayActiveOrgCount() (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 1 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 1 DAY) = date(from_unixtime(ctime))  Group by date(from_unixtime(ctime))")
 	err = db.Scan(&weekStatistics).Error
 	return
 }
@@ -200,7 +186,9 @@ func GetWeekRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err e
 
 //获取近七天每天的机构活跃总量
 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 := 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))")
+
 	err = db.Scan(&weekStatistics).Error
 	return
 }
@@ -225,7 +213,7 @@ func GetMonthRegistedOrgCount() (weekStatistics []*admin_models.Statistics, err
 
 //获取近30天每天的机构活跃总量
 func GetMonthActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
-	err = 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 30 DAY) <= date(from_unixtime(created_time)) AND status = 1 GROUP BY date(from_unixtime(created_time));").Scan(&weekStatistics).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
 }
 
@@ -255,7 +243,7 @@ func GetThreeMonthActiveAdminUserCount() (weekStatistics []*admin_models.Statist
 
 //获取近3个月每个月的机构活跃总量
 func GetThreeMonthActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
-	err = readDb.Raw("select DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times,count(DISTINCT(user_org_id)) as count From  xt_dialysis_order  where  DATE_FORMAT(date(from_unixtime(created_time)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 3 month),'%Y-%m') AND status = 1  group by times").Scan(&weekStatistics).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
 }
 
@@ -279,7 +267,7 @@ func GetSixMonthActiveAdminUserCount() (weekStatistics []*admin_models.Statistic
 
 //获取近半年每个月的机构活跃总量
 func GetSixMonthActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
-	err = readDb.Raw("select DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times,count(DISTINCT(user_org_id)) as count From  xt_dialysis_order  where  DATE_FORMAT(date(from_unixtime(created_time)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 6 month),'%Y-%m') AND status = 1  group by times").Scan(&weekStatistics).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
 }
 
@@ -303,7 +291,7 @@ func GetYearActiveAdminUserCount() (weekStatistics []*admin_models.Statistics, e
 
 //获取近1年每个月的机构活跃总量
 func GetYearActiveOrgCount() (weekStatistics []*admin_models.Statistics, err error) {
-	err = readDb.Raw("select DATE_FORMAT(date(from_unixtime(created_time)) ,'%Y-%m') as times,count(DISTINCT(user_org_id)) as count From  xt_dialysis_order  where  DATE_FORMAT(date(from_unixtime(created_time)),'%Y-%m')>=DATE_FORMAT(date_sub(curdate(), interval 12 month),'%Y-%m') AND status = 1  group by times").Scan(&weekStatistics).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
 }
 

service/org_service.go

@@ -700,3 +700,15 @@ func GetFollowOrgList(follow int64) (list []*models.Org, err error) {
 	return
 
 }
+
+type ActiveOrg struct {
+	OrgId   int64  `gorm:"org_id" json:"org_id"`
+	OrgName string `gorm:"org_name" json:"org_name"`
+}
+
+func GetActiveOrgList(from int64, to int64) (list []*ActiveOrg, err error) {
+	err = readUserDb.Raw("Select a.org_id as org_id, org.org_name as org_name from (Select org_id  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 ctime >= ? AND ctime <= ?  Group by log.org_id) a JOIN sgj_users.sgj_user_org org On a.org_id = org.id", from, to).Scan(&list).Error
+
+	return
+
+}