新功能

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -276,9 +276,16 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 
 	var range_value string
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
 
-		range_value = qcs.RangeMin + "," + qcs.RangeMax
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
 
@@ -290,6 +297,7 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 				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)

controllers/pc_index_evaluation_api_controller.go

@@ -278,10 +278,19 @@ func (this *PCIndexEvaluationApiController) GetPatientInspectionBarChartData() {
 
 	var range_value string
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_value = qcs.RangeMin + "," + qcs.RangeMax
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
+
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
 		for _, item := range inspection {
 			if len(range_value) == 0 {
@@ -292,7 +301,6 @@ func (this *PCIndexEvaluationApiController) GetPatientInspectionBarChartData() {
 		}
 
 	}
-
 	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,