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

common/crypto.go

@@ -0,0 +1,41 @@
+package common
+
+import (
+	"crypto/hmac"
+	"crypto/sha256"
+)
+
+const (
+	// HMAC签名算法
+	HMAC_SHA256 = "HMAC-SHA256"
+)
+
+// HMAC_Sha256 加密
+func HMAC_Sha256(data string, secret string) []byte {
+	h := hmac.New(sha256.New, []byte(secret))
+	h.Write([]byte(data))
+	return h.Sum(nil)
+}
+
+// RSASHA256 加密
+// func RSASHA256(data string, Key string) (string, error) {
+// 	h := sha256.New()
+// 	h.Write([]byte(data))
+// 	hashed := h.Sum(nil)
+// 	block, _ := pem.Decode([]byte(Key))
+// 	if block == nil {
+// 		return "", errors.New("private key error")
+// 	}
+
+// 	privateKey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+// 	if err != nil {
+// 		return "", err
+// 	}
+
+// 	signature, err := rsa.SignPKCS1v15(cryptorand.Reader, privateKey, crypto.SHA256, hashed)
+// 	if err != nil {
+// 		return "", err
+// 	}
+
+// 	return base64.StdEncoding.EncodeToString(signature), nil
+// }

common/json.go

@@ -0,0 +1,23 @@
+package common
+
+import (
+	"encoding/json"
+)
+
+func GetPostDataWithMap(post map[string]interface{}) (string, error) {
+	//json := jsoniter.Config{
+	//	MarshalFloatWith6Digits: true,
+	//	EscapeHTML:              false,
+	//	SortMapKeys:             true, //本身高灯平台仅要求对最外层json key进行asci码升序排序，但map是无序且随机的，所以签名和post数据均排序以保持一致
+	//	UseNumber:               true,
+	//	DisallowUnknownFields:   false,
+	//	CaseSensitive:           true,
+	//}.Froze()
+
+	s, err := json.Marshal(&post)
+	if err != nil {
+		return "", err
+	}
+
+	return string(s), nil
+}

common/rand.go

@@ -0,0 +1,27 @@
+package common
+
+import (
+	"fmt"
+	"math/rand"
+	"strings"
+	"time"
+)
+
+const (
+	numLen = 10 //随机序列长度
+)
+
+var (
+	numeric = [numLen]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9} //随机序列
+)
+
+func GetRand(width int) string {
+	r := len(numeric)
+	rand.Seed(time.Now().UnixNano())
+
+	var sb strings.Builder
+	for i := 0; i < width; i++ {
+		fmt.Fprintf(&sb, "%d", numeric[rand.Intn(r)])
+	}
+	return sb.String()
+}

controllers/fapiao_controller.go

@@ -1,34 +1,185 @@
 package controllers
 
 import (
+	"XT_New/common"
 	"XT_New/enums"
+	"XT_New/invoice"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/service/fapiao"
 	"XT_New/utils"
+	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
-	"github.com/gaodengyun/goldencloud-sdk-go/goldencloud/common"
-	"github.com/gaodengyun/goldencloud-sdk-go/goldencloud/invoice"
+	"github.com/shopspring/decimal"
+	"math"
+	"strconv"
+	"strings"
 	"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")
+	beego.Router("/api/gdfapiao/list", &FapiaoApiController{}, "get:GetFaPiaoList")
+
+}
+
+type FapiaoApiController struct {
+	BaseAuthAPIController
+}
+
+type InvoiceRequest struct {
+	SellerName           string                `json:"seller_name,omitempty"`            // 销方名称
+	SellerTaxpayerNum    string                `json:"seller_taxpayer_num"`              // 销方纳税人识别号
+	SellerAddress        string                `json:"seller_address"`                   // 销方地址
+	SellerTel            string                `json:"seller_tel"`                       // 销方电话
+	SellerBankName       string                `json:"seller_bank_name"`                 // 销方银行名称
+	SellerBankAccount    string                `json:"seller_bank_account"`              // 销方银行账号
+	TitleType            int                   `json:"title_type"`                       // 抬头类型：1 个人、政府事业单位；2 企业
+	BuyerTitle           string                `json:"buyer_title"`                      // 购方名称
+	BuyerTaxpayerNum     string                `json:"buyer_taxpayer_num,omitempty"`     // 购方纳税人识别号
+	BuyerAddress         string                `json:"buyer_address,omitempty"`          // 购方地址
+	BuyerPhone           string                `json:"buyer_phone,omitempty"`            // 购方电话
+	BuyerBankName        string                `json:"buyer_bank_name,omitempty"`        // 购方银行名称
+	BuyerBankAccount     string                `json:"buyer_bank_account,omitempty"`     // 购方银行账号
+	BuyerEmail           string                `json:"buyer_email,omitempty"`            // 收票人邮箱
+	OrderID              string                `json:"order_id"`                         // 商户订单号
+	InvoiceTypeCode      string                `json:"invoice_type_code,omitempty"`      // 开具发票类型
+	CallbackURL          string                `json:"callback_url"`                     // 发票结果回传地址
+	Drawer               string                `json:"drawer"`                           // 开票人姓名
+	Payee                string                `json:"payee,omitempty"`                  // 收款人姓名
+	Checker              string                `json:"checker,omitempty"`                // 复核人姓名
+	TerminalCode         string                `json:"terminal_code"`                    // 税盘号
+	UserOpenID           string                `json:"user_openid,omitempty"`            // 商家用户标识
+	SpecialInvoiceKind   string                `json:"special_invoice_kind,omitempty"`   // 特殊票种标识
+	AmountHasTax         string                `json:"amount_has_tax"`                   // 含税总金额
+	TaxAmount            string                `json:"tax_amount"`                       // 总税额
+	AmountWithoutTax     string                `json:"amount_without_tax"`               // 不含税总金额
+	Remark               string                `json:"remark,omitempty"`                 // 备注
+	StoreNo              string                `json:"store_no,omitempty"`               // 门店编码
+	Template             int                   `json:"template"`                         // 发票模板
+	Info                 *InvoiceInfo          `json:"info,omitempty"`                   // 冠名票信息
+	TaxpayerConfirmation *TaxpayerConfirmation `json:"taxpayer_confirmation,omitempty"`  // 纳税人确认信息
+	SpecificBusinessCode string                `json:"specific_business_code,omitempty"` // 特定业务代码
+	RealStaticRent       *RealStaticRent       `json:"real_static_rent,omitempty"`       // 不动产经营租赁信息
+	PassengerTransport   []PassengerTransport  `json:"passenger_transport,omitempty"`    // 旅客运输信息
+	GoodsTransport       []GoodsTransport      `json:"goods_transport,omitempty"`        // 货物运输信息
+	AgriculturalPurchase *AgriculturalPurchase `json:"agricultural_purchase,omitempty"`  // 农产品收购信息
+	BuildingService      *BuildingService      `json:"building_service,omitempty"`       // 建筑服务信息
+	RealStaticSales      *RealStaticSales      `json:"real_static_sales,omitempty"`      // 不动产销售信息
+	TractorCombine       *TractorCombine       `json:"tractor_combine,omitempty"`        // 拖拉机与联合收割机信息
+	UsedCarService       *UsedCarService       `json:"used_car_service,omitempty"`       // 二手车服务信息
+	UsedCarSell          *UsedCarSell          `json:"used_car_sell,omitempty"`          // 二手车销售信息
+	DeductionService     *DeductionService     `json:"deduction_service,omitempty"`      // 差额征税信息
+	Items                []Item                `json:"items"`                            // 项目商品明细
+}
+
+type InvoiceInfo struct {
+	UseDate    string `json:"use_date,omitempty"`    // 入园日期
+	TicketName string `json:"ticket_name,omitempty"` // 票据名称
+}
+
+type TaxpayerConfirmation struct {
+	RenewableResourceRecyclingFlag int    `json:"renewable_resource_recycling_flag,omitempty"` // 再生资源回收单位标志
+	DrawWithNoBuyerFlag            int    `json:"draw_with_nobuyer_flag,omitempty"`            // 无购买方纳税人信息继续开票标志
+	NotDutyFreeReason              string `json:"not_dutyfree_reason,omitempty"`               // 放弃享受减按1%征收率原因
+}
+
+type RealStaticRent struct {
+	PropertyNum   string `json:"property_num"`    // 房屋产权证号
+	Location      string `json:"location"`        // 不动产地址 (省市区县)
+	AddressDetail string `json:"address_detail"`  // 不动产详细地址
+	RentBeginDate string `json:"rent_begin_date"` // 租赁期起
+	RentEndDate   string `json:"rent_end_date"`   // 租赁期止
+	IntercityFlag string `json:"intercity_flag"`  // 跨地市标志
+	UnitOfArea    int    `json:"unit_of_area"`    // 面积单位
+}
+
+type PassengerTransport struct {
+	Traveler         string `json:"traveler,omitempty"`          // 出行人
+	IDType           int    `json:"id_type,omitempty"`           // 证件类型
+	IDNumber         string `json:"id_number,omitempty"`         // 证件号码
+	TravelDate       string `json:"travel_date,omitempty"`       // 出行日期
+	DeparturePlace   string `json:"departure_place,omitempty"`   // 出发地
+	DestinationPlace string `json:"destination_palce,omitempty"` // 到达地
+	VehicleType      int    `json:"vehicle_type,omitempty"`      // 交通工具类型
+	Level            string `json:"level,omitempty"`             // 等级
+}
 
+type GoodsTransport struct {
+	TransportNumber  string `json:"transport_number,omitempty"`  // 运输工具号牌
+	TransportKind    string `json:"transport_kind,omitempty"`    // 运输工具种类
+	GoodsName        string `json:"goods_name,omitempty"`        // 货物名称
+	DeparturePlace   string `json:"departure_place,omitempty"`   // 出发地
+	DestinationPlace string `json:"destination_place,omitempty"` // 到达地
 }
+
+type AgriculturalPurchase struct {
+	IDType string `json:"id_type,omitempty"` // 证件类型
+}
+
+type BuildingService struct {
+	Site            string `json:"site"`                  // 建筑服务发生地
+	DetailSite      string `json:"detail_site,omitempty"` // 详细地址
+	BuildingProject string `json:"building_project"`      // 建筑项目名称
+	CrossSign       string `json:"cross_sign"`            // 跨地市标志
+}
+
+type RealStaticSales struct {
+	PropertyNum        string `json:"property_num,omitempty"`         // 房屋产权证书号
+	Location           string `json:"location"`                       // 不动产地址
+	AddressDetail      string `json:"address_detail,omitempty"`       // 不动产详细地址
+	CrossSign          string `json:"cross_sign"`                     // 跨市标志
+	UnitOfArea         int    `json:"unit_of_area"`                   // 面积单位
+	OnlineContractCode string `json:"online_contract_code,omitempty"` // 不动产单元代码/网签合同编码
+}
+
+type TractorCombine struct {
+	ChassisNumber string `json:"chassis_number,omitempty"` // 底盘号或机架号
+	EngineNumber  string `json:"engine_number"`            // 发动机号
+	IsRegister    string `json:"is_register,omitempty"`    // 是否用于拖拉机和联合收割机登记
+}
+
+type UsedCarService struct {
+	TicketSN        string `json:"ticket_sn"`         // 发票号码
+	PaperTicketCode string `json:"paper_ticket_code"` // 纸票发票代码
+	PaperTicketSN   string `json:"paper_ticket_sn"`   // 纸票发票号码
+}
+
+type UsedCarSell struct {
+	FrameNumber             string `json:"frame_number"`             // 车架号码
+	LicensePlateNumber      string `json:"license_plate_number"`     // 车牌号
+	BrandModel              string `json:"brand_model"`              // 厂牌型号
+	RegistrationCertificate string `json:"registration_certificate"` // 登记证号
+	TransferOfficeName      string `json:"transfer_office_name"`     // 转入地车辆管理所名称
+	NatureOfEnterprise      string `json:"nature_of_enterprise"`     // 企业性质
+}
+
+type DeductionService struct {
+	TaxDiffServiceFlag int    `json:"tax_diff_service_flag,omitempty"` // 差额征税标识
+	TaxableServiceName string `json:"taxable_service_name,omitempty"`  // 差额征税项目名称
+}
+
+type Item struct {
+	ItemName      string  `json:"item_name"`           // 商品名称
+	ItemSpec      string  `json:"item_spec,omitempty"` // 商品规格
+	ItemUnit      string  `json:"item_unit"`           // 商品单位
+	ItemQuantity  float64 `json:"item_quantity"`       // 商品数量
+	ItemPrice     float64 `json:"item_price"`          // 商品单价
+	ItemAmount    float64 `json:"item_amount"`         // 商品金额
+	ItemTaxRate   float64 `json:"item_tax_rate"`       // 商品税率
+	ItemTaxAmount float64 `json:"item_tax_amount"`     // 商品税额
+	RowType       int     `json:"row_type"`            // 行性质标志
+}
+
 func (c *FapiaoApiController) GetFaPiaoList() {
 	page, _ := c.GetInt64("page", -1)
 	limit, _ := c.GetInt64("limit", -1)
@@ -62,8 +213,8 @@ func (c *FapiaoApiController) GetFaPiaoList() {
 	order, err, total := service.GetFaPiaoList(org_id, page, limit, startTime, endTime)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"order": order,
-			"total": total,
+			"fapiao_record": order,
+			"total":         total,
 		})
 
 	} else {
@@ -120,99 +271,718 @@ 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)
 
-func (c *FapiaoApiController) GetFaPiaoStock() {
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+	//认证接口
+	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 //治疗费用
+
+	var details []models.HisOrderInfo
+	var numbers []string
+	decimal.DivisionPrecision = 2
+
+	for _, oss := range orders {
+		MedfeeSumamt, _ = decimal.NewFromFloat(MedfeeSumamt).Add(decimal.NewFromFloat(oss.MedfeeSumamt)).Float64()
+		PsnCashPay, _ = decimal.NewFromFloat(PsnCashPay).Add(decimal.NewFromFloat(oss.PsnCashPay)).Float64()
+		FundPaySumamt, _ = decimal.NewFromFloat(FundPaySumamt).Add(decimal.NewFromFloat(oss.FundPaySumamt)).Float64()
+		numbers = append(numbers, oss.Number)
+	}
+	details, _ = service.GetFaPiaoOrderInfoByNumbers(numbers)
+	role, _ := service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
+	role.UserName = "邹碧琳"
+	type CostType struct {
+		name  string
+		price float64
+	}
+	var cts []CostType
+	var ct CostType
+
+	var bedCostTotal float64 = 0                        //床位总费
+	var operationCostTotal float64 = 0                  //手术费
+	var otherCostTotal float64 = 0                      //其他费用
+	var materialCostTotal float64 = 0                   //材料费
+	var westernMedicineCostTotal float64 = 0            //西药费
+	var chineseTraditionalMedicineCostTotal float64 = 0 //中成药
+	var checkCostTotal float64 = 0                      //检查费
+	var laboratoryCostTotal float64 = 0                 //化验费
+	var treatCostTotal float64 = 0                      //治疗费用
+	var huliCostTotal float64 = 0                       //治疗费用
+	var zhencaCostTotal float64 = 0                     //治疗费用
+
+	for _, item := range details {
+		if item.MedChrgitmType == "01" { //床位费
+			bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+		if item.MedChrgitmType == "07" { //护理费
+			huliCostTotal, _ = decimal.NewFromFloat(huliCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+		if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+			if item.MedChrgitmType == "03" { //检查费
+				laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			}
+		} else {
+			if item.MedChrgitmType == "03" { //检查费
+				checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+			}
+
+		}
+		if item.MedChrgitmType == "04" { //化验费
+			laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+
+		if item.MedChrgitmType == "05" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" { //治疗费
+			treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+
+		if item.MedChrgitmType == "06" { //手术费
+			operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+
+		if item.MedChrgitmType == "08" { //材料费
+			materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+
+		if item.MedChrgitmType == "09" { //西药费
+			westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+
+		if item.MedChrgitmType == "11" { //中成费
+			chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+
+		if item.MedChrgitmType == "14" || item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+			otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+
+		if item.MedChrgitmType == "02" { //诊察
+			zhencaCostTotal, _ = decimal.NewFromFloat(zhencaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+		}
+	}
+	if bedCostTotal > 0 {
+		ct.name = "床位费"
+		ct.price = bedCostTotal
+		cts = append(cts, ct)
+	}
+
+	if operationCostTotal > 0 {
+		ct.name = "手术费"
+		ct.price = operationCostTotal
+		cts = append(cts, ct)
+
+	}
+	if otherCostTotal > 0 {
+		ct.name = "其他费"
+		ct.price = otherCostTotal
+		cts = append(cts, ct)
+
+	}
+	if materialCostTotal > 0 {
+		ct.name = "材料费"
+		ct.price = materialCostTotal
+		cts = append(cts, ct)
+
+	}
+	if westernMedicineCostTotal > 0 {
+		ct.name = "西药费"
+		ct.price = westernMedicineCostTotal
+		cts = append(cts, ct)
+
+	}
+	if chineseTraditionalMedicineCostTotal > 0 {
+		ct.name = "中成药费"
+		ct.price = chineseTraditionalMedicineCostTotal
+		cts = append(cts, ct)
+
+	}
+	if checkCostTotal > 0 {
+		ct.name = "检查费"
+		ct.price = checkCostTotal
+		cts = append(cts, ct)
+
+	}
+	if laboratoryCostTotal > 0 {
+		ct.name = "化验费"
+		ct.price = laboratoryCostTotal
+		cts = append(cts, ct)
+
+	}
+	if treatCostTotal > 0 {
+		ct.name = "治疗费"
+		ct.price = treatCostTotal
+		cts = append(cts, ct)
+
+	}
+	if huliCostTotal > 0 {
+		ct.name = "护理费"
+		ct.price = huliCostTotal
+		cts = append(cts, ct)
+
+	}
+
+	if zhencaCostTotal > 0 {
+		ct.name = "诊察费"
+		ct.price = zhencaCostTotal
+		cts = append(cts, ct)
+
+	}
+	fmt.Println(cts)
+	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)
+
+	postData3 := map[string]interface{}{
+		"seller_name":          org_config.OrgName,
+		"seller_taxpayer_num":  config2.SellerTaxpayerNum,
+		"seller_address":       config2.SellerAddress,
+		"seller_tel":           config2.SellerTel,
+		"seller_bank_name":     config2.SellerBankName,
+		"seller_bank_account":  config2.SellerBankAccount,
+		"title_type":           1,
+		"buyer_title":          orders[0].PsnName,
+		"buyer_taxpayer_num":   "",
+		"buyer_address":        "",
+		"buyer_phone":          "",
+		"buyer_bank_name":      "",
+		"buyer_bank_account":   "",
+		"buyer_email":          "",
+		"order_id":             number,
+		"invoice_type_code":    "082",
+		"callback_url":         "http://www.goldentec.com/callback",
+		"drawer":               role.UserName,
+		"payee":                "",
+		"checker":              "",
+		"terminal_code":        config2.TerminalCode,
+		"user_openid":          "",
+		"special_invoice_kind": "",
+		"zsfs":                 "",
+		"deduction":            "",
+		"amount_has_tax":       amountHasTax,
+		"tax_amount":           taxAmount,
+		"amount_without_tax":   amountWithoutTax,
+		"remark":               "医疗发票",
+	}
+
+	////项目商品明细
+	items := make([]map[string]interface{}, 0)
+	for _, ct := range cts {
+		item := make(map[string]interface{})
+		amountWithoutTax, _, taxAmount, _ := CalculatePriceDetails(ct.price, 1, 0.06)
+		item["name"] = ct.name
+		item["tax_code"] = "3070202000000000000"
+		item["models"] = ""
+		item["unit"] = ""
+		item["total_price"] = amountWithoutTax
+		item["total"] = "1"
+		item["price"] = amountWithoutTax
+		item["tax_rate"] = "0.06"
+		item["tax_amount"] = taxAmount
+		item["discount"] = "0"
+		item["preferential_policy_flag"] = ""
+		item["zero_tax_flag"] = ""
+		item["vat_special_management"] = ""
+		items = append(items, item)
+	}
+
+	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 err4 != nil {
+		fmt.Println(err4)
+	} else {
+		var resp OpenFaPiaoResultResponse
+		// 将 byte 切片转换为结构体
+		err := json.Unmarshal(r, &resp)
+		fmt.Println(resp)
+		if err != nil {
+			fmt.Println("Error unmarshalling:", err)
+		} else {
+			fmt.Println(resp)
+
+			if resp.Code == 0 {
+				//开具蓝票成功，请求查询接口，获取发票相关数据
+				routerAddress2, postData2 := fapiao.Query(config2.SellerTaxpayerNum, resp.Data.OrderSn, number)
+				r3, err2 := sdk.HttpPost("https://apigw.goldentec.com", routerAddress2, postData2)
+				fmt.Println("query")
+				fmt.Println(string(r3))
+				if err2 != nil {
+					fmt.Println(err2)
+				} else {
+					var resp3 QueryFaPiaoResultResponse
+					// 将 byte 切片转换为结构体
+					json.Unmarshal(r3, &resp3)
+					if resp3.Code == 0 {
+						var fapiao models.HisFaPiaoOrder
+						fapiao.InvoiceId = resp.Data.InvoiceId
+						fapiao.OrderSn = resp.Data.OrderSn
+						fapiao.TicketSn = resp3.Data.TicketSn
+						fapiao.TicketDate = resp3.Data.TicketDate
+						fapiao.AmountWithTax = resp3.Data.AmountWithoutTax
+						fapiao.AmountWithoutTax = resp3.Data.AmountWithoutTax
+						fapiao.TaxAmount = resp3.Data.TaxAmount
+						fapiao.IsRedWashed = strconv.FormatInt(int64(resp3.Data.IsRedWashed), 10)
+						fapiao.PdfUrl = resp3.Data.PdfUrl
+						fapiao.OfdUrl = resp3.Data.OfdUrl
+						fapiao.XmlUrl = resp3.Data.XmlUrl
+						fapiao.FapiaoStatus = "1"
+						fapiao.OrderIds = order_ids
+						fapiao.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+						fapiao.Status = 1
+						fapiao.PatientId = orders[0].PatientId
+						fapiao.Ctime = time.Now().Unix()
+						fapiao.Mtime = time.Now().Unix()
+						fapiao.Creator = role.UserName
+						fapiao.MedfeeSumamt = MedfeeSumamt
+						fapiao.FundPaySumamt = FundPaySumamt
+						fapiao.PsnCashPay = PsnCashPay
+						err5 := service.SaveFaPiaoOrder(fapiao)
+						fmt.Println(err5)
+						if err5 == nil {
+							service.UpdateFaPiaoNumber(resp3.Data.TicketSn, ids) //同步发票号码
+							c.ServeSuccessJSON(map[string]interface{}{
+								"msg": "开具成功",
+							})
+						}
+					} else {
+						//错误处理
+
+					}
+				}
+			} else {
+				//错误处理
+
+			}
+		}
+	}
+}
+func (c *FapiaoApiController) RedFaPiao() {
+	//认证
+	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)
-	routerAddress, postData := fapiao.QueryStock(config) //发票开具
-	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	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.goldentec.com", routerAddress, postData)
+	fmt.Println("red")
+	fmt.Println(red)
+	fmt.Println("red")
+
 	if err != nil {
 		fmt.Println(err)
 	} else {
-		fmt.Println(string(r))
-	}
+		var resp RedResult
+		// 将 byte 切片转换为结构体
+		json.Unmarshal(red, &resp)
 
-}
+		fmt.Println("resp")
+		fmt.Println(resp)
+		fmt.Println("resp")
 
-func (c *FapiaoApiController) OpenFaPiao() {
-	GetQRStatus(c.GetAdminUserInfo().CurrentOrgId)
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+		if resp.Code == 0 {
+			if resp.Data[0].State == 1 {
+				//查询红票开具情况
+				routerAddress2, postData2 := fapiao.Query(config.SellerTaxpayerNum, fapiao_config.OrderSn, "")
+				r3, _ := sdk.HttpPost("https://apigw.goldentec.com", routerAddress2, postData2)
+				var resp3 QueryFaPiaoResultResponse
+				// 将 byte 切片转换为结构体
+				json.Unmarshal(r3, &resp3)
+
+				fmt.Println("resp")
+				fmt.Println(string(r3))
+				fmt.Println(resp3)
+				fmt.Println("resp")
+				if resp3.Code == 0 {
+					if resp3.Data.IsRedWashed == 1 {
+						fapiao_config.IsRedWashed = "1"
+						fapiao_config.Status = 0
+						fapiao_config.RedInvoiceId = resp.Data[0].InvoiceId
+						fapiao_config.RedInvoiceCreator = role2.UserName
+						service.SaveFaPiaoOrder(fapiao_config)
+						//将结算表的发票号码清空
+						service.UpdateFaPiaoNumberByNumber(fapiao_config.TicketSn)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg": "红冲成功",
+						})
+					} else {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg": "红冲失败",
+						})
+					}
+				} else {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "红冲失败",
+					})
+				}
+			} else {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "红冲失败",
+				})
+			}
+		} else {
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "红冲失败",
+			})
+		}
+	}
+}
+func GetQRStatusTwo(org_id int64) (status int64) {
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "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)
+	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 {
-		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 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
 }
 
-func (c *FapiaoApiController) RedFaPiao() {
-	GetQRStatus(c.GetAdminUserInfo().CurrentOrgId)
+type RedResult struct {
+	Code int `json:"code"`
+	Data []struct {
+		State     int    `json:"state"`
+		Message   string `json:"message"`
+		OrderSn   string `json:"order_sn"`
+		InvoiceId string `json:"invoice_id"`
+	} `json:"data"`
+	Message string `json:"message"`
+}
+type QueryFaPiaoResultResponse struct {
+	Code int `json:"code"`
+	Data struct {
+		OrderSn          string `json:"order_sn"`
+		Status           int    `json:"status"`
+		Message          string `json:"message"`
+		TicketDate       string `json:"ticket_date"`
+		TicketSn         string `json:"ticket_sn"`
+		TicketCode       string `json:"ticket_code"`
+		CheckCode        string `json:"check_code"`
+		AmountWithTax    string `json:"amount_with_tax"`
+		AmountWithoutTax string `json:"amount_without_tax"`
+		TaxAmount        string `json:"tax_amount"`
+		IsRedWashed      int    `json:"is_red_washed"`
+		PdfUrl           string `json:"pdf_url"`
+		OfdUrl           string `json:"ofd_url"`
+		XmlUrl           string `json:"xml_url"`
+	} `json:"data"`
+	Message string `json:"message"`
+}
+type OpenFaPiaoResultResponse struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		State     int    `json:"state"`
+		OrderSn   string `json:"order_sn"`
+		InvoiceId string `json:"invoice_id"`
+	} `json:"data"`
+}
+type SurplusStockResponse struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		LeftQuantity int `json:"left_quantity"`
+	} `json:"data"`
+}
+
+func GetFaPiaoStock(org_id int64) (left_quantity int) {
 	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
-	//var config models.FapiaoConfig
-	//config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
-	routerAddress, postData := fapiao.Red() //发票开具
+	var config models.FapiaoConfig
+	config, _ = service.FindFaPiaoConfigInfo(org_id)
+	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))
+		var resp SurplusStockResponse
+		// 将 byte 切片转换为结构体
+		err := json.Unmarshal(r, &resp)
+		if err != nil {
+			fmt.Println("Error unmarshalling:", err)
+		} else {
+			if resp.Code == 0 {
+				left_quantity = resp.Data.LeftQuantity
+			}
+		}
 	}
+	return
 }
 
-func GetQRStatus(org_id int64) {
-	redis := service.RedisClient()
-	defer redis.Close()
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "8ca4ee7b152c0abceff9", "17402aff152dbeedf7a7b30be553f4c4", "", "test")
+type Response struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    struct {
+		Status string `json:"status"`
+	} `json:"data"`
+}
+
+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)
-	routerAddress, postData := fapiao.GetQRStatus("", config) //发票开具
-	r, err := sdk.HttpPost("https://apigw-test.goldentec.com", routerAddress, postData)
+	fmt.Println(config)
+	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)
 	} else {
+		fmt.Println(r)
+
+		var resp Response
+
+		// 将 byte 切片转换为结构体
+		err := json.Unmarshal(r, &resp)
 		fmt.Println(string(r))
+		if err != nil {
+			status = "FAILD"
+			fmt.Println("Error unmarshalling:", err)
+		} else {
+			status = resp.Data.Status
+			fmt.Printf("Parsed struct: %+v\n", resp)
+		}
 	}
+	return status
+	//return
+}
+
+// 计算商品价格、税额等函数
+func CalculatePriceDetails(totalCost float64, itemCount int, taxRate float64) (string, string, string, string) {
+	// 商品不含税总金额，保留两位小数
+	amountWithoutTax := roundTo(totalCost/(1+taxRate), 2)
+
+	// 商品不含税单价，保留八位小数
+	pricePerItem := roundTo(amountWithoutTax/float64(itemCount), 8)
+
+	// 税额，保留两位小数
+	taxAmount := roundTo(amountWithoutTax*taxRate, 2)
+
+	// 含税总金额
+	amountHasTax := amountWithoutTax + taxAmount
+
+	return fmt.Sprintf("%f", amountWithoutTax), fmt.Sprintf("%f", pricePerItem), fmt.Sprintf("%f", taxAmount), fmt.Sprintf("%f", amountHasTax)
+}
+
+// 保留指定小数位数的函数
+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")
@@ -146,6 +149,9 @@ func (c *StatisticsApiController) GetPatientBP() {
 		}
 		endTime = theTime.Unix()
 	}
+	fmt.Println(startTime)
+	fmt.Println(endTime)
+
 	item, _ := service.GetNewDialysisBloodChartData(c.GetAdminUserInfo().CurrentOrgId, startTime, endTime, statistics_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": item,

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 {

invoice/sdk.go

@@ -0,0 +1,88 @@
+package invoice
+
+import (
+	"encoding/base64"
+	"errors"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"XT_New/common"
+)
+
+func NewSdk(algorithm, appkey, appsecret, privateKey, env string) *Client {
+	return &Client{
+		env:        env,
+		appkey:     appkey,
+		appsecret:  appsecret,
+		algorithm:  algorithm,
+		privateKey: privateKey,
+	}
+}
+
+type Client struct {
+	env        string
+	appkey     string
+	appsecret  string
+	privateKey string
+	algorithm  string
+}
+
+func (this *Client) HttpPost(baseUrl string, routerAddress string, post map[string]interface{}) ([]byte, error) {
+
+	// 获取转换后的post字符串
+	postData, err := common.GetPostDataWithMap(post)
+	if err != nil {
+		return nil, err
+	}
+
+	timestamp := strconv.FormatInt(time.Now().Unix(), 10)                //获取时间戳
+	nonce := common.GetRand(6)                                           //6位随机数
+	auth, err := this.getAuth(routerAddress, postData, timestamp, nonce) //认证串
+	if err != nil {
+		return nil, err
+	}
+
+	client := &http.Client{}
+
+	reqest, err := http.NewRequest("POST", baseUrl+routerAddress, strings.NewReader((postData)))
+	if err != nil {
+		return nil, err
+	}
+
+	reqest.Header.Add("Authorization", auth)
+	reqest.Header.Add("Content-Type", "application/json")
+
+	r, err := client.Do(reqest)
+	if err != nil {
+		return nil, err
+	}
+	defer r.Body.Close()
+
+	return ioutil.ReadAll(r.Body)
+}
+
+// getAuth 获取授权字符串
+func (this *Client) getAuth(routerAddress string, postData string, timestamp string, nonce string) (string, error) {
+
+	originStr := "algorithm=" + this.algorithm + "|appkey=" + this.appkey + "|nonce=" + nonce + "|timestamp=" + timestamp + "|" + routerAddress + "|" + postData
+
+	var signs string
+	var err error
+	switch this.algorithm {
+	case common.HMAC_SHA256:
+		signs = base64.StdEncoding.EncodeToString(common.HMAC_Sha256(originStr, this.appsecret))
+	default:
+		panic(errors.New("algorithm not exists"))
+	}
+
+	if err != nil {
+		return "", err
+	}
+
+	auth := "algorithm=" + this.algorithm + ",appkey=" + this.appkey + ",nonce=" + nonce + ",timestamp=" + timestamp + ",signature=" + signs
+
+	return auth, nil
+}

models/fapiao.go

@@ -61,29 +61,32 @@ func (HisOrderByFaPiao) TableName() string {
 }
 
 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"`
+	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"`
+	RedInvoiceId      string   `gorm:"column:red_invoice_id" json:"red_invoice_id" form:"red_invoice_id"`
+	RedInvoiceCreator string   `gorm:"column:red_invoice_creator" json:"red_invoice_creator" form:"red_invoice_creator"`
+	Patients          Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 }
 
 func (HisFaPiaoOrder) TableName() string {

service/fapiao/bule.go

@@ -1,63 +1,6 @@
 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
-
+func Blue(postData map[string]interface{}) (string, map[string]interface{}) {
+	routerAddress := "/tax-api/invoice/blue/v1"
 	return routerAddress, postData
 }

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

@@ -2,14 +2,14 @@ package fapiao
 
 import "XT_New/models"
 
-func Query() (routerAddress string, postData map[string]interface{}) {
+func Query(seller_taxpayer_num string, order_sn string, order_id string) (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",
+		"seller_taxpayer_num": seller_taxpayer_num,
+		"order_sn":            order_sn,
+		"order_id":            order_id,
 		"is_red":              0,
 	}
 
@@ -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/fapiao/red.go

@@ -1,15 +1,16 @@
 package fapiao
 
-func Red() (routerAddress string, postData map[string]interface{}) {
+func Red(seller_taxpayer_num string, callback_url string, order_sn string) (routerAddress string, postData map[string]interface{}) {
 
-	routerAddress = "/tax-api/invoice/red/v1"
+	routerAddress = "/tax-api/invoice/red/quick/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"
+	invoice["seller_taxpayer_num"] = seller_taxpayer_num
+	invoice["callback_url"] = callback_url
+	invoice["order_sn"] = order_sn
+	invoice["apply_reason"] = "2"
 
 	invoices[0] = invoice
 

service/fapiao_service.go

@@ -69,12 +69,11 @@ func GetFaPiaoSettleList(user_org_id int64, page int64, limit int64, start_time_
 	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) {
+func GetFaPiaoList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64) (order []*models.HisFaPiaoOrder, 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)
+	db = db.Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id)
+	db = db.Where("ctime >= ? and ctime <= ? and user_org_id = ? and status = 1", start_time_timestamp, end_time_timestamp, user_org_id)
 	// Count the total number of records
 	db = db.Count(&total)
 	// Apply pagination
@@ -83,3 +82,33 @@ func GetFaPiaoList(user_org_id int64, page int64, limit int64, start_time_timest
 	err = db.Find(&order).Error
 	return
 }
+
+func GetFaPiaoOrderByIDS(ids []string) (orders []models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id in (?) AND status = 1", ids).Find(&orders).Error
+	return
+}
+
+func GetFaPiaoOrderById(id int64) (orders models.HisFaPiaoOrder, err error) {
+	err = readDb.Model(&models.HisFaPiaoOrder{}).Where("id = ?", id).Find(&orders).Error
+	return
+}
+
+func GetFaPiaoOrderInfoByNumbers(numbers []string) (infos []models.HisOrderInfo, err error) {
+	err = readDb.Model(&models.HisOrderInfo{}).Where("order_number in (?)", numbers).Find(&infos).Error
+	return
+}
+
+func SaveFaPiaoOrder(fapiao models.HisFaPiaoOrder) (err error) {
+	err = writeDb.Save(&fapiao).Error
+	return
+}
+
+func UpdateFaPiaoNumber(number string, ids []string) (err error) {
+	err = XTWriteDB().Model(&models.HisOrder{}).Where("id in (?)", ids).Updates(map[string]interface{}{"fa_piao_number": number}).Error
+	return
+}
+
+func UpdateFaPiaoNumberByNumber(number string) (err error) {
+	err = XTWriteDB().Model(&models.HisOrder{}).Where("fa_piao_number = ?", number).Updates(map[string]interface{}{"fa_piao_number": ""}).Error
+	return
+}

service/statistis_qc_service.go

@@ -1248,14 +1248,18 @@ type Patient struct {
 	IDCardNo string `gorm:"column:id_card_no"`
 }
 
+func (Patient) TableName() string {
+	return "xt_patients"
+}
+
 // 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"`
+	ID             uint    `gorm:"id"`
+	PatientID      uint    `gorm:"column:patient_id"`
+	SystolicBP     float64 `gorm:"column:systolic_blood_pressure"`
+	DiastolicBP    float64 `gorm:"column:diastolic_blood_pressure"`
+	AssessmentDate int64   `gorm:"column:assessment_date"`
+	UserOrgID      int     `gorm:"column:user_org_id"`
 }
 
 func (Assessment) TableName() string {
@@ -1768,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
@@ -1881,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)
@@ -1896,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 = '其他'")
 	}
 }
 
@@ -1949,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 {