Merge branch 'xt_statistics_branch'

service/statistics_service/index_evaluation_service.go

@@ -33,20 +33,22 @@ func GetDialysisProcessIndexChartData(user_org_id int64, patient_id int64, start
 	db := service.XTReadDB()
 	switch statistics_type {
 	case 1:
-		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_before as value from xt_assessment_before_dislysis dislysis JOIN xt_schedule sch ON sch.schedule_date = dislysis.assessment_date AND sch.patient_id = dislysis.patient_id AND sch.user_org_id = ?  Where dislysis.status = 1 AND dislysis.user_org_id = ? AND dislysis.patient_id = ?  AND dislysis.assessment_date <= ? AND  dislysis.assessment_date >= ? ", user_org_id, user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_before as value from xt_assessment_before_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
 		break
 	case 2:
-		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis dislysis JOIN xt_schedule sch ON sch.schedule_date = dislysis.assessment_date AND sch.patient_id = dislysis.patient_id AND sch.user_org_id = ?   Where dislysis.status = 1 AND dislysis.user_org_id = ? AND dislysis.patient_id = ?  AND dislysis.assessment_date <= ? AND  dislysis.assessment_date >= ? ", user_org_id, user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+
 		break
 	case 3:
-		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, systolic_blood_pressure as value from xt_assessment_before_dislysis dislysis JOIN xt_schedule sch ON sch.schedule_date = dislysis.assessment_date AND sch.patient_id = dislysis.patient_id AND sch.user_org_id = ?   Where dislysis.status = 1 AND dislysis.user_org_id = ? AND dislysis.patient_id = ? AND  dislysis.assessment_date <= ? AND  dislysis.assessment_date >= ? AND dislysis.systolic_blood_pressure <> 0 ", user_org_id, user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, systolic_blood_pressure as value from xt_assessment_before_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ? AND  assessment_date <= ? AND  assessment_date >= ? AND systolic_blood_pressure <> 0 ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+
 		break
 	case 4:
-		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, diastolic_blood_pressure as value from xt_assessment_before_dislysis dislysis JOIN xt_schedule sch ON sch.schedule_date = dislysis.assessment_date AND sch.patient_id = dislysis.patient_id AND sch.user_org_id = ?    Where dislysis.status = 1 AND dislysis.user_org_id = ? AND dislysis.patient_id = ?  AND dislysis.assessment_date <= ? AND  dislysis.assessment_date >= ?  AND dislysis.diastolic_blood_pressure <> 0", user_org_id, user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, diastolic_blood_pressure as value from xt_assessment_before_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ?  AND diastolic_blood_pressure <> 0", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
 
 		break
 	case 5:
-		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, pulse_frequency as value from xt_assessment_before_dislysis dialysis JOIN xt_schedule sch ON sch.schedule_date = dislysis.assessment_date AND sch.patient_id = dislysis.patient_id AND sch.user_org_id = ?   Where dislysis.status = 1 AND dislysis.user_org_id = ? AND dislysis.patient_id = ?  AND dislysis.assessment_date <= ? AND  dislysis.assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, pulse_frequency as value from xt_assessment_before_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
 
 		break
 	case 6: