Merge branch 'xt_statistics_branch'

service/statistics_service/index_evaluation_service.go

@@ -667,7 +667,7 @@ func GetDialysisWeightTableData(orgID, patientID int64, page, limit, start, end
 	if end != 0 {
 		db = db.Where("assessment_date<=?", end)
 	}
-	db = db.Preload("VMAssessmentAfterDislysis", "status = 1").Preload("VMPatients", "status = 1 AND user_org_id = ?", orgID)
+	db = db.Preload("VMAssessmentAfterDislysis", "status = 1 AND user_org_id = ?", orgID).Preload("VMPatients", "status = 1 AND user_org_id = ?", orgID)
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("assessment_date desc").Select("dry_weight, weight_before, patient_id, assessment_date").Find(&orders).Error
 
 	for _, item := range orders {
@@ -972,13 +972,13 @@ func GetBloodPressureTableData(orgID, patientID int64, page, limit, start, end i
 	if end != 0 {
 		db = db.Where("sch.created_time<=?", end)
 	}
-	db = db.Preload("VMPredialysisEvaluation", "status = 1").
-		Preload("VMAssessmentAfterDislysis", "status = 1").
+	db = db.Preload("VMPredialysisEvaluation", "status = 1 AND user_org_id = ?", orgID).
+		Preload("VMAssessmentAfterDislysis", "status = 1 AND user_org_id = ?", orgID).
 		Preload("VMMinMonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1").Order("systolic_blood_pressure DESC")
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("systolic_blood_pressure DESC")
 		}).
 		Preload("VMMaxMonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1").Order("systolic_blood_pressure ASC")
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("systolic_blood_pressure ASC")
 		}).
 		Preload("VMPatients", "status = 1 AND user_org_id = ?", orgID)
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("sch.schedule_date desc").Select(" sch.schedule_date,sch.patient_id,sch.user_org_id").Find(&orders).Error
@@ -1311,7 +1311,7 @@ func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time i
 			db := service.XTReadDB()
 			offset := (page - 1) * limit
 			err = db.Model(&Inspection{}).Where("org_id = ? AND status = 1 AND created_time >= ? AND created_time <= ?  AND project_id = ? AND item_id = ? AND status = 1  AND inspect_value < ?", user_org_id, start_time, end_time, project_id, item_id, value).Preload("Patient", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1")
+				return db.Where("status = 1 AND user_org_id = ?", user_org_id)
 			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
 			return datas, total, err
 		} else if indexTwo != -1 {
@@ -1320,7 +1320,7 @@ func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time i
 			db := service.XTReadDB()
 			offset := (page - 1) * limit
 			err = db.Model(&Inspection{}).Where("org_id = ? AND status = 1 AND created_time >= ? AND created_time <= ?  AND project_id = ? AND item_id = ? AND status = 1  AND inspect_value > ?", user_org_id, start_time, end_time, project_id, item_id, value).Preload("Patient", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1")
+				return db.Where("status = 1 AND user_org_id = ?", user_org_id)
 			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
 			return datas, total, err
 		} else if indexThree != -1 {
@@ -1337,14 +1337,14 @@ func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time i
 			db := service.XTReadDB()
 			offset := (page - 1) * limit
 			err = db.Model(&Inspection{}).Where("org_id = ? AND status = 1 AND created_time >= ? AND created_time <= ?  AND project_id = ? AND item_id = ? AND status = 1  AND inspect_value >= ? AND inspect_value <= ?", user_org_id, start_time, end_time, project_id, item_id, float1, float2).Preload("Patient", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1")
+				return db.Where("status = 1 AND user_org_id = ?", user_org_id)
 			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
 			return datas, total, err
 		} else {
 			db := service.XTReadDB()
 			offset := (page - 1) * limit
 			err = db.Model(&Inspection{}).Where("org_id = ? AND status = 1 AND created_time >= ? AND created_time <= ?  AND project_id = ? AND item_id = ? AND status = 1 ", user_org_id, start_time, end_time, project_id, item_id).Preload("Patient", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1")
+				return db.Where("status = 1 AND user_org_id = ?", user_org_id)
 			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
 			return datas, total, err
 		}
@@ -1355,7 +1355,7 @@ func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time i
 			db := service.XTReadDB()
 			offset := (page - 1) * limit
 			err = db.Model(&Inspection{}).Where("org_id = ? AND status = 1 AND created_time >= ? AND created_time <= ?  AND project_id = ? AND item_id = ? AND status = 1  ", user_org_id, start_time, end_time, project_id, item_id).Preload("Patient", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1")
+				return db.Where("status = 1 AND user_org_id = ?", user_org_id)
 			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
 			return datas, total, err
 
@@ -1364,7 +1364,7 @@ func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time i
 			db := service.XTReadDB()
 			offset := (page - 1) * limit
 			err = db.Model(&Inspection{}).Where("org_id = ? AND status = 1 AND created_time >= ? AND created_time <= ?  AND project_id = ? AND item_id = ? AND status = 1  AND inspect_value = ?", user_org_id, start_time, end_time, project_id, item_id, range_value).Preload("Patient", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1")
+				return db.Where("status = 1 AND user_org_id = ?", user_org_id)
 			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
 			return datas, total, err