Merge branch 'xt_statistics_branch'

service/statistics_service/index_evaluation_service.go

@@ -1121,10 +1121,10 @@ func GetBloodPressureTableData(orgID, patientID int64, page, limit, start, end i
 	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 AND user_org_id = ?", orgID).Order("diastolic_blood_pressure DESC")
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("diastolic_blood_pressure ASC")
 		}).
 		Preload("VMMaxMonitoringRecord", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("systolic_blood_pressure ASC")
+			return db.Where("status = 1 AND user_org_id = ?", orgID).Order("systolic_blood_pressure DESC")
 		}).
 		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