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

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9841
+		subscibe.OrgId = 7957
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9841
+		adminUserInfo.CurrentOrgId = 7957
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9841
+		subscibe.OrgId = 7957
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9841
+		adminUserInfo.CurrentOrgId = 7957
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/new_mobile_api_controllers/common_api_controller.go

 	adminInfo := this.GetAdminUserInfo()
 	orgid := adminInfo.CurrentOrgId
 	major, err := service.GetInspectionMajor(orgid)
-	fmt.Println("major====================================", major)
+
 	if len(major) == 0 {
 		major, _ := service.GetInspectionMajor(0)
 		if err != nil {
 	sort := dataBody["sort"].(string)
 	sorts, err := strconv.ParseInt(sort, 10, 64)
 	fmt.Println("sort", sort)
-
+	checktype := int64(dataBody["check_type"].(float64))
+	fmt.Println("检查类型", checktype)
+	rangvalue := dataBody["range_value"].(string)
+	fmt.Println("rangvalue", rangvalue)
+	if rangvalue == "0" {
+		rangvalue = ""
+	}
 	_, errcode := service.GetConfigurationById(inspectionmajor, inspectionMinor, orgid)
 	if errcode == gorm.ErrRecordNotFound {
 		standard := models.XtQualityControlStandard{
 			Sort:            sorts,
 			UserOrgId:       orgid,
 			Status:          1,
+			RangeType:       checktype,
+			RangeValue:      rangvalue,
 			CreatedTime:     time.Now().Unix(),
 		}
 		fmt.Println(standard)
 	fmt.Println("largerange", largerange)
 	sort := int64(dataBody["sort"].(float64))
 	fmt.Println("排序", sort)
+	rangvalue := dataBody["range_value"].(string)
+	fmt.Println("范围", rangvalue)
+	if rangvalue == "0" {
+		rangvalue = ""
+	}
+	rangtype := int64(dataBody["check_type"].(float64))
 	adminInfo := this.GetAdminUserInfo()
 	orgId := adminInfo.CurrentOrgId
 	configuration, err := service.GetConfigurationByIdTwo(inspectionmajor, inspectionMinor, orgId)
 		MinRange:        minrange,
 		LargeRange:      largerange,
 		Sort:            sort,
+		RangeValue:      rangvalue,
+		RangeType:       rangtype,
 	}
 	err = service.UpdarteConfiguration(&standard, id)
 	if err != nil {
 }
 
 func (this *CommonApiController) GetTotalLapseCount() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	startime, _ := this.GetInt64("startime")
-	fmt.Println("startime", startime)
-	endtime, _ := this.GetInt64("endtime")
-	fmt.Println("endtime", endtime)
-
+	startime := this.GetString("startime")
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startnunix := startTimes.Unix()
+	//fmt.Println("开始时间==========",startnunix)
+	endtime := this.GetString("endtime")
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
+	endunix := endtimes.Unix()
+	//fmt.Println("结束日期========",endunix)
 	//统计一个月内转出的病人
 	//patients, total, err := service.GetTotalRollOut(startime, endtime, orgid)
 	//统计该机构的转出人数
-	patients, err := service.GetTotalRollOutPatients(orgid, startime, endtime)
+	patients, err := service.GetTotalRollOutPatients(orgid, startnunix, endunix)
 	//统计该机构转出病人
-	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startime, endtime)
+	patienttwo, err := service.GetTotalRollOutPatientsTwo(orgid, startnunix, endunix)
 	//统计总共病人
 	//	_, count, _ := service.GetPatientTotalCountTwo(orgid, startime, endtime)
 	count := service.GetPatientTotalCount(orgid)
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	fmt.Println("orgid", orgid)
-	startime, _ := this.GetInt64("startime")
-	fmt.Println("开始时间", startime)
-	endtime, _ := this.GetInt64("endtime")
-	fmt.Println("结束时间", endtime)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime := this.GetString("startime")
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startnunix := startTimes.Unix()
+	endtime := this.GetString("endtime")
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
+	endunix := endtimes.Unix()
 	//统计透析总人数
 	total := service.GetPatientTotalCount(orgid)
 	//统计透析人数传染病所占比例
-	count, err := service.GetPatientInfectiousCount(orgid, startime, endtime)
+	count, err := service.GetPatientInfectiousCount(orgid, startnunix, endunix)
 	//统计其他
 	_, otherTotal, err := service.GetPatientOtherInfectious(orgid)
 	if err != nil {
 	fmt.Println("limit", limit)
 	adminUser := this.GetAdminUserInfo()
 	orgId := adminUser.CurrentOrgId
-
+	count, _ := service.TotalDialysisCount(statime, entime, orgId)
 	dialysislist, total, err := service.GetDialysisList(statime, entime, page, limit, orgId)
 	prescriptionList, _ := service.GetAllDialysisList(statime, entime, orgId)
 	list, totallist, _ := service.GetDialysisPatientList(statime, entime, page, limit, orgId)
 		"list":             list,
 		"totallist":        totallist,
 		"prescriptionList": prescriptionList,
+		"count":            count,
 	})
 }
 
 	fmt.Println("结束日期", entime)
 	//group, parseDateErr := service.GetItemNameGroup(orgid, statime, entime)
 	//quarter, err := service.GetFirstQuarter(orgid, statime, entime)
