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

controllers/pc_index_evaluation_api_controller.go

 			} 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 {
 			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 {

service/statistics_service/index_evaluation_service.go

 	"XT_New/service"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"math"
 	"strconv"
 	"strings"
 )
 	db.Table("xt_dialysis_prescription as p").Where("p.user_org_id=? AND p.status = 1 AND p.patient_id = ? AND p.created_time >= ? and p.created_time <= ? ", user_org_id, patient_id, start_time, end_time).Count(&total)
 
 	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)
+		if math.IsNaN(float64(item.Total) / float64(total)) {
+			item.Ratio = "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)
+		}
 	}
 	if tempErr != nil {
 		return nil, err
 	db := service.XTReadDB()
 	var items []*otherItemAmount
 	var tempErr error
-	//var total int64
+	var Total int64
 	switch statistics_type {
 	case 1:
+		db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).Count(&Total)
 		tempErr = db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).
 			Select("CASE WHEN dry_weight < 40 THEN '小于40kg'" +
 				" WHEN dry_weight >= 40 AND dry_weight < 50 THEN '40~50kg'" +
 			items = append(items, newItem)
 		}
 
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(Total)) {
+				item.Ratio = "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)
+			}
+		}
+
 		break
 	case 2:
+		db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).Count(&Total)
+
 		tempErr = db.Table("xt_assessment_before_dislysis").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).
 			Select("CASE WHEN weight_before < 40 THEN '小于40kg'" +
 				" WHEN weight_before >= 40 AND weight_before < 50 THEN '40~50kg'" +
 			}
 			items = append(items, newItem)
 		}
+
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(Total)) {
+				item.Ratio = "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)
+			}
+		}
+
 		break
 	case 3:
+
+		//db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).Count(&Total)
+
+		//db.Raw("Select count(*) from `xt_assessment_before_dislysis`   LEFT JOIN  `xt_assessment_after_dislysis`  On xt_assessment_before_dislysis.`patient_id` = xt_assessment_after_dislysis.`patient_id` AND xt_assessment_before_dislysis.assessment_date = xt_assessment_after_dislysis.assessment_date AND xt_assessment_after_dislysis.weight_after != 0   Where  xt_assessment_before_dislysis.user_org_id = ? AND xt_assessment_before_dislysis.created_time >= ? AND  xt_assessment_before_dislysis.created_time <= ? Order by xt_assessment_before_dislysis.assessment_date desc", user_org_id, start_time, end_time).Count(&Total)
+
+		var newTotal int64
 		type weight struct {
 			WeightAfter  float64 `json:"weight_after"`
 			WeightBefore float64 `json:"weight_before"`
 		for _, item := range weightAdd {
 			if item < 1 {
 				total_one++
-				fmt.Println(total_one)
 
 			}
 
 			if item >= 1 && item < 2 {
 				total_two++
-				fmt.Println(total_two)
 
 			}
 
 			if item >= 2 && item < 3 {
 				total_three++
-				fmt.Println(total_three)
 
 			}
 
 			if item >= 3 && item <= 4 {
 				total_four++
-				fmt.Println(total_four)
 
 			}
 
 			if item > 4 {
 				total_five++
-				fmt.Println(total_five)
 
 			}
 		}
 
+		newTotal = total_one + total_two + total_three + total_four + total_five
+
 		newItem := &otherItemAmount{
 			Total: total_one,
 			Name:  "小于1kg",
 		items = append(items, newItem3)
 		items = append(items, newItem4)
 
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(newTotal)) {
+				item.Ratio = "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)
+			}
+		}
+
 		break
 	case 4:
+
+		db.Table("xt_assessment_after_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).Count(&Total)
+
 		tempErr = db.Table("xt_assessment_after_dislysis").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?", user_org_id, start_time, end_time).
 			Select("CASE WHEN weight_after < 40 THEN '小于40kg'" +
 				" WHEN weight_after >= 40 AND weight_after < 50 THEN '40~50kg'" +
 			}
 			items = append(items, newItem)
 		}
+
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(Total)) {
+				item.Ratio = "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)
+			}
+		}
+
 		break
 	}
 	if tempErr != nil {
 	db := service.XTReadDB()
 	var items []*otherItemAmount
 	var tempErr error
+	var TotalOne int64
+	var TotalTwo int64
 	var Total int64
-	fmt.Println(Total)
+
 	switch statistics_type {
 	case 1:
 		type bp struct {
 
 		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)
+			db.Raw("SELECT count(id) FROM xt_assessment_before_dislysis Where user_org_id = ? AND  created_time >= ? AND created_time <= ?     ", user_org_id, start_time, end_time).Count(&TotalOne)
+			db.Raw("SELECT count(id) FROM xt_assessment_after_dislysis Where user_org_id = ? AND  created_time >= ? AND created_time <= ?   ", user_org_id, start_time, end_time).Count(&TotalTwo)
+			Total = TotalOne + TotalTwo
+			fmt.Println("----Total-----")
+			fmt.Println(TotalOne)
+			fmt.Println(TotalTwo)
+			fmt.Println(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)
+			db.Raw("SELECT count(id) FROM xt_assessment_before_dislysis Where user_org_id = ? AND  created_time >= ? AND created_time <= ? AND patient_id = ?", user_org_id, start_time, end_time, patient_id).Count(&TotalOne)
+			db.Raw("SELECT count(id) 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).Count(&TotalTwo)
+			Total = TotalOne + TotalTwo
+			fmt.Println(TotalOne)
+			fmt.Println(TotalTwo)
+			fmt.Println(Total)
 
 		}
 
 			} else if item.SystolicBloodPressure < 140 && item.DiastolicBloodPressure < 99 {
 				total_two++
 
-			} else if item.SystolicBloodPressure >= 100 && item.SystolicBloodPressure <= 160 && item.DiastolicBloodPressure >= 99 && item.DiastolicBloodPressure <= 140 {
+			} else if item.SystolicBloodPressure >= 140 && item.SystolicBloodPressure <= 160 && item.DiastolicBloodPressure >= 99 && item.DiastolicBloodPressure <= 100 {
 				total_three++
 			} else {
-				fmt.Println(item.SystolicBloodPressure)
-				fmt.Println(item.DiastolicBloodPressure)
 
 				total_four++
 			}
 		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)
-		//}
-
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(Total)) {
+				item.Ratio = "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)
+			}
+		}
 		break
 	case 2:
 		if patient_id == 0 {
 			tempErr = db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ?  ", user_org_id, start_time, end_time).
 				Select("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
 					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure >= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 140 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
-				).Scan(&items).Group("name").Error
+				).Group("name").Scan(&items).Error
+			db.Table("xt_assessment_before_dislysis ").Where("user_org_id=? AND status = 1  AND created_time >= ? AND created_time <= ? ", user_org_id, start_time, end_time).Count(&Total)
 
 		} else {
 
 			tempErr = db.Table("xt_assessment_before_dislysis ").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).
 				Select("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
 					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure >= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 140 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
-				).Scan(&items).Group("name").Error
+				).Group("name").Scan(&items).Error
 
-		}
+			db.Table("xt_assessment_before_dislysis ").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).Count(&Total)
 
-		//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
+		var isHasConditionFour bool = false
 
 		for _, item := range items {
 			if item.Name == "大于160/100mmHg" {
 			if item.Name == "140-160mmHg/90-100mmHg" {
 				isHasConditionThree = true
 			}
+			if item.Name == "其他" {
+				isHasConditionFour = true
+			}
 		}
 		if !isHasConditionOne {
 			newItem := &otherItemAmount{
 				Ratio: "0",
 			}
 			items = append(items, newItem)
+		}
 
+		if !isHasConditionFour {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "其他",
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(Total)) {
+				item.Ratio = "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)
+			}
 		}
 		break
 	case 3:
 			tempErr = db.Table("xt_assessment_after_dislysis ").Where("user_org_id=? and status=1 and  created_time >= ? and created_time <= ? ", user_org_id, start_time, end_time).
 				Select("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
 					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure >= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 140 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
-				).Scan(&items).Group("name").Error
+				).Group("name").Scan(&items).Error
+			db.Table("xt_assessment_after_dislysis").Where("user_org_id=? AND status = 1  AND created_time >= ? AND created_time <= ? ", user_org_id, start_time, end_time).Count(&Total)
+
 		} else {
 			tempErr = db.Table("xt_assessment_after_dislysis ").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).
 				Select("CASE WHEN systolic_blood_pressure > 160 AND  diastolic_blood_pressure > 100 THEN '大于160/100mmHg'" +
 					" WHEN systolic_blood_pressure < 140 AND  diastolic_blood_pressure < 99 THEN '小于140/99mmHg'" +
-					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure >= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 140 THEN '140-160mmHg/90-100mmHg'" +
+					" WHEN systolic_blood_pressure >= 140 AND  systolic_blood_pressure <= 160   AND  diastolic_blood_pressure >= 99 AND  diastolic_blood_pressure <= 100 THEN '140-160mmHg/90-100mmHg'" +
 					" ELSE '其他' END AS name, COUNT(*) AS total",
-				).Scan(&items).Group("name").Error
+				).Group("name").Scan(&items).Error
+
+			db.Table("xt_assessment_after_dislysis ").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).Count(&Total)
+
 		}
 
 		var isHasConditionOne bool = false
 		var isHasConditionTwo bool = false
 		var isHasConditionThree bool = false
+		var isHasConditionFour bool = false
 
 		for _, item := range items {
 			if item.Name == "大于160/100mmHg" {
 			if item.Name == "140-160mmHg/90-100mmHg" {
 				isHasConditionThree = true
 			}
+			if item.Name == "其他" {
+				isHasConditionFour = true
+			}
 		}
 		if !isHasConditionOne {
 			newItem := &otherItemAmount{
 
 		}
 
+		if !isHasConditionFour {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "其他",
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(Total)) {
+				item.Ratio = "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)
+			}
+		}
 		break
 	}
 	if tempErr != nil {
 }
 
 func GetPatientBloodPressureChartData(user_org_id int64, patient_id int64, start_time int64, end_time int64, statistics_type int) (datas []*BPDataStruct, err error) {
-	fmt.Println("8u8923u213u8129")
 	db := service.XTReadDB()
 	switch statistics_type {
 	case 1:
 	db := service.XTReadDB()
 	var items []*otherItemAmount
 	var tempErr error
+	var Total int64
 	selectContent := "CASE"
 	range_value_arr := strings.Split(range_value, ",")
 
-	fmt.Println(range_value_arr)
+	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)
 
 	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).
 			}
 			items = append(items, newItem)
 		}
+
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(Total)) {
+				item.Ratio = "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)
+			}
+		}
 		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 + "'"
 			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"
+			} else {
+				float_value, _ := strconv.ParseFloat(fmt.Sprintf("%.1f", (float64(item.Total)/float64(Total))*100), 64)
+				item.Ratio = strconv.FormatFloat(float_value, 'f', 1, 32)
+			}
+		}
+
 		return items, tempErr
 	}