Merge branch 'xt_statistics_branch' of http://git.shengws.com/csx/XT_New into xt_statistics_branch

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -47,6 +47,7 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueDat
 	var range_vaule []string
 	if range_type == 1 {
 		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+
 		if qcs.ID == 0 { //没有配置选项
 			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id) //判断是否为集成过来的数据
 			if count <= 0 {                                                             //不是，读系统参考值

service/statistics_service/index_evaluation_service.go

@@ -12,7 +12,7 @@ import (
 func GetOrgFirstPatientInfo(user_org_id int64) (patient *models.Patients, err error) {
 	db := service.XTReadDB()
 	var tempPatient models.Patients
-	findErr := db.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", user_org_id).First(&tempPatient).Error
+	findErr := db.Model(&models.Patients{}).Where("user_org_id = ? AND status = 1 AND lapseto = 1", user_org_id).Last(&tempPatient).Error
 	if findErr == gorm.ErrRecordNotFound {
 		return nil, nil
 	}
@@ -487,7 +487,6 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 				weightAdd = append(weightAdd, weights[index].WeightBefore-weights[index+1].WeightAfter)
 			}
 		}
-		fmt.Println(weightAdd)
 
 		var total_one int64
 		var total_two int64
@@ -668,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 {
@@ -750,7 +749,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 	db := service.XTReadDB()
 	var items []*otherItemAmount
 	var tempErr error
-	//var total int64
+	var Total int64
 	switch statistics_type {
 	case 1:
 		type bp struct {
@@ -761,8 +760,11 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 
 		if patient_id == 0 {
 			db.Raw("SELECT systolic_blood_pressure,diastolic_blood_pressure FROM xt_assessment_before_dislysis Where user_org_id = ? AND  created_time >= ? AND created_time <= ?   UNION ALL SELECT systolic_blood_pressure,diastolic_blood_pressure  FROM xt_assessment_after_dislysis Where user_org_id = ? AND created_time >= ? AND created_time <= ?  ", user_org_id, start_time, end_time, user_org_id, start_time, end_time).Scan(&bps)
+			//db.Raw("SELECT count(id) FROM xt_assessment_before_dislysis Where user_org_id = ? AND  created_time >= ? AND created_time <= ?   UNION ALL SELECT systolic_blood_pressure,diastolic_blood_pressure  FROM xt_assessment_after_dislysis Where user_org_id = ? AND created_time >= ? AND created_time <= ?  ", user_org_id, start_time, end_time, user_org_id, start_time, end_time).Count(&Total)
+
 		} else {
 			db.Raw("SELECT systolic_blood_pressure,diastolic_blood_pressure FROM xt_assessment_before_dislysis Where user_org_id = ? AND  created_time >= ? AND created_time <= ? AND patient_id = ?  UNION ALL SELECT systolic_blood_pressure,diastolic_blood_pressure  FROM xt_assessment_after_dislysis Where user_org_id = ? AND created_time >= ? AND created_time <= ? AND patient_id = ?  ", user_org_id, start_time, end_time, patient_id, user_org_id, start_time, end_time, patient_id).Scan(&bps)
+			//db.Raw("SELECT  count(id) FROM xt_assessment_before_dislysis Where user_org_id = ? AND  created_time >= ? AND created_time <= ? AND patient_id = ?  UNION ALL SELECT systolic_blood_pressure,diastolic_blood_pressure  FROM xt_assessment_after_dislysis Where user_org_id = ? AND created_time >= ? AND created_time <= ? AND patient_id = ?  ", user_org_id, start_time, end_time, patient_id, user_org_id, start_time, end_time, patient_id).Count(&Total)
 
 		}
 
@@ -780,6 +782,9 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 			} else if item.SystolicBloodPressure >= 100 && item.SystolicBloodPressure <= 160 && item.DiastolicBloodPressure >= 99 && item.DiastolicBloodPressure <= 140 {
 				total_three++
 			} else {
+				fmt.Println(item.SystolicBloodPressure)
+				fmt.Println(item.DiastolicBloodPressure)
+
 				total_four++
 			}
 		}
@@ -810,6 +815,12 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 		items = append(items, newItem2)
 		items = append(items, newItem3)
 
+		//
+		//for _, item := range items {
+		//	float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", float64(item.Total)/float64(Total)), 64)
+		//	item.Ratio = strconv.FormatInt(int64(float_value*100), 10)
+		//}
+
 		break
 	case 2:
 		if patient_id == 0 {
@@ -831,6 +842,8 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 
 		}
 
+		//db.Table("xt_assessment_before_dislysis as before").Where("before.user_org_id=? AND before.status = 1  AND before.created_time >= ? and before.created_time <= ? ", user_org_id, patient_id, start_time, end_time).Count(&total)
+
 		var isHasConditionOne bool = false
 		var isHasConditionTwo bool = false
 		var isHasConditionThree bool = false
@@ -960,13 +973,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
@@ -1076,14 +1089,14 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 	case 1:
 		for _, item := range datas {
 			var Total int64
-			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND config.name like '%内瘘%' Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
+			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND  FIND_IN_SET('内瘘',config.name) > 0   Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
 			item.PunctureCount = Total
 		}
 		break
 	case 2:
 		for _, item := range datas {
 			var Total int64
-			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND config.name like '%导管%' Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
+			db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('导管',config.name) > 0 Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
 			item.ChangemedicineCount = Total
 		}
 
@@ -1127,8 +1140,8 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 		var TotalOne int64
 		var TotalTwo int64
 		var TotalThree int64
-		db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND config.name like '%内瘘%' Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
-		db.Raw("select count(*) as total_one from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND config.name like '%导管%' Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalOne)
+		db.Raw("select count(*) as total from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('内瘘',config.name) > 0 Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
+		db.Raw("select count(*) as total_one from  (select d.patient_id as patient, d.id, d.`assessment_date` as date,config.name as name from  xt_assessment_before_dislysis as d  JOIN `xt_data_config` config on  d.`blood_access_part_opera_id` = config.value AND config.org_id = ? AND config.parent_id = ? AND FIND_IN_SET('导管',config.name) > 0 Group by d.id)  b JOIN `xt_dialysis_order`  on xt_dialysis_order.`dialysis_date` = b.date AND xt_dialysis_order.user_org_id = ? AND xt_dialysis_order.status = 1  AND xt_dialysis_order.start_nurse = ? AND xt_dialysis_order.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalOne)
 		db.Table("xt_monitoring_record ").Where("user_org_id = ? AND status = 1 AND monitoring_nurse = ? AND created_time >= ? AND created_time <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalTwo)
 		db.Table("xt_treatment_summary").Where("user_org_id = ? AND status = 1 AND creater = ? AND created_time >= ? AND created_time <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalThree)
 		item.PunctureCount = Total
@@ -1299,7 +1312,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 {
@@ -1308,7 +1321,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 {
@@ -1325,14 +1338,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
 		}
@@ -1343,7 +1356,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
 
@@ -1352,7 +1365,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