Merge branch 'xt_statistics_branch' of http://git.shengws.com/csx/XT_New into xt_statistics_branch

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -370,14 +370,17 @@ func (this *CommonApiController) GetTotalLapseCount() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	startime, _ := this.GetInt64("startime")
-	fmt.Println("startime--", startime)
+	fmt.Println("startime", startime)
 	endtime, _ := this.GetInt64("endtime")
-	fmt.Println("endtime--", endtime)
+	fmt.Println("endtime", endtime)
 
 	//统计一个月内转出的病人
-	patients, total, err := service.GetTotalRollOut(startime, endtime, orgid)
+	//patients, total, err := service.GetTotalRollOut(startime, endtime, orgid)
+	//统计该机构的转出人数
+	patients, total, err := service.GetTotalRollOutPatients(orgid)
 	//统计总共病人
-	_, count, _ := service.GetPatientTotalCountTwo(orgid, startime, endtime)
+	//	_, count, _ := service.GetPatientTotalCountTwo(orgid, startime, endtime)
+	count := service.GetPatientTotalCount(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -397,10 +400,8 @@ func (this *CommonApiController) GetTotalSexCount() {
 	fmt.Println("开始时间", startime)
 	endtime, _ := this.GetInt64("endtime")
 	fmt.Println("结束时间", endtime)
-	//统计这个月透析病人的总数
-	_, total, err := service.GetPatientTotalCountTwo(orgid, startime, endtime)
-	//统计改月男病人的总数
-	_, totalSex, err := service.GetManPatientTotalCount(orgid, startime, endtime)
+	total := service.GetPatientTotalCount(orgid)
+	_, totalSex, err := service.GetManPatientTotal(orgid)
 
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -420,20 +421,20 @@ func (this *CommonApiController) GetTotalInfectiouscount() {
 	fmt.Println("开始时间", startime)
 	endtime, _ := this.GetInt64("endtime")
 	fmt.Println("结束时间", endtime)
-	//统计本月透析总人数
-	_, total, err := service.GetPatientTotalCountTwo(orgid, startime, endtime)
-	fmt.Println("err--", err)
-	fmt.Println("total", total)
-	//统计本月透析人数传染病所占比例
-	count, err := service.GetPatientInfectiousCount(orgid, startime, endtime)
-	fmt.Println("报错-------------", count)
+	//统计透析总人数
+	total := service.GetPatientTotalCount(orgid)
+	//统计透析人数传染病所占比例
+	count, err := service.GetPatientInfectiousCount(orgid)
+	//统计其他
+	_, otherTotal, err := service.GetPatientOtherInfectious(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total": total,
-		"count": count,
+		"total":      total,
+		"count":      count,
+		"otherTotal": otherTotal,
 	})
 }
 
@@ -445,11 +446,9 @@ func (this *CommonApiController) GetTotalAgeCount() {
 	fmt.Println("开始时间", startime)
 	endtime, _ := this.GetInt64("endtime")
 	fmt.Println("结束时间", endtime)
-	//统计本月透析总人数
-	_, total, err := service.GetPatientTotalCountTwo(orgid, startime, endtime)
-	fmt.Println("err--", err)
-	fmt.Println("total", total)
-	agecount, err := service.GetTotalAgeCount(orgid, startime, endtime)
+	//统计透析总人数
+	total := service.GetPatientTotalCount(orgid)
+	agecount, err := service.GetTotalAgeCount(orgid)
 	//two, err := service.GetTotalAgeCountTwo(orgid, startime, endtime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -469,4 +468,18 @@ func (this *CommonApiController) GetTotalDialysisCount() {
 	fmt.Println(startime)
 	endtime, _ := this.GetInt64("endtime")
 	fmt.Println(endtime)
+	//统计透析总人数
+	total := service.GetPatientTotalCount(orgid)
+	fmt.Println("total--------------", total)
+	//获取该机构下的所有病人数据
+	patients, err := service.GetTotalDialysisAgeCount(orgid)
+	fmt.Println("patients--------", patients)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":    total,
+		"patients": patients,
+	})
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -0,0 +1,125 @@
+package new_mobile_api_controllers
+
+import (
+	"XT_New/controllers/mobile_api_controllers"
+	"XT_New/enums"
+	"XT_New/service"
+	"fmt"
+	"time"
+)
+
+type NewCommonApiController struct {
+	mobile_api_controllers.MobileBaseAPIAuthController
+}
+
+func (this *NewCommonApiController) GetTotalDialysis() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime := this.GetString("startime")
+	fmt.Println("开始时间", startime)
+	endtime := this.GetString("endtime")
+	fmt.Println("结束时间", endtime)
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startimes := startTimes.Unix()
+	fmt.Println("startime", startimes)
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 00:00:00", loc)
+	endtimeData := endtimes.Unix()
+	fmt.Println("结束日期", endtimeData)
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	fmt.Println("机构ID", orgid)
+	//统计透析总量
+	_, total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid)
+
+	modeType, err := service.GetDialysisCountMode(startimes, endtimeData, orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":    total,
+		"modetype": modeType,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileTotalLapseCount() {
+	startime, _ := this.GetInt64("startime")
+	fmt.Println("startime", startime)
+	endtime, _ := this.GetInt64("endtime")
+	fmt.Println("endtime", endtime)
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	_, total, err := service.GetTotalRollOutPatients(orgid)
+	count := service.GetPatientTotalCount(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total": total,
+		"count": count,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileTotalSexCount() {
+	startime, _ := this.GetInt64("startime")
+	fmt.Println("startime", startime)
+	endtime, _ := this.GetInt64("endtime")
+	fmt.Println("endtime", endtime)
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	total := service.GetPatientTotalCount(orgid)
+	_, totalSex, err := service.GetManPatientTotal(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":    total,
+		"totalSex": totalSex,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileTotalInfectiousCout() {
+	startime, _ := this.GetInt64("startime")
+	fmt.Println("startime", startime)
+	endtime, _ := this.GetInt64("endtime")
+	fmt.Println("endtime", endtime)
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	//统计透析总人数
+	total := service.GetPatientTotalCount(orgid)
+	//统计透析人数传染病所占比例
+	count, err := service.GetPatientInfectiousCount(orgid)
+	//统计其他
+	_, otherTotal, err := service.GetPatientOtherInfectious(orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":      total,
+		"count":      count,
+		"otherTotal": otherTotal,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileTotalAgeCount() {
+	startime, _ := this.GetInt64("startime")
+	fmt.Println("开始时间", startime)
+	endtime, _ := this.GetInt64("endtime")
+	fmt.Println("结束时间", endtime)
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	total := service.GetPatientTotalCount(orgid)
+	agecount, err := service.GetTotalAgeCount(orgid)
+	//two, err := service.GetTotalAgeCountTwo(orgid, startime, endtime)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"total":    total,
+		"ageCount": agecount,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -0,0 +1,12 @@
+package new_mobile_api_controllers
+
+import "github.com/astaxie/beego"
+
+func NewCommonApiControllersRegisterRouters() {
+
+	beego.Router("/m/api/gettotaldialysis", &NewCommonApiController{}, "Get:GetTotalDialysis")
+	beego.Router("/m/api/getmobiletotallapsecount", &NewCommonApiController{}, "Get:GetMobileTotalLapseCount")
+	beego.Router("/m/api/getmobiletotalsexcount", &NewCommonApiController{}, "Get:GetMobileTotalSexCount")
+	beego.Router("/m/api/getmobiletotalinfectiouscount", &NewCommonApiController{}, "Get:GetMobileTotalInfectiousCout")
+	beego.Router("/m/api/getmobiletotalagecount", &NewCommonApiController{}, "Get:GetMobileTotalAgeCount")
+}

routers/router.go

@@ -57,6 +57,7 @@ func init() {
 
 	//admin_api.AdminAPIControllersRegisterRouters()
 	new_m_api.CommonApiControllersRegisterRouters()
+	new_m_api.NewCommonApiControllersRegisterRouters()
 	controllers.ManageRouters()
 	//controllers.PatientRouters()
 }

service/common_service.go

@@ -179,6 +179,12 @@ func GetTotalRollOut(starttime int64, endtime int64, orgid int64) (counts []*mod
 	return counts, total, err
 }
 
+func GetTotalRollOutPatients(orgid int64) (patients []*models.XtPatients, total int64, err error) {
+
+	err = XTReadDB().Model(&patients).Where("user_org_id = ? and status = 1 and lapseto = 2", orgid).Count(&total).Find(&patients).Error
+	return patients, total, err
+}
+
 func GetPatientTotalCount(orgID int64) (total int64) {
 	readDb.Model(&models.XtPatients{}).Where("user_org_id=? and status=1", orgID).Count(&total)
 	return
@@ -200,12 +206,30 @@ func GetManPatientTotalCount(orgid int64, starttime int64, endtime int64) (dialy
 
 }
 
-func GetPatientInfectiousCount(orgid int64, starttime int64, endtime int64) (counts []*models.PatientContagionsCountStruct, err error) {
-	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_dialysis_order as o on o.patient_id = x.patient_id").Joins("join xt_patients as s on s.id = x.patient_id").Where("o.user_org_id = ? and o.status =1 and o.dialysis_date>=? and o.dialysis_date <=? and x.status =1 and s.is_infectious = 2", orgid, starttime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+func GetManPatientTotal(orgid int64) (patients []*models.XtPatients, total int64, err error) {
+
+	err = XTReadDB().Model(&patients).Where("user_org_id = ? and status = 1 and gender = 1", orgid).Count(&total).Find(&patients).Error
+	return patients, total, err
+}
+
+//func GetPatientInfectiousCount(orgid int64, starttime int64, endtime int64) (counts []*models.PatientContagionsCountStruct, err error) {
+//	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_dialysis_order as o on o.patient_id = x.patient_id").Joins("join xt_patients as s on s.id = x.patient_id").Where("o.user_org_id = ? and o.status =1 and o.dialysis_date>=? and o.dialysis_date <=? and x.status =1 and s.is_infectious = 2", orgid, starttime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+//	return counts, err
+//}
+
+func GetPatientInfectiousCount(orgid int64) (counts []*models.PatientContagionsCountStruct, err error) {
+
+	err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.is_infectious = 2", orgid).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	return counts, err
 }
 
-func GetTotalAgeCount(orgid int64, starttime int64, endtime int64) (counts []*models.PatientAgeCountStruct, err error) {
+func GetPatientOtherInfectious(orgid int64) (patients []*models.XtPatients, total int64, err error) {
+
+	err = XTReadDB().Model(&patients).Where("user_org_id = ? and status = 1 and is_infectious = 1", orgid).Count(&total).Find(&patients).Error
+	return patients, total, err
+}
+
+func GetTotalAgeCount(orgid int64) (counts []*models.PatientAgeCountStruct, err error) {
 
 	readDb.Raw(`SELECT nnd AS 'age',COUNT(*) AS 'count' FROM(
 	 SELECT
@@ -217,8 +241,8 @@ func GetTotalAgeCount(orgid int64, starttime int64, endtime int64) (counts []*mo
 	  WHEN (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )>80 AND (YEAR(NOW())-DATE_FORMAT(DATE_ADD(FROM_UNIXTIME(0), INTERVAL birthday SECOND),'%Y')-1) + ( FROM_UNIXTIME(birthday, '%m%d') <= DATE_FORMAT(NOW(), '%m%d') )<=150 THEN '150'
 	  ELSE '-1'
 	 END
-	 AS nnd FROM xt_patients as s  left join xt_dialysis_order as o on o.patient_id = s.id where s.user_org_id=? and s.status=1 and o.dialysis_date>= ? and o.dialysis_date<=?
-	 )a GROUP BY nnd`, orgid, starttime, endtime).Scan(&counts)
+	 AS nnd FROM xt_patients as s  where s.user_org_id=? and s.status=1
+	 )a GROUP BY nnd`, orgid).Scan(&counts)
 	return
 
 }
@@ -233,3 +257,9 @@ func GetTotalAgeCountTwo(orgid int64, starttime int64, endtime int64) (counts []
        )a GROUP BY nnd`, orgid, starttime, endtime).Scan(&counts)
 	return
 }
+
+func GetTotalDialysisAgeCount(orgid int64) (patients []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status =1", orgid).Find(&patients).Error
+	return patients, err
+}