提交代码

controllers/fapiao_controller.go

@@ -8,6 +8,7 @@ import (
 	"XT_New/service"
 	"XT_New/service/fapiao"
 	"XT_New/utils"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
@@ -270,55 +271,164 @@ func (c *FapiaoApiController) GetOrderFaPiaoList() {
 }
 
 func (c *FapiaoApiController) GetLoginUploadCode() {
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
 	var config models.FapiaoConfig
 	config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
 	routerAddress, postData := fapiao.GetSMSCode(config) //发票开具
-	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	fmt.Println(routerAddress)
+	fmt.Println(postData)
+	r, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
 	if err != nil {
 		fmt.Println(err)
 	} else {
-		fmt.Println(string(r))
+		var resp SmsCode
+		// 将 byte 切片转换为结构体
+		json.Unmarshal(r, &resp)
+		if resp.Code == 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": resp.Message,
+			})
+		}
 	}
 }
 
+type SmsCode struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
 func (c *FapiaoApiController) Login() {
-	GetQRStatus(c.GetAdminUserInfo().CurrentOrgId)
 	code := c.GetString("code")
 	var config models.FapiaoConfig
 	config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
 	routerAddress, postData := fapiao.Login(code, config) //发票开具
-	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	r, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
 	if err != nil {
 		fmt.Println(err)
 	} else {
-		fmt.Println(string(r))
+		var resp SmsCode
+		// 将 byte 切片转换为结构体
+		json.Unmarshal(r, &resp)
+		if resp.Code == 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": resp.Message,
+			})
+		}
 	}
 }
-
 func (c *FapiaoApiController) GetQRCode() {
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
 	var config models.FapiaoConfig
 	config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
 	routerAddress, postData := fapiao.GetQRCode(config) //发票开具
-	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	r, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
 	if err != nil {
 		fmt.Println(err)
 	} else {
-		fmt.Println(string(r))
+		var resp QRAuth
+		// 将 byte 切片转换为结构体
+		err := json.Unmarshal(r, &resp)
+		fmt.Println(resp)
+		if err != nil {
+			fmt.Println("Error unmarshalling:", err)
+		} else {
+			if resp.Code == 0 {
+				decodedBytes, _ := base64.StdEncoding.DecodeString(resp.Data.QrCode)
+				if len(resp.Data.AuthId) == 0 { //还没进行授权,则获取二维码信息
+					c.ServeSuccessJSON(map[string]interface{}{
+						"cus_status": 1,
+						"qr_code":    string(decodedBytes),
+					})
+
+				} else {
+					status := GetQRStatus(c.GetAdminUserInfo().CurrentOrgId, resp.Data.AuthId)
+					if status == "UNDEFINE" {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"cus_status": -1,
+							"msg":        "未定义",
+						})
+					} else if status == "UNHANDLED" {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"cus_status": 1,
+							"qr_code":    string(decodedBytes),
+						})
+					} else if status == "REAL_AUTH_SUCCESS" {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"cus_status": 2,
+							"msg":        "已经实名认证成功",
+						})
+					} else if status == "REFRESH" {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"cus_status": 1,
+							"qr_code":    string(decodedBytes),
+						})
+					} else if status == "NEED_RELOGIN_BUREAU" {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"cus_status": -3,
+							"msg":        "登录失效,请重新短信登录税局",
+						})
+
+					}
+				}
+
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"cus_status": -4,
+					"msg":        resp.Message,
+				})
+			}
+
+		}
+		//fmt.Println(string(r))
 	}
 }
-
 func (c *FapiaoApiController) OpenFaPiao() {
+	//var config models.FapiaoConfig
+	//config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
+
 	//认证接口
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
+	status := GetQRStatusTwo(c.GetAdminUserInfo().CurrentOrgId)
+	fmt.Println("11112222")
+
+	fmt.Println(status)
+	if status == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAuthWrong)
+		return
+	}
 	//查询余量接口
+	//routerAddress, postData := fapiao.QueryStock(config)
+	//r, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
+	//fmt.Println(string(r))
+	//if err != nil {
+	//	fmt.Println(err)
+	//} else {
+	//	var resp2 FapiaoStock
+	//	// 将 byte 切片转换为结构体
+	//	err2 := json.Unmarshal(r, &resp2)
+	//	if err2 != nil {
+	//		fmt.Println(err2)
+	//
+	//	} else {
+	//		if resp2.Code == 0 {
+	//			if resp2.Data.LeftQuantity <= 0 {
+	//				c.ServeSuccessJSON(map[string]interface{}{
+	//					"msg":    "发票余量不足，请登录高灯平台申领发票",
+	//					"status": -1,
+	//				})
+	//				return
+	//			}
+	//		}
+	//	}
+	//}
+	//return
+
+	//开蓝票逻辑
 	order_ids := c.GetString("order_ids")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
 	ids := strings.Split(order_ids, ",")
 	orders, _ := service.GetFaPiaoOrderByIDS(ids)
-
 	var MedfeeSumamt float64 = 0  //治疗费用
 	var PsnCashPay float64 = 0    //治疗费用
 	var FundPaySumamt float64 = 0 //治疗费用
@@ -334,9 +444,8 @@ func (c *FapiaoApiController) OpenFaPiao() {
 		numbers = append(numbers, oss.Number)
 	}
 	details, _ = service.GetFaPiaoOrderInfoByNumbers(numbers)
-	//orders, _ := service.GetFaPiaoOrderByIDS(ids)
 	role, _ := service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
-	role.UserName = "王毅"
+	role.UserName = "邹碧琳"
 	type CostType struct {
 		name  string
 		price float64
@@ -473,14 +582,14 @@ func (c *FapiaoApiController) OpenFaPiao() {
 
 	}
 	fmt.Println(cts)
-	config, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	org_config, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 	var config2 models.FapiaoConfig
 	config2, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
 	number := strconv.FormatInt(time.Now().Unix(), 10) + "_" + strconv.FormatInt(orders[0].UserOrgId, 10) + "_" + strconv.FormatInt(orders[0].PatientId, 10)
 	amountWithoutTax, _, taxAmount, amountHasTax := CalculatePriceDetails(MedfeeSumamt, 1, 0.13)
 
-	postData := map[string]interface{}{
-		"seller_name":          config.OrgName,
+	postData3 := map[string]interface{}{
+		"seller_name":          org_config.OrgName,
 		"seller_taxpayer_num":  config2.SellerTaxpayerNum,
 		"seller_address":       config2.SellerAddress,
 		"seller_tel":           config2.SellerTel,
@@ -500,7 +609,7 @@ func (c *FapiaoApiController) OpenFaPiao() {
 		"drawer":               role.UserName,
 		"payee":                "",
 		"checker":              "",
-		"terminal_code":        "140301195503104110",
+		"terminal_code":        config2.TerminalCode,
 		"user_openid":          "",
 		"special_invoice_kind": "",
 		"zsfs":                 "",
@@ -532,16 +641,13 @@ func (c *FapiaoApiController) OpenFaPiao() {
 		items = append(items, item)
 	}
 
-	postData["items"] = items
-	fmt.Println("postData")
-	fmt.Println(postData)
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
-	routerAddress, postData := fapiao.Blue(postData) //发票开具
-	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	postData3["items"] = items
+	routerAddress, postData4 := fapiao.Blue(postData3) //发票开具
+	r, err4 := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData4)
 	fmt.Println("blue")
 	fmt.Println(string(r))
-	if err != nil {
-		fmt.Println(err)
+	if err4 != nil {
+		fmt.Println(err4)
 	} else {
 		var resp OpenFaPiaoResultResponse
 		// 将 byte 切片转换为结构体
@@ -555,7 +661,7 @@ func (c *FapiaoApiController) OpenFaPiao() {
 			if resp.Code == 0 {
 				//开具蓝票成功，请求查询接口，获取发票相关数据
 				routerAddress2, postData2 := fapiao.Query(config2.SellerTaxpayerNum, resp.Data.OrderSn, number)
-				r3, err2 := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress2, postData2)
+				r3, err2 := sdk.HttpPost("https://apigw.goldentec.com", routerAddress2, postData2)
 				fmt.Println("query")
 				fmt.Println(string(r3))
 				if err2 != nil {
@@ -596,42 +702,38 @@ func (c *FapiaoApiController) OpenFaPiao() {
 								"msg": "开具成功",
 							})
 						}
+					} else {
+						//错误处理
+
 					}
 				}
+			} else {
+				//错误处理
+
 			}
 		}
 	}
 }
 func (c *FapiaoApiController) RedFaPiao() {
-	////1.开发发票前先检查是否已经登录到税局和已经实名认证
-	//status := GetQRStatus(c.GetAdminUserInfo().CurrentOrgId)
-	//if status == "REAL_AUTH_SUCCESS" { //实人认证成功
-	//	GetQRStatus(c.GetAdminUserInfo().CurrentOrgId)
-	//	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
-	//	var config models.FapiaoConfig
-	//	config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
-	//
-	//	routerAddress, postData := fapiao.Red() //发票开具
-	//	_, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
-	//	if err != nil {
-	//		fmt.Println(err)
-	//	} else {
-	//
-	//	}
-	//}
-	//order_ids := c.GetString("order_ids")
+	//认证
+	status := GetQRStatusTwo(c.GetAdminUserInfo().CurrentOrgId)
+	if status == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAuthWrong)
+		return
+	}
+
 	id, _ := c.GetInt64("id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	role2, _ := service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
 	fapiao_config, _ := service.GetFaPiaoOrderById(id)
 	var config models.FapiaoConfig
 	config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
 	routerAddress, postData := fapiao.Red(config.SellerTaxpayerNum, "", fapiao_config.OrderSn) //发票开具
 	fmt.Println("postData")
 	fmt.Println(postData)
 	fmt.Println("postData")
-	red, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	red, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
 	fmt.Println("red")
 	fmt.Println(red)
 	fmt.Println("red")
@@ -651,7 +753,7 @@ func (c *FapiaoApiController) RedFaPiao() {
 			if resp.Data[0].State == 1 {
 				//查询红票开具情况
 				routerAddress2, postData2 := fapiao.Query(config.SellerTaxpayerNum, fapiao_config.OrderSn, "")
-				r3, _ := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress2, postData2)
+				r3, _ := sdk.HttpPost("https://apigw.goldentec.com", routerAddress2, postData2)
 				var resp3 QueryFaPiaoResultResponse
 				// 将 byte 切片转换为结构体
 				json.Unmarshal(r3, &resp3)
@@ -695,6 +797,44 @@ func (c *FapiaoApiController) RedFaPiao() {
 		}
 	}
 }
+func GetQRStatusTwo(org_id int64) (status int64) {
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
+	var config models.FapiaoConfig
+	config, _ = service.FindFaPiaoConfigInfo(org_id)
+	routerAddress, postData := fapiao.GetQRCode(config) //发票开具
+	r, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		var resp QRAuth
+		// 将 byte 切片转换为结构体
+		err := json.Unmarshal(r, &resp)
+		fmt.Println(resp)
+		if err != nil {
+			fmt.Println("Error unmarshalling:", err)
+		} else {
+			if len(resp.Data.AuthId) == 0 { //还没实名认证
+
+			} else {
+				status = 1
+				status_str := GetQRStatus(org_id, resp.Data.AuthId)
+				if status_str == "UNDEFINE" {
+					status = 0
+				} else if status_str == "UNHANDLED" {
+					status = 0
+				} else if status_str == "REAL_AUTH_SUCCESS" {
+					status = 1
+				} else if status_str == "REFRESH" {
+					status = 0
+				} else if status_str == "NEED_RELOGIN_BUREAU" {
+					status = 0
+
+				}
+			}
+		}
+	}
+	return
+}
 
 type RedResult struct {
 	Code int `json:"code"`
@@ -706,7 +846,6 @@ type RedResult struct {
 	} `json:"data"`
 	Message string `json:"message"`
 }
-
 type QueryFaPiaoResultResponse struct {
 	Code int `json:"code"`
 	Data struct {
@@ -736,7 +875,6 @@ type OpenFaPiaoResultResponse struct {
 		InvoiceId string `json:"invoice_id"`
 	} `json:"data"`
 }
-
 type SurplusStockResponse struct {
 	Code    int    `json:"code"`
 	Message string `json:"message"`
@@ -776,14 +914,16 @@ type Response struct {
 	} `json:"data"`
 }
 
-func GetQRStatus(org_id int64) (status string) {
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+func GetQRStatus(org_id int64, auth_id string) (status string) {
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
 	fmt.Println(sdk)
 	var config models.FapiaoConfig
 	config, _ = service.FindFaPiaoConfigInfo(org_id)
 	fmt.Println(config)
-	routerAddress, postData := fapiao.GetQRStatus("", config) //发票开具
-	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	routerAddress, postData := fapiao.GetQRStatus(auth_id, config) //发票开具
+	fmt.Println(routerAddress)
+	fmt.Println(postData)
+	r, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
 	if err != nil {
 		status = "FAILD"
 		fmt.Println(err)
@@ -794,6 +934,7 @@ func GetQRStatus(org_id int64) (status string) {
 
 		// 将 byte 切片转换为结构体
 		err := json.Unmarshal(r, &resp)
+		fmt.Println(string(r))
 		if err != nil {
 			status = "FAILD"
 			fmt.Println("Error unmarshalling:", err)
@@ -828,3 +969,20 @@ func roundTo(value float64, places int) float64 {
 	scale := math.Pow(10, float64(places))
 	return math.Round(value*scale) / scale
 }
+
+type QRAuth struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		AuthId string `json:"auth_id"`
+		QrCode string `json:"qr_code"`
+	} `json:"data"`
+}
+
+type FapiaoStock struct {
+	Code int `json:"code"`
+	Data struct {
+		LeftQuantity int `json:"left_quantity"`
+	} `json:"data"`
+	Message string `json:"message"`
+}

controllers/statistics_api_controller.go

@@ -87,6 +87,9 @@ func (c *StatisticsApiController) GetPatientWeightDetail() {
 	end_time := c.GetString("end_time")
 	add_type, _ := c.GetInt64("add_type")
 	dry_type, _ := c.GetInt64("dry_type")
+	fmt.Println("dry_type")
+	fmt.Println(dry_type)
+
 	after_type, _ := c.GetInt64("after_type")
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")

enums/error_code.go

@@ -285,6 +285,8 @@ const ( // ErrorCode
 	ErrorAdivceCode = 600000010
 
 	ErrorTimeCodeParamWrong = 600000012
+
+	ErrorCodeAuthWrong = 600000013
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -549,6 +551,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorAdivceCode:                       "该患者已开药,请先删除药品或耗材",
 
 	ErrorTimeCodeParamWrong: "时间跨度不能超过一个月",
+	ErrorCodeAuthWrong:      "尚未实名认证,请先认证",
 }
 
 type SGJError struct {

service/fapiao/qrcode.go

@@ -15,7 +15,7 @@ func GetQRCode(config models.FapiaoConfig) (routerAddress string, postData map[s
 
 func GetQRStatus(auth_id string, config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
 
-	routerAddress = "tax-api/invoice/auth/query-qrcode-status/v1"
+	routerAddress = "/tax-api/invoice/auth/query-qrcode-status/v1"
 	postData = map[string]interface{}{
 		"taxpayer_id":   config.TaxpayerId,
 		"terminal_code": config.TerminalCode,

service/fapiao/query.go

@@ -21,7 +21,7 @@ func QueryStock(config models.FapiaoConfig) (routerAddress string, postData map[
 	postData = map[string]interface{}{
 		"taxpayer_id":       config.TaxpayerId,
 		"terminal_code":     config.TerminalCode,
-		"invoice_type_code": "007",
+		"invoice_type_code": "026",
 	}
 	return routerAddress, postData
 }

service/statistis_qc_service.go

@@ -1772,105 +1772,265 @@ type DialysisDataTwo struct {
 	WeightStatus      string   `json:"weight_status"`
 }
 
-func GetNewDialysisWeightDetailTableTen(user_org_id int64, start_time int64, end_time int64, addType, dryType, afterType, page, limit int64) ([]DialysisDataTwo, int64, error) {
+//func GetNewDialysisWeightDetailTableTen(user_org_id int64, start_time int64, end_time int64, addType, dryType, afterType, page, limit int64) ([]DialysisDataTwo, int64, error) {
+//	offset := (page - 1) * limit
+//	var dialysisData []DialysisDataTwo
+//	var total int64
+//	// 构建基本查询
+//	query := readDb.Table("xt_assessment_before_dislysis b").
+//		Select(`
+//			p.dialysis_no AS dialysis_no,
+//			p.name AS patient_name,
+//			p.gender AS gender,
+//			FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS age,
+//			b.assessment_date AS assessment_date,
+//			b.dry_weight AS dry_weight,
+//			b.weight_before AS weight_before,
+//			a.weight_after AS weight_after,
+//			(
+//				SELECT a2.weight_after
+//				FROM xt_assessment_after_dislysis a2
+//				JOIN xt_assessment_before_dislysis b2
+//				ON a2.patient_id = b2.patient_id
+//				AND a2.assessment_date = b2.assessment_date
+//				WHERE b2.patient_id = b.patient_id
+//				AND b2.assessment_date < b.assessment_date
+//				ORDER BY b2.assessment_date DESC LIMIT 1
+//			) AS last_weight_after,
+//			CASE
+//				WHEN (
+//					SELECT a2.weight_after
+//					FROM xt_assessment_after_dislysis a2
+//					JOIN xt_assessment_before_dislysis b2
+//					ON a2.patient_id = b2.patient_id
+//					AND a2.assessment_date = b2.assessment_date
+//					WHERE b2.patient_id = b.patient_id
+//					AND b2.assessment_date < b.assessment_date
+//					ORDER BY b2.assessment_date DESC LIMIT 1
+//				) IS NOT NULL
+//				THEN (b.weight_before - (
+//					SELECT a2.weight_after
+//					FROM xt_assessment_after_dislysis a2
+//					JOIN xt_assessment_before_dislysis b2
+//					ON a2.patient_id = b2.patient_id
+//					AND a2.assessment_date = b2.assessment_date
+//					WHERE b2.patient_id = b.patient_id
+//					AND b2.assessment_date < b.assessment_date
+//					ORDER BY b2.assessment_date DESC LIMIT 1
+//				)) / (
+//					SELECT a2.weight_after
+//					FROM xt_assessment_after_dislysis a2
+//					JOIN xt_assessment_before_dislysis b2
+//					ON a2.patient_id = b2.patient_id
+//					AND a2.assessment_date = b2.assessment_date
+//					WHERE b2.patient_id = b.patient_id
+//					AND b2.assessment_date < b.assessment_date
+//					ORDER BY b2.assessment_date DESC LIMIT 1
+//				)
+//				ELSE NULL
+//			END AS weight_add,
+//			CASE
+//				WHEN b.dry_weight IS NOT NULL THEN
+//					CASE
+//						WHEN b.dry_weight < 40 THEN '小于40'
+//						WHEN b.dry_weight BETWEEN 40 AND 50 THEN '40～50'
+//						WHEN b.dry_weight BETWEEN 50 AND 60 THEN '50～60'
+//						WHEN b.dry_weight BETWEEN 60 AND 70 THEN '60～70'
+//						WHEN b.dry_weight > 70 THEN '大于70'
+//					END
+//				ELSE '其他'
+//			END AS dry_weight_category,
+//			CASE
+//				WHEN b.dry_weight IS NOT NULL THEN
+//					CASE
+//						WHEN ABS(a.weight_after - b.dry_weight) <= 0.3 THEN '达标'
+//						ELSE '不达标'
+//					END
+//				ELSE '其他'
+//			END AS weight_status
+//		`).
+//		Joins("JOIN xt_patients p ON p.id = b.patient_id").
+//		Joins("JOIN xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date AND a.status = 1").
+//		Where("b.user_org_id = ?", user_org_id).
+//		Where("b.assessment_date >= ?", start_time).
+//		Where("b.assessment_date <= ?", end_time).
+//		Where("b.status = ?", 1)
+//
+//	fmt.Println("dry_type")
+//	fmt.Println(dryType)
+//	switch dryType {
+//	case 1:
+//		query.Where("dry_weight_category = '小于40'")
+//	case 2:
+//		query.Where("dry_weight_category = '40～50'")
+//	case 3:
+//		query.Where("dry_weight_category = '50～60'")
+//	case 4:
+//		query.Where("dry_weight_category = '60～70'")
+//	case 5:
+//		query.Where("dry_weight_category = '大于70'")
+//	}
+//
+//	// 根据传入的 add_type 值动态构建条件
+//	addTypeCondition(query, addType)
+//	// 根据传入的 dry_type 值动态构建条件
+//	//fmt.Println("dry_type")
+//	//fmt.Println(dryType)
+//
+//	//dryTypeCondition(query, dryType)
+//	// 根据传入的 after_type 值动态构建条件
+//	afterTypeCondition(query, afterType)
+//	// 获取总记录数
+//	if err := query.Count(&total).Error; err != nil {
+//		return nil, 0, fmt.Errorf("count query failed: %v", err)
+//	}
+//	// 获取分页数据
+//	rows, err := query.Order("p.id, b.assessment_date").Offset(int(offset)).Limit(int(limit)).Rows()
+//	if err != nil {
+//		return nil, 0, fmt.Errorf("pagination query failed: %v", err)
+//	}
+//	defer rows.Close()
+//	// 处理结果集
+//	for rows.Next() {
+//		var data DialysisDataTwo
+//		if err := rows.Scan(
+//			&data.DialysisNo,
+//			&data.PatientName,
+//			&data.Gender,
+//			&data.Age,
+//			&data.AssessmentDate,
+//			&data.DryWeight,
+//			&data.WeightBefore,
+//			&data.WeightAfter,
+//			&data.LastWeightAfter,
+//			&data.WeightAdd,
+//			&data.DryWeightCategory,
+//			&data.WeightStatus,
+//		); err != nil {
+//			return nil, 0, fmt.Errorf("row scan failed: %v", err)
+//		}
+//		// 将每一行结果追加到切片中
+//		dialysisData = append(dialysisData, data)
+//	}
+//	return dialysisData, total, nil
+//}
+
+func GetNewDialysisWeightDetailTableTen(
+	user_org_id int64,
+	start_time int64,
+	end_time int64,
+	addType, dryType, afterType, page, limit int64,
+) ([]DialysisDataTwo, int64, error) {
 	offset := (page - 1) * limit
 	var dialysisData []DialysisDataTwo
 	var total int64
+
 	// 构建基本查询
 	query := readDb.Table("xt_assessment_before_dislysis b").
 		Select(`
-			p.dialysis_no AS dialysis_no, 
-			p.name AS patient_name, 
-			p.gender AS gender, 
-			FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS age,
-			b.assessment_date AS assessment_date, 
-			b.dry_weight AS dry_weight, 
-			b.weight_before AS weight_before, 
-			a.weight_after AS weight_after,
-			(
-				SELECT a2.weight_after 
-				FROM xt_assessment_after_dislysis a2
-				JOIN xt_assessment_before_dislysis b2 
-				ON a2.patient_id = b2.patient_id 
-				AND a2.assessment_date = b2.assessment_date
-				WHERE b2.patient_id = b.patient_id 
-				AND b2.assessment_date < b.assessment_date
-				ORDER BY b2.assessment_date DESC LIMIT 1
-			) AS last_weight_after,
-			CASE 
-				WHEN (
-					SELECT a2.weight_after 
-					FROM xt_assessment_after_dislysis a2
-					JOIN xt_assessment_before_dislysis b2 
-					ON a2.patient_id = b2.patient_id 
-					AND a2.assessment_date = b2.assessment_date
-					WHERE b2.patient_id = b.patient_id 
-					AND b2.assessment_date < b.assessment_date
-					ORDER BY b2.assessment_date DESC LIMIT 1
-				) IS NOT NULL
-				THEN (b.weight_before - (
-					SELECT a2.weight_after 
-					FROM xt_assessment_after_dislysis a2
-					JOIN xt_assessment_before_dislysis b2 
-					ON a2.patient_id = b2.patient_id 
-					AND a2.assessment_date = b2.assessment_date
-					WHERE b2.patient_id = b.patient_id 
-					AND b2.assessment_date < b.assessment_date
-					ORDER BY b2.assessment_date DESC LIMIT 1
-				)) / (
-					SELECT a2.weight_after 
-					FROM xt_assessment_after_dislysis a2
-					JOIN xt_assessment_before_dislysis b2 
-					ON a2.patient_id = b2.patient_id 
-					AND a2.assessment_date = b2.assessment_date
-					WHERE b2.patient_id = b.patient_id 
-					AND b2.assessment_date < b.assessment_date
-					ORDER BY b2.assessment_date DESC LIMIT 1
-				)
-				ELSE NULL
-			END AS weight_add,
-			CASE 
-				WHEN b.dry_weight IS NOT NULL THEN 
-					CASE 
-						WHEN b.dry_weight < 40 THEN '小于40'
-						WHEN b.dry_weight BETWEEN 40 AND 50 THEN '40～50'
-						WHEN b.dry_weight BETWEEN 50 AND 60 THEN '50～60'
-						WHEN b.dry_weight BETWEEN 60 AND 70 THEN '60～70'
-						WHEN b.dry_weight > 70 THEN '大于70'
-					END
-				ELSE '其他'
-			END AS dry_weight_category,
-			CASE 
-				WHEN b.dry_weight IS NOT NULL THEN 
-					CASE 
-						WHEN ABS(a.weight_after - b.dry_weight) <= 0.3 THEN '达标'
-						ELSE '不达标'
-					END
-				ELSE '其他'
-			END AS weight_status
-		`).
+            p.dialysis_no AS dialysis_no, 
+            p.name AS patient_name, 
+            p.gender AS gender, 
+            FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS age,
+            b.assessment_date AS assessment_date, 
+            b.dry_weight AS dry_weight, 
+            b.weight_before AS weight_before, 
+            a.weight_after AS weight_after,
+            (
+                SELECT a2.weight_after 
+                FROM xt_assessment_after_dislysis a2
+                JOIN xt_assessment_before_dislysis b2 
+                ON a2.patient_id = b2.patient_id 
+                AND a2.assessment_date = b2.assessment_date
+                WHERE b2.patient_id = b.patient_id 
+                AND b2.assessment_date < b.assessment_date
+                ORDER BY b2.assessment_date DESC LIMIT 1
+            ) AS last_weight_after,
+            CASE 
+                WHEN (
+                    SELECT a2.weight_after 
+                    FROM xt_assessment_after_dislysis a2
+                    JOIN xt_assessment_before_dislysis b2 
+                    ON a2.patient_id = b2.patient_id 
+                    AND a2.assessment_date = b2.assessment_date
+                    WHERE b2.patient_id = b.patient_id 
+                    AND b2.assessment_date < b.assessment_date
+                    ORDER BY b2.assessment_date DESC LIMIT 1
+                ) IS NOT NULL
+                THEN (b.weight_before - (
+                    SELECT a2.weight_after 
+                    FROM xt_assessment_after_dislysis a2
+                    JOIN xt_assessment_before_dislysis b2 
+                    ON a2.patient_id = b2.patient_id 
+                    AND a2.assessment_date = b2.assessment_date
+                    WHERE b2.patient_id = b.patient_id 
+                    AND b2.assessment_date < b.assessment_date
+                    ORDER BY b2.assessment_date DESC LIMIT 1
+                )) / (
+                    SELECT a2.weight_after 
+                    FROM xt_assessment_after_dislysis a2
+                    JOIN xt_assessment_before_dislysis b2 
+                    ON a2.patient_id = b2.patient_id 
+                    AND a2.assessment_date = b2.assessment_date
+                    WHERE b2.patient_id = b.patient_id 
+                    AND b2.assessment_date < b.assessment_date
+                    ORDER BY b2.assessment_date DESC LIMIT 1
+                )
+                ELSE NULL
+            END AS weight_add,
+            CASE 
+                WHEN b.dry_weight IS NOT NULL THEN 
+                    CASE 
+                        WHEN ABS(a.weight_after - b.dry_weight) <= 0.3 THEN '达标'
+                        ELSE '不达标'
+                    END
+                ELSE '其他'
+            END AS weight_status
+        `).
 		Joins("JOIN xt_patients p ON p.id = b.patient_id").
 		Joins("JOIN xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date AND a.status = 1").
 		Where("b.user_org_id = ?", user_org_id).
 		Where("b.assessment_date >= ?", start_time).
 		Where("b.assessment_date <= ?", end_time).
 		Where("b.status = ?", 1)
-	// 根据传入的 add_type 值动态构建条件
-	addTypeCondition(query, addType)
+
 	// 根据传入的 dry_type 值动态构建条件
-	dryTypeCondition(query, dryType)
-	// 根据传入的 after_type 值动态构建条件
+	fmt.Println("00=-----11111")
+	fmt.Println(dryType)
+
+	switch dryType {
+	case 1:
+		fmt.Println("00=-----11111")
+		fmt.Println(dryType)
+		query = query.Where("b.dry_weight < ?", 40)
+	case 2:
+		query = query.Where("b.dry_weight BETWEEN ? AND ?", 40, 50)
+	case 3:
+		query = query.Where("b.dry_weight BETWEEN ? AND ?", 50, 60)
+	case 4:
+		query = query.Where("b.dry_weight BETWEEN ? AND ?", 60, 70)
+	case 5:
+		query = query.Where("b.dry_weight > ?", 70)
+	}
+
+	//// 根据传入的 add_type 值动态构建条件
+	addTypeCondition(query, addType)
+	//
+	//// 根据传入的 after_type 值动态构建条件
 	afterTypeCondition(query, afterType)
+
 	// 获取总记录数
 	if err := query.Count(&total).Error; err != nil {
 		return nil, 0, fmt.Errorf("count query failed: %v", err)
 	}
+
 	// 获取分页数据
 	rows, err := query.Order("p.id, b.assessment_date").Offset(int(offset)).Limit(int(limit)).Rows()
 	if err != nil {
 		return nil, 0, fmt.Errorf("pagination query failed: %v", err)
 	}
 	defer rows.Close()
+
 	// 处理结果集
 	for rows.Next() {
 		var data DialysisDataTwo
@@ -1885,7 +2045,6 @@ func GetNewDialysisWeightDetailTableTen(user_org_id int64, start_time int64, end
 			&data.WeightAfter,
 			&data.LastWeightAfter,
 			&data.WeightAdd,
-			&data.DryWeightCategory,
 			&data.WeightStatus,
 		); err != nil {
 			return nil, 0, fmt.Errorf("row scan failed: %v", err)
@@ -1900,41 +2059,30 @@ func GetNewDialysisWeightDetailTableTen(user_org_id int64, start_time int64, end
 func addTypeCondition(query *gorm.DB, addType int64) {
 	switch addType {
 	case 1:
-		query.Where("weight_add <= 0.03")
+		query = query.Where("weight_add <= 0.03")
 	case 2:
-		query.Where("weight_add > 0.03 AND weight_add < 0.05")
+		query = query.Where("weight_add > 0.03 AND weight_add < 0.05")
 	case 3:
-		query.Where("weight_add >= 0.05")
+		query = query.Where("weight_add >= 0.05")
 	case 4:
-		query.Where("weight_add IS NULL")
+		query = query.Where("weight_add IS NULL")
 	}
 }
 
 // dryType 条件处理
 func dryTypeCondition(query *gorm.DB, dryType int64) {
-	switch dryType {
-	case 1:
-		query.Where("dry_weight_category = '小于40'")
-	case 2:
-		query.Where("dry_weight_category = '40～50'")
-	case 3:
-		query.Where("dry_weight_category = '50～60'")
-	case 4:
-		query.Where("dry_weight_category = '60～70'")
-	case 5:
-		query.Where("dry_weight_category = '大于70'")
-	}
+
 }
 
 // afterType 条件处理
 func afterTypeCondition(query *gorm.DB, afterType int64) {
 	switch afterType {
 	case 1:
-		query.Where("weight_status = '达标'")
+		query = query.Where("weight_status = '达标'")
 	case 2:
-		query.Where("weight_status = '不达标'")
+		query = query.Where("weight_status = '不达标'")
 	case 3:
-		query.Where("weight_status = '其他'")
+		query = query.Where("weight_status = '其他'")
 	}
 }
 
@@ -1953,102 +2101,217 @@ type DialysisDataThree struct {
 	BPStatus            string  `json:"血压达标状态"`
 }
 
-func GetNewDialysisBPDetailTableTen(user_org_id int64, start_time int64, end_time int64, addType, page, limit int64) ([]DialysisDataThree, int64, error) {
+//	func GetNewDialysisBPDetailTableTen(user_org_id int64, start_time int64, end_time int64, addType, page, limit int64) ([]DialysisDataThree, int64, error) {
+//		offset := (page - 1) * limit
+//		var total int64
+//		var results []DialysisDataThree
+//		// SQL 查询
+//		query := `
+//			SELECT
+//				p.dialysis_no AS 透析号,
+//				p.name AS 患者姓名,
+//				p.gender AS 性别,
+//				FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS 年龄,
+//				b.assessment_date AS 透析日期,
+//				b.dry_weight AS 干体重,
+//				CONCAT(b.systolic_blood_pressure, '/', b.diastolic_blood_pressure) AS 透前血压,
+//				CONCAT(a.systolic_blood_pressure, '/', a.diastolic_blood_pressure) AS 透后血压,
+//				GROUP_CONCAT(CONCAT(m.systolic_blood_pressure, '/', m.diastolic_blood_pressure) ORDER BY m.monitoring_date ASC SEPARATOR ',') AS 监测记录血压,
+//				(SELECT mr.ultrafiltration_rate
+//				 FROM xt_monitoring_record mr
+//				 WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
+//				 ORDER BY mr.operate_time DESC
+//				 LIMIT 1) AS 超滤率,
+//				(SELECT mr.ultrafiltration_volume
+//				 FROM xt_monitoring_record mr
+//				 WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
+//				 ORDER BY mr.operate_time DESC
+//				 LIMIT 1) AS 超滤总量,
+//				CASE
+//					WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+//						CASE
+//							WHEN b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90 THEN '达标'
+//							ELSE '不达标'
+//						END
+//					WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+//						CASE
+//							WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN '达标'
+//							ELSE '不达标'
+//						END
+//				END AS 血压达标状态
+//			FROM
+//				xt_patients p
+//			JOIN
+//				xt_assessment_before_dislysis b ON p.id = b.patient_id
+//			JOIN
+//				xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date
+//			JOIN
+//				xt_monitoring_record m ON p.id = m.patient_id AND m.monitoring_date = b.assessment_date
+//			WHERE
+//				b.user_org_id = ?
+//				AND b.assessment_date >= ?
+//				AND b.assessment_date <= ?
+//				AND (
+//					(? = 1 AND CASE
+//						WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+//							CASE
+//								WHEN b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90 THEN 1
+//								ELSE 0
+//							END
+//						WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+//							CASE
+//								WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN 1
+//								ELSE 0
+//							END
+//					END = 1)
+//					OR
+//					(? = 2 AND CASE
+//						WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+//							CASE
+//								WHEN b.systolic_blood_pressure >= 140 AND b.diastolic_blood_pressure >= 90 THEN 1
+//								ELSE 0
+//							END
+//						WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+//							CASE
+//								WHEN b.systolic_blood_pressure >= 160 AND b.diastolic_blood_pressure >= 90 THEN 1
+//								ELSE 0
+//							END
+//					END = 1)
+//				)
+//			GROUP BY
+//				p.id, b.assessment_date
+//			ORDER BY
+//				p.id, b.assessment_date
+//			LIMIT ? OFFSET ?;
+//		`
+//
+//		// 计算总数
+//		countQuery := `
+//			SELECT COUNT(*)
+//			FROM
+//				xt_patients p
+//			JOIN
+//				xt_assessment_before_dislysis b ON p.id = b.patient_id
+//			WHERE
+//				b.user_org_id = ?
+//				AND b.assessment_date >= ?
+//				AND b.assessment_date <= ?
+//		`
+//
+//		// 执行统计查询
+//		if err := readDb.Raw(countQuery, user_org_id, start_time, end_time).Scan(&total).Error; err != nil {
+//			return nil, 0, fmt.Errorf("error calculating total count: %v", err)
+//		}
+//
+//		// 执行数据查询
+//		if err := readDb.Raw(query, user_org_id, start_time, end_time, addType, addType, limit, offset).Scan(&results).Error; err != nil {
+//			return nil, 0, fmt.Errorf("error executing query: %v", err)
+//		}
+//
+//		return results, total, nil
+//	}
+func GetNewDialysisBPDetailTableTen(
+	user_org_id int64,
+	start_time int64,
+	end_time int64,
+	addType, page, limit int64,
+) ([]DialysisDataThree, int64, error) {
 	offset := (page - 1) * limit
 	var total int64
 	var results []DialysisDataThree
+
 	// SQL 查询
 	query := `
-		SELECT
-			p.dialysis_no AS 透析号,
-			p.name AS 患者姓名,
-			p.gender AS 性别,
-			FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS 年龄,
-			b.assessment_date AS 透析日期,
-			b.dry_weight AS 干体重,
-			CONCAT(b.systolic_blood_pressure, '/', b.diastolic_blood_pressure) AS 透前血压,
-			CONCAT(a.systolic_blood_pressure, '/', a.diastolic_blood_pressure) AS 透后血压,
-			GROUP_CONCAT(CONCAT(m.systolic_blood_pressure, '/', m.diastolic_blood_pressure) ORDER BY m.monitoring_date ASC SEPARATOR ',') AS 监测记录血压,
-			(SELECT mr.ultrafiltration_rate
-			 FROM xt_monitoring_record mr
-			 WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
-			 ORDER BY mr.operate_time DESC
-			 LIMIT 1) AS 超滤率,
-			(SELECT mr.ultrafiltration_volume
-			 FROM xt_monitoring_record mr
-			 WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
-			 ORDER BY mr.operate_time DESC
-			 LIMIT 1) AS 超滤总量,
-			CASE 
-				WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
-					CASE 
-						WHEN b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90 THEN '达标'
-						ELSE '不达标'
-					END
-				WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
-					CASE 
-						WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN '达标'
-						ELSE '不达标'
-					END
-			END AS 血压达标状态
-		FROM
-			xt_patients p
-		JOIN
-			xt_assessment_before_dislysis b ON p.id = b.patient_id
-		JOIN
-			xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date
-		JOIN
-			xt_monitoring_record m ON p.id = m.patient_id AND m.monitoring_date = b.assessment_date
-		WHERE
-			b.user_org_id = ?
-			AND b.assessment_date >= ?
-			AND b.assessment_date <= ?
-			AND (
-				(? = 1 AND CASE 
-					WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
-						CASE 
-							WHEN b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90 THEN 1
-							ELSE 0
-						END
-					WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
-						CASE 
-							WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN 1
-							ELSE 0
-						END
-				END = 1)
-				OR
-				(? = 2 AND CASE 
-					WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
-						CASE 
-							WHEN b.systolic_blood_pressure >= 140 AND b.diastolic_blood_pressure >= 90 THEN 1
-							ELSE 0
-						END
-					WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
-						CASE 
-							WHEN b.systolic_blood_pressure >= 160 AND b.diastolic_blood_pressure >= 90 THEN 1
-							ELSE 0
-						END
-				END = 1)
-			)
-		GROUP BY
-			p.id, b.assessment_date
-		ORDER BY
-			p.id, b.assessment_date
-		LIMIT ? OFFSET ?;
-	`
+        SELECT
+            p.dialysis_no AS DialysisNo,
+            p.name AS PatientName,
+            p.gender AS Gender,
+            FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) AS Age,
+            b.assessment_date AS AssessmentDate,
+            b.dry_weight AS DryWeight,
+            CONCAT(b.systolic_blood_pressure, '/', b.diastolic_blood_pressure) AS PreDialysisBP,
+            CONCAT(a.systolic_blood_pressure, '/', a.diastolic_blood_pressure) AS PostDialysisBP,
+            GROUP_CONCAT(CONCAT(m.systolic_blood_pressure, '/', m.diastolic_blood_pressure) ORDER BY m.monitoring_date ASC SEPARATOR ',') AS MonitoringBP,
+            (SELECT mr.ultrafiltration_rate
+             FROM xt_monitoring_record mr
+             WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
+             ORDER BY mr.operate_time DESC
+             LIMIT 1) AS UltrafiltrationRate,
+            (SELECT mr.ultrafiltration_volume
+             FROM xt_monitoring_record mr
+             WHERE mr.patient_id = p.id AND mr.monitoring_date = b.assessment_date
+             ORDER BY mr.operate_time DESC
+             LIMIT 1) AS UltrafiltrationVol,
+            CASE 
+                WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+                    CASE 
+                        WHEN b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90 THEN '达标'
+                        ELSE '不达标'
+                    END
+                WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+                    CASE 
+                        WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN '达标'
+                        ELSE '不达标'
+                    END
+            END AS BPStatus
+        FROM
+            xt_patients p
+        JOIN
+            xt_assessment_before_dislysis b ON p.id = b.patient_id
+        JOIN
+            xt_assessment_after_dislysis a ON p.id = a.patient_id AND b.assessment_date = a.assessment_date
+        JOIN
+            xt_monitoring_record m ON p.id = m.patient_id AND m.monitoring_date = b.assessment_date
+        WHERE
+            b.user_org_id = ?
+            AND b.assessment_date >= ?
+            AND b.assessment_date <= ?
+            AND (
+                (? = 1 AND CASE 
+                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+                        CASE 
+                            WHEN b.systolic_blood_pressure < 140 OR b.diastolic_blood_pressure < 90 THEN 1
+                            ELSE 0
+                        END
+                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+                        CASE 
+                            WHEN b.systolic_blood_pressure < 160 OR b.diastolic_blood_pressure < 90 THEN 1
+                            ELSE 0
+                        END
+                END = 1)
+                OR
+                (? = 2 AND CASE 
+                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) < 60 THEN
+                        CASE 
+                            WHEN b.systolic_blood_pressure >= 140 AND b.diastolic_blood_pressure >= 90 THEN 1
+                            ELSE 0
+                        END
+                    WHEN FLOOR((YEAR(CURDATE()) - SUBSTRING(p.id_card_no, 7, 4))) >= 60 THEN
+                        CASE 
+                            WHEN b.systolic_blood_pressure >= 160 AND b.diastolic_blood_pressure >= 90 THEN 1
+                            ELSE 0
+                        END
+                END = 1)
+            )
+        GROUP BY
+            p.id, b.assessment_date
+        ORDER BY
+            p.id, b.assessment_date
+        LIMIT ? OFFSET ?;
+    `
 
 	// 计算总数
 	countQuery := `
-		SELECT COUNT(*)
-		FROM
-			xt_patients p
-		JOIN
-			xt_assessment_before_dislysis b ON p.id = b.patient_id
-		WHERE
-			b.user_org_id = ?
-			AND b.assessment_date >= ?
-			AND b.assessment_date <= ?
-	`
+        SELECT COUNT(*)
+        FROM
+            xt_patients p
+        JOIN
+            xt_assessment_before_dislysis b ON p.id = b.patient_id
+        WHERE
+            b.user_org_id = ?
+            AND b.assessment_date >= ?
+            AND b.assessment_date <= ?
+    `
 
 	// 执行统计查询
 	if err := readDb.Raw(countQuery, user_org_id, start_time, end_time).Scan(&total).Error; err != nil {