controllers/fapiao_controller.go

@@ -9,9 +9,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"math"
 	"net/http"
+	"os"
+	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
@@ -34,22 +37,479 @@ func FaPiaoApiRegistRouters() {
 	beego.Router("/api/bwfapiao/sms/login", &FapiaoApiController{}, "get:Login")
 	beego.Router("/api/bwfapiao/qrcode/get", &FapiaoApiController{}, "get:GetQRCode")
 	//beego.Router("/api/bwfapiao/blue", &FapiaoApiController{}, "get:OpenFaPiao")
-	//beego.Router("/api/bwfapiao/red", &FapiaoApiController{}, "get:RedFaPiao")
+	beego.Router("/api/bwfapiao/red", &FapiaoApiController{}, "get:RedFaPiao")
 	beego.Router("/api/order/fapiao/list", &FapiaoApiController{}, "get:GetOrderFaPiaoList")
 	beego.Router("/api/fapiao/list", &FapiaoApiController{}, "get:GetFaPiaoList")
 	beego.Router("/api/newfapiao/get", &HisApiController{}, "get:GetNewFaPiaoData")
 	beego.Router("/api/fapiao/query", &FapiaoApiController{}, "get:QueryFaPiao")
-
+	beego.Router("/api/bwfapiao/batchopen", &FapiaoApiController{}, "get:BwOpenBatchBlueFaPiao")
 	//百望云
 	//beego.Router("/api/bwfapiao/login", &FapiaoApiController{}, "get:GetBwFaPiaoLogin")
 	//beego.Router("/api/bwfapiao/qrcode", &FapiaoApiController{}, "get:GetBwFaPiaoQRCode")
-	beego.Router("/api/bwfapiao/blue", &FapiaoApiController{}, "get:BwOpenBlueFaPiao")
-	beego.Router("/api/bwfapiao/query", &FapiaoApiController{}, "get:QueryBwFaPiao")
-	beego.Router("/api/bwfapiao/red", &FapiaoApiController{}, "get:BwOpenRedFaPiao")
+	//beego.Router("/api/bwfapiao/blue", &FapiaoApiController{}, "get:BwOpenBlueFaPiao")
+	//beego.Router("/api/bwfapiao/query", &FapiaoApiController{}, "get:QueryBwFaPiao")
+	//beego.Router("/api/bwfapiao/red", &FapiaoApiController{}, "get:BwOpenRedFaPiao")
+
+	//beego.Router("/api/download", &FapiaoApiController{}, "get:DownLoad")
+
+	//beego.Router("/api/all_download", &FapiaoApiController{}, "get:AllDownLoad")
 
 }
 
+func (c *FapiaoApiController) BwOpenBatchBlueFaPiao() {
+	//判断是否处于登录状态
+	//开蓝票逻辑
+	order_ids := c.GetString("id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	ids := strings.Split(order_ids, ",")
+	orders, _ := service.GetFaPiaoOrderByIDS(ids)
+	fmt.Println(ids)
+	fmt.Println(orders)
+	//return
+	var success []int64
+	var errs string
+
+	for _, oss := range orders {
+		var MedfeeSumamt float64 = 0  //治疗费用
+		var PsnCashPay float64 = 0    //治疗费用
+		var FundPaySumamt float64 = 0 //治疗费用
+
+		var HifmiPay float64 = 0 //治疗费用
+		var MafPay float64 = 0   //治疗费用
+		var HifpPay float64 = 0  //治疗费用
+		var AcctPay float64 = 0  //治疗费用
+
+		var GongWuYuan float64 = 0 //治疗费用
+
+		var BuCong float64 = 0 //治疗费用
+
+		var OthPay float64 = 0 //治疗费用
+
+		var details []models.NewHisOrderInfo
+		var numbers []string
+		decimal.DivisionPrecision = 2
+		var remark string
+
+		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()
+
+		HifmiPay, _ = decimal.NewFromFloat(HifmiPay).Add(decimal.NewFromFloat(oss.HifmiPay)).Float64()
+		MafPay, _ = decimal.NewFromFloat(MafPay).Add(decimal.NewFromFloat(oss.MafPay)).Float64()
+		HifpPay, _ = decimal.NewFromFloat(HifpPay).Add(decimal.NewFromFloat(oss.HifpPay)).Float64()
+		AcctPay, _ = decimal.NewFromFloat(AcctPay).Add(decimal.NewFromFloat(oss.AcctPay)).Float64()
+
+		GongWuYuan, _ = decimal.NewFromFloat(GongWuYuan).Add(decimal.NewFromFloat(oss.CvlservPay)).Float64()
+
+		BuCong, _ = decimal.NewFromFloat(BuCong).Add(decimal.NewFromFloat(oss.HifesPay)).Float64()
+
+		OthPay, _ = decimal.NewFromFloat(OthPay).Add(decimal.NewFromFloat(oss.OthPay)).Float64()
+		numbers = append(numbers, oss.Number)
+
+		// 假设你有一个以秒为单位的时间戳
+		timestamp := oss.SettleAccountsDate // 例如：2023-01-01T00:00:00Z
+		// 将时间戳转换为time.Time对象
+		t := time.Unix(timestamp, 0) // 第二个参数是纳秒，这里我们不需要转换，所以设为0
+		// 格式化日期和时间
+		//fmt.Println(t.Format("2006-01-02"))
+
+		remark = "治疗时间: " + t.Format("2006-01-02")
+
+		MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "医疗总费用: " + MedfeeSumamt_str
+		} else {
+			remark = remark + " 医疗总费用:" + MedfeeSumamt_str
+		}
+		FundPaySumamt_str := fmt.Sprintf("%.2f", FundPaySumamt)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "基金支付总金额: " + FundPaySumamt_str
+		} else {
+			remark = remark + " 基金支付总金额:" + FundPaySumamt_str
+		}
+		HifpPay_str := fmt.Sprintf("%.2f", HifpPay)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "基本统筹基金支付: " + HifpPay_str
+		} else {
+			remark = remark + " 基本统筹基金支付:" + HifpPay_str
+		}
+
+		HifmiPay_str := fmt.Sprintf("%.2f", HifmiPay)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "大病基金支付: " + HifmiPay_str
+		} else {
+			remark = remark + " 大病基金支付:" + HifmiPay_str
+		}
+
+		GongWuYuan_str := fmt.Sprintf("%.2f", GongWuYuan)
+
+		if len(remark) == 0 {
+			remark = "公务员支付: " + GongWuYuan_str
+		} else {
+			remark = remark + " 公务员支付:" + GongWuYuan_str
+		}
+
+		BuCong_str := fmt.Sprintf("%.2f", BuCong)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "补充医疗保险支付: " + BuCong_str
+		} else {
+			remark = remark + " 补充医疗保险支付:" + BuCong_str
+		}
+
+		MafPay_str := fmt.Sprintf("%.2f", MafPay)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "医疗救助基金支付: " + MafPay_str
+		} else {
+			remark = remark + " 医疗救助基金支付:" + MafPay_str
+		}
+		OthPay_str := fmt.Sprintf("%.2f", OthPay)
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "其他支付: " + OthPay_str
+		} else {
+			remark = remark + " 其他支付:" + OthPay_str
+		}
+		AcctPay_str := fmt.Sprintf("%.2f", AcctPay)
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "医保账户支付: " + AcctPay_str
+		} else {
+			remark = remark + " 医保账户支付:" + AcctPay_str
+		}
+		PsnCashPay_str := fmt.Sprintf("%.2f", PsnCashPay)
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "个人现金支付: " + PsnCashPay_str
+		} else {
+			remark = remark + " 个人现金支付:" + PsnCashPay_str
+		}
+
+		details, _ = service.GetFaPiaoOrderInfoByNumbersTwo(numbers)
+		role, _ := service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
+
+		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)
+
+		}
+		//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(oss.UserOrgId, 10) + "_" + strconv.FormatInt(oss.PatientId, 10)
+		amountWithoutTax, _, taxAmount, _ := CalculatePriceDetails(MedfeeSumamt, 1, 0.00)
+		patient, _ := service.GetPatientByIDTwo(c.GetAdminUserInfo().CurrentOrgId, oss.PatientId)
+		oss.PsnName = patient.Name
+
+		requestBody2 := map[string]interface{}{
+			"taxNo":               config2.TerminalCode,
+			"taxUserName":         role.UserName,
+			"invoiceTerminalCode": "",
+			"isSplit":             "",
+			"orgCode":             "",
+			"taxDiskNo":           "",
+			"formatGenerate":      "",
+			"formatPushType":      "",
+			"completionCustom":    "",
+			"isAsync":             "",
+			"isReturnRedInfo":     "",
+		}
+		//var subData map[string]interface{}
+		subData := make(map[string]interface{})
+		subData["invoiceTypeCode"] = "02"
+		subData["paperInvoiceFlag"] = ""
+		subData["paperInvoiceTypeCode"] = ""
+		subData["paperInvoiceTypeCode"] = ""
+		subData["invoiceType"] = "0"
+		subData["invoiceSpecialMark"] = "00"
+		subData["isConfirmIssue"] = ""
+		subData["confirmIssue"] = ""
+		subData["taxationMethod"] = ""
+		subData["taxationLabel"] = ""
+		subData["reducedTaxCode"] = ""
+		subData["invoiceListMark"] = ""
+		subData["priceTaxMark"] = ""
+		subData["serialNo"] = number             // todo
+		subData["orderNo"] = ""                  //todo
+		subData["buyerTaxNo"] = patient.IdCardNo //todo
+		subData["buyerName"] = oss.PsnName + "(个人)"
+		subData["buyerAddressPhone"] = ""
+		subData["buyerBankAccount"] = ""
+		subData["drawer"] = role.UserName
+		subData["checker"] = ""
+		subData["payee"] = ""
+		subData["invoiceTotalPrice"] = MedfeeSumamt
+		subData["invoiceTotalTax"] = taxAmount
+		subData["invoiceTotalPriceTax"] = amountWithoutTax
+		subData["remarks"] = remark
+		subData["redInfoNo"] = ""
+		subData["originalInvoiceCode"] = ""
+		subData["originalInvoiceNo"] = ""
+		subData["deductibleAmount"] = ""
+		subData["sellerAddressPhone"] = ""
+		subData["sellerBankAccount"] = ""
+		//var subDetails []map[string]interface{}
+		subDetails := make([]map[string]interface{}, 0)
+		for index, item := range cts {
+			subDetailData := make(map[string]interface{})
+			amountWithoutTax_two, _, taxAmount_tow, _ := CalculatePriceDetails(item.price, 1, 0.00)
+			subDetailData["goodsLineNo"] = index + 1
+			subDetailData["originalInvoiceDetailNo"] = ""
+			subDetailData["invoiceLineNature"] = "0"
+			subDetailData["goodsCode"] = "3070202000000000000"
+			subDetailData["goodsBarCode"] = ""
+			subDetailData["goodsPersonalCode"] = ""
+			subDetailData["goodsName"] = item.name
+			subDetailData["goodsSpecification"] = ""
+			subDetailData["goodsUnit"] = ""
+			subDetailData["goodsQuantity"] = "1"
+			subDetailData["goodsPrice"] = amountWithoutTax_two
+			subDetailData["goodsTotalPrice"] = amountWithoutTax_two
+			subDetailData["goodsTotalTax"] = taxAmount_tow
+			subDetailData["goodsTaxRate"] = "0"
+			subDetailData["vatSpecialManagement"] = ""
+			subDetailData["freeTaxMark"] = "3"
+			subDetailData["preferentialMarkFlag"] = ""
+			subDetailData["goodsDiscountAmount"] = "0"
+			subDetails = append(subDetails, subDetailData)
+		}
+		subData["invoiceDetailsList"] = subDetails
+		requestBody2["data"] = subData
+
+		status, reason, response, request_log, response_log := OpenBWBlue(requestBody2)
+		if status == 0 { //失败 //TODO
+
+			if len(errs) == 0 {
+				errs = reason
+
+			} else {
+				errs = errs + "\n" + reason
+
+			}
+
+		} else { //成功
+			var fapiaos models.HisFaPiaoOrder
+			fapiaos.InvoiceId = response.Response.Success[0].SerialNo
+			fapiaos.OrderSn = response.Response.Success[0].SerialNo
+			fapiaos.OrderIds = strconv.FormatInt(oss.ID, 10)
+			fapiaos.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+			fapiaos.Status = 1
+			// 解析日期字符串的布局（对应输入的格式）
+			layout := "20060102150405"
+
+			// 将字符串解析为时间对象
+			t, _ := time.Parse(layout, response.Response.Success[0].InvoiceDate)
+			// 将时间对象格式化为所需的输出格式
+			output := t.Format("2006-01-02 15:04:05")
+			fapiaos.TicketDate = output
+			fapiaos.PatientId = oss.PatientId
+			fapiaos.Ctime = time.Now().Unix()
+			fapiaos.Mtime = time.Now().Unix()
+			fapiaos.Creator = role.UserName
+			fapiaos.MedfeeSumamt = MedfeeSumamt
+			fapiaos.FundPaySumamt = FundPaySumamt
+			fapiaos.PsnCashPay = PsnCashPay
+			fapiaos.TicketSn = response.Response.Success[0].InvoiceNo
+			fapiaos.AmountWithTax = fmt.Sprintf("%.2f", response.Response.Success[0].InvoiceTotalPrice)
+			fapiaos.AmountWithoutTax = fmt.Sprintf("%.2f", response.Response.Success[0].InvoiceTotalPrice)
+			fapiaos.FapiaoStatus = "2"
+			fapiaos.TaxAmount = fmt.Sprintf("%.2f", response.Response.Success[0].InvoiceTotalTax)
+			fapiaos.IsRedWashed = "0"
+			fapiaos.PdfUrl = response.Response.Success[0].EInvoiceUrl
+			fapiaos.OfdUrl = ""
+			fapiaos.XmlUrl = ""
+			fapiaos.OfdUrl = ""
+			fapiaos.XmlUrl = ""
+			fapiaos.BlueRequestInfo = request_log
+			fapiaos.BlueResponseInfo = response_log
+			var ids_new []string
+			ids_new = append(ids_new, strconv.FormatInt(oss.ID, 10))
+			err := service.SaveFaPiaoOrder(&fapiaos)
+			err = service.UpdateFaPiaoSN(response.Response.Success[0].SerialNo, ids_new)      //同步发票号码
+			err = service.UpdateFaPiaoNumber(response.Response.Success[0].InvoiceNo, ids_new) //同步发票号码
+			fmt.Println(err)
+			status2, msg, result := BWBanShi(config2, response.Response.Success[0].InvoiceNo)
+			if status2 == 0 { //TODO
+				if len(errs) == 0 {
+					errs = msg
+				} else {
+					errs = errs + "\n" + msg
+				}
+			} else {
+				fapiaos.PdfUrl = result.Response.UrlMap.PdfUrl
+				fapiaos.OfdUrl = result.Response.UrlMap.OfdUrl
+				fapiaos.XmlUrl = result.Response.UrlMap.XmlUrl
+				service.SaveFaPiaoOrder(&fapiaos)
+				success = append(success, fapiaos.ID)
+			}
+
+		}
+
+	}
+	if len(ids) == len(success) {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "批量开票成功",
+		})
+	} else {
+		if len(success) > 0 && len(success) <= len(ids) { // 部分成功
+			msgs := "部分开票成功,开票成功条数" + strconv.FormatInt(int64(len(success)), 10) + "条\n" + "开票失败原因:" + errs
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         msgs,
+			})
+
+		} else if len(success) == 0 {
+			msgs := "批量开票失败，开票失败原因:" + errs
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":         msgs,
+			})
+
+		}
+	}
+}
 func signTopRequestTwo(params map[string]string, secret string, body map[string]interface{}) (string, error) {
+	fmt.Println(params)
+	fmt.Println(secret)
+	fmt.Println(body)
+
 	// 第一步：检查参数是否已经排序
 	keys := make([]string, 0, len(params))
 	for k := range params {
@@ -88,6 +548,91 @@ func signTopRequestTwo(params map[string]string, secret string, body map[string]
 	return sign, nil
 }
 
+func (c *FapiaoApiController) AllDownLoad() {
+	var downloadedFiles []string
+	now := time.Now()
+	dateStr1 := now.Format("2006-01-02")
+	fapiao_config, _ := service.GetFaPiaoOrderByIds()
+	downloadDir := "./发票/" + dateStr1 + "/"
+	for _, item := range fapiao_config {
+		if err := os.MkdirAll(downloadDir, os.ModePerm); err != nil {
+			fmt.Printf("Failed to create directory: %v\n", err)
+			return
+		}
+		fileName := fmt.Sprintf("%s.pdf", item.TicketSn)
+
+		// 下载文件
+		savePath := filepath.Join(downloadDir, fileName)
+		fmt.Printf("Downloading %s to %s...\n", item.PdfUrl, savePath)
+		err := DownloadFile(item.PdfUrl, savePath)
+		if err != nil {
+			fmt.Printf("Failed to download file: %v\n", err)
+		}
+		downloadedFiles = append(downloadedFiles, savePath)
+	}
+	// 检查下载结果
+	if len(downloadedFiles) > 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "下载成功",
+		})
+	}
+
+}
+
+func (c *FapiaoApiController) DownLoad() {
+	now := time.Now()
+	dateStr1 := now.Format("2006-01-02")
+	id, _ := c.GetInt64("id")
+	fapiao_config, _ := service.GetFaPiaoOrderById(id)
+	downloadDir := "./发票/" + dateStr1 + "/"
+	if err := os.MkdirAll(downloadDir, os.ModePerm); err != nil {
+		fmt.Printf("Failed to create directory: %v\n", err)
+		return
+	}
+	fileName := fmt.Sprintf("%s.pdf", fapiao_config.TicketSn)
+
+	// 下载文件
+	var downloadedFiles []string
+	savePath := filepath.Join(downloadDir, fileName)
+	fmt.Printf("Downloading %s to %s...\n", fapiao_config.PdfUrl, savePath)
+	err := DownloadFile(fapiao_config.PdfUrl, savePath)
+	if err != nil {
+		fmt.Printf("Failed to download file: %v\n", err)
+	}
+	downloadedFiles = append(downloadedFiles, savePath)
+	// 检查下载结果
+	if len(downloadedFiles) > 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "下载成功",
+		})
+	}
+}
+
+func DownloadFile(url, savePath string) error {
+	resp, err := http.Get(url)
+	if err != nil {
+		return fmt.Errorf("failed to download file: %v", err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return fmt.Errorf("bad status: %s", resp.Status)
+	}
+
+	out, err := os.Create(savePath)
+	if err != nil {
+		return fmt.Errorf("failed to create file: %v", err)
+	}
+	defer out.Close()
+
+	_, err = io.Copy(out, resp.Body)
+	if err != nil {
+		return fmt.Errorf("failed to save file: %v", err)
+	}
+
+	return nil
+}
+
 func (c *FapiaoApiController) BwOpenBlueFaPiao() {
 	//判断是否处于登录状态
 	//开蓝票逻辑
@@ -104,6 +649,12 @@ func (c *FapiaoApiController) BwOpenBlueFaPiao() {
 	var HifpPay float64 = 0  //治疗费用
 	var AcctPay float64 = 0  //治疗费用
 
+	var GongWuYuan float64 = 0 //治疗费用
+
+	var BuCong float64 = 0 //治疗费用
+
+	var OthPay float64 = 0 //治疗费用
+
 	var details []models.HisOrderInfo
 	var numbers []string
 	decimal.DivisionPrecision = 2
@@ -118,78 +669,103 @@ func (c *FapiaoApiController) BwOpenBlueFaPiao() {
 		HifpPay, _ = decimal.NewFromFloat(HifpPay).Add(decimal.NewFromFloat(oss.HifpPay)).Float64()
 		AcctPay, _ = decimal.NewFromFloat(AcctPay).Add(decimal.NewFromFloat(oss.AcctPay)).Float64()
 
+		GongWuYuan, _ = decimal.NewFromFloat(GongWuYuan).Add(decimal.NewFromFloat(oss.CvlservPay)).Float64()
+
+		BuCong, _ = decimal.NewFromFloat(BuCong).Add(decimal.NewFromFloat(oss.HifesPay)).Float64()
+
+		OthPay, _ = decimal.NewFromFloat(OthPay).Add(decimal.NewFromFloat(oss.OthPay)).Float64()
 		numbers = append(numbers, oss.Number)
 	}
-	if MedfeeSumamt > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+	// 假设你有一个以秒为单位的时间戳
+	timestamp := orders[0].SettleAccountsDate // 例如：2023-01-01T00:00:00Z
+	// 将时间戳转换为time.Time对象
+	t := time.Unix(timestamp, 0) // 第二个参数是纳秒，这里我们不需要转换，所以设为0
+	// 格式化日期和时间
+	//fmt.Println(t.Format("2006-01-02"))
 
-		if len(remark) == 0 {
-			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "医疗总费用: " + MedfeeSumamt_str
-		} else {
-			remark = remark + " 医疗总费用:" + MedfeeSumamt_str
-		}
+	remark = "治疗时间: " + t.Format("2006-01-02")
+
+	MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "医疗总费用: " + MedfeeSumamt_str
+	} else {
+		remark = remark + " 医疗总费用:" + MedfeeSumamt_str
 	}
-	if FundPaySumamt > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", FundPaySumamt)
+	FundPaySumamt_str := fmt.Sprintf("%.2f", FundPaySumamt)
 
-		if len(remark) == 0 {
-			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "基金支付总金额: " + MedfeeSumamt_str
-		} else {
-			remark = remark + " 基金支付总金额:" + MedfeeSumamt_str
-		}
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "基金支付总金额: " + FundPaySumamt_str
+	} else {
+		remark = remark + " 基金支付总金额:" + FundPaySumamt_str
 	}
-	if PsnCashPay > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", PsnCashPay)
+	HifpPay_str := fmt.Sprintf("%.2f", HifpPay)
 
-		if len(remark) == 0 {
-			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "个人现金支付: " + MedfeeSumamt_str
-		} else {
-			remark = remark + " 个人现金支付:" + MedfeeSumamt_str
-		}
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "基本统筹基金支付: " + HifpPay_str
+	} else {
+		remark = remark + " 基本统筹基金支付:" + HifpPay_str
 	}
-	if HifmiPay > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", HifmiPay)
 
-		if len(remark) == 0 {
-			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "大病基金支付: " + MedfeeSumamt_str
-		} else {
-			remark = remark + " 大病基金支付:" + MedfeeSumamt_str
-		}
+	HifmiPay_str := fmt.Sprintf("%.2f", HifmiPay)
+
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "大病基金支付: " + HifmiPay_str
+	} else {
+		remark = remark + " 大病基金支付:" + HifmiPay_str
 	}
-	if AcctPay > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", AcctPay)
 
-		if len(remark) == 0 {
-			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "个账支付: " + MedfeeSumamt_str
-		} else {
-			remark = remark + " 个账支付:" + MedfeeSumamt_str
-		}
+	GongWuYuan_str := fmt.Sprintf("%.2f", GongWuYuan)
+
+	if len(remark) == 0 {
+		remark = "公务员支付: " + GongWuYuan_str
+	} else {
+		remark = remark + " 公务员支付:" + GongWuYuan_str
 	}
-	if HifpPay > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", HifpPay)
 
-		if len(remark) == 0 {
-			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "基本统筹基金支付: " + MedfeeSumamt_str
-		} else {
-			remark = remark + " 基本统筹基金支付:" + MedfeeSumamt_str
-		}
+	BuCong_str := fmt.Sprintf("%.2f", BuCong)
+
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "补充医疗保险支付: " + BuCong_str
+	} else {
+		remark = remark + " 补充医疗保险支付:" + BuCong_str
 	}
-	if MafPay > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", MafPay)
 
-		if len(remark) == 0 {
-			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "医疗救助基金支付: " + MedfeeSumamt_str
-		} else {
-			remark = remark + " 医疗救助基金支付:" + MedfeeSumamt_str
-		}
+	MafPay_str := fmt.Sprintf("%.2f", MafPay)
+
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "医疗救助基金支付: " + MafPay_str
+	} else {
+		remark = remark + " 医疗救助基金支付:" + MafPay_str
+	}
+	OthPay_str := fmt.Sprintf("%.2f", OthPay)
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "其他支付: " + OthPay_str
+	} else {
+		remark = remark + " 其他支付:" + OthPay_str
 	}
+	AcctPay_str := fmt.Sprintf("%.2f", AcctPay)
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "医保账户支付: " + AcctPay_str
+	} else {
+		remark = remark + " 医保账户支付:" + AcctPay_str
+	}
+	PsnCashPay_str := fmt.Sprintf("%.2f", PsnCashPay)
+	if len(remark) == 0 {
+		//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+		remark = "个人现金支付: " + PsnCashPay_str
+	} else {
+		remark = remark + " 个人现金支付:" + PsnCashPay_str
+	}
+
 	details, _ = service.GetFaPiaoOrderInfoByNumbers(numbers)
 	role, _ := service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
 	role.UserName = ""
@@ -360,9 +936,9 @@ func (c *FapiaoApiController) BwOpenBlueFaPiao() {
 	subData["reducedTaxCode"] = ""
 	subData["invoiceListMark"] = ""
 	subData["priceTaxMark"] = ""
-	subData["serialNo"] = number // todo
-	subData["orderNo"] = ""      //todo
-	subData["buyerTaxNo"] = ""   //todo
+	subData["serialNo"] = number             // todo
+	subData["orderNo"] = ""                  //todo
+	subData["buyerTaxNo"] = patient.IdCardNo //todo
 	subData["buyerName"] = orders[0].PsnName + "(个人)"
 	subData["buyerAddressPhone"] = ""
 	subData["buyerBankAccount"] = ""
@@ -406,11 +982,12 @@ func (c *FapiaoApiController) BwOpenBlueFaPiao() {
 	}
 	subData["invoiceDetailsList"] = subDetails
 	requestBody2["data"] = subData
+
 	status, reason, response, request_log, response_log := OpenBWBlue(requestBody2)
 	if status == 0 { //失败
 		c.ServeSuccessJSON(map[string]interface{}{
-			"status": -10,
-			"msg":    reason,
+			"failed_code": -10,
+			"msg":         reason,
 		})
 	} else { //成功
 		var fapiaos models.HisFaPiaoOrder
@@ -507,6 +1084,7 @@ func (c *FapiaoApiController) BwOpenRedFaPiao() {
 
 }
 func (c *FapiaoApiController) QueryBwFaPiao() {
+	fmt.Println("------")
 	id, _ := c.GetInt64("id")
 	oc, _ := service.GetFaPiaoOrderById(id)
 	var config models.FapiaoConfig
@@ -568,24 +1146,32 @@ func OpenBWBlue(requestBody2 map[string]interface{}) (int64, string, bwfapiao.In
 			return 0, result.ErrorResponse.Message + "\n" + result.ErrorResponse.SubMessage, result, string(reques_log), response
 		}
 	} else { //token 不存在，则进行获取token的操作
-		fmt.Println("token 不存在")
 
 		tokenResp, _ := GetAccessToken("https://openapi.baiwang.com/router/rest", "b033l65qAA", "cc73223bd14a4064bb0fe9ba642da58f", "10059482", "bb481e0c-9895-44d8-b184-6b9707a60ec7", "admin_ffzyx16zmybx4", "")
 		fmt.Println(tokenResp)
 
 		if len(tokenResp.Response.AccessToken) > 0 { //token请求成功，则将token和有效时间存储进redis，
 			redisClient.Set("fapiao_access_token", tokenResp.Response.AccessToken, time.Duration(tokenResp.Response.ExpiresIn)*time.Second)
-			params["token"] = tokenResp.Response.AccessToken
 			// 生成签名
-			sign, err = signTopRequestTwo(params, secret, requestBody2)
+			secret = "bb481e0c-9895-44d8-b184-6b9707a60ec7"
+			params_two := map[string]string{
+				"method":    "baiwang.output.invoice.issue",
+				"version":   "6.0",
+				"appKey":    "10059482",
+				"format":    "json",
+				"timestamp": strconv.FormatInt(time.Now().Unix(), 10),
+				"token":     tokenResp.Response.AccessToken,
+				"type":      "sync",
+			}
+			sign, err = signTopRequestTwo(params_two, secret, requestBody2)
 			if err != nil {
 				fmt.Println("Error:", err)
 				return 0, err.Error(), result, string(reques_log), ""
 			}
-			params["sign"] = sign
+			params_two["sign"] = sign
 
 			// 调用 API
-			response, err := callApiTwo("https://openapi.baiwang.com/router/rest", params, requestBody2)
+			response, err := callApiTwo("https://openapi.baiwang.com/router/rest", params_two, requestBody2)
 			if err != nil {
 				fmt.Println("接口调用失败:", err)
 				return 0, err.Error(), result, string(reques_log), response
@@ -711,16 +1297,18 @@ func OpenBWRed(config models.FapiaoConfig, orders models.HisFaPiaoOrder) (int64,
 			remark = remark + " 基金支付总金额:" + MedfeeSumamt_str
 		}
 	}
-	if PsnCashPay > 0 {
-		MedfeeSumamt_str := fmt.Sprintf("%.2f", PsnCashPay)
+
+	if HifmiPay > 0 {
+		MedfeeSumamt_str := fmt.Sprintf("%.2f", HifmiPay)
 
 		if len(remark) == 0 {
 			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
-			remark = "个人现金支付: " + MedfeeSumamt_str
+			remark = "大病基金支付: " + MedfeeSumamt_str
 		} else {
-			remark = remark + " 个人现金支付:" + MedfeeSumamt_str
+			remark = remark + " 大病基金支付:" + MedfeeSumamt_str
 		}
 	}
+
 	if HifmiPay > 0 {
 		MedfeeSumamt_str := fmt.Sprintf("%.2f", HifmiPay)
 
@@ -731,6 +1319,18 @@ func OpenBWRed(config models.FapiaoConfig, orders models.HisFaPiaoOrder) (int64,
 			remark = remark + " 大病基金支付:" + MedfeeSumamt_str
 		}
 	}
+
+	if PsnCashPay > 0 {
+		MedfeeSumamt_str := fmt.Sprintf("%.2f", PsnCashPay)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "个人现金支付: " + MedfeeSumamt_str
+		} else {
+			remark = remark + " 个人现金支付:" + MedfeeSumamt_str
+		}
+	}
+
 	if AcctPay > 0 {
 		MedfeeSumamt_str := fmt.Sprintf("%.2f", AcctPay)
 
@@ -1371,7 +1971,7 @@ type AuthResponse struct {
 // GetAccessToken 获取登录授权的 access_token
 func GetAccessToken(apiURL, plainPassword, salt, clientID, clientSecret, username, orgAuthCode string) (AuthResponse, error) {
 	// 当前时间戳（毫秒级）
-	timestamp := ""
+	timestamp := strconv.FormatInt(time.Now().Unix(), 10)
 
 	// 密码加密：MD5 + SHA1
 	encryptedPassword := md5AndSha1(plainPassword + salt)
@@ -1384,7 +1984,6 @@ func GetAccessToken(apiURL, plainPassword, salt, clientID, clientSecret, usernam
 
 	// 构造请求体
 	authReq := map[string]interface{}{
-
 		"client_secret": clientSecret,
 		"username":      username,
 		"password":      encryptedPassword,
@@ -1392,13 +1991,11 @@ func GetAccessToken(apiURL, plainPassword, salt, clientID, clientSecret, usernam
 	}
 
 	var aa AuthResponse
-
 	// 转换为 JSON
 	reqBody, err := json.Marshal(authReq)
 	if err != nil {
 		return aa, fmt.Errorf("failed to marshal request: %v", err)
 	}
-
 	// 发送 POST 请求
 	resp, err := http.Post(apiURL+"?"+"version="+"6.0"+"&method="+"baiwang.oauth.token"+"&grant_type="+"password"+"&client_id="+clientID+"&timestamp="+timestamp, "application/json", bytes.NewBuffer(reqBody))
 	if err != nil {

controllers/his_charge_api_controller.go

@@ -506,6 +506,8 @@ func (c *HisChargeApiController) GetPrescriptionStatisticsDetail() {
 	patient_id, _ := c.GetInt64("patient_id")
 	item_type, _ := c.GetInt64("type")
 
+	//time_type, _ := c.GetInt64("time_type")
+
 	//date1, _ := time.Parse("2006-01-02", start_time)
 	//date2, _ := time.Parse("2006-01-02", end_time)
 	// 计算日期间隔

controllers/yh_api_controller.go

@@ -111,7 +111,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func UploadDiase(org_id int64) error {
 //	patients := service.GetAllPatients(org_id)
 //	var hdreq models.HDRequest
@@ -187,7 +186,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func UploadZhuanGui(org_id int64) error {
 //	//syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	//var sync_time int64
@@ -280,7 +278,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func UploadTrtPlan(org_id int64) error {
 //	//syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	//var sync_time int64
@@ -340,7 +337,7 @@ package controllers
 //	// 构建请求数据
 //	requestData := map[string]interface{}{
 //		"data": map[string]interface{}{
-//			"hd_data_type": "outCome", // 患者信息类型
+//			"hd_data_type": "trtPlan", // 患者信息类型
 //			"hd_data":      plans,
 //		},
 //	}
@@ -386,7 +383,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func UploadSch(org_id int64) error {
 //	//syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	//var sync_time int64
@@ -431,7 +427,7 @@ package controllers
 //	// 构建请求数据
 //	requestData := map[string]interface{}{
 //		"data": map[string]interface{}{
-//			"hd_data_type": "outCome", // 患者信息类型
+//			"hd_data_type": "schedule", // 患者信息类型
 //			"hd_data":      schs,
 //		},
 //	}
@@ -477,7 +473,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func UploadOrder(org_id int64) error {
 //	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	var sync_time int64
@@ -575,7 +570,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func Uploadbf(org_id int64) error {
 //	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	var sync_time int64
@@ -587,6 +581,80 @@ package controllers
 //
 //	ps := service.GetAllDialysisRecord(org_id, sync_time)
 //
+//	var drs []models.PreDialysisRecord
+//	for _, item := range ps {
+//		var dr models.PreDialysisRecord
+//		order := service.GetAllPatientDialysisRecord(org_id, item.DialysisDate, item.PatientId)
+//		sch, _ := service.GetScheduleByPatient(item.PatientId, item.DialysisDate, org_id)
+//		pre, _ := service.GetDialysisPrescribe(org_id, item.PatientId, item.DialysisDate)
+//		str2 := strconv.Itoa(int(sch.ID))
+//		dr.TagtWaterVal = pre.TargetUltrafiltration
+//		dr.BtchID = str2
+//		dr.RxWateVal = pre.PrescriptionDewatering
+//		s1 := fmt.Sprintf("%f", order.KyyPredialysisEvaluation.WeightBefore)
+//		dr.BfWt = s1
+//		drs = append(drs, dr)
+//	}
+//	// 构建请求数据
+//	requestData := map[string]interface{}{
+//		"data": map[string]interface{}{
+//			"hd_data_type": "bfHd", // 患者信息类型
+//			"hd_data":      drs,
+//		},
+//	}
+//
+//	// 转换为 JSON
+//	jsonData, err := json.Marshal(requestData)
+//	if err != nil {
+//		return fmt.Errorf("JSON 编码失败: %v", err)
+//	}
+//
+//	// 创建 HTTP 请求
+//	req, err := http.NewRequest("POST", "https://ggfw.scyb.org.cn/ims/his/outside/api/scen/twoDecisions/hdDataUpload", bytes.NewBuffer(jsonData))
+//	if err != nil {
+//		return fmt.Errorf("创建请求失败: %v", err)
+//	}
+//
+//	// 设置请求头
+//	req.Header.Set("Content-Type", "application/json")
+//	// 根据实际需要添加其他请求头，如认证信息等
+//	// req.Header.Set("Authorization", "Bearer your_token")
+//
+//	// 发送请求
+//	client := &http.Client{}
+//	resp, err := client.Do(req)
+//	if err != nil {
+//		return fmt.Errorf("请求发送失败: %v", err)
+//	}
+//	defer resp.Body.Close()
+//
+//	// 读取响应
+//	body, err := io.ReadAll(resp.Body)
+//	if err != nil {
+//		return fmt.Errorf("读取响应失败: %v", err)
+//	}
+//
+//	// 检查响应状态
+//	if resp.StatusCode != http.StatusOK {
+//		return fmt.Errorf("请求失败，状态码: %d, 响应: %s", resp.StatusCode, string(body))
+//	}
+//
+//	// 处理响应数据
+//	fmt.Printf("上传成功，响应: %s\n", string(body))
+//
+//	return nil
+//}
+//func Uploadhdbf(org_id int64) error {
+//	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
+//	var sync_time int64
+//	if syncLastInfo.ID > 0 {
+//		sync_time = syncLastInfo.SyncTime
+//	} else {
+//		sync_time = 0
+//	}
+//
+//	ps := service.GetAllDialysisRecord(org_id, sync_time)
+//
 //	var drs []models.DialysisRecord
 //
 //	for _, item := range ps {
@@ -673,7 +741,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func Uploadmo(org_id int64) error {
 //	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	var sync_time int64
@@ -768,7 +835,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func Uploadaf(org_id int64) error {
 //	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	var sync_time int64
@@ -845,7 +911,6 @@ package controllers
 //
 //	return nil
 //}
-//
 //func Uploadtrt(org_id int64) error {
 //	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
 //	var sync_time int64
@@ -857,26 +922,29 @@ package controllers
 //
 //	ps := service.GetAllDialysisRecord(org_id, sync_time)
 //
-//	var drs []models.PostDialysisRecord
+//	var drs []models.YHTreatmentSummary
 //	for _, item := range ps {
-//		var dr models.PostDialysisRecord
+//		var dr models.YHTreatmentSummary
 //		order := service.GetAllPatientDialysisRecord(org_id, item.DialysisDate, item.PatientId)
 //		sch, _ := service.GetScheduleByPatient(item.PatientId, item.DialysisDate, org_id)
 //		str2 := strconv.Itoa(int(sch.ID))
-//		dr.AfSymp = order.KyyAssessmentAfterDislysis.SymptomAfterDialysis
-//		dr.ClotDeg = str2
-//		dr.ImptStas = order.KyyAssessmentAfterDislysis.InternalFistula
-//		s2 := fmt.Sprintf("%f", order.KyyAssessmentAfterDislysis.WeightAfter)
-//		s3 := fmt.Sprintf("%f", sch.ID)
-//		dr.AfWt = s2
-//		dr.ActFitrCnt = order.KyyAssessmentAfterDislysis.ActualUltrafiltration
-//		dr.BtchID = s3
+//		PunctureRole, _ := service.GetAdminUserRoleTwo(order.KyyTreatmentSummary.Puncture, org_id)
+//		ZlRole, _ := service.GetAdminUserRole(order.KyyTreatmentSummary.ZlNurse, org_id)
+//		FinishRole, _ := service.GetAdminUserRole(order.FinishNurse, org_id)
+//		PrescriptionDoctor, _ := service.GetAdminUserRole(order.KYYPrescriptionVM.PrescriptionDoctor, org_id)
+//		dr.PncrNurs = PunctureRole.UserName
+//		dr.TrtNurs = ZlRole.UserName
+//		dr.Chker = ""
+//		dr.OffMchNurs = FinishRole.UserName
+//		dr.TrtDr = PrescriptionDoctor.UserName
+//		dr.BtchID = str2
+//		dr.RsltCont = order.KyyTreatmentSummary.DialysisSummary
 //		drs = append(drs, dr)
 //	}
 //	// 构建请求数据
 //	requestData := map[string]interface{}{
 //		"data": map[string]interface{}{
-//			"hd_data_type": "afHd", // 患者信息类型
+//			"hd_data_type": "trtRslt", // 患者信息类型
 //			"hd_data":      drs,
 //		},
 //	}
@@ -919,20 +987,34 @@ package controllers
 //}
 //
 //func UploadDoc(org_id int64) error {
-//	//syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
-//	//var sync_time int64
-//	//if syncLastInfo.ID > 0 {
-//	//	sync_time = syncLastInfo.SyncTime
-//	//} else {
-//	//	sync_time = 0
-//	//}
 //
-//	// 构建请求数据
-//	requestData := map[string]interface{}{
-//		"data": map[string]interface{}{
-//			"hd_data_type": "outCome", // 患者信息类型
-//			"hd_data":      schs,
-//		},
+//	syncLastInfo, _ := service.GetSyncTimeByOrgId(org_id, 10)
+//	var sync_time int64
+//	if syncLastInfo.ID > 0 {
+//		sync_time = syncLastInfo.SyncTime
+//	} else {
+//		sync_time = 0
+//	}
+//	ps := service.GetAllDialysisRecord(org_id, sync_time)
+//
+//	var drs []models.YHDialysisOrder
+//	for _, item := range ps {
+//		var dr models.YHDialysisOrder
+//		order := service.GetAllPatientDialysisRecord(org_id, item.DialysisDate, item.PatientId)
+//		sch, _ := service.GetScheduleByPatient(item.PatientId, item.DialysisDate, org_id)
+//		str2 := strconv.Itoa(int(sch.ID))
+//		PunctureRole, _ := service.GetAdminUserRoleTwo(order.KyyTreatmentSummary.Puncture, org_id)
+//		ZlRole, _ := service.GetAdminUserRole(order.KyyTreatmentSummary.ZlNurse, org_id)
+//		FinishRole, _ := service.GetAdminUserRole(order.FinishNurse, org_id)
+//		PrescriptionDoctor, _ := service.GetAdminUserRole(order.KYYPrescriptionVM.PrescriptionDoctor, org_id)
+//		dr.PncrNurs = PunctureRole.UserName
+//		dr.TrtNurs = ZlRole.UserName
+//		dr.Chker = ""
+//		dr.OffMchNurs = FinishRole.UserName
+//		dr.TrtDr = PrescriptionDoctor.UserName
+//		dr.BtchID = str2
+//		dr.RsltCont = order.KyyTreatmentSummary.DialysisSummary
+//		drs = append(drs, dr)
 //	}
 //
 //	// 转换为 JSON

models/YH_models.go

@@ -1123,6 +1123,7 @@ type KYYDialysisOrder struct {
 	Condenser                  string                     `gorm:"column:condenser" json:"condenser" form:"condenser"`
 	BloodDrawing               int64                      `gorm:"column:blood_drawing" json:"blood_drawing" form:"blood_drawing"`
 	DialysisStrainer           string                     `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	KYYPrescriptionVM          KYYPrescriptionVM          `json:"p" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	KyyPredialysisEvaluation   KyyPredialysisEvaluation   `json:"pre" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	KyyAssessmentAfterDislysis KyyAssessmentAfterDislysis `json:"after" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	KyyTreatmentSummary        KyyTreatmentSummary        `json:"summary" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`

models/fapiao.go

@@ -109,9 +109,12 @@ type SettleAccountsDateOrder struct {
 	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"`
+
+	SetlTime string `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+
+	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"`
 }
 
 func (SettleAccountsDateOrder) TableName() string {

service/app_version.go

@@ -2,9 +2,11 @@ package service
 
 import (
 	"XT_New/models"
+	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"math"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -487,83 +489,83 @@ func GetAllProject(id int64) (pre []*models.HisPrescriptionProject) {
 //}
 
 type HisOrderTen 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"`
-	Naty                  string                `gorm:"column:naty" json:"naty" form:"naty"`
-	Brdy                  time.Time             `gorm:"column:brdy" json:"brdy" form:"brdy"`
-	Age                   float64               `gorm:"column:age" json:"age" form:"age"`
-	Insutype              string                `gorm:"column:insutype" json:"insutype" form:"insutype"`
-	PsnType               string                `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
-	CvlservFlag           string                `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
-	SetlTime              string                `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
-	MdtrtCertType         string                `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
-	MedType               string                `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	MedfeeSumamt          float64               `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	FulamtOwnpayAmt       float64               `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
-	OverlmtSelfPay        float64               `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
-	PreselfpayAmt         float64               `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
-	InscpScpAmt           float64               `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
-	ActPayDedc            float64               `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
-	HifpPay               float64               `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
-	CvlservPay            float64               `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
-	PoolPropSelfpay       float64               `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
-	HifesPay              float64               `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
-	HifmiPay              float64               `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
-	HifobPay              float64               `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
-	MafPay                float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
-	OthPay                float64               `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
-	FundPaySumamt         float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
-	PsnPartAmt            float64               `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
-	AcctPay               float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
-	PsnCashPay            float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
-	HospPartAmt           float64               `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
-	Balc                  float64               `gorm:"column:balc" json:"balc" form:"balc"`
-	AcctMulaidPay         float64               `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
-	MedinsSetlId          string                `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
-	ClrOptins             string                `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
-	ClrWay                string                `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
-	ClrType               string                `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
-	SetlDetail            string                `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
-	IsMedicineInsurance   int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
-	PayWay                int64                 `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
-	PayPrice              float64               `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
-	PayCardNo             string                `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
-	DiscountPrice         float64               `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
-	PreferentialPrice     float64               `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
-	RealityPrice          float64               `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
-	FoundPrice            float64               `gorm:"column:found_price" json:"found_price" form:"found_price"`
-	MedicalInsurancePrice float64               `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
-	PrivatePrice          float64               `gorm:"column:private_price" json:"private_price" form:"private_price"`
-	DepartmentName        string                `gorm:"-" json:"department_name" form:"department_name"`
-	DoctorName            string                `gorm:"-" json:"doctor_name" form:"doctor_name"`
-	Creator               int64                 `gorm:"column:creator" json:"creator" form:"creator"`
-	PType                 int64                 `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Decimal               float64               `gorm:"column:decimal" json:"decimal" form:"decimal"`
-	VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
-	//HisPrescriptionTen []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
-	Patients Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	CardDesc string   `gorm:"card_desc" json:"card_desc" form:"card_desc"`
+	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"`
+	Naty                  string    `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                  time.Time `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                   float64   `gorm:"column:age" json:"age" form:"age"`
+	Insutype              string    `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType               string    `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag           string    `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime              string    `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType         string    `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType               string    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt          float64   `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt       float64   `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay        float64   `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt         float64   `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt           float64   `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc            float64   `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay               float64   `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay            float64   `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay       float64   `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay              float64   `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay              float64   `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay              float64   `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                float64   `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                float64   `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt         float64   `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt            float64   `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay               float64   `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay            float64   `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt           float64   `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                  float64   `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay         float64   `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId          string    `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins             string    `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                string    `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType               string    `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail            string    `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	IsMedicineInsurance   int64     `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	PayWay                int64     `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice              float64   `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo             string    `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice         float64   `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice     float64   `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice          float64   `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice            float64   `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	DepartmentName        string    `gorm:"-" json:"department_name" form:"department_name"`
+	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
+	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Decimal               float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	//VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
+	HisPrescriptionTen []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
+	Patients           Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	CardDesc           string                `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (HisOrderTen) TableName() string {
@@ -910,7 +912,7 @@ func GetHisOrderDetail10138() (order []*HisOrderTen, err error) {
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject")
 		})
-	}).Where("setl_time >= '2024-07-01 00:00:00' AND setl_time <= '2024-09-30 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
+	}).Where("setl_time >= '2025-01-01 00:00:00' AND setl_time <= '2025-03-31 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10610").Find(&order).Error
 	return
 }
 
@@ -1617,7 +1619,7 @@ func Aaa() {
 
 func GetOrder11111() {
 	var info []models.HisOrder
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138 and order_status = 2 and status = 1 and setl_time >= '2024-08-01 00:00:00' and setl_time <= '2024-12-31 23:59:59'").Find(&info).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138 and order_status = 2 and status = 1 and setl_time >= '2024-01-01 00:00:00' and setl_time <= '2024-12-31 23:59:59 and length(warn_msg) = 0'").Find(&info).Error
 	for _, in := range info {
 		var p models.HisPatient
 		var sss models.OutpatientServiceSick
@@ -1632,29 +1634,291 @@ func GetOrder11111() {
 
 func GetOrder111112() {
 	var info []models.HisOrder
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138 and order_status = 2 and status = 1 and setl_time >= '2024-11-23 00:00:00'").Find(&info).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10106 and order_status = 2 and status = 1 and setl_time >= '2022-07-01 00:00:00' and setl_time <= '2025-12-31 23:00:00'").Find(&info).Error
 	for _, in := range info {
-		var p_info models.HisPrescriptionInfo
-		readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = 10138 and status = 1 and patient_id = ? and record_date = ?", in.PatientId, in.SettleAccountsDate).First(&p_info)
-		//readUserDb.Model(&models.UserAdminRole{}).Where("admin_user_id = ? and org_id = 10138", p_info.DoctorId)
-
-		diass := strings.Split(in.Diagnosis, ",")
+		var re models.HisPatient
+		readDb.Model(&models.HisPatient{}).Where("status = 1 and number = ? and user_org_id = 10106", in.MdtrtId).First(&re)
+		diass := strings.Split(re.Diagnosis, ",")
 		var dia_name = ""
+		var dia_code = ""
+
 		for _, dia := range diass {
 			var sss models.HisXtDiagnoseConfig
 			if len(dia) > 0 {
 				readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ?", dia).First(&sss)
 				if len(dia_name) == 0 {
 					dia_name = sss.ClassName
+					dia_code = sss.CountryCode
 				} else {
-					dia_name = dia_name + "," + sss.ClassName
+					dia_name = dia_name + "&" + sss.ClassName
+					dia_code = dia_code + "&" + sss.CountryCode
+
 				}
 			}
 		}
 		if len(dia_name) > 0 {
 			in.WarnMsg = dia_name
+			in.Cainfo = dia_code
 			writeDb.Save(&in)
 		}
 	}
 	return
 }
+
+//func GetOrder000000() {
+//	var info []models.HisOrder
+//	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 10138 and order_status = 2 and status = 1 and setl_time >= '2024-01-01 00:00:00'").Find(&info).Error
+//	for _, in := range info {
+//
+//		var p_info models.HisPrescriptionInfo
+//		readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = 10138 and status = 1 and patient_id = ? and record_date = ?", in.PatientId, in.SettleAccountsDate).First(&p_info)
+//		//readUserDb.Model(&models.UserAdminRole{}).Where("admin_user_id = ? and org_id = 10138", p_info.DoctorId)
+//		//var re models.HisHospitalCheckRecord
+//		//readDb.Model(&models.HisHospitalCheckRecord{}).Where("status = 1 and number = ? and user_org_id = 10215", in.MdtrtId).First(&re)
+//		//diass := strings.Split(re.Diagnosis, ",")
+//		var dia_name = ""
+//		for _, dia := range p_info.Diagnosis {
+//			var sss models.HisXtDiagnoseConfig
+//			if len(dia) > 0 && dia != 92 {
+//				readDb.Model(&models.HisXtDiagnoseConfig{}).Where("id = ?", dia).First(&sss)
+//				if len(dia_name) == 0 {
+//					dia_name = sss.ClassName
+//				} else {
+//					dia_name = dia_name + "," + sss.ClassName
+//				}
+//			}
+//		}
+//		if len(dia_name) > 0 {
+//			in.WarnMsg = dia_name
+//		}
+//		if len(in.WarnMsg) > 0 {
+//			WarnMsg := removeDuplicates(in.WarnMsg)
+//			in.WarnMsg = WarnMsg
+//			writeDb.Save(&in)
+//		}
+//
+//	}
+//	return
+//}
+
+func removeDuplicates(input string) string {
+	// 使用 map 存储去重元素
+	seen := make(map[string]bool)
+	uniqueValues := []string{}
+
+	// 以逗号分隔字符串
+	items := strings.Split(input, ",")
+
+	// 遍历数组，去重并保持顺序
+	for _, item := range items {
+		trimmedItem := strings.TrimSpace(item) // 去除首尾空格
+		if _, exists := seen[trimmedItem]; !exists {
+			seen[trimmedItem] = true
+			uniqueValues = append(uniqueValues, trimmedItem)
+		}
+	}
+
+	// 将去重后的元素重新拼接成字符串
+	return strings.Join(uniqueValues, ",")
+}
+
+type DrugWarehouseInfoTwo struct {
+	DrugCode string `gorm:"column:drug_code"`
+}
+
+var drugCodes []string
+
+func Cccc() error {
+	// 执行查询
+	err := readDb.Table("xt_drug_warehouse_info").
+		Select("drug_code").
+		Where("is_pc = ? AND org_id = ? AND pc_date >= ? AND drug_code <> ?", 1, 10610, 1738339200, "").
+		Pluck("drug_code", &drugCodes).Error
+	num := 0
+	for _, item := range drugCodes {
+		codess := strings.Split(item, ",")
+		for _, item := range codess {
+			if len(item) > 0 {
+				num = num + 1
+			}
+		}
+	}
+	fmt.Println(num)
+
+	return err
+}
+
+func Cccc2() error {
+	// 执行查询
+	err := readDb.Table("his_doctor_advice_info").
+		Select("drug_code").
+		Where("is_upload = 1 AND user_org_id = ? AND advice_date >= ? AND drug_code <> ?", 10610, 1738339200, "").
+		Pluck("drug_code", &drugCodes).Error
+	num := 0
+	for _, item := range drugCodes {
+		codess := strings.Split(item, ",")
+		for _, item := range codess {
+			if len(item) > 0 {
+				num = num + 1
+			}
+		}
+	}
+	fmt.Println(num)
+
+	return err
+}
+
+func SyncUploadStatus() {
+	var fl []models.DrugFlow
+	readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info on his_doctor_advice_info.patient_id = xt_drug_flow.patient_id and his_doctor_advice_info.record_date = xt_drug_flow.system_time and his_doctor_advice_info.drug_id = xt_drug_flow.drug_id and  his_doctor_advice_info.is_upload <>  1 and his_doctor_advice_info.drug_code <> ''").Where("xt_drug_flow.user_org_id = 10402 and xt_drug_flow.status = 1 and xt_drug_flow.is_sale = 1").Find(&fl)
+	for _, item := range fl {
+		writeDb.Model(&models.HisDoctorAdviceInfo{}).Where("user_org_id = 10402 and record_date = ? and drug_id = ? and patient_id = ? and is_upload <> 1", item.SystemTime, item.DrugId, item.PatientId).Updates(map[string]interface{}{"is_upload": 1})
+	}
+
+}
+
+func UpdateAAA(code string, cz string, new_code string) {
+	writeDb.Model(&models.BaseDrugLib{}).Where("medical_insurance_number = ? and org_id = 10480", code).Updates(map[string]interface{}{"code": new_code, "drug_remark": cz})
+
+}
+
+type Record struct {
+	AreaCode    string  `json:"area_code"`
+	Label       string  `json:"label"`
+	Sort        *int    `json:"sort"` // 允许null的字段使用指针类型
+	Type        string  `json:"type"`
+	Version     *string `json:"version"`  // 允许null的字符串字段
+	ValiFlag    *bool   `json:"valiFlag"` // 布尔指针
+	CreateID    *int    `json:"create_id"`
+	CreateUser  *string `json:"createUser"`
+	ID          int     `json:"id"`
+	ParentValue *string `json:"parentValue"`
+	Value       string  `json:"value"`
+	CreateDate  *string `json:"createDate"` // 若时间格式不同可单独处理
+	Status      string  `json:"status"`
+	CreateName  *string `json:"create_name"`
+}
+
+func CCCCCccc() {
+	// 读取文件
+	data, err := os.ReadFile("./aaa.json")
+	if err != nil {
+		fmt.Sprintf("读取文件失败: %v", err)
+		return
+	}
+
+	// 解析JSON数组
+	var records []Record
+	if err := json.Unmarshal(data, &records); err != nil {
+		panic(fmt.Sprintf("解析失败: %v", err))
+	}
+	var ps []models.Patients
+
+	readDb.Model(&models.Patients{}).Where("user_org_id = 10721").Find(&ps)
+	for _, item := range ps {
+		for _, re := range records {
+			if item.InsuplcAdmdvs == re.Value {
+				//item.InsuplcAdmdvsName = re.Label
+				writeDb.Save(&item)
+			}
+		}
+	}
+}
+
+func GetHisOrder9768() (order_infos []*VmHisOrderInfo9504, err error) {
+	err = readDb.Model(&VmHisOrderInfo95042{}).Where(" status = 1  AND user_org_id = 9478 AND patient_id = 37836 AND project_id > 0").Find(&order_infos).Error
+	for _, item := range order_infos {
+		var pp HisPrescriptionProject
+		readDb.Model(&HisPrescriptionProject{}).Where("id = ? and type = 3", item.ProjectId).First(&pp)
+		if pp.ID > 0 {
+			item.MedChrgitmType = "08"
+			readDb.Model(&VmHisOrderInfo95042{}).Save(&item)
+		}
+	}
+
+	return
+}
+
+func GetHisOrder0000() (order_infos []*VmHisOrderInfo9504, err error) {
+	err = readDb.Model(&VmHisOrderInfo95042{}).Where(" status = 1  AND upload_date > 1747754876 AND project_id = 0 and advice_id = 0").Find(&order_infos).Error
+	for _, item := range order_infos {
+		//timestamp := int64(item.UploadDate) // 对应2023-10-05 00:00:00 UTC
+		//t := time.Unix(timestamp, 0).UTC()
+		//midnight := getMidnightTimestamp(t)
+		//fmt.Printf("Unix时间戳的零点时间戳：%d\n", midnight)
+
+		// 示例：Unix 时间戳（秒级）
+		//timestamp := int64(item.UploadDate) // 对应 2023-10-05 00:00:00 UTC
+		//
+		//// 转换为 time.Time
+		//t := time.Unix(timestamp, 0)
+		//
+		//// 格式化为 "2006-01-02 15:04:05"（年月日时分秒）
+		//formattedTime := t.Format("2006-01-02 15:04:05")
+		//aa := strings.Split(formattedTime, " ")
+		//
+		//// 解析为 time.Time（默认 UTC 时区）
+		//t, err := time.Parse("2006-01-02", aa[0])
+		//if err != nil {
+		//	panic(err)
+		//}
+		//
+		//// 转换为 Unix 时间戳（秒级）
+		//timestamp = t.Unix()
+		//fmt.Println(timestamp)
+		var pp HisPrescriptionProject
+		readDb.Model(&HisPrescriptionProject{}).Where("user_org_id = ? and price = ? and count = ? and status = 1 and record_date = ? and type = 3 and patient_id = ?", item.UserOrgId, item.Pric, item.Cnt, 1748016000, item.PatientId).First(&pp)
+		if pp.ID > 0 {
+			item.ProjectId = pp.ID
+			readDb.Model(&VmHisOrderInfo95042{}).Save(&item)
+		}
+	}
+
+	return
+}
+
+// getMidnightTimestamp 返回给定时间的当天零点时间戳（秒）
+func getMidnightTimestamp(t time.Time) int64 {
+	midnight := time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
+	return midnight.Unix()
+}
+
+func UpdateP() (ps []*HisPrescriptionInfo, err error) {
+	//err = readDb.Model(&models.HisPrescriptionInfo{}).Joins("join xt_patients on  his_prescription_info.`patient_id` = xt_patients.id").Where(" his_prescription_info.status = 1  AND his_prescription_info.record_date > 1746028800 AND his_prescription_info.status = 1 and and his_prescription_info.user_org_id = 10567").Find(&order_infos).Group("his_prescription_info.patient_id").Error
+	err = readDb.Model(&models.HisPrescriptionInfo{}).
+		Joins("join xt_patients on his_prescription_info.patient_id = xt_patients.id").
+		Where("his_prescription_info.status = 1").
+		Where("his_prescription_info.record_date >= 1746028800").
+		Where("his_prescription_info.user_org_id = 10724").
+		Where("xt_patients.name NOT IN (?)", []string{
+			"肖平", "江长永", "曾玉环", // 30A区域
+		}).
+		Group("his_prescription_info.patient_id").
+		Find(&ps).Error
+	for _, item := range ps {
+		writeDb.Model(&models.HisPrescription{}).Where("patient_id = ? and record_date >= ?", item.PatientId, 1746028800).Updates(map[string]interface{}{"p_type": 1})
+		writeDb.Model(&models.HisPrescriptionInfo{}).Where("patient_id = ? and record_date >= ?", item.PatientId, 1746028800).Updates(map[string]interface{}{"p_type": 1})
+
+	}
+
+	return
+}
+
+func Updateo() {
+	var order []models.HisOrderInfo
+	err = readDb.Model(&models.HisOrderInfo{}).
+		Where("his_order_info.status = 1 and his_order_info.upload_date >= 1746028800 and his_order_info.user_org_id = 10768 and his_order_info.order_number like '%H440113000%'").
+		Find(&order).Error
+	for _, item := range order {
+		if item.AdviceId == 0 && item.ProjectId > 0 {
+			var pp models.HisPrescriptionProject
+			readDb.Model(&models.HisPrescriptionProject{}).Where("id = ?", item.ProjectId).First(&pp)
+			writeDb.Model(&models.HisOrderInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{"item_id": pp.RecordDate})
+		} else if item.AdviceId > 0 && item.ProjectId == 0 {
+			var doc models.HisDoctorAdviceInfo
+			readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id = ?", item.AdviceId).First(&doc)
+			writeDb.Model(&models.HisOrderInfo{}).Where("id = ?", item.ID).Updates(map[string]interface{}{"item_id": doc.RecordDate})
+
+		}
+	}
+}

service/export_data_service.go

@@ -128,7 +128,7 @@ func GetHisOrderDetailFor390(start_time string, end_time string, org_id int64) (
 	return
 }
 func GetHisOrderByTime(patient_id int64, start_time string, end_time string) (order []models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("patient_id = ? AND status = 1 and order_status = 2 and  FROM_UNIXTIME(settle_accounts_date)  >= ? and FROM_UNIXTIME(settle_accounts_date) <= ?", patient_id, start_time+" 00:00:00", end_time+" 23:59:00").Find(&order).Error
+	err = readDb.Model(&models.HisOrder{}).Where("patient_id = ? AND status = 1 and order_status = 2 and  FROM_UNIXTIME(settle_accounts_date)  >= ? and FROM_UNIXTIME(settle_accounts_date) <= ?", patient_id, start_time+" 00:00:00", end_time+" 23:59:00").Order("settle_accounts_date").Find(&order).Error
 	return
 }
 
@@ -599,9 +599,9 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
 			var tempTotal CusTotalTwo
 
 			readDb.Table("his_order_info as oi").Select(`
-    COALESCE(SUM(CASE WHEN project.project_name = '血液透析（用）' THEN p.count ELSE 0 END), 0) as XT,
-    COALESCE(SUM(CASE WHEN project.project_name = '血液透析滤过（用）' THEN p.count ELSE 0 END), 0) as XL,
-    COALESCE(SUM(CASE WHEN project.project_name = '血液灌流（用）' THEN p.count ELSE 0 END), 0) as GL
+    COALESCE(SUM(CASE WHEN project.project_name  IN ('血液透析（用）', '血液透析费')  THEN p.count ELSE 0 END), 0) as XT,
+    COALESCE(SUM(CASE WHEN project.project_name IN ('血液透析滤过（用）','血液滤过费') THEN p.count ELSE 0 END), 0) as XL,
+    COALESCE(SUM(CASE WHEN project.project_name IN ('血液灌流（用）','血液灌流费') THEN p.count ELSE 0 END), 0) as GL
 `).
 				Joins("JOIN his_order o ON oi.order_number = o.number AND o.setl_time BETWEEN ? AND ? AND o.order_status = 2 AND o.status = 1", startTime+" 00:00:00", endTime+" 23:59:59").
 				Joins("JOIN his_prescription_project p ON oi.project_id = p.id").
@@ -615,7 +615,7 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
     AND oi.upload_date <= ? 
     AND oi.status = 1 
     AND p.type = 2 
-    AND project.project_name IN ('血液透析（用）','血液透析滤过（用）','血液灌流（用）')
+    AND project.project_name IN ('血液透析（用）','血液透析费','血液透析滤过（用）','血液滤过费','血液灌流（用）','血液灌流费')
 `, item.PatientID, org_id, st_stamp, end_stamp).
 				Scan(&tempTotal)
 

service/fapiao_service.go

@@ -113,6 +113,11 @@ func GetFaPiaoOrderById(id int64) (orders models.HisFaPiaoOrder, err error) {
 	return
 }
 
+func GetFaPiaoOrderByIds() (orders []models.HisFaPiaoOrder, err error) {
+	err = readDb.Model(&models.HisFaPiaoOrder{}).Where("user_org_id = 10318 and status  = 1 and fapiao_status = 2").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
@@ -140,3 +145,8 @@ 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
 }
+
+func GetFaPiaoOrderInfoByNumbersTwo(numbers []string) (infos []models.NewHisOrderInfo, err error) {
+	err = readDb.Model(&models.NewHisOrderInfo{}).Where("order_number in (?)", numbers).Find(&infos).Error
+	return
+}

service/his_summary_service.go

@@ -21,7 +21,7 @@ func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64,
 						return db.Select("id,good_name,good_unit,specification_name,packing_unit,medical_insurance_level,medical_insurance_number").Where("status = 1 ")
 					}).Where("status = 1 ")
 				})
-			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
+			}).Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id).Order("settle_accounts_date desc")
 	}).Where("p.status = 1  AND p.user_org_id = ? and p.id = ?", org_id, patient_id).Group("id").Find(&patients).Error
 
 	return

service/yh_service.go

@@ -23,7 +23,7 @@ func GetAllPatientSch(org_id int64) (ps []models.KyySchedule) {
 }
 
 func GetAllPatientDialysisRecord(org_id int64, record_date int64, patient_id int64) (ps models.KYYDialysisOrder) {
-	readDb.Model(&models.KYYDialysisOrder{}).Preload("DeviceNumber", "status = 1").Preload("UserAdminRole", "status = 1").Preload("KyyPredialysisEvaluation", "status = 1 and user_org_id = ? and assessment_date = ?", org_id, record_date).Preload("KyyAssessmentAfterDislysis", "status = 1 and user_org_id = ? and assessment_date = ?", org_id, record_date).Preload("KyyTreatmentSummary", "status = 1 and user_org_id = ? and assessment_date = ?", org_id, record_date).Preload("KyyMonitoringRecord", "status = 1 and user_org_id = ? and  monitoring_date = ?", org_id, record_date).Preload("KyyDoctorAdvice", "status = 1 and user_org_id = ? and advice_date = ?", org_id, record_date).Where("user_org_id = ? and status = 1 and dialysis_date = ? and patient_id = ?", org_id, record_date, patient_id).Find(&ps)
+	readDb.Model(&models.KYYDialysisOrder{}).Preload("KYYPrescriptionVM", "status = 1").Preload("DeviceNumber", "status = 1").Preload("UserAdminRole", "status = 1").Preload("KyyPredialysisEvaluation", "status = 1 and user_org_id = ? and assessment_date = ?", org_id, record_date).Preload("KyyAssessmentAfterDislysis", "status = 1 and user_org_id = ? and assessment_date = ?", org_id, record_date).Preload("KyyTreatmentSummary", "status = 1 and user_org_id = ? and assessment_date = ?", org_id, record_date).Preload("KyyMonitoringRecord", "status = 1 and user_org_id = ? and  monitoring_date = ?", org_id, record_date).Preload("KyyDoctorAdvice", "status = 1 and user_org_id = ? and advice_date = ?", org_id, record_date).Where("user_org_id = ? and status = 1 and dialysis_date = ? and patient_id = ?", org_id, record_date, patient_id).Find(&ps)
 	return
 }
 
@@ -36,3 +36,9 @@ func GetSyncTimeByOrgId(org_id int64, sync_type int64) (sync_info models.YHDataU
 	err = readDb.Model(&models.YHDataUpload{}).Where("org_id = ? and sync_type = ? ", org_id, sync_type).Last(&sync_info).Error
 	return
 }
+
+func GetAdminUserRoleTwo(id string, orgid int64) (models.SgjUserAdminRole, error) {
+	role := models.SgjUserAdminRole{}
+	err := UserReadDB().Where("admin_user_id = ? and org_id = ? and status = 1", id, orgid).Find(&role).Error
+	return role, err
+}