患者检验检查统计开发

controllers/base_api_controller.go

@@ -79,7 +79,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 7957
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -89,7 +89,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 7957
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 7957
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 7957
+		adminUserInfo.CurrentOrgId = 9841
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

service/common_service.go

@@ -758,7 +758,7 @@ func GetNormDataByOrgId(orgid int64) (standard []*models.QualityControlStandard,
 	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,x.range_value,x.range_type").
+	err = db.Order("x.sort asc,x.created_time asc").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
 }
@@ -772,7 +772,7 @@ func GetNormData(orgid int64) (standard []*models.QualityControlStandard, err er
 	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 asc").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").
 		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Scan(&standard).Error
 	return standard, err
 }
@@ -822,7 +822,7 @@ func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto in
 	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 and r.range_type = 1", orgid)
+		db = db.Where("x.org_id = ? and x.inspect_value+0 <> 0 and r.range_type = 1 and q.user_org_id = ?", orgid, orgid)
 	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)
@@ -850,7 +850,7 @@ func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto
 	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)
+		db = db.Where("x.org_id = ?  and r.range_type = 2 and q.user_org_id = ? and x.inspect_value <>''", orgid, orgid)
 	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)