+	//统计数值类型的数据
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
+	//统计rang_type== 2
+	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"count": count,
+		"count":   count,
+		"countwo": countwo,
 	})
 }
 
 	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
 	fourQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
 	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
-	fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
+	//fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
+	rangetype, parseDateErr := this.GetInt64("range_type")
 	//按季度统计
-	if itemtype == 1 {
+	if rangetype == 1 {
 		//统计总共
 		list, err := service.GetProjectList(orgid, lapseto, modetype, statime, entime, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		//统计达标个数
 		standList, err := service.GetProjectStandList(orgid, lapseto, modetype, statime, entime, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return

models/common_models.go

 	CreatedTime     int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime     int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	LargeRange      string `gorm:"column:large_range" json:"large_range" form:"large_range"`
+	RangeType       int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeValue      string `gorm:"column:range_value" json:"range_value" form:"range_value"`
 	Unit            string `gorm:"column:unit" json:"unit" form:"unit"`
 	ProjectName     string `gorm:"column:project_name" json:"project_name" form:"project_name"`
 	ItemName        string `gorm:"column:item_name" json:"item_name" form:"item_name"`
 	CreatedTime     int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime     int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	LargeRange      string `gorm:"column:large_range" json:"large_range" form:"large_range"`
+	RangeType       int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
+	RangeValue      string `gorm:"column:range_value" json:"range_value" form:"range_value"`
 }
 
 func (XtQualityControlStandard) TableName() string {
 	ItemId int64 `gorm:"column:item_id" json:"item_id" form:"item_id"`
 	Total  int64
 	Count  int64
+	Sort   int64 `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 type VmPatientInspection struct {
 }
 
 type ProjectCountOne struct {
-	Total   string
-	Count   int64
-	NoCount int64
+	Total      string
+	Count      int64
+	NoCount    int64
+	MinRange   string `gorm:"column:min_range" json:"min_range" form:"min_range"`
+	LargeRange string `gorm:"column:large_range" json:"large_range" form:"large_range"`
 }
 
 type ProjectCount struct {
 	return "xt_inspection"
 }
 
+type BloodDialysisOrderCount struct {
+	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Count     int64
+}
+
 type BloodDialysisOrder struct {
 	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
 	DialysisDate       int64  `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`

service/common_service.go

 
 func GetInspectionMajor(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
-	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1 and range_type = 1", orgid).Group("project_name").Order("id asc").Find(&inspection).Error
+	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1", orgid).Group("project_name").Order("id asc").Find(&inspection).Error
 	return inspection, err
 }
 
 
 func UpdarteConfiguration(st *models.XtQualityControlStandard, id int64) error {
 
-	err := XTWriteDB().Model(&st).Where("id = ?", id).Updates(map[string]interface{}{"inspection_major": st.InspectionMajor, "inspection_minor": st.InspectionMinor, "min_range": st.MinRange, "large_range": st.LargeRange, "sort": st.Sort, "updated_time": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(&st).Where("id = ?", id).Updates(map[string]interface{}{"inspection_major": st.InspectionMajor, "inspection_minor": st.InspectionMinor, "min_range": st.MinRange, "large_range": st.LargeRange, "sort": st.Sort, "range_value": st.RangeValue, "range_type": st.RangeType, "updated_time": time.Now().Unix()}).Error
 	return err
 }
 
 	return patients, err
 }
 
+func TotalDialysisCount(startime int64, endtime int64, orgid int64) (order []*models.BloodDialysisOrderCount, err error) {
+
+	db := XTReadDB().Table("xt_dialysis_order as o")
+
+	err = db.Raw("select count(o.id) as count,o.patient_id from xt_dialysis_order as o where o.status = 1 and o.dialysis_date>=? and o.dialysis_date<=? and o.user_org_id = ?", startime, endtime, orgid).Group("o.patient_id").Scan(&order).Error
+	return order, err
+}
+
 func GetDialysisList(startime int64, endtime int64, page int64, limit int64, orgid int64) (order []*models.BloodDialysisOrder, total int64, err error) {
 
 	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status = 1")
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
 
-	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name,x.range_value,x.range_type").
 		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Scan(&standard).Error
 	return standard, err
 }
 	fmt.Println(table)
 	d := XTReadDB().Table("xt_patients as s")
 	fmt.Println(d)
-	//d2 := XTReadDB().Table("xt_quality_control_standard as p")
-	//fmt.Println(d2)
+	q := XTReadDB().Table("x.xt_quality_control_standard as q")
+	fmt.Println(q)
 	if orgid > 0 {
-		db = db.Where("x.org_id = ? and x.inspect_value <> 0", orgid)
+		db = db.Where("x.org_id = ? and x.inspect_value <> 0 and r.range_type = 1", orgid)
 	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)
 	if lapseto > 0 {
 		db = db.Where("s.lapseto = ?", lapseto)
 	}
-	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_patients as  s on s.id = x.patient_id").Scan(&inspection).Error
+	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=q.min_range+0 and x.inspect_value +0 <= q.large_range+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_patients as  s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto int64) (inspection []*models.VmPatientInspectionTwo, err error) {
+
+	db := XTReadDB().Table("xt_inspection as x ").Where("x.status = 1")
+	table := XTReadDB().Table("xt_inspection_reference as r")
+	fmt.Println(table)
+	d := XTReadDB().Table("xt_patients as s")
+	fmt.Println(d)
+	q := XTReadDB().Table("x.xt_quality_control_standard as q")
+	fmt.Println(q)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?  and r.range_type = 2", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", endtime)
+	}
+	if lapseto == 0 {
+		db = db.Where("s.lapseto = 1 or s.lapseto = 2")
+	}
+	if lapseto > 0 {
+		db = db.Where("s.lapseto = ?", lapseto)
+	}
+	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when q.range_value = x.inspect_value and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_patients as  s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
 
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第三季度'" +
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第四季度'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2)"
+			"END AS nnd FROM xt_inspection as x  left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and x.inspect_value <> 0"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, firststart)
 		countParams = append(countParams, firstend)
 		fmt.Println("d", d)
 		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
 		table := XTReadDB().Table("xt_inspection_reference as r")
+		//q := XTReadDB().Table("xt_quality_control_standard as q")
+		//fmt.Println("q",q)
 		fmt.Println(table)
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '第一季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第二季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <=  r.range_max+0 THEN '第二季度'" +
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第三季度'" +
 			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第四季度'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value + 0 >= r.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+			"END AS nnd FROM xt_inspection as x  left join xt_inspection_reference as  r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0) left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value + 0 >= r.range_min + 0 AND x.inspect_value + 0 <= range_max+0)"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, firststart)
 		countParams = append(countParams, firstend)