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

controllers/fapiao_controller.go

@@ -30,6 +30,108 @@ func FaPiaoApiRegistRouters() {
 
 	beego.Router("/api/newfapiao/get", &HisApiController{}, "get:GetNewFaPiaoData")
 
+	beego.Router("/api/fapiao/query", &FapiaoApiController{}, "get:QueryFaPiao")
+
+}
+
+func (c *FapiaoApiController) QueryFaPiao() {
+	id, _ := c.GetInt64("id")
+	oc, _ := service.GetFaPiaoOrderById(id)
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "")
+	var config models.FapiaoConfig
+	config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
+	routerAddress2, postData2 := fapiao.Query(config.SellerTaxpayerNum, oc.OrderSn, "")
+	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 fapiaos models.HisFaPiaoOrder
+			if resp3.Data.Status == 3 {
+				// 异步调用查询操作，不阻塞主程序
+				oc.TicketSn = resp3.Data.TicketSn
+				oc.TicketDate = resp3.Data.TicketDate
+				oc.AmountWithTax = resp3.Data.AmountWithoutTax
+				oc.AmountWithoutTax = resp3.Data.AmountWithoutTax
+				oc.FapiaoStatus = "2"
+				oc.TaxAmount = resp3.Data.TaxAmount
+				oc.IsRedWashed = strconv.FormatInt(int64(resp3.Data.IsRedWashed), 10)
+				oc.PdfUrl = resp3.Data.PdfUrl
+				oc.OfdUrl = resp3.Data.OfdUrl
+				oc.XmlUrl = resp3.Data.XmlUrl
+				service.SaveFaPiaoOrder(&oc)
+				ids := strings.Split(oc.OrderIds, ",")
+				service.UpdateFaPiaoNumber(resp3.Data.TicketSn, ids) //同步发票号码
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "同步成功",
+				})
+
+			} else if resp3.Data.Status == 1 {
+				oc.FapiaoStatus = "1"
+				oc.TicketSn = ""
+				service.SaveFaPiaoOrder(&oc)
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "同步成功",
+				})
+				//service.UpdateFaPiaoNumber(resp3.Data.TicketSn, ids) //同步发票号码
+			} else if resp3.Data.Status == 2 {
+				oc.FapiaoStatus = "3"
+				oc.TicketSn = ""
+				oc.Message = resp3.Data.Message
+				service.SaveFaPiaoOrder(&oc)
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "同步成功",
+				})
+			} else {
+				oc.FapiaoStatus = "3"
+				oc.TicketSn = ""
+				oc.Message = resp3.Data.Message
+				service.SaveFaPiaoOrder(&oc)
+
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "同步成功",
+				})
+			}
+		} else {
+			//错误处理
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "查询失败" + resp3.Message,
+			})
+		}
+		//if resp3.Code == 0 {
+		//	// 异步调用查询操作，不阻塞主程序
+		//	oc.TicketSn = resp3.Data.TicketSn
+		//	oc.TicketDate = resp3.Data.TicketDate
+		//	oc.AmountWithTax = resp3.Data.AmountWithoutTax
+		//	oc.AmountWithoutTax = resp3.Data.AmountWithoutTax
+		//	oc.FapiaoStatus = "2"
+		//	oc.TaxAmount = resp3.Data.TaxAmount
+		//	oc.IsRedWashed = strconv.FormatInt(int64(resp3.Data.IsRedWashed), 10)
+		//	oc.PdfUrl = resp3.Data.PdfUrl
+		//	oc.OfdUrl = resp3.Data.OfdUrl
+		//	oc.XmlUrl = resp3.Data.XmlUrl
+		//	service.SaveFaPiaoOrder(oc)
+		//	ids := strings.Split(oc.OrderIds, ",")
+		//	service.UpdateFaPiaoNumber(resp3.Data.TicketSn, ids) //同步发票号码
+		//	c.ServeSuccessJSON(map[string]interface{}{
+		//		"msg": "查询成功",
+		//	})
+		//} else {
+		//	//错误处理
+		//	c.ServeSuccessJSON(map[string]interface{}{
+		//		"msg": "查询失败" + resp3.Message,
+		//	})
+		//}
+	}
+
 }
 
 func (c *HisApiController) GetNewFaPiaoData() {
@@ -719,6 +821,7 @@ func (c *FapiaoApiController) GetQRCode() {
 		//fmt.Println(string(r))
 	}
 }
+
 func (c *FapiaoApiController) OpenFaPiao() {
 	//var config models.FapiaoConfig
 	//config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
@@ -769,19 +872,109 @@ func (c *FapiaoApiController) OpenFaPiao() {
 	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 details []models.HisOrderInfo
 	var numbers []string
 	decimal.DivisionPrecision = 2
 
+	var remark string
+
 	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()
+
+		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()
+
 		numbers = append(numbers, oss.Number)
 	}
+	if MedfeeSumamt > 0 {
+		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)
+
+		if len(remark) == 0 {
+			//MedfeeSumamt_str := fmt.Sprintf("%.2f", MedfeeSumamt)
+			remark = "基金支付总金额: " + MedfeeSumamt_str
+		} else {
+			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 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
+		}
+	}
+
+	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
+		}
+	}
+
+	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
+		}
+	}
+
+	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
+		}
+	}
+
 	details, _ = service.GetFaPiaoOrderInfoByNumbers(numbers)
 	role, _ := service.GetAdminUserRole(admin_user_id, c.GetAdminUserInfo().CurrentOrgId)
-	role.UserName = "邹碧琳"
+	//role.UserName = ""
 	type CostType struct {
 		name  string
 		price float64
@@ -922,8 +1115,12 @@ func (c *FapiaoApiController) OpenFaPiao() {
 	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)
+	amountWithoutTax, _, taxAmount, amountHasTax := CalculatePriceDetails(MedfeeSumamt, 1, 0.00)
 
+	patient, _ := service.GetXTPatientInfo(c.GetAdminUserInfo().CurrentOrgId, orders[0].PatientId)
+
+	orders[0].PsnName = patient.Name
+	role.UserName = "陈金娣"
 	postData3 := map[string]interface{}{
 		"seller_name":          org_config.OrgName,
 		"seller_taxpayer_num":  config2.SellerTaxpayerNum,
@@ -932,7 +1129,7 @@ func (c *FapiaoApiController) OpenFaPiao() {
 		"seller_bank_name":     config2.SellerBankName,
 		"seller_bank_account":  config2.SellerBankAccount,
 		"title_type":           1,
-		"buyer_title":          orders[0].PsnName,
+		"buyer_title":          orders[0].PsnName + "(个人)",
 		"buyer_taxpayer_num":   "",
 		"buyer_address":        "",
 		"buyer_phone":          "",
@@ -953,14 +1150,14 @@ func (c *FapiaoApiController) OpenFaPiao() {
 		"amount_has_tax":       amountHasTax,
 		"tax_amount":           taxAmount,
 		"amount_without_tax":   amountWithoutTax,
-		"remark":               "医疗发票",
+		"remark":               remark,
 	}
 
 	////项目商品明细
 	items := make([]map[string]interface{}, 0)
 	for _, ct := range cts {
 		item := make(map[string]interface{})
-		amountWithoutTax, _, taxAmount, _ := CalculatePriceDetails(ct.price, 1, 0.06)
+		amountWithoutTax, _, taxAmount, _ := CalculatePriceDetails(ct.price, 1, 0.00)
 		item["name"] = ct.name
 		item["tax_code"] = "3070202000000000000"
 		item["models"] = ""
@@ -968,20 +1165,21 @@ func (c *FapiaoApiController) OpenFaPiao() {
 		item["total_price"] = amountWithoutTax
 		item["total"] = "1"
 		item["price"] = amountWithoutTax
-		item["tax_rate"] = "0.06"
+		item["tax_rate"] = "0.00"
 		item["tax_amount"] = taxAmount
 		item["discount"] = "0"
-		item["preferential_policy_flag"] = ""
-		item["zero_tax_flag"] = ""
-		item["vat_special_management"] = ""
+		item["preferential_policy_flag"] = "1"
+		item["zero_tax_flag"] = "1"
+		item["vat_special_management"] = "免税"
 		items = append(items, item)
 	}
-
 	postData3["items"] = items
-
 	routerAddress, postData4 := fapiao.Blue(postData3) //发票开具
+	fmt.Println(postData4)
+
 	r, err4 := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData4)
 	fmt.Println("blue")
+	fmt.Println(err4)
 	fmt.Println(string(r))
 	if err4 != nil {
 		fmt.Println(err4)
@@ -996,56 +1194,87 @@ func (c *FapiaoApiController) OpenFaPiao() {
 			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) //同步发票号码
+				var fapiaos models.HisFaPiaoOrder
+				fapiaos.InvoiceId = resp.Data.InvoiceId
+				fapiaos.OrderSn = resp.Data.OrderSn
+				fapiaos.FapiaoStatus = "1"
+				fapiaos.OrderIds = order_ids
+				fapiaos.UserOrgId = c.GetAdminUserInfo().CurrentOrgId
+				fapiaos.Status = 1
+				fapiaos.PatientId = orders[0].PatientId
+				fapiaos.Ctime = time.Now().Unix()
+				fapiaos.Mtime = time.Now().Unix()
+				fapiaos.Creator = role.UserName
+				fapiaos.MedfeeSumamt = MedfeeSumamt
+				fapiaos.FundPaySumamt = FundPaySumamt
+				fapiaos.PsnCashPay = PsnCashPay
+				fmt.Println(ids)
+				service.UpdateFaPiaoSN(resp.Data.OrderSn, ids) //同步发票号码
+				err5 := service.SaveFaPiaoOrder(&fapiaos)
+				// 异步调用查询操作，通过闭包传递参数
+				// 异步调用查询操作，通过闭包传递多个参数
+				go func(num string, sn string, number string, fapiaos models.HisFaPiaoOrder, ids []string) {
+					// 延迟等待一定时间再查询
+					time.Sleep(30 * time.Second)
+					// 调用查询发票的函数
+					//queryInvoice(id, user, retries)
+					routerAddress2, postData2 := fapiao.Query(num, sn, 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 {
+							if resp3.Data.Status == 3 {
+								// 异步调用查询操作，不阻塞主程序
+								fapiaos.TicketSn = resp3.Data.TicketSn
+								fapiaos.TicketDate = resp3.Data.TicketDate
+								fapiaos.AmountWithTax = resp3.Data.AmountWithoutTax
+								fapiaos.AmountWithoutTax = resp3.Data.AmountWithoutTax
+								fapiaos.FapiaoStatus = "2"
+								fapiaos.TaxAmount = resp3.Data.TaxAmount
+								fapiaos.IsRedWashed = strconv.FormatInt(int64(resp3.Data.IsRedWashed), 10)
+								fapiaos.PdfUrl = resp3.Data.PdfUrl
+								fapiaos.OfdUrl = resp3.Data.OfdUrl
+								fapiaos.XmlUrl = resp3.Data.XmlUrl
+								service.SaveFaPiaoOrder(&fapiaos)
+								service.UpdateFaPiaoNumber(resp3.Data.TicketSn, ids) //同步发票号码
+
+							} else if resp3.Data.Status == 1 {
+								fapiaos.FapiaoStatus = "1"
+								fapiaos.TicketSn = ""
+								service.SaveFaPiaoOrder(&fapiaos)
+								//service.UpdateFaPiaoNumber(resp3.Data.TicketSn, ids) //同步发票号码
+							} else if resp3.Data.Status == 2 {
+								fapiaos.FapiaoStatus = "3"
+								fapiaos.TicketSn = ""
+								fapiaos.Message = resp3.Data.Message
+								service.SaveFaPiaoOrder(&fapiaos)
+							} else {
+								fapiaos.FapiaoStatus = "3"
+								fapiaos.TicketSn = ""
+								fapiaos.Message = resp3.Data.Message
+								service.SaveFaPiaoOrder(&fapiaos)
+							}
+						} else {
+							//错误处理
 							c.ServeSuccessJSON(map[string]interface{}{
-								"msg": "开具成功",
+								"msg": "查询失败" + resp3.Message,
 							})
 						}
-					} else {
-						//错误处理
-						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "查询失败" + resp3.Message,
-						})
 					}
+				}(config2.SellerTaxpayerNum, resp.Data.OrderSn, number, fapiaos, ids) // 这里将多个参数传递给闭包
+
+				if err5 == nil {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "开具成功,审核中。",
+					})
 				}
+
 			} else {
 				//错误处理
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -1055,6 +1284,7 @@ func (c *FapiaoApiController) OpenFaPiao() {
 		}
 	}
 }
+
 func (c *FapiaoApiController) RedFaPiao() {
 
 	id, _ := c.GetInt64("id")
@@ -1103,7 +1333,7 @@ func (c *FapiaoApiController) RedFaPiao() {
 						fapiao_config.Status = 0
 						fapiao_config.RedInvoiceId = resp.Data[0].InvoiceId
 						fapiao_config.RedInvoiceCreator = role2.UserName
-						service.SaveFaPiaoOrder(fapiao_config)
+						service.SaveFaPiaoOrder(&fapiao_config)
 						//将结算表的发票号码清空
 						service.UpdateFaPiaoNumberByNumber(fapiao_config.TicketSn)
 						c.ServeSuccessJSON(map[string]interface{}{

controllers/his_api_controller.go

@@ -9413,6 +9413,7 @@ type Custom struct {
 	AdviceId         int64
 	ProjectId        int64
 	ItemId           int64
+	CostType         int64
 }
 
 // 获取个人信息----挂号-----上传就诊信息
@@ -9948,6 +9949,7 @@ func (c *HisApiController) GetUploadInfo() {
 						Price:            fmt.Sprintf("%.4f", subItem.Price),
 						MedListCodg:      subItem.MedListCodg,
 						Type:             1,
+						CostType:         9,
 					}
 					customs = append(customs, cus)
 				}
@@ -9964,6 +9966,7 @@ func (c *HisApiController) GetUploadInfo() {
 						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 						MedListCodg:      subItem.MedListCodg,
 						Type:             2,
+						CostType:         subItem.HisProject.CostClassify,
 					}
 					customs = append(customs, cus)
 				}
@@ -9979,6 +9982,7 @@ func (c *HisApiController) GetUploadInfo() {
 					Price:            fmt.Sprintf("%.4f", float64(item.Price)),
 					MedListCodg:      item.XtHisAddtionConfig.Code,
 					Type:             3,
+					CostType:         5,
 				}
 				customs = append(customs, cus)
 			}
@@ -9990,12 +9994,20 @@ func (c *HisApiController) GetUploadInfo() {
 			var item_id int64 = 0
 
 			var types int64 = 0
-
+			var med_chrgitm_type string
 			if item.Type == 1 {
 				advice_id = item.AdviceId
 				project_id = 0
 				item_id = 0
+				med_chrgitm_type = "09"
 			} else if item.Type == 2 {
+				med_chrgitm_type = "05"
+				if item.CostType == 3 {
+					med_chrgitm_type = "04"
+				}
+				if item.CostType == 8 {
+					med_chrgitm_type = "03"
+				}
 				advice_id = 0
 				item_id = 0
 
@@ -10004,6 +10016,8 @@ func (c *HisApiController) GetUploadInfo() {
 				advice_id = 0
 				item_id = item.ItemId
 				project_id = 0
+				med_chrgitm_type = "08"
+
 			}
 			detItemFeeSumamt, _ := strconv.ParseFloat(item.DetItemFeeSumamt, 32)
 			cut, _ := strconv.ParseFloat(item.Cut, 32)
@@ -10013,6 +10027,7 @@ func (c *HisApiController) GetUploadInfo() {
 				UploadDate:       time.Now().Unix(),
 				AdviceId:         advice_id,
 				DetItemFeeSumamt: detItemFeeSumamt,
+				MedChrgitmType:   med_chrgitm_type,
 				Cnt:              cut,
 				Pric:             pric,
 				PatientId:        id,

models/fapiao.go

@@ -22,39 +22,41 @@ func (FapiaoConfig) TableName() string {
 }
 
 type HisOrderByFaPiao struct {
-	ID                 int64          `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId          int64          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HisPatientId       int64          `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	SettleAccountsDate int64          `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
-	Ctime              int64          `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64          `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status             int64          `gorm:"column:status" json:"status" form:"status"`
-	Number             string         `gorm:"column:number" json:"number" form:"number"`
-	PatientId          int64          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Infcode            int64          `gorm:"column:infcode" json:"infcode" form:"infcode"`
-	WarnMsg            string         `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
-	Cainfo             string         `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
-	ErrMsg             string         `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
-	RespondTime        string         `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
-	InfRefmsgid        string         `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
-	OrderStatus        int64          `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	MdtrtId            string         `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
-	SetlId             string         `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
-	PsnNo              string         `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
-	PsnName            string         `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
-	PsnCertType        string         `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
-	Certno             string         `gorm:"column:certno" json:"certno" form:"certno"`
-	Gend               string         `gorm:"column:gend" json:"gend" form:"gend"`
-	Insutype           string         `gorm:"column:insutype" json:"insutype" form:"insutype"`
-	SetlTime           string         `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
-	MedType            string         `gorm:"column:med_type" json:"med_type" form:"med_type"`
-	MedfeeSumamt       float64        `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	FaPiaoCode         string         `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
-	FaPiaoNumber       string         `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
-	Patients           Patients       `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	HisPatient         HisPatient     `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
-	HisFaPiaoOrder     HisFaPiaoOrder `gorm:"ForeignKey:FaPiaoNumber;AssociationForeignKey:TicketSn" json:"result"`
-	Creator            int64          `gorm:"column:creator" json:"creator" form:"creator"`
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId          int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId       int64  `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	SettleAccountsDate int64  `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	Ctime              int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
+	Number             string `gorm:"column:number" json:"number" form:"number"`
+	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode            int64  `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg            string `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo             string `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg             string `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime        string `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid        string `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus        int64  `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId            string `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId             string `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo              string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName            string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	PsnCertType        string `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno             string `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend               string `gorm:"column:gend" json:"gend" form:"gend"`
+	Insutype           string `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	SetlTime           string `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MedType            string `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	FaPiaoSn           string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
+
+	MedfeeSumamt   float64        `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FaPiaoCode     string         `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber   string         `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	Patients       Patients       `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisPatient     HisPatient     `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
+	HisFaPiaoOrder HisFaPiaoOrder `gorm:"ForeignKey:FaPiaoSn;AssociationForeignKey:OrderSn" json:"result"`
+	Creator        int64          `gorm:"column:creator" json:"creator" form:"creator"`
 }
 
 func (HisOrderByFaPiao) TableName() string {
@@ -62,34 +64,50 @@ 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"`
-	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"`
+	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"`
+	SettleAccountsDateOrder []*SettleAccountsDateOrder `gorm:"-" json:"orders" form:"orders"`
+	Message                 string                     `gorm:"column:message" json:"message" form:"message"`
 }
 
 func (HisFaPiaoOrder) TableName() string {
 	return "his_fapiao_order"
 }
+
+type SettleAccountsDateOrder 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"`
+}
+
+func (SettleAccountsDateOrder) TableName() string {
+	return "his_order"
+}

models/his_models.go

@@ -1077,6 +1077,7 @@ type HisOrder struct {
 
 	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	FaPiaoSn     string `gorm:"column:fa_piao_sn" json:"fa_piao_sn" form:"fa_piao_sn"`
 
 	AdminUser AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 
@@ -1097,6 +1098,7 @@ type HisOrder struct {
 	IsUploadDiagnose        int64                   `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
 	IsUploadOrderInfo       int64                   `gorm:"column:is_upload_order_info" json:"is_upload_order_info" form:"is_upload_order_info"`
 	IsUploadSuccess         int64                   `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
+	SickName                string                  `gorm:"column:sick_name" json:"sick_name" form:"sick_name"`
 }
 
 func (HisOrder) TableName() string {