Merge branch 'xt_statistics_branch'

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -34,7 +34,6 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexInitData() {
 //获取取值范围
 func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueData() {
 	range_type, _ := this.GetInt64("range_type")
-	fmt.Println(range_type)
 	project_id, _ := this.GetInt64("project_id")
 	item_id, _ := this.GetInt64("item_id")
 	adminUserInfo := this.GetMobileAdminUserInfo()

service/statistics_service/index_evaluation_service.go

@@ -33,22 +33,20 @@ 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  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
+		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
 		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  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
-
+		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
 		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  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
-
+		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
 		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  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
+		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
 
 		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  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
+		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
 
 		break
 	case 6:
@@ -1403,7 +1401,7 @@ type InspectionReference struct {
 
 func FindOrgQualityControlStandardInspectionReference(user_org_id int64) (references []*InspectionReference, err error) {
 	db := service.XTReadDB()
-	err = db.Raw("Select reference.project_name as project_name,qcs.inspection_major as project_id, qcs.inspection_minor as id,reference.item_name as item_name,reference.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit  from xt_quality_control_standard qcs Left JOIN xt_inspection_reference reference ON  qcs.inspection_major = reference.project_id and qcs.inspection_minor = reference.id and  (reference.org_id = ? OR org_id = 0)  Where qcs.user_org_id = ?  AND qcs.status = 1", user_org_id, user_org_id).Scan(&references).Error
+	err = db.Raw("Select reference.project_name as project_name,qcs.inspection_major as project_id, qcs.inspection_minor as id,reference.item_name as item_name,qcs.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit  from xt_quality_control_standard qcs Left JOIN xt_inspection_reference reference ON  qcs.inspection_major = reference.project_id and qcs.inspection_minor = reference.id and  (reference.org_id = ? OR org_id = 0)  Where qcs.user_org_id = ?  AND qcs.status = 1", user_org_id, user_org_id).Scan(&references).Error
 	return
 }