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

controllers/fapiao_controller.go

@@ -0,0 +1,218 @@
+package controllers
+
+import (
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/service/fapiao"
+	"XT_New/utils"
+	"fmt"
+	"github.com/astaxie/beego"
+	"github.com/gaodengyun/goldencloud-sdk-go/goldencloud/common"
+	"github.com/gaodengyun/goldencloud-sdk-go/goldencloud/invoice"
+	"time"
+)
+
+type FapiaoApiController struct {
+	BaseAuthAPIController
+}
+
+func FaPiaoApiRegistRouters() {
+	beego.Router("/api/fapiao/sms/code", &FapiaoApiController{}, "get:GetLoginUploadCode")
+	beego.Router("/api/fapiao/sms/login", &FapiaoApiController{}, "get:Login")
+	beego.Router("/api/fapiao/qrcode/get", &FapiaoApiController{}, "get:GetQRCode")
+	beego.Router("/api/fapiao/stock/get", &FapiaoApiController{}, "get:GetFaPiaoStock")
+	beego.Router("/api/fapiao/blue", &FapiaoApiController{}, "get:OpenFaPiao")
+	beego.Router("/api/fapiao/red", &FapiaoApiController{}, "get:RedFaPiao")
+
+	beego.Router("/api/order/fapiao/list", &FapiaoApiController{}, "get:GetOrderFaPiaoList")
+	beego.Router("/api/fapiao/list", &FapiaoApiController{}, "get:GetFaPiaoList")
+
+}
+func (c *FapiaoApiController) GetFaPiaoList() {
+	page, _ := c.GetInt64("page", -1)
+	limit, _ := c.GetInt64("limit", -1)
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			//fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	adminUser := c.GetAdminUserInfo()
+	org_id := adminUser.CurrentOrgId
+	order, err, total := service.GetFaPiaoList(org_id, page, limit, startTime, endTime)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order": order,
+			"total": total,
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+}
+func (c *FapiaoApiController) GetOrderFaPiaoList() {
+	page, _ := c.GetInt64("page", -1)
+	limit, _ := c.GetInt64("limit", -1)
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	is_open_fapiao, _ := c.GetInt64("is_open_fapiao", 0)
+	sort_type, _ := c.GetInt64("sort_type", 0)
+
+	patient_id, _ := c.GetInt64("patient_id", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			//fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	adminUser := c.GetAdminUserInfo()
+	org_id := adminUser.CurrentOrgId
+	order, err, total := service.GetFaPiaoSettleList(org_id, page, limit, startTime, endTime, sort_type, start_time, end_time, is_open_fapiao, patient_id)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"order": order,
+			"total": total,
+		})
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+}
+
+func (c *FapiaoApiController) GetLoginUploadCode() {
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "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)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(string(r))
+	}
+}
+
+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")
+	routerAddress, postData := fapiao.Login(code, config) //发票开具
+	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(string(r))
+	}
+}
+
+func (c *FapiaoApiController) GetQRCode() {
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "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)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(string(r))
+	}
+}
+
+func (c *FapiaoApiController) GetFaPiaoStock() {
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+	var config models.FapiaoConfig
+	config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
+	routerAddress, postData := fapiao.QueryStock(config) //发票开具
+	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(string(r))
+	}
+
+}
+
+func (c *FapiaoApiController) OpenFaPiao() {
+	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.Blue(config) //发票开具
+	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(string(r))
+	}
+}
+
+func (c *FapiaoApiController) RedFaPiao() {
+	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() //发票开具
+	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(string(r))
+	}
+}
+
+func GetQRStatus(org_id int64) {
+	redis := service.RedisClient()
+	defer redis.Close()
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+	var config models.FapiaoConfig
+	config, _ = service.FindFaPiaoConfigInfo(org_id)
+	routerAddress, postData := fapiao.GetQRStatus("", config) //发票开具
+	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		fmt.Println(string(r))
+	}
+}

controllers/statistics_api_controller.go

@@ -44,6 +44,148 @@ func StatisticsApiRegistRouters() {
 	beego.Router("/api/commonqc/dialysistreat/finish", &StatisticsApiController{}, "get:GetDialysisTreatFinsh")
 	beego.Router("/api/commonqc/dialysistreat/detail", &StatisticsApiController{}, "get:GetDialysisTreatDetail")
 
+	beego.Router("/api/commonqc/patinet/weight", &StatisticsApiController{}, "get:GetPatientWeight")
+	beego.Router("/api/commonqc/weight/detail", &StatisticsApiController{}, "get:GetPatientWeightDetail")
+	beego.Router("/api/commonqc/patinet/bp", &StatisticsApiController{}, "get:GetPatientBP")
+	beego.Router("/api/commonqc/bp/detail", &StatisticsApiController{}, "get:GetPatientBPDetail")
+
+}
+func (c *StatisticsApiController) GetPatientWeight() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	statistics_type, _ := c.GetInt("statistics_type")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	item, _ := service.GetNewDialysisWeightChartData(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, statistics_type)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": item,
+	})
+}
+func (c *StatisticsApiController) GetPatientWeightDetail() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	add_type, _ := c.GetInt64("add_type")
+	dry_type, _ := c.GetInt64("dry_type")
+	after_type, _ := c.GetInt64("after_type")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	data, total, _ := service.GetNewDialysisWeightDetailTableTen(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, dry_type, after_type, page, limit)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  data,
+		"total": total,
+	})
+}
+func (c *StatisticsApiController) GetPatientBP() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	statistics_type, _ := c.GetInt("statistics_type")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	item, _ := service.GetNewDialysisBloodChartData(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, statistics_type)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": item,
+	})
+}
+func (c *StatisticsApiController) GetPatientBPDetail() {
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	add_type, _ := c.GetInt64("status_type")
+	page, _ := c.GetInt64("page")
+	limit, _ := c.GetInt64("limit")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		fmt.Println("err-----------", err)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	data, total, _ := service.GetNewDialysisBPDetailTableTen(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, add_type, page, limit)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  data,
+		"total": total,
+	})
+
 }
 
 func (c *StatisticsApiController) GetDialysisTreatFinsh() {
@@ -118,7 +260,6 @@ func (c *StatisticsApiController) GetDialysisTreatDetail() {
 		"total": total,
 	})
 }
-
 func (c *StatisticsApiController) GetDialysisTotal() {
 	start_date := c.GetString("start_date")
 	end_date := c.GetString("end_date")
@@ -1204,7 +1345,6 @@ func (c *StatisticsApiController) GetDialysisTotalDetailInfo() {
 	}
 
 }
-
 func (c *StatisticsApiController) GetAnticoagulant() {
 	start_date := c.GetString("start_date")
 	end_date := c.GetString("end_date")

models/fapiao.go

@@ -0,0 +1,91 @@
+package models
+
+type FapiaoConfig struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsUse             int64  `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	TaxpayerId        string `gorm:"column:taxpayer_id" json:"taxpayer_id" form:"taxpayer_id"`
+	TerminalCode      string `gorm:"column:terminal_code" json:"terminal_code" form:"terminal_code"`
+	SellerTaxpayerNum string `gorm:"column:seller_taxpayer_num" json:"seller_taxpayer_num" form:"seller_taxpayer_num"`
+	SellerAddress     string `gorm:"column:seller_address" json:"seller_address" form:"seller_address"`
+	SellerTel         string `gorm:"column:seller_tel" json:"seller_tel" form:"seller_tel"`
+	SellerBankName    string `gorm:"column:seller_bank_name" json:"seller_bank_name" form:"seller_bank_name"`
+	SellerBankAccount string `gorm:"column:seller_bank_account" json:"seller_bank_account" form:"seller_bank_account"`
+	TitleType         string `gorm:"column:title_type" json:"title_type" form:"title_type"`
+	BuyerTitle        string `gorm:"column:buyer_title" json:"buyer_title" form:"buyer_title"`
+	CallbackUrl       string `gorm:"column:callback_url" json:"callback_url" form:"callback_url"`
+	UserOpenid        string `gorm:"column:user_openid" json:"user_openid" form:"user_openid"`
+}
+
+func (FapiaoConfig) TableName() string {
+	return "fapiao_config"
+}
+
+type HisOrderByFaPiao struct {
+	ID                 int64          `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId       int64          `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64          `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime              int64          `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64          `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64          `gorm:"column:status" json:"status" form:"status"`
+	Number             string         `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode            int64          `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg            string         `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo             string         `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg             string         `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime        string         `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid        string         `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus        int64          `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId            string         `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId             string         `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo              string         `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName            string         `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType        string         `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno             string         `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend               string         `gorm:"column:gend" json:"gend" form:"gend"`
+	Insutype           string         `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SetlTime           string         `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MedType            string         `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt       float64        `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FaPiaoCode         string         `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber       string         `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	Patients           Patients       `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient         HisPatient     `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
+	HisFaPiaoOrder     HisFaPiaoOrder `gorm:"ForeignKey:FaPiaoNumber;AssociationForeignKey:TicketSn" json:"result"`
+}
+
+func (HisOrderByFaPiao) TableName() string {
+	return "his_order"
+}
+
+type HisFaPiaoOrder struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	InvoiceId        string  `gorm:"column:invoice_id" json:"invoice_id" form:"invoice_id"`
+	OrderSn          string  `gorm:"column:order_sn" json:"order_sn" form:"order_sn"`
+	TicketSn         string  `gorm:"column:ticket_sn" json:"ticket_sn" form:"ticket_sn"`
+	TicketDate       string  `gorm:"column:ticket_date" json:"ticket_date" form:"ticket_date"`
+	AmountWithTax    string  `gorm:"column:amount_with_tax" json:"amount_with_tax" form:"amount_with_tax"`
+	AmountWithoutTax string  `gorm:"column:amount_without_tax" json:"amount_without_tax" form:"amount_without_tax"`
+	TaxAmount        string  `gorm:"column:tax_amount" json:"tax_amount" form:"tax_amount"`
+	IsRedWashed      string  `gorm:"column:is_red_washed" json:"is_red_washed" form:"is_red_washed"`
+	PdfUrl           string  `gorm:"column:pdf_url" json:"pdf_url" form:"pdf_url"`
+	OfdUrl           string  `gorm:"column:ofd_url" json:"ofd_url" form:"ofd_url"`
+	XmlUrl           string  `gorm:"column:xml_url" json:"xml_url" form:"xml_url"`
+	FapiaoStatus     string  `gorm:"column:fapiao_status" json:"fapiao_status" form:"fapiao_status"`
+	OrderIds         string  `gorm:"column:order_ids" json:"order_ids" form:"order_ids"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	PatientId        int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Creator          string  `gorm:"column:creator" json:"creator" form:"creator"`
+	MedfeeSumamt     float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	PsnCashPay       float64 `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	FundPaySumamt    float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+}
+
+func (HisFaPiaoOrder) TableName() string {
+	return "his_fapiao_order"
+}

routers/router.go

@@ -88,4 +88,5 @@ func init() {
 	controllers.ZuobiaoApiRegistRouters()
 	controllers.HisExportDataApiRegistRouters()
 	controllers.NewStockApiRegistRouters()
+	controllers.FaPiaoApiRegistRouters()
 }

service/fapiao/bule.go

@@ -0,0 +1,63 @@
+package fapiao
+
+import "XT_New/models"
+
+func Blue(config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/blue/v1"
+
+	postData = map[string]interface{}{
+		"seller_name":          "wkbb invoice blue test",
+		"seller_taxpayer_num":  "your seller_taxpayer_num",
+		"seller_address":       "",
+		"seller_tel":           "",
+		"seller_bank_name":     "",
+		"seller_bank_account":  "",
+		"title_type":           1,
+		"buyer_title":          "海南高灯科技",
+		"buyer_taxpayer_num":   "",
+		"buyer_address":        "",
+		"buyer_bank_name":      "",
+		"buyer_bank_account":   "",
+		"buyer_phone":          "",
+		"buyer_email":          "",
+		"taker_phone":          "",
+		"order_id":             "fc5fec2d1b6942658c009a151d4cffa5",
+		"invoice_type_code":    "032",
+		"callback_url":         "http://www.test.com",
+		"drawer":               "TEST",
+		"payee":                "TEST",
+		"checker":              "TEST",
+		"terminal_code":        "661234567789",
+		"user_openid":          "ba9ea0bdfa1f460993c990564caab18f",
+		"special_invoice_kind": "",
+		"zsfs":                 "",
+		"deduction":            "",
+		"amount_has_tax":       "66.66",
+		"tax_amount":           "66.66",
+		"amount_without_tax":   "66.66",
+		"remark":               "readme",
+	}
+
+	//项目商品明细
+	items := make([]map[string]interface{}, 1)
+	item := make(map[string]interface{})
+	item["name"] = "海鲜真划算"
+	item["tax_code"] = "your tax_code"
+	item["models"] = "zyx"
+	item["unit"] = "个"
+	item["total_price"] = "66.66"
+	item["total"] = "5"
+	item["price"] = "17.22"
+	item["tax_rate"] = "66.66"
+	item["tax_amount"] = "66.66"
+	item["discount"] = "66.66"
+	item["preferential_policy_flag"] = "0"
+	item["zero_tax_flag"] = "0"
+	item["vat_special_management"] = ""
+	items[0] = item
+
+	postData["items"] = items
+
+	return routerAddress, postData
+}

service/fapiao/invalid.go

@@ -0,0 +1,16 @@
+package fapiao
+
+func Invalid() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/invalid/v1"
+
+	postData = map[string]interface{}{
+		"seller_taxpayer_num": "500102010004038",
+		"order_sn":            "",
+		"order_id":            "gp_20190828115454_742_11296_31131",
+		"name":                "fff",
+		"is_red":              0,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/login.go

@@ -0,0 +1,13 @@
+package fapiao
+
+import "XT_New/models"
+
+func Login(code string, config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+	routerAddress = "/tax-api/invoice/sms/upload/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+		"sms_code":      code,
+	}
+	return routerAddress, postData
+}

service/fapiao/print.go

@@ -0,0 +1,18 @@
+package fapiao
+
+func Print() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/print/v1"
+
+	postData = map[string]interface{}{
+		"seller_taxpayer_num": "500102010004038",
+		"order_sn":            "",
+		"order_id":            "gp_20190828115454_742_11296_31131",
+		"print_type":          "",
+		"print_flag":          "",
+		"print_mode":          "",
+		"is_red":              0,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/qrcode.go

@@ -0,0 +1,26 @@
+package fapiao
+
+import "XT_New/models"
+
+func GetQRCode(config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/auth/get-qrcode/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+	}
+
+	return routerAddress, postData
+}
+
+func GetQRStatus(auth_id string, config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "tax-api/invoice/auth/query-qrcode-status/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+		"auth_id":       auth_id,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/query.go

@@ -0,0 +1,27 @@
+package fapiao
+
+import "XT_New/models"
+
+func Query() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/query/v1"
+
+	postData = map[string]interface{}{
+		"seller_taxpayer_num": "500102010004038",
+		"order_sn":            "",
+		"order_id":            "gp_20190828115454_742_11296_31131",
+		"is_red":              0,
+	}
+
+	return routerAddress, postData
+}
+
+func QueryStock(config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+	routerAddress = "/tax-api/invoice/query-stock/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":       config.TaxpayerId,
+		"terminal_code":     config.TerminalCode,
+		"invoice_type_code": "007",
+	}
+	return routerAddress, postData
+}

service/fapiao/red.go

@@ -0,0 +1,21 @@
+package fapiao
+
+func Red() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/red/v1"
+
+	invoices := make([]map[string]interface{}, 1)
+
+	invoice := make(map[string]interface{})
+	invoice["seller_taxpayer_num"] = "111112222233333"
+	invoice["callback_url"] = "http://test.feehi.com/sign/mock/invoice-callback.php"
+	invoice["order_sn"] = "6555407740980870214"
+
+	invoices[0] = invoice
+
+	postData = map[string]interface{}{
+		"invoices": invoices,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/sms.go

@@ -0,0 +1,14 @@
+package fapiao
+
+import "XT_New/models"
+
+func GetSMSCode(config models.FapiaoConfig) (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/login/check/v1"
+	postData = map[string]interface{}{
+		"taxpayer_id":   config.TaxpayerId,
+		"terminal_code": config.TerminalCode,
+	}
+
+	return routerAddress, postData
+}

service/fapiao/waitopen.go

@@ -0,0 +1,14 @@
+package fapiao
+
+func WaitOpen() (routerAddress string, postData map[string]interface{}) {
+
+	routerAddress = "/tax-api/invoice/wait-open/v1"
+
+	postData = map[string]interface{}{
+		"taxpayer_num":      "20181010000000865115391398242493",
+		"machine_no":        "125523523523",
+		"invoice_type_code": "026",
+	}
+
+	return routerAddress, postData
+}

service/fapiao_service.go

@@ -0,0 +1,85 @@
+package service
+
+import "XT_New/models"
+
+func FindFaPiaoConfigInfo(org_id int64) (config models.FapiaoConfig, err error) {
+	err = readDb.Model(&models.FapiaoConfig{}).Where("status = 1 AND user_org_id = ?", org_id).First(&config).Error
+	return
+}
+
+func GetFaPiaoSettleList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, sort_type int64, start_time string, end_time string, is_open_fapiao int64, patient_id int64) (order []*models.HisOrderByFaPiao, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisOrderByFaPiao{})
+
+	// Join the patients table based on user_org_id
+	db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id and patient.user_org_id = ?", user_org_id)
+
+	// Handle the is_open_fapiao logic
+	if is_open_fapiao == 1 {
+		// is_open_fapiao == 1: Look for orders with a corresponding fa_piao_number
+		db = db.Joins("left join his_fapiao_order as fo on fo.ticket_sn = his_order.fa_piao_number and fo.user_org_id = ?", user_org_id).
+			Where("fo.id IS NOT NULL") // Ensure fa_piao_number exists
+	} else if is_open_fapiao == 2 {
+		// is_open_fapiao == 2: Look for orders without a corresponding fa_piao_number
+		db = db.Joins("left join his_fapiao_order as fo on fo.ticket_sn = his_order.fa_piao_number and fo.user_org_id = ?", user_org_id).
+			Where("fo.id IS NULL") // Ensure fa_piao_number does not exist
+	}
+
+	// Handle sorting logic
+	if sort_type == 1 {
+		if start_time_timestamp != 0 {
+			db = db.Where("his_order.settle_accounts_date >= ?", start_time_timestamp)
+		}
+		if end_time_timestamp != 0 {
+			db = db.Where("his_order.settle_accounts_date <= ?", end_time_timestamp)
+		}
+	} else {
+		if len(start_time) != 0 {
+			db = db.Where("his_order.setl_time >= ?", start_time+" 00:00:00")
+		}
+		if len(end_time) != 0 {
+			db = db.Where("his_order.setl_time <= ?", end_time+" 23:59:59")
+		}
+	}
+	if patient_id > 0 {
+		db = db.Where("his_order.patient_id = ?", patient_id)
+
+	}
+
+	// Preload related data
+	db = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisFaPiaoOrder", "status = 1")
+
+	// Count the total number of records
+	db = db.Count(&total)
+
+	// Apply pagination
+	db = db.Limit(limit).Offset(offset)
+
+	// Execute query and return results
+	err = db.Find(&order).Error
+	//
+	//for _, item := range order {
+	//	var hfpo models.HisFaPiaoOrder
+	//	readDb.Model(&models.HisFaPiaoOrder{}).Where("ticket_sn = ?", item.FaPiaoNumber).First(&hfpo)
+	//	item.HisFaPiaoOrder =
+	//}
+
+	return
+}
+
+func GetFaPiaoList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64) (order []*models.HisOrder, err error, total int64) {
+	offset := (page - 1) * limit
+	db := readDb.Model(&models.HisFaPiaoOrder{})
+	db = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
+		Preload("HisFaPiaoOrder", "status = 1")
+	db = db.Where("ctime >= ? and ctime <= ? and user_org_id = ?", start_time_timestamp, end_time_timestamp, user_org_id)
+	// Count the total number of records
+	db = db.Count(&total)
+	// Apply pagination
+	db = db.Limit(limit).Offset(offset)
+	// Execute query and return results
+	err = db.Find(&order).Error
+	return
+}

service/statistics_service/index_evaluation_service.go

@@ -365,16 +365,13 @@ func GetDialysisWeightChartData(user_org_id int64, start_time int64, end_time in
 			if item.Name == "40~50kg" {
 				isHasConditionTwo = true
 			}
-
 			if item.Name == "60~70kg" {
 				isHasConditionThree = true
 			}
-
 			if item.Name == "大于70kg" {
 				isHasConditionFour = true
 			}
-
-			if item.Name == "未知" {
+			if item.Name == "待定/卧床" {
 				isHasConditionFive = true
 			}
 		}

service/statistis_qc_service.go

@@ -3,7 +3,10 @@ package service
 import (
 	"database/sql"
 	"fmt"
+	"log"
+	"math"
 	"reflect"
+	"strconv"
 	"strings"
 	"time"
 
@@ -1232,3 +1235,826 @@ func GetScheduleInfo(start_date string, end_date string, mode int64, org_id int6
 	}).Where("FROM_UNIXTIME(schedule_date, '%Y-%m-%d') >= ? and FROM_UNIXTIME(schedule_date, '%Y-%m-%d') <= ? and user_org_id = ? and mode_id = ? and status = 1", start_date, end_date, org_id, mode).Count(&total).Offset(offset).Limit(limit).Find(&qcp).Error
 	return
 }
+
+type otherItemAmount struct {
+	Total int64  `json:"total"`
+	Name  string `json:"name"`
+	Ratio string `json:"ratio"`
+}
+
+// xt_patients model
+type Patient struct {
+	ID       uint   `gorm:"primaryKey"`
+	IDCardNo string `gorm:"column:id_card_no"`
+}
+
+// xt_assessment_before_dislysis model
+type Assessment struct {
+	ID             uint      `gorm:"id"`
+	PatientID      uint      `gorm:"column:patient_id"`
+	SystolicBP     int       `gorm:"column:systolic_blood_pressure"`
+	DiastolicBP    int       `gorm:"column:diastolic_blood_pressure"`
+	AssessmentDate time.Time `gorm:"column:assessment_date"`
+	UserOrgID      int       `gorm:"column:user_org_id"`
+}
+
+func (Assessment) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+// xt_assessment_before_dislysis model
+type AssessmentAfter struct {
+	ID             uint      `gorm:"id"`
+	PatientID      uint      `gorm:"column:patient_id"`
+	SystolicBP     int       `gorm:"column:systolic_blood_pressure"`
+	DiastolicBP    int       `gorm:"column:diastolic_blood_pressure"`
+	AssessmentDate time.Time `gorm:"column:assessment_date"`
+	UserOrgID      int       `gorm:"column:user_org_id"`
+}
+
+func (AssessmentAfter) TableName() string {
+	return "xt_assessment_before_dislysis"
+}
+
+type WeightDetail struct {
+	DialysisNo      string
+	PatientName     string
+	Gender          int64
+	IDCardNo        string
+	DialysisDate    string
+	DryWeight       float64
+	LastWeightAfter float64
+	WeightBefore    float64
+}
+
+func GetNewDialysisWeightChartData(user_org_id int64, start_time int64, end_time int64, statistics_type int) (item []*otherItemAmount, err error) {
+	db := XTReadDB()
+	var items []*otherItemAmount
+	var tempErr error
+	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'" +
+				" WHEN dry_weight >= 50 AND dry_weight < 60 THEN '50~60kg'" +
+				" WHEN dry_weight >= 60 AND dry_weight < 70 THEN '60~70kg'" +
+				" WHEN dry_weight >= 70 THEN '大于70kg'" +
+				" ELSE '未知' END AS name, COUNT(*) AS total",
+			).Group("name").Scan(&items).Error
+
+		var isHasConditionOne bool = false
+		var isHasConditionTwo bool = false
+		var isHasConditionThree bool = false
+		var isHasConditionFour bool = false
+		var isHasConditionFive bool = false
+
+		for _, item := range items {
+			if item.Name == "小于40kg" {
+				isHasConditionOne = true
+			}
+			if item.Name == "40~50kg" {
+				isHasConditionTwo = true
+			}
+			if item.Name == "60~70kg" {
+				isHasConditionThree = true
+			}
+			if item.Name == "大于70kg" {
+				isHasConditionFour = true
+			}
+			if item.Name == "待定/卧床" {
+				isHasConditionFive = true
+			}
+		}
+		if !isHasConditionOne {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "小于40kg",
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+
+		if !isHasConditionTwo {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "40~50kg",
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+		}
+		if !isHasConditionThree {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "60~70kg",
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+
+		}
+
+		if !isHasConditionFour {
+			newItem := &otherItemAmount{
+				Total: 0,
+				Name:  "大于70kg",
+				Ratio: "0",
+			}
+			items = append(items, newItem)
+
+		}
+
+		if !isHasConditionFive {
+			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.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)
+
+		//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"`
+		}
+		var weights []*weight
+		var weightAdd []float64
+		db.Raw("Select xt_assessment_after_dislysis.weight_after as weight_after ,xt_assessment_before_dislysis.weight_before as weight_before 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 AND xt_assessment_after_dislysis.user_org_id = ?  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, user_org_id, start_time, end_time).Scan(&weights)
+		for index, _ := range weights {
+			if index+1 < len(weights) {
+				if weights[index+1].WeightAfter == 0 || weights[index].WeightBefore == 0 {
+					continue
+				}
+				weightAdd = append(weightAdd, ((weights[index].WeightBefore - weights[index+1].WeightAfter) / weights[index+1].WeightAfter))
+			}
+		}
+
+		var total_one int64
+		var total_two int64
+		var total_three int64
+		for _, item := range weightAdd {
+			if item <= 0.03 {
+				total_one++
+
+			}
+
+			if item > 0.03 && item < 0.05 {
+				total_two++
+
+			}
+
+			if item >= 0.05 {
+				total_three++
+
+			}
+
+		}
+
+		newTotal = total_one + total_two + total_three
+
+		newItem := &otherItemAmount{
+			Total: total_one,
+			Name:  "体重增长<=3%",
+			Ratio: "0",
+		}
+		newItem1 := &otherItemAmount{
+			Total: total_two,
+			Name:  "3%<体重增长<5%",
+			Ratio: "0",
+		}
+		newItem2 := &otherItemAmount{
+			Total: total_three,
+			Name:  "体重增长>=5%",
+			Ratio: "0",
+		}
+
+		items = append(items, newItem)
+		items = append(items, newItem1)
+		items = append(items, newItem2)
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(newTotal)) {
+				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)
+			}
+		}
+
+		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 {
+			DryWeight    float64 `json:"dry_weight"`
+			WeightBefore float64 `json:"weight_before"`
+		}
+		var weights []*weight
+		var weightAdd []float64
+		db.Raw("Select xt_assessment_before_dislysis.dry_weight as dry_weight ,xt_assessment_before_dislysis.weight_before as weight_before from `xt_assessment_before_dislysis`  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, user_org_id, start_time, end_time).Scan(&weights)
+		for index, _ := range weights {
+			weightAdd = append(weightAdd, ((weights[index].WeightBefore - weights[index].DryWeight) / weights[index].DryWeight))
+		}
+
+		var total_one int64
+		var total_two int64
+		var total_three int64
+		for _, item := range weightAdd {
+			if item <= 0.03 {
+				total_one++
+
+			}
+
+			if item > 0.03 && item < 0.05 {
+				total_two++
+
+			}
+
+			if item >= 0.05 {
+				total_three++
+
+			}
+
+		}
+
+		newTotal = total_one + total_two + total_three
+
+		newItem := &otherItemAmount{
+			Total: total_one,
+			Name:  "体重增长<=3%",
+			Ratio: "0",
+		}
+		newItem1 := &otherItemAmount{
+			Total: total_two,
+			Name:  "3%<体重增长<5%",
+			Ratio: "0",
+		}
+		newItem2 := &otherItemAmount{
+			Total: total_three,
+			Name:  "体重增长>=5%",
+			Ratio: "0",
+		}
+
+		items = append(items, newItem)
+		items = append(items, newItem1)
+		items = append(items, newItem2)
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(newTotal)) {
+				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)
+			}
+		}
+
+		break
+	case 4:
+		var newTotal int64
+		type weight struct {
+			WeightAfter float64 `json:"weight_after"`
+			DryWeight   float64 `json:"dry_weight"`
+		}
+		var weights []*weight
+		//var weightAdd []float64
+		db.Raw("Select xt_assessment_after_dislysis.weight_after as weight_after ,xt_assessment_before_dislysis.dry_weight as dry_weight 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 AND xt_assessment_after_dislysis.user_org_id = ?  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, user_org_id, start_time, end_time).Scan(&weights)
+
+		var total_one int64
+		var total_two int64
+		var total_three int64
+		for _, item := range weights {
+			if item.WeightAfter != 0 && item.DryWeight != 0 {
+				if item.WeightAfter-item.DryWeight == 0.3 || item.WeightAfter-item.DryWeight == -0.3 {
+					total_one++
+
+				}
+
+				if item.WeightAfter-item.DryWeight > 0.3 && item.WeightAfter-item.DryWeight < -0.3 {
+					total_two++
+
+				}
+			}
+
+			if item.WeightAfter == 0 {
+				total_three++
+			}
+
+		}
+
+		newTotal = total_one + total_two + total_three
+
+		newItem := &otherItemAmount{
+			Total: total_one,
+			Name:  "达到干体重",
+			Ratio: "0",
+		}
+		newItem1 := &otherItemAmount{
+			Total: total_two,
+			Name:  "未达到干体重",
+			Ratio: "0",
+		}
+		newItem2 := &otherItemAmount{
+			Total: total_three,
+			Name:  "其他或卧床",
+			Ratio: "0",
+		}
+
+		items = append(items, newItem)
+		items = append(items, newItem1)
+		items = append(items, newItem2)
+		for _, item := range items {
+			if math.IsNaN(float64(item.Total) / float64(newTotal)) {
+				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)
+			}
+		}
+
+		break
+	}
+	if tempErr != nil {
+		return nil, err
+	}
+
+	fmt.Println(items)
+	return items, nil
+}
+func GetNewDialysisBloodChartData(user_org_id int64, start_time int64, end_time int64, statistics_type int) (item []otherItemAmount, err error) {
+	db := XTReadDB()
+	switch statistics_type {
+	case 1:
+		var assessments []Assessment
+		err = db.Joins("JOIN xt_patients ON xt_patients.id = xt_assessment_before_dislysis.patient_id").
+			Where("xt_assessment_before_dislysis.assessment_date >= ? AND xt_assessment_before_dislysis.assessment_date <= ? AND xt_assessment_before_dislysis.user_org_id = ?", start_time, end_time, user_org_id).
+			Find(&assessments).Error
+		if err != nil {
+			log.Fatal("Query execution error:", err)
+		}
+
+		var total, metStandard, unmetStandard int
+
+		// Iterate through the result set
+		for _, assessment := range assessments {
+			// Fetch patient information
+			var patient Patient
+			err = db.First(&patient, assessment.PatientID).Error
+			if err != nil {
+				log.Printf("Skipping record due to missing patient data for ID: %v", assessment.PatientID)
+				continue
+			}
+
+			// Calculate the patient's age
+			age, err := calculateAge(patient.IDCardNo)
+			if err != nil {
+				log.Printf("Skipping record due to invalid ID card number: %v", patient.IDCardNo)
+				continue
+			}
+
+			// Update the total count of patients
+			total++
+
+			// Determine if the patient meets the standard based on their age and blood pressure
+			if (age < 60 && assessment.SystolicBP < 140 && assessment.DiastolicBP < 90) || (age >= 60 && assessment.SystolicBP < 160 && assessment.DiastolicBP < 90) {
+				metStandard++
+			} else {
+				unmetStandard++
+			}
+		}
+
+		// Calculate and print the results
+		if total > 0 {
+			metPercentage := float64(metStandard) / float64(total) * 100
+			unmetPercentage := float64(unmetStandard) / float64(total) * 100
+			fmt.Printf("Total patients: %d\n", total)
+			fmt.Printf("Met standard: %d (%.2f%%)\n", metStandard, metPercentage)
+			fmt.Printf("Unmet standard: %d (%.2f%%)\n", unmetStandard, unmetPercentage)
+
+			var items otherItemAmount
+			items.Name = "达标患者"
+			items.Ratio = strconv.FormatFloat(metPercentage, 'f', 1, 32)
+			items.Total = int64(metStandard)
+			item = append(item, items)
+
+			var items2 otherItemAmount
+			items2.Name = "未达标患者"
+			items2.Ratio = strconv.FormatFloat(unmetPercentage, 'f', 1, 32)
+			items2.Total = int64(unmetStandard)
+			item = append(item, items2)
+
+		}
+	case 2:
+		var assessments []AssessmentAfter
+		err = db.Joins("JOIN xt_patients ON xt_patients.id = xt_assessment_after_dislysis.patient_id").
+			Where("xt_assessment_after_dislysis.assessment_date >= ? AND xt_assessment_after_dislysis.assessment_date <= ? AND xt_assessment_before_dislysis.user_org_id = ?", start_time, end_time, user_org_id).
+			Find(&assessments).Error
+		if err != nil {
+			log.Fatal("Query execution error:", err)
+		}
+
+		var total, metStandard, unmetStandard int
+
+		// Iterate through the result set
+		for _, assessment := range assessments {
+			// Fetch patient information
+			var patient Patient
+			err = db.First(&patient, assessment.PatientID).Error
+			if err != nil {
+				log.Printf("Skipping record due to missing patient data for ID: %v", assessment.PatientID)
+				continue
+			}
+
+			// Calculate the patient's age
+			age, err := calculateAge(patient.IDCardNo)
+			if err != nil {
+				log.Printf("Skipping record due to invalid ID card number: %v", patient.IDCardNo)
+				continue
+			}
+
+			// Update the total count of patients
+			total++
+
+			// Determine if the patient meets the standard based on their age and blood pressure
+			if (age < 60 && assessment.SystolicBP < 140 && assessment.DiastolicBP < 90) || (age >= 60 && assessment.SystolicBP < 160 && assessment.DiastolicBP < 90) {
+				metStandard++
+			} else {
+				unmetStandard++
+			}
+		}
+
+		// Calculate and print the results
+		if total > 0 {
+			metPercentage := float64(metStandard) / float64(total) * 100
+			unmetPercentage := float64(unmetStandard) / float64(total) * 100
+			fmt.Printf("Total patients: %d\n", total)
+			fmt.Printf("Met standard: %d (%.2f%%)\n", metStandard, metPercentage)
+			fmt.Printf("Unmet standard: %d (%.2f%%)\n", unmetStandard, unmetPercentage)
+
+			var items otherItemAmount
+			items.Name = "达标患者"
+			items.Ratio = strconv.FormatFloat(metPercentage, 'f', 1, 32)
+			items.Total = int64(metStandard)
+			item = append(item, items)
+
+			var items2 otherItemAmount
+			items2.Name = "未达标患者"
+			items2.Ratio = strconv.FormatFloat(unmetPercentage, 'f', 1, 32)
+			items2.Total = int64(unmetStandard)
+			item = append(item, items2)
+		}
+
+		break
+	}
+	return
+}
+func calculateAge(idCardNo string) (int, error) {
+	if len(idCardNo) < 14 {
+		return 0, fmt.Errorf("invalid ID card number")
+	}
+
+	// Extract birth year, month, and day from ID card number
+	year := idCardNo[6:10]
+	month := idCardNo[10:12]
+	day := idCardNo[12:14]
+
+	// Parse the birth date
+	birthDate, err := time.Parse("20060102", year+month+day)
+	if err != nil {
+		return 0, err
+	}
+
+	// Calculate age
+	now := time.Now()
+	age := now.Year() - birthDate.Year()
+	if now.YearDay() < birthDate.YearDay() {
+		age--
+	}
+
+	return age, nil
+}
+
+// 定义结果结构体
+type DialysisDataTwo struct {
+	DialysisNo        string   `json:"dialysis_no"`
+	PatientName       string   `json:"patient_name"`
+	Gender            string   `json:"gender"`
+	Age               int      `json:"age"`
+	AssessmentDate    string   `json:"assessment_date"` // 使用 string 存储日期，或使用 time.Time
+	DryWeight         float64  `json:"dry_weight"`
+	WeightBefore      float64  `json:"weight_before"`
+	WeightAfter       float64  `json:"weight_after"`
+	LastWeightAfter   *float64 `json:"last_weight_after"` // 使用指针处理可能为空的值
+	WeightAdd         *float64 `json:"weight_add"`        // 使用指针处理可能为空的值
+	DryWeightCategory string   `json:"dry_weight_category"`
+	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) {
+	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)
+	// 根据传入的 add_type 值动态构建条件
+	addTypeCondition(query, addType)
+	// 根据传入的 dry_type 值动态构建条件
+	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
+}
+
+// addType 条件处理
+func addTypeCondition(query *gorm.DB, addType int64) {
+	switch addType {
+	case 1:
+		query.Where("weight_add <= 0.03")
+	case 2:
+		query.Where("weight_add > 0.03 AND weight_add < 0.05")
+	case 3:
+		query.Where("weight_add >= 0.05")
+	case 4:
+		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 = '达标'")
+	case 2:
+		query.Where("weight_status = '不达标'")
+	case 3:
+		query.Where("weight_status = '其他'")
+	}
+}
+
+type DialysisDataThree struct {
+	DialysisNo          string  `json:"透析号"`
+	PatientName         string  `json:"患者姓名"`
+	Gender              string  `json:"性别"`
+	Age                 int     `json:"年龄"`
+	AssessmentDate      string  `json:"透析日期"`
+	DryWeight           float64 `json:"干体重"`
+	PreDialysisBP       string  `json:"透前血压"`
+	PostDialysisBP      string  `json:"透后血压"`
+	MonitoringBP        string  `json:"监测记录血压"`
+	UltrafiltrationRate float64 `json:"超滤率"`
+	UltrafiltrationVol  float64 `json:"超滤总量"`
+	BPStatus            string  `json:"血压达标状态"`
+}
+
+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
+}