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

@@ -46,32 +46,29 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueDat
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	var range_vaule []string
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRnageTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		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 {                                                             //不是，读系统参考值
 				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
-				range_vaule = append(range_vaule, "小于"+reference.RangeMin)
-				range_vaule = append(range_vaule, reference.RangeMin+"～"+reference.RangeMax)
-				range_vaule = append(range_vaule, "大于"+reference.RangeMax)
+				range_vaule = append(range_vaule, reference.RangeMin)
+				range_vaule = append(range_vaule, reference.RangeMax)
 
 			} else { //是，读集成过来的参考值
 				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.Org.Id, project_id, item_id)
-				range_vaule = append(range_vaule, "小于"+reference.RangeMin)
-				range_vaule = append(range_vaule, reference.RangeMin+"～"+reference.RangeMax)
-				range_vaule = append(range_vaule, "大于"+reference.RangeMax)
+				range_vaule = append(range_vaule, reference.RangeMin)
+				range_vaule = append(range_vaule, reference.RangeMax)
 			}
 
 		} else { //有配置
-			range_vaule = append(range_vaule, "小于"+qcs.MinRange)
-			range_vaule = append(range_vaule, qcs.MinRange+"～"+qcs.LargeRange)
-			range_vaule = append(range_vaule, "大于"+qcs.LargeRange)
+			range_vaule = append(range_vaule, qcs.MinRange)
+			range_vaule = append(range_vaule, qcs.LargeRange)
 
 		}
 
 	} else {
 
-		inspection, _ := statistics_service.FindOrgInspectionReferenceRnageTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
 		for _, item := range inspection {
 			range_vaule = append(range_vaule, item.InspectValue)
 		}
@@ -89,7 +86,6 @@ func (this *IndexEvaluationApiController) GetInspectionChartData() {
 	project_id, _ := this.GetInt64("project_id")
 	item_id, _ := this.GetInt64("item_id")
 	range_type, _ := this.GetInt("range_type")
-	range_value := this.GetString("range_value")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -111,6 +107,38 @@ func (this *IndexEvaluationApiController) GetInspectionChartData() {
 		theEndtTIme = theTime.Unix()
 	}
 
+	var range_value 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 {                                                             //不是，读系统参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			} else { //是，读集成过来的参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.Org.Id, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			}
+
+		} else { //有配置
+			range_value = qcs.MinRange + "," + qcs.LargeRange
+
+		}
+
+	} else {
+
+		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		for _, item := range inspection {
+			if len(range_value) == 0 {
+				range_value = item.InspectValue
+			} else {
+				range_value = range_value + "," + item.InspectValue
+			}
+		}
+	}
+
 	data, _ := statistics_service.GetInspectionChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"data": data,
@@ -126,6 +154,8 @@ func (this *IndexEvaluationApiController) GetInspectionChartTableData() {
 	limit, _ := this.GetInt64("limit")
 	project_id, _ := this.GetInt64("project_id")
 	item_id, _ := this.GetInt64("item_id")
+	range_value := this.GetString("range_value")
+	range_type, _ := this.GetInt("range_type")
 
 	if page == 0 {
 		page = 1
@@ -152,7 +182,7 @@ func (this *IndexEvaluationApiController) GetInspectionChartTableData() {
 		}
 		theEndtTIme = theTime.Unix()
 	}
-	data, total, _ := statistics_service.GetInspectionChartTableData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, patient_id, page, limit)
+	data, total, _ := statistics_service.GetInspectionChartTableData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, patient_id, page, limit, range_type, range_value)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"data":  data,
 		"total": total,
@@ -200,7 +230,6 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 	project_id, _ := this.GetInt64("project_id")
 	item_id, _ := this.GetInt64("item_id")
 	range_type, _ := this.GetInt("range_type")
-	range_value := this.GetString("range_value")
 	patient_id, _ := this.GetInt64("patient_id")
 
 	timeLayout := "2006-01-02"
@@ -223,6 +252,38 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 		theEndtTIme = theTime.Unix()
 	}
 
+	var range_value 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 {                                                             //不是，读系统参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			} else { //是，读集成过来的参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.Org.Id, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			}
+
+		} else { //有配置
+			range_value = qcs.MinRange + "," + qcs.LargeRange
+
+		}
+
+	} else {
+
+		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		for _, item := range inspection {
+			if len(range_value) == 0 {
+				range_value = item.InspectValue
+			} else {
+				range_value = range_value + "," + item.InspectValue
+			}
+		}
+	}
+
 	data, _ := statistics_service.GetPatientInspectionBarChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value, patient_id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"data": data,
@@ -356,7 +417,6 @@ func (this *IndexEvaluationApiController) GetDialysisProcessIndexTableData() {
 	}
 
 }
-
 func (this *IndexEvaluationApiController) GetDialysisWatchChartData() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	statistics_type, _ := this.GetInt("statistics_type")

controllers/pc_index_evaluation_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
 	"github.com/astaxie/beego"
@@ -10,6 +11,13 @@ import (
 
 func PCIndexEvaluationApiControllersRegisterRouters() {
 
+	beego.Router("/api/inspectionindex/init", &PCIndexEvaluationApiController{}, "Get:GetLaboratoryIndexInitData")
+	beego.Router("/api/rangevalue/get", &PCIndexEvaluationApiController{}, "Get:GetLaboratoryIndexProjectRangeValueData")
+	beego.Router("/api/inspectionindex/chart", &PCIndexEvaluationApiController{}, "Get:GetInspectionChartData")
+	beego.Router("/api/inspectionindex/table", &PCIndexEvaluationApiController{}, "Get:GetInspectionChartTableData")
+	beego.Router("/api/patientinspectionindex/chart", &PCIndexEvaluationApiController{}, "Get:GetPatientInspectionChartData")
+	beego.Router("/api/patientinspectionindex/barchart", &PCIndexEvaluationApiController{}, "Get:GetPatientInspectionBarChartData")
+
 	beego.Router("/api/dialysisprocessindex/chart", &PCIndexEvaluationApiController{}, "Get:GetDialysisProcessIndexChartData")
 	beego.Router("/api/dialysisprocessindex/table", &PCIndexEvaluationApiController{}, "Get:GetDialysisProcessIndexTableData")
 
@@ -39,6 +47,282 @@ type PCIndexEvaluationApiController struct {
 	BaseAuthAPIController
 }
 
+//化验指标
+
+//初始化数据
+func (this *PCIndexEvaluationApiController) GetLaboratoryIndexInitData() {
+	adminUserInfo := this.GetAdminUserInfo()
+	var references []*models.InspectionReference
+	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+	if count <= 0 {
+		references, _ = statistics_service.FindOrgInspectionReference(0)
+	} else {
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"references": references,
+	})
+
+}
+
+//获取取值范围
+func (this *PCIndexEvaluationApiController) GetLaboratoryIndexProjectRangeValueData() {
+	range_type, _ := this.GetInt64("range_type")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	var range_vaule []string
+	if range_type == 1 {
+		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+		if qcs.ID == 0 { //没有配置选项
+			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId) //判断是否为集成过来的数据
+			if count <= 0 {                                                                   //不是，读系统参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
+				range_vaule = append(range_vaule, reference.RangeMin)
+				range_vaule = append(range_vaule, reference.RangeMax)
+
+			} else { //是，读集成过来的参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.CurrentOrgId, project_id, item_id)
+				range_vaule = append(range_vaule, reference.RangeMin)
+				range_vaule = append(range_vaule, reference.RangeMax)
+			}
+
+		} else { //有配置
+			range_vaule = append(range_vaule, qcs.MinRange)
+			range_vaule = append(range_vaule, qcs.LargeRange)
+
+		}
+
+	} else {
+
+		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+		for _, item := range inspection {
+			range_vaule = append(range_vaule, item.InspectValue)
+		}
+
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"range_vaule": range_vaule,
+	})
+
+}
+func (this *PCIndexEvaluationApiController) GetInspectionChartData() {
+	adminUserInfo := this.GetAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	range_type, _ := this.GetInt("range_type")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	var range_value string
+	if range_type == 1 {
+		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+		if qcs.ID == 0 { //没有配置选项
+			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId) //判断是否为集成过来的数据
+			if count <= 0 {                                                                   //不是，读系统参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			} else { //是，读集成过来的参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.CurrentOrgId, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			}
+
+		} else { //有配置
+
+			range_value = qcs.MinRange + "," + qcs.LargeRange
+
+		}
+
+	} else {
+
+		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+		for _, item := range inspection {
+			if len(range_value) == 0 {
+				range_value = item.InspectValue
+			} else {
+				range_value = range_value + "," + item.InspectValue
+			}
+		}
+
+	}
+
+	data, _ := statistics_service.GetInspectionChartData(adminUserInfo.CurrentOrgId, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data": data,
+	})
+
+}
+func (this *PCIndexEvaluationApiController) GetInspectionChartTableData() {
+	adminUserInfo := this.GetAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	patient_id, _ := this.GetInt64("patient_id")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	range_value := this.GetString("range_value")
+	range_type, _ := this.GetInt("range_type")
+
+	if page == 0 {
+		page = 1
+	}
+	if limit == 0 {
+		limit = 20
+	}
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+	data, total, _ := statistics_service.GetInspectionChartTableData(adminUserInfo.CurrentOrgId, theStartTIme, theEndtTIme, project_id, item_id, patient_id, page, limit, range_type, range_value)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data":  data,
+		"total": total,
+	})
+
+}
+func (this *PCIndexEvaluationApiController) GetPatientInspectionChartData() {
+	adminUserInfo := this.GetAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	patient_id, _ := this.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	data, _ := statistics_service.GetPatientInspectionChartData(adminUserInfo.CurrentOrgId, theStartTIme, theEndtTIme, project_id, item_id, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data": data,
+	})
+
+}
+func (this *PCIndexEvaluationApiController) GetPatientInspectionBarChartData() {
+	adminUserInfo := this.GetAdminUserInfo()
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	project_id, _ := this.GetInt64("project_id")
+	item_id, _ := this.GetInt64("item_id")
+	range_type, _ := this.GetInt("range_type")
+	patient_id, _ := this.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var theStartTIme int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theStartTIme = theTime.Unix()
+	}
+	var theEndtTIme int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+		}
+		theEndtTIme = theTime.Unix()
+	}
+
+	var range_value string
+	if range_type == 1 {
+		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+		if qcs.ID == 0 { //没有配置选项
+			count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId) //判断是否为集成过来的数据
+			if count <= 0 {                                                                   //不是，读系统参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(0, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			} else { //是，读集成过来的参考值
+				reference, _ := statistics_service.FindProcjectInspectionReference(adminUserInfo.CurrentOrgId, project_id, item_id)
+				range_value = reference.RangeMin + "," + reference.RangeMax
+
+			}
+
+		} else { //有配置
+
+			range_value = qcs.MinRange + "," + qcs.LargeRange
+
+		}
+
+	} else {
+
+		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+		for _, item := range inspection {
+			if len(range_value) == 0 {
+				range_value = item.InspectValue
+			} else {
+				range_value = range_value + "," + item.InspectValue
+			}
+		}
+
+	}
+
+	data, _ := statistics_service.GetPatientInspectionBarChartData(adminUserInfo.CurrentOrgId, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value, patient_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"data": data,
+	})
+
+}
+
 func (this *PCIndexEvaluationApiController) GetAdminUser() {
 	admins, _ := statistics_service.GetAllAdminUser(this.GetAdminUserInfo().CurrentOrgId)
 	this.ServeSuccessJSON(map[string]interface{}{

service/statistics_service/index_evaluation_service.go

@@ -331,7 +331,7 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 			}
 
 			if item.Name == "60~70kg" {
-				isHasConditionTwo = true
+				isHasConditionThree = true
 			}
 
 			if item.Name == "大于70kg" {
@@ -414,7 +414,7 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 			}
 
 			if item.Name == "60~70kg" {
-				isHasConditionTwo = true
+				isHasConditionThree = true
 			}
 
 			if item.Name == "大于70kg" {
@@ -585,7 +585,7 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 			}
 
 			if item.Name == "60~70kg" {
-				isHasConditionTwo = true
+				isHasConditionThree = true
 			}
 
 			if item.Name == "大于70kg" {
@@ -844,7 +844,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 			}
 
 			if item.Name == "140-160mmHg/90-100mmHg" {
-				isHasConditionTwo = true
+				isHasConditionThree = true
 			}
 		}
 		if !isHasConditionOne {
@@ -906,7 +906,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 			}
 
 			if item.Name == "140-160mmHg/90-100mmHg" {
-				isHasConditionTwo = true
+				isHasConditionThree = true
 			}
 		}
 		if !isHasConditionOne {
@@ -1168,23 +1168,23 @@ func FindOrgInspectionCount(user_org_id int64) (count int64, err error) {
 
 func FindOrgInspectionReference(user_org_id int64) (references []*models.InspectionReference, err error) {
 	db := service.XTReadDB()
-	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ?", user_org_id).Find(&references).Error
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND range_max REGEXP '(^[0-9]+.[0-9]+$)|(^[0-9]$)' AND range_min REGEXP '(^[0-9]+.[0-9]+$)|(^[0-9]$)' ", user_org_id).Find(&references).Error
 	return
 }
 
 func FindProcjectInspectionReference(user_org_id int64, project_id int64, item_id int64) (references models.InspectionReference, err error) {
 	db := service.XTReadDB()
-	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND project_id = ? AND item_id = ?", user_org_id, project_id, item_id).First(&references).Error
+	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND project_id = ? AND id = ?", user_org_id, project_id, item_id).First(&references).Error
 	return
 }
 
-func FindOrgInspectionReferenceRnageTypeValue(user_org_id int64, project_id int64, item_id int64) (inspection []*models.Inspection, err error) {
+func FindOrgInspectionReferenceRangeTypeValue(user_org_id int64, project_id int64, item_id int64) (inspection []*models.Inspection, err error) {
 	db := service.XTReadDB()
-	err = db.Model(&models.Inspection{}).Where("status = 1 AND org_id = ? AND project_id = ? AND item_id = ? AND  inspect_type = 2", user_org_id, project_id, item_id).Group("inspect_value").Find(&inspection).Error
+	err = db.Model(&models.Inspection{}).Where("status = 1 AND org_id = ? AND project_id = ? AND item_id = ? AND  inspect_type = 2 AND inspect_value <> ''", user_org_id, project_id, item_id).Group("inspect_value").Find(&inspection).Error
 	return
 }
 
-func FindOrgConfigRnageTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs models.QualityControlStandard, err error) {
+func FindOrgConfigRangeTypeValue(user_org_id int64, project_id int64, item_id int64) (qcs QualityControlStandard, err error) {
 	db := service.XTReadDB()
 	err = db.Model(&QualityControlStandard{}).Where("status = 1 AND user_org_id = ? AND inspection_major = ? AND inspection_minor = ?", user_org_id, project_id, item_id).First(&qcs).Error
 	return
@@ -1197,49 +1197,179 @@ func GetInspectionChartData(user_org_id int64, start_time int64, end_time int64,
 	selectContent := "CASE"
 	range_value_arr := strings.Split(range_value, ",")
 
+	fmt.Println(range_value_arr)
+
 	if range_type == 1 {
-		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ?", user_org_id, start_time, end_time, project_id, item_id).
-			Select("CASE WHEN inspect_value < ? THEN 小于" + range_value_arr[0] +
-				" WHEN inspect_value >= ? AND  inspect_value <= ? THEN " + range_value_arr[0] + "~" + range_value_arr[1] +
-				" WHEN inspect_value > ? THEN 大于" + range_value_arr[1] +
+		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ?", user_org_id, start_time, end_time, project_id, item_id).
+			Select("CASE WHEN inspect_value < " + range_value_arr[0] + "THEN" + "'" + "小于" + range_value_arr[0] + "'" +
+				" WHEN inspect_value >= " + range_value_arr[0] + "AND  inspect_value <= " + range_value_arr[1] + " THEN " + "'" + range_value_arr[0] + "~" + range_value_arr[1] + "'" +
+				" WHEN inspect_value > " + range_value_arr[1] + "THEN " + "'" + "大于" + range_value_arr[1] + "'" +
 				" ELSE '未知' END AS name, COUNT(*) AS total",
 			).Group("name").Scan(&items).Error
+
+		var isHasConditionOne bool = false
+		var isHasConditionTwo bool = false
+		var isHasConditionThree bool = false
+
+		for _, item := range items {
+			if item.Name == "大于"+range_value_arr[1] {
+				isHasConditionOne = true
+			}
+			if item.Name == "小于"+range_value_arr[0] {
+				isHasConditionTwo = true
+			}
+			if item.Name == range_value_arr[0]+"~"+range_value_arr[1] {
+				isHasConditionThree = true
+			}
+		}
+		if !isHasConditionOne {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "大于" + range_value_arr[1],
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+
+		if !isHasConditionTwo {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "小于" + range_value_arr[0],
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+		if !isHasConditionThree {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  range_value_arr[0] + "～" + range_value_arr[1],
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+		return items, tempErr
+
 	} else {
+
 		for _, item := range range_value_arr {
-			selectContent = selectContent + " WHEN inspect_value =" + item + " THEN " + "'" + item + "'"
+			//selectContent = selectContent + " WHEN inspect_value =" + item + " THEN " + "'" + item + "'"
+			selectContent = selectContent + " WHEN inspect_value =" + "'" + item + "'" + " THEN " + "'" + item + "'"
+
 		}
-		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).
+		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ?", user_org_id, start_time, end_time, project_id, item_id).
 			Select(selectContent +
 				" ELSE '未知' END AS name, COUNT(*) AS total",
 			).Group("name").Scan(&items).Error
-
+		return items, tempErr
 	}
-	return items, tempErr
 
 }
 
-type Patient struct {
-	ID         int64             `gorm:"column:id" json:"id" form:"id"`
-	Name       string            `gorm:"column:name" json:"name" form:"name"`
-	Inspection models.Inspection `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+type Inspection struct {
+	ID           int64           `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64           `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ProjectId    int64           `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	ItemId       int64           `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string          `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	ProjectName  string          `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	InspectType  int64           `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string          `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64           `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64           `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64           `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64           `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Patient      models.Patients `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
 }
 
-func (Patient) TableName() string {
-	return "xt_patients"
+func (Inspection) TableName() string {
+	return "xt_inspection"
 }
 
-func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, patient_id int64, page, limit int64) (datas []*Patient, total int64, err error) {
-	db := service.XTReadDB()
-	offset := (page - 1) * limit
-	err = db.Select("id, name from xt_patients RIGHT JOIN  xt_inspection ON xt_inspection.patient_id = xt_patients.id AND xt_inspection.created_time >= ? AND xt_inspection.created_time >= ? AND xt_inspection.project_id = ? AND xt_inspection.item_id = ?", start_time, end_time, project_id, item_id).Where("user_org_id = ? AND status = 1", user_org_id).Preload("Inspection", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND created_time >= ? AND created_time >= ? AND project_id = ? AND item_id = ?", start_time, end_time, project_id, item_id).Order("created_time DESC")
-	}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
-	return datas, total, err
+func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, patient_id int64, page, limit int64, range_type int, range_value string) (datas []*Inspection, total int64, err error) {
+
+	if range_type == 1 {
+
+		index := strings.Index(range_value, "小于")
+		indexTwo := strings.Index(range_value, "大于")
+		indexThree := strings.Index(range_value, "~")
+
+		if index != -1 {
+			value, _ := strconv.ParseFloat(strings.Replace(range_value, "小于", "", 1), 64)
+			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")
+			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
+			return datas, total, err
+		} else if indexTwo != -1 {
+			value, _ := strconv.ParseFloat(strings.Replace(range_value, "大于", "", 1), 64)
+
+			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")
+			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
+			return datas, total, err
+		} else if indexThree != -1 {
+			range_value_arr := strings.Split(range_value, "~")
+			fmt.Println(range_value_arr)
+
+			float1, err := strconv.ParseFloat(range_value_arr[0], 64)
+			float2, err := strconv.ParseFloat(range_value_arr[1], 64)
+			fmt.Println(err)
+			fmt.Println(float1)
+
+			fmt.Println(float2)
+
+			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")
+			}).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")
+			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
+			return datas, total, err
+		}
+
+	} else {
+
+		if range_value == "全部" {
+			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")
+			}).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  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")
+			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
+			return datas, total, err
+
+		}
+
+	}
+
+}
+
+type NewIndexDataStruct struct {
+	Date  string `json:"date"`
+	Value string `json:"value"`
 }
 
-func GetPatientInspectionChartData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, patient_id int64) (datas []*ProcessIndexDataStruct, err error) {
+func GetPatientInspectionChartData(user_org_id int64, start_time int64, end_time int64, project_id int64, item_id int64, patient_id int64) (datas []*NewIndexDataStruct, err error) {
 	db := service.XTReadDB()
-	err = db.Raw("select from_unixtime(inspect_date, '%Y-%m-%d') as date, inspect_value as value from xt_inspection  Where status = 1 AND user_org_id = ? AND patient_id = ? AND project_id = ? AND item_id = ? created_time <= ? AND  created_time >= ? ", user_org_id, patient_id, project_id, item_id, end_time, start_time).Scan(&datas).Error
+	err = db.Raw("select from_unixtime(inspect_date, '%Y-%m-%d') as date, inspect_value as value from xt_inspection  Where status = 1 AND org_id = ? AND patient_id = ? AND project_id = ? AND item_id = ? AND created_time <= ? AND  created_time >= ? ", user_org_id, patient_id, project_id, item_id, end_time, start_time).Scan(&datas).Error
 	if err != nil {
 		return nil, err
 	}
@@ -1255,22 +1385,65 @@ func GetPatientInspectionBarChartData(user_org_id int64, start_time int64, end_t
 	range_value_arr := strings.Split(range_value, ",")
 
 	if range_type == 1 {
-		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ? AND patient_id = ?", user_org_id, start_time, end_time, project_id, item_id, patient_id).
-			Select("CASE WHEN inspect_value < ? THEN 小于" + range_value_arr[0] +
-				" WHEN inspect_value >= ? AND  inspect_value <= ? THEN " + range_value_arr[0] + "~" + range_value_arr[1] +
-				" WHEN inspect_value > ? THEN 大于" + range_value_arr[1] +
+		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ? AND patient_id = ?", user_org_id, start_time, end_time, project_id, item_id, patient_id).
+			Select("CASE WHEN inspect_value < " + range_value_arr[0] + "THEN" + "'" + "小于" + range_value_arr[0] + "'" +
+				" WHEN inspect_value >= " + range_value_arr[0] + "AND  inspect_value <= " + range_value_arr[1] + " THEN " + "'" + range_value_arr[0] + "~" + range_value_arr[1] + "'" +
+				" WHEN inspect_value > " + range_value_arr[1] + "THEN " + "'" + "大于" + range_value_arr[1] + "'" +
 				" ELSE '未知' END AS name, COUNT(*) AS total",
 			).Group("name").Scan(&items).Error
+
+		var isHasConditionOne bool = false
+		var isHasConditionTwo bool = false
+		var isHasConditionThree bool = false
+
+		for _, item := range items {
+			if item.Name == "大于"+range_value_arr[1] {
+				isHasConditionOne = true
+			}
+			if item.Name == "小于"+range_value_arr[0] {
+				isHasConditionTwo = true
+			}
+			if item.Name == range_value_arr[0]+"~"+range_value_arr[1] {
+				isHasConditionThree = true
+			}
+		}
+		if !isHasConditionOne {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "大于" + range_value_arr[1],
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+
+		if !isHasConditionTwo {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "小于" + range_value_arr[0],
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+		if !isHasConditionThree {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  range_value_arr[0] + "～" + range_value_arr[1],
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+		return items, tempErr
+
 	} else {
+
 		for _, item := range range_value_arr {
-			selectContent = selectContent + " WHEN inspect_value =" + item + " THEN " + "'" + item + "'"
+			selectContent = selectContent + " WHEN inspect_value =" + "'" + item + "'" + " THEN " + "'" + item + "'"
 		}
-		tempErr = db.Table("xt_inspection").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? AND patient_id = ?", user_org_id, start_time, end_time, patient_id).
+		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND patient_id  = ?", user_org_id, start_time, end_time, patient_id).
 			Select(selectContent +
 				" ELSE '未知' END AS name, COUNT(*) AS total",
 			).Group("name").Scan(&items).Error
-
+		return items, tempErr
 	}
-	return items, tempErr
 
 }