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

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2670,6 +2670,7 @@ func (this *PatientApiController) GetPatientsByKeyWord() {
 }
 
 func (this *PatientApiController) GetSearchPatient() {
+
 	keyWord := this.GetString("keyword")
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	patient, err := service.GetPatientsByKey(adminUserInfo.Org.Id, keyWord)

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
+	"fmt"
 	"time"
 )
 
@@ -27,9 +28,15 @@ func (this *IndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	var references []*models.InspectionReference
 	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
 	if count <= 0 {
-		references, _ = statistics_service.FindOrgInspectionReference(0)
+		references, _ = statistics_service.FindOrgInspectionReference(0, 1)
+		references_two, _ := statistics_service.FindOrgInspectionReference(0, 2)
+		references = append(references, references_two...)
+
 	} else {
-		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id)
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 1)
+		references_two, _ := statistics_service.FindOrgInspectionReference(adminUserInfo.Org.Id, 2)
+		references = append(references, references_two...)
+
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -41,6 +48,7 @@ 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()

controllers/pc_index_evaluation_api_controller.go

@@ -55,9 +55,15 @@ func (this *PCIndexEvaluationApiController) GetLaboratoryIndexInitData() {
 	var references []*models.InspectionReference
 	count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
 	if count <= 0 {
-		references, _ = statistics_service.FindOrgInspectionReference(0)
+		references, _ = statistics_service.FindOrgInspectionReference(0, 1)
+		temp_references, _ := statistics_service.FindOrgInspectionReference(0, 2)
+		references = append(references, temp_references...)
+
 	} else {
-		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId)
+		references, _ = statistics_service.FindOrgInspectionReference(adminUserInfo.CurrentOrgId, 1)
+		temp_references, _ := statistics_service.FindOrgInspectionReference(0, 2)
+		references = append(references, temp_references...)
+
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{

service/statistics_service/index_evaluation_service.go

@@ -124,7 +124,7 @@ func GetDialysisProcessIndexOtherChartData(user_org_id int64, patient_id int64,
 
 	for _, item := range items {
 		if math.IsNaN(float64(item.Total) / float64(total)) {
-			item.Ratio = "0"
+			item.Ratio = "0.0"
 		} else {
 			float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(total))*100), 64)
 			item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -428,7 +428,7 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -522,7 +522,7 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -622,7 +622,7 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(newTotal)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(newTotal))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -717,7 +717,7 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -913,7 +913,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -1002,7 +1002,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -1089,7 +1089,7 @@ func GetBloodPressureChartData(user_org_id int64, start_time int64, end_time int
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -1167,25 +1167,59 @@ func GetDoctorWorkloadChartData(user_org_id int64, start_time int64, end_time in
 
 	switch statistics_type {
 	case 1:
+		var Total int64
+		db.Table("xt_dialysis_prescription as p").Where("user_org_id = ? AND status = 1  AND created_time >= ? AND  created_time <= ?", user_org_id, start_time, end_time).Count(&Total)
+
 		for _, item := range datas {
 			var total int64
 			db.Table("xt_dialysis_prescription as p").Where("user_org_id = ? AND status = 1 AND prescription_doctor = ? AND created_time >= ? AND  created_time <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&total)
 			item.PCount = total
+
+			if math.IsNaN(float64(item.PCount) / float64(Total)) {
+				item.PRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.PCount)/float64(Total))*100), 64)
+				item.PRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+
 		}
 		break
 	case 2:
+		var Total int64
+		db.Table("xt_patient_course_of_disease as course").Where("org_id = ? AND status = 1 AND ctime >= ? AND ctime <= ?", user_org_id, start_time, end_time).Count(&Total)
+
 		for _, item := range datas {
 			var total int64
 			db.Table("xt_patient_course_of_disease as course").Where("org_id = ? AND status = 1 AND recorder = ? AND ctime >= ? AND ctime <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&total)
 			item.CourseCount = total
+
+			if math.IsNaN(float64(item.CourseCount) / float64(Total)) {
+				item.CourseRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.CourseCount)/float64(Total))*100), 64)
+				item.CourseRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+
 		}
 
 		break
 	case 3:
+		var Total int64
+
+		db.Table("xt_patient_rescue_record as rescue").Where("org_id = ? AND status = 1  AND ctime >= ? AND ctime <= ?", user_org_id, start_time, end_time).Count(&Total)
+
 		for _, item := range datas {
 			var total int64
 			db.Table("xt_patient_rescue_record as rescue").Where("org_id = ? AND status = 1 AND recorder = ?  AND ctime >= ? AND ctime <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&total)
 			item.RescueCount = total
+
+			if math.IsNaN(float64(item.RescueCount) / float64(Total)) {
+				item.RescueRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.RescueCount)/float64(Total))*100), 64)
+				item.RescueRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+
 		}
 		break
 	}
@@ -1227,15 +1261,33 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 	db := service.XTReadDB()
 	userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3 ", user_org_id).Scan(&datas)
 
+	var NewTotalOne int64
+	var NewTotalTwo int64
+	var NewTotalThree int64
+	var NewTotalFour int64
+
 	var tempConfig models.Dataconfig
 	db.Model(&models.Dataconfig{}).Where("name = '血管通路' AND module = 'hemodialysis' AND field_name = 'vascular_access_desc' AND parent_id = 0").First(&tempConfig)
 
+	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.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, start_time, end_time).Count(&NewTotalOne)
+	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.created_time >= ? AND xt_dialysis_order.created_time <= ? ", user_org_id, tempConfig.ID, user_org_id, start_time, end_time).Count(&NewTotalTwo)
+	db.Table("xt_monitoring_record ").Where("user_org_id = ? AND status = 1  AND created_time >= ? AND created_time <= ?", user_org_id, start_time, end_time).Count(&NewTotalThree)
+	db.Table("xt_treatment_summary").Where("user_org_id = ? AND status = 1  AND created_time >= ? AND created_time <= ?", user_org_id, start_time, end_time).Count(&NewTotalFour)
+
 	switch statistics_type {
 	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  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
+
+			if math.IsNaN(float64(item.PunctureCount) / float64(NewTotalOne)) {
+				item.PunctureRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.PunctureCount)/float64(NewTotalOne))*100), 64)
+				item.PunctureRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+
 		}
 		break
 	case 2:
@@ -1243,6 +1295,13 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 			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 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
+
+			if math.IsNaN(float64(item.ChangemedicineCount) / float64(NewTotalTwo)) {
+				item.ChangemedicineRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.ChangemedicineCount)/float64(NewTotalTwo))*100), 64)
+				item.ChangemedicineRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
 		}
 
 		break
@@ -1251,6 +1310,13 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 			var total int64
 			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(&total)
 			item.CureCount = total
+			if math.IsNaN(float64(item.CureCount) / float64(NewTotalThree)) {
+				item.CureRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.CureCount)/float64(NewTotalThree))*100), 64)
+				item.CureRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+
 		}
 		break
 
@@ -1259,6 +1325,12 @@ func GetNurseWorkloadChartData(user_org_id int64, start_time int64, end_time int
 			var Total int64
 			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(&Total)
 			item.MissionCount = Total
+			if math.IsNaN(float64(item.MissionCount) / float64(NewTotalFour)) {
+				item.MissionRatio = "0.0"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.MissionCount)/float64(NewTotalFour))*100), 64)
+				item.MissionRatio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
 		}
 		break
 	}
@@ -1273,6 +1345,7 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 	userDb := service.UserReadDB()
 	db := service.XTReadDB()
 	var tempConfig models.Dataconfig
+
 	db.Model(&models.Dataconfig{}).Where("name = '血管通路' AND module = 'hemodialysis' AND field_name = 'vascular_access_desc' AND parent_id = 0").First(&tempConfig)
 
 	if admin_user_id == 0 {
@@ -1280,6 +1353,7 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 	} else {
 		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 3  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
+
 	for _, item := range datas {
 		var Total int64
 		var TotalOne int64
@@ -1291,10 +1365,11 @@ func GetNurseWorkloadTableData(user_org_id int64, start_time int64, end_time int
 		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
 		item.ChangemedicineCount = TotalOne
-		item.PCount = Total
 		item.CureCount = TotalTwo
 		item.MissionCount = TotalThree
+
 	}
+
 	if err != nil {
 		return nil, err
 	}
@@ -1324,9 +1399,15 @@ func FindOrgInspectionCount(user_org_id int64) (count int64, err error) {
 	return
 }
 
-func FindOrgInspectionReference(user_org_id int64) (references []*models.InspectionReference, err error) {
+func FindOrgInspectionReference(user_org_id int64, range_type int) (references []*models.InspectionReference, err error) {
 	db := service.XTReadDB()
-	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
+	if range_type == 1 {
+		err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND range_type = 1 AND range_max REGEXP '([^0-9.])' AND range_min REGEXP '([^0-9.])' ", user_org_id).Find(&references).Error
+
+	} else {
+		err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ? AND range_type = 2", user_org_id).Find(&references).Error
+
+	}
 	return
 }
 
@@ -1338,7 +1419,7 @@ func FindProcjectInspectionReference(user_org_id int64, project_id int64, item_i
 
 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 AND inspect_value <> ''", 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 = ? ", user_org_id, project_id, item_id).Group("inspect_value").Find(&inspection).Error
 	return
 }
 
@@ -1356,10 +1437,10 @@ func GetInspectionChartData(user_org_id int64, start_time int64, end_time int64,
 	selectContent := "CASE"
 	range_value_arr := strings.Split(range_value, ",")
 
-	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).Count(&Total)
+	db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ? AND inspect_value <> '' ", user_org_id, start_time, end_time, project_id, item_id).Count(&Total)
 
 	if range_type == 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).
+		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ? AND inspect_value <> ''", 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] + "'" +
@@ -1409,7 +1490,7 @@ func GetInspectionChartData(user_org_id int64, start_time int64, end_time int64,
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -1423,14 +1504,14 @@ func GetInspectionChartData(user_org_id int64, start_time int64, end_time int64,
 			selectContent = selectContent + " WHEN inspect_value =" + "'" + item + "'" + " THEN " + "'" + item + "'"
 
 		}
-		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).
+		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND project_id = ? AND item_id = ? AND inspect_value <> '' ", 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
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -1519,7 +1600,7 @@ func GetInspectionChartTableData(user_org_id int64, start_time int64, end_time i
 		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 {
+			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 AND user_org_id = ?", user_org_id)
 			}).Count(&total).Offset(offset).Limit(limit).Find(&datas).Error
 			return datas, total, err
@@ -1562,10 +1643,10 @@ func GetPatientInspectionBarChartData(user_org_id int64, start_time int64, end_t
 	range_value_arr := strings.Split(range_value, ",")
 	var Total int64
 
-	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).Count(&Total)
+	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 = ?  AND inspect_value <> ''", user_org_id, start_time, end_time, project_id, item_id, patient_id).Count(&Total)
 
 	if range_type == 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).
+		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 = ? AND inspect_value <> ''", 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] + "'" +
@@ -1615,7 +1696,7 @@ func GetPatientInspectionBarChartData(user_org_id int64, start_time int64, end_t
 
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
@@ -1629,13 +1710,13 @@ func GetPatientInspectionBarChartData(user_org_id int64, start_time int64, end_t
 		for _, item := range range_value_arr {
 			selectContent = selectContent + " WHEN inspect_value =" + "'" + item + "'" + " THEN " + "'" + item + "'"
 		}
-		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).
+		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  created_time >= ? and created_time <= ? AND patient_id  = ? AND inspect_value <> '' AND project_id = ? AND item_id = ?", user_org_id, start_time, end_time, patient_id, project_id, item_id).
 			Select(selectContent +
 				" ELSE '未知' END AS name, COUNT(*) AS total",
 			).Group("name").Scan(&items).Error
 		for _, item := range items {
 			if math.IsNaN(float64(item.Total) / float64(Total)) {
-				item.Ratio = "0"
+				item.Ratio = "0.0"
 			} else {
 				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
 				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)

service/statistics_service/index_models.go

@@ -119,14 +119,24 @@ type VMUserAdminRole struct {
 	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	UserName    string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	PCount      int64  `gorm:"-" json:"p_count"`
-	CourseCount int64  `gorm:"-" json:"course_count" `
+
+	PCount      int64 `gorm:"-" json:"p_count"`
+	CourseCount int64 `gorm:"-" json:"course_count" `
+	RescueCount int64 `gorm:"-" json:"rescue_count" `
 
 	PunctureCount       int64 `gorm:"-" json:"puncture_count" `
 	ChangemedicineCount int64 `gorm:"-" json:"change_medicine_count" `
-	RescueCount         int64 `gorm:"-" json:"rescue_count" `
 	CureCount           int64 `gorm:"-" json:"cure_count" `
 	MissionCount        int64 `gorm:"-" json:"mission_count" `
+
+	PRatio      string `gorm:"-" json:"p_ratio"`
+	CourseRatio string `gorm:"-" json:"course_ratio" `
+	RescueRatio string `gorm:"-" json:"rescue_ratio" `
+
+	PunctureRatio       string `gorm:"-" json:"puncture_ratio" `
+	ChangemedicineRatio string `gorm:"-" json:"change_medicine_ratio" `
+	CureRatio           string `gorm:"-" json:"cure_ratio" `
+	MissionRatio        string `gorm:"-" json:"mission_ratio" `
 }
 
 func (VMUserAdminRole) TableName() string {