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

controllers/statistics_api_controller.go

@@ -1447,10 +1447,6 @@ func (c *StatisticsApiController) GetFivePatientInspectionStatistisc() {
 		// 打印其他列的值
 		for columnName, columnValue := range result {
 
-			fmt.Println("000000")
-			fmt.Println(columnName)
-			fmt.Println("000000")
-
 			// 跳过患者ID列
 
 			if columnName == "姓名" {
@@ -1474,14 +1470,14 @@ func (c *StatisticsApiController) GetFivePatientInspectionStatistisc() {
 			strValue := string(byteValue)
 
 			// 尝试将字符串转换为浮点数
-			floatValue, err := strconv.ParseFloat(strValue, 64)
-			if err != nil {
-				// 如果转换失败，输出错误信息
-				fmt.Printf("Error converting value for column %s: %v\n", columnName, err)
-			} else {
-				// 如果转换成功，输出列名和浮点数值
-				fmt.Printf("Column: %s, Value: %f\n", columnName, floatValue)
-			}
+			floatValue, _ := strconv.ParseFloat(strValue, 64)
+			//if err != nil {
+			//	// 如果转换失败，输出错误信息
+			//	fmt.Printf("Error converting value for column %s: %v\n", columnName, err)
+			//} else {
+			//	// 如果转换成功，输出列名和浮点数值
+			//	fmt.Printf("Column: %s, Value: %f\n", columnName, floatValue)
+			//}
 			ynamicField["年月"] = strings.Split(end_date, "-")[0] + "-" + strings.Split(end_date, "-")[1]
 			if floatValue == 0 {
 				ynamicField[columnName] = ""

service/patientmanage_service.go

@@ -2254,10 +2254,12 @@ func GetFiveInspectionPatientList(orgid int64, keyword string) (xti []*models.Xt
 	return
 }
 
-func GetPatientFiveInspectionByID(startime int64, endtime int64, orgid int64, keyword string) (inspections []models.InspectionTen, err error) {
+func GetPatientFiveInspectionByID(startime int64, endtime int64, orgid int64, keyword string) (inspections []models.InspectionTenOne, err error) {
 	keyword = "%" + keyword + "%"
 
-	db := XTReadDB().Table("xt_patients as p").Select("p.id as patient_id, p.name as name, IFNULL(a.inspect_value, '') AS 'ipth',IFNULL(b.inspect_value, '') AS 'xuejia',IFNULL(c.inspect_value, '') AS 'xuelin',IFNULL(d.inspect_value, '') AS 'bdb',IFNULL(e.inspect_value, '') AS 'xhdb'").Joins("LEFT JOIN `xt_inspection` a ON p.id = a.patient_id AND a.org_id = ?  and a.`reference_item_id` = 171 and a.`reference_project_id` = 20  and a.`inspect_date` >= ? and a.`inspect_date` <= ?  LEFT JOIN xt_inspection b ON p.id = b.patient_id AND b.org_id = ?  and b.`reference_item_id` = 48 and b.`reference_project_id` = 4 and b.`inspect_date` >= ? and b.`inspect_date` <= ? LEFT JOIN xt_inspection c ON p.id = c.patient_id AND c.org_id = ?  and c.`reference_item_id` = 169 and c.`reference_project_id` = 4 and c.`inspect_date` >= ? and c.`inspect_date` <= ? LEFT JOIN xt_inspection d ON p.id = d.patient_id AND d.org_id = ?  and d.`reference_item_id` = 35 and d.`reference_project_id` = 2 and d.`inspect_date` >= ? and d.`inspect_date` <= ? LEFT JOIN xt_inspection e ON p.id = e.patient_id AND e.org_id = ?  and e.`reference_item_id` = 17 and e.`reference_project_id` = 1 and e.`inspect_date` >= ? and e.`inspect_date` <= ?", orgid, startime, endtime, orgid, startime, endtime, orgid, startime, endtime, orgid, startime, endtime, orgid, startime, endtime).Where("p.name like ? and  p.user_org_id = ? and p.status = 1 and p.lapseto = 1 ", keyword, orgid).Group("p.id")
+	db := XTReadDB().Table("xt_inspection i").Select("p.id AS patient_id,p.name AS patient_name,i.inspect_value,i.item_name,i.project_name,i.item_id").Joins("join xt_patients p ON i.patient_id = p.id").Joins("left join xt_quality_control_standard c ON i.item_id = c.`inspection_minor`").Where("i.org_id = ? and i.inspect_date >= ? and i.inspect_date <= ? and i.item_name <> 'KT/V' and i.item_name <> 'URR(%)'", orgid, startime, endtime)
+
+	//db := XTReadDB().Table("xt_patients as p").Select("p.id as patient_id, p.name as name, IFNULL(a.inspect_value, '') AS 'ipth',IFNULL(b.inspect_value, '') AS 'xuejia',IFNULL(c.inspect_value, '') AS 'xuelin',IFNULL(d.inspect_value, '') AS 'bdb',IFNULL(e.inspect_value, '') AS 'xhdb'").Joins("LEFT JOIN `xt_inspection` a ON p.id = a.patient_id AND a.org_id = ?  and a.`reference_item_id` = 171 and a.`reference_project_id` = 20  and a.`inspect_date` >= ? and a.`inspect_date` <= ?  LEFT JOIN xt_inspection b ON p.id = b.patient_id AND b.org_id = ?  and b.`reference_item_id` = 48 and b.`reference_project_id` = 4 and b.`inspect_date` >= ? and b.`inspect_date` <= ? LEFT JOIN xt_inspection c ON p.id = c.patient_id AND c.org_id = ?  and c.`reference_item_id` = 169 and c.`reference_project_id` = 4 and c.`inspect_date` >= ? and c.`inspect_date` <= ? LEFT JOIN xt_inspection d ON p.id = d.patient_id AND d.org_id = ?  and d.`reference_item_id` = 35 and d.`reference_project_id` = 2 and d.`inspect_date` >= ? and d.`inspect_date` <= ? LEFT JOIN xt_inspection e ON p.id = e.patient_id AND e.org_id = ?  and e.`reference_item_id` = 17 and e.`reference_project_id` = 1 and e.`inspect_date` >= ? and e.`inspect_date` <= ?", orgid, startime, endtime, orgid, startime, endtime, orgid, startime, endtime, orgid, startime, endtime, orgid, startime, endtime).Where("p.name like ? and  p.user_org_id = ? and p.status = 1 and p.lapseto = 1 ", keyword, orgid).Group("p.id")
 	err = db.Find(&inspections).Error
 	return inspections, err
 }

service/statistis_qc_service.go

@@ -927,6 +927,68 @@ type DialysisQualityStat struct {
 	Counts map[string]float64 `json:"counts"`
 }
 
+//func GetLatestInspectionValues(org_id int64, yearMonth string) ([]map[string]interface{}, error) {
+//	standards, err := getQualityControlStandards(org_id)
+//	if err != nil {
+//		return nil, err
+//	}
+//
+//	var selectFields []string
+//	for _, standard := range standards {
+//		field := fmt.Sprintf("IFNULL(MAX(CASE WHEN i.item_name = %s THEN i.inspect_value END),'') AS `%s`",
+//			"'"+standard.ItemName+"'", standard.ItemName)
+//		selectFields = append(selectFields, field)
+//	}
+//
+//	query := fmt.Sprintf(`
+//		SELECT
+//		    p.name as '姓名',
+//			%s
+//		FROM xt_inspection i
+//		JOIN xt_patients p On p.id = i.patient_id
+//		WHERE DATE_FORMAT(FROM_UNIXTIME(i.inspect_date), '%%Y-%%m') = ? and org_id = ?
+//
+//		GROUP BY i.patient_id
+//	`, strings.Join(selectFields, ", "))
+//
+//	var results []map[string]interface{}
+//	rows, err := readDb.Raw(query, yearMonth, org_id).Rows()
+//	if err != nil {
+//		return nil, err
+//	}
+//	defer rows.Close()
+//
+//	columns, err := rows.Columns()
+//	if err != nil {
+//		return nil, err
+//	}
+//
+//	for rows.Next() {
+//		// 创建一个长度为列数的切片，用于存储每一行的值
+//		columnValues := make([]interface{}, len(columns))
+//		columnPointers := make([]interface{}, len(columns))
+//		for i := range columnValues {
+//			columnPointers[i] = &columnValues[i]
+//		}
+//
+//		// 扫描当前行的值
+//		if err := rows.Scan(columnPointers...); err != nil {
+//			return nil, err
+//		}
+//
+//		// 将扫描到的值放入结果 map 中
+//		result := make(map[string]interface{})
+//		for i, colName := range columns {
+//			val := columnPointers[i].(*interface{})
+//			result[colName] = *val
+//		}
+//
+//		results = append(results, result)
+//	}
+//
+//	return results, nil
+//}
+
 func GetLatestInspectionValues(org_id int64, yearMonth string) ([]map[string]interface{}, error) {
 	standards, err := getQualityControlStandards(org_id)
 	if err != nil {
@@ -935,24 +997,48 @@ func GetLatestInspectionValues(org_id int64, yearMonth string) ([]map[string]int
 
 	var selectFields []string
 	for _, standard := range standards {
-		field := fmt.Sprintf("IFNULL(MAX(CASE WHEN i.item_name = %s THEN i.inspect_value END),'') AS `%s`",
-			"'"+standard.ItemName+"'", standard.ItemName)
+		field := fmt.Sprintf("IFNULL(MAX(CASE WHEN latest_inspections.item_name = '%s' THEN latest_inspections.inspect_value END),'') AS `%s`",
+			standard.ItemName, standard.ItemName)
 		selectFields = append(selectFields, field)
 	}
 
 	query := fmt.Sprintf(`
-		SELECT
-		    p.name as '姓名',
-			%s
-		FROM xt_inspection i
-		JOIN xt_patients p On p.id = i.patient_id
-		WHERE DATE_FORMAT(FROM_UNIXTIME(i.inspect_date), '%%Y-%%m') = ? and org_id = ?
-		
-		GROUP BY i.patient_id
-	`, strings.Join(selectFields, ", "))
+			SELECT
+			    p.name as '姓名',
+				%s
+			FROM xt_patients p
+			JOIN (
+				SELECT
+					i1.patient_id,
+					i1.item_name,
+					i1.inspect_value
+				FROM
+					xt_inspection i1
+				JOIN (
+					SELECT
+						patient_id,
+						item_name,
+						MAX(inspect_date) AS latest_inspect_date
+					FROM
+						xt_inspection
+					WHERE
+						DATE_FORMAT(FROM_UNIXTIME(inspect_date), '%%Y-%%m') = ?
+						AND org_id = ?
+					GROUP BY
+						patient_id, item_name
+				) latest
+				ON
+					i1.patient_id = latest.patient_id
+					AND i1.item_name = latest.item_name
+					AND i1.inspect_date = latest.latest_inspect_date
+			) latest_inspections
+			ON p.id = latest_inspections.patient_id 
+			WHERE p.user_org_id = ? and p.lapseto = 1
+			GROUP BY p.id, p.name
+		`, strings.Join(selectFields, ", "))
 
 	var results []map[string]interface{}
-	rows, err := readDb.Raw(query, yearMonth, org_id).Rows()
+	rows, err := readDb.Raw(query, yearMonth, org_id, org_id).Rows() // 注意这里多传一个org_id参数
 	if err != nil {
 		return nil, err
 	}
@@ -989,6 +1075,92 @@ func GetLatestInspectionValues(org_id int64, yearMonth string) ([]map[string]int
 	return results, nil
 }
 
+//func GetLatestInspectionValues(org_id int64, yearMonth string) ([]map[string]interface{}, error) {
+//	standards, err := getQualityControlStandards(org_id)
+//	if err != nil {
+//		return nil, err
+//	}
+//
+//	var selectFields []string
+//	for _, standard := range standards {
+//		field := fmt.Sprintf("IFNULL(MAX(CASE WHEN latest_inspections.item_name = '%s' THEN latest_inspections.inspect_value END),'') AS `%s`",
+//			standard.ItemName, standard.ItemName)
+//		selectFields = append(selectFields, field)
+//	}
+//
+//	query := fmt.Sprintf(`
+//		SELECT
+//		    p.name AS '姓名',
+//			%s
+//		FROM xt_patients p
+//		LEFT JOIN (
+//			SELECT
+//				i1.patient_id,
+//				i1.item_name,
+//				i1.inspect_value
+//			FROM
+//				xt_inspection i1
+//			JOIN (
+//				SELECT
+//					patient_id,
+//					item_name,
+//					MAX(inspect_date) AS latest_inspect_date
+//				FROM
+//					xt_inspection
+//				WHERE
+//					DATE_FORMAT(FROM_UNIXTIME(inspect_date), '%%Y-%%m') = ?
+//					AND org_id = ?
+//				GROUP BY
+//					patient_id, item_name
+//			) latest
+//			ON
+//				i1.patient_id = latest.patient_id
+//				AND i1.item_name = latest.item_name
+//				AND i1.inspect_date = latest.latest_inspect_date
+//		) latest_inspections
+//		ON p.id = latest_inspections.patient_id
+//		WHERE p.user_org_id = ?
+//		GROUP BY p.id, p.name
+//	`, strings.Join(selectFields, ", "))
+//
+//	var results []map[string]interface{}
+//	rows, err := readDb.Raw(query, yearMonth, org_id, org_id).Rows() // 注意这里多传一个org_id参数
+//	if err != nil {
+//		return nil, err
+//	}
+//	defer rows.Close()
+//
+//	columns, err := rows.Columns()
+//	if err != nil {
+//		return nil, err
+//	}
+//
+//	for rows.Next() {
+//		// 创建一个长度为列数的切片，用于存储每一行的值
+//		columnValues := make([]interface{}, len(columns))
+//		columnPointers := make([]interface{}, len(columns))
+//		for i := range columnValues {
+//			columnPointers[i] = &columnValues[i]
+//		}
+//
+//		// 扫描当前行的值
+//		if err := rows.Scan(columnPointers...); err != nil {
+//			return nil, err
+//		}
+//
+//		// 将扫描到的值放入结果 map 中
+//		result := make(map[string]interface{})
+//		for i, colName := range columns {
+//			val := columnPointers[i].(*interface{})
+//			result[colName] = *val
+//		}
+//
+//		results = append(results, result)
+//	}
+//
+//	return results, nil
+//}
+
 func createDynamicStruct(fields map[string]interface{}) reflect.Type {
 	var structFields []reflect.StructField
 	for name, value := range fields {