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

@@ -23,13 +23,349 @@ func FaPiaoApiRegistRouters() {
 	beego.Router("/api/fapiao/sms/code", &FapiaoApiController{}, "get:GetLoginUploadCode")
 	beego.Router("/api/fapiao/sms/login", &FapiaoApiController{}, "get:Login")
 	beego.Router("/api/fapiao/qrcode/get", &FapiaoApiController{}, "get:GetQRCode")
-
 	beego.Router("/api/fapiao/blue", &FapiaoApiController{}, "get:OpenFaPiao")
 	beego.Router("/api/fapiao/red", &FapiaoApiController{}, "get:RedFaPiao")
-
 	beego.Router("/api/order/fapiao/list", &FapiaoApiController{}, "get:GetOrderFaPiaoList")
 	beego.Router("/api/gdfapiao/list", &FapiaoApiController{}, "get:GetFaPiaoList")
 
+	beego.Router("/api/newfapiao/get", &HisApiController{}, "get:GetNewFaPiaoData")
+
+}
+
+func (c *HisApiController) GetNewFaPiaoData() {
+	order_ids := c.GetString("order_ids")
+	patient_id, _ := c.GetInt64("patient_id")
+	//number := c.GetString("number")
+
+	adminUser := c.GetAdminUserInfo()
+	orders := strings.Split(order_ids, ",")
+	patient, _ := service.GetFaPiaoPatientByID(adminUser.CurrentOrgId, patient_id)
+
+	var bedCostTotal float64 = 0         //床位总费
+	var bedCostSelfTotal float64 = 0     //床位自费
+	var bedCostPartSelfTotal float64 = 0 //床位部分项目自费
+
+	var operationCostTotal float64 = 0         //手术费
+	var operationCostSelfTotal float64 = 0     //手术费
+	var operationCostPartSelfTotal float64 = 0 //手术费
+
+	var otherCostTotal float64 = 0         //其他费用
+	var otherCostSelfTotal float64 = 0     //其他费用
+	var otherCostPartSelfTotal float64 = 0 //其他费用
+
+	var materialCostTotal float64 = 0         //材料费
+	var materialCostSelfTotal float64 = 0     //材料费
+	var materialCostPartSelfTotal float64 = 0 //材料费
+
+	var westernMedicineCostTotal float64 = 0         //西药费
+	var westernMedicineCostSelfTotal float64 = 0     //西药费
+	var westernMedicineCostPartSelfTotal float64 = 0 //西药费
+
+	var chineseTraditionalMedicineCostTotal float64 = 0         //中成药
+	var chineseTraditionalMedicineCostSelfTotal float64 = 0     //中成药
+	var chineseTraditionalMedicineCostPartSelfTotal float64 = 0 //中成药
+
+	var checkCostTotal float64 = 0         //检查费
+	var checkCostSelfTotal float64 = 0     //检查费
+	var checkCostPartSelfTotal float64 = 0 //检查费
+
+	var hiliCostTotal float64 = 0     //护理费
+	var hiliCostSelfTotal float64 = 0 //护理费
+	//var hiliCostPartSelfTotal float64 = 0 //护理费
+
+	var laboratoryCostTotal float64 = 0         //化验费
+	var laboratoryCostSelfTotal float64 = 0     //化验费
+	var laboratoryCostPartSelfTotal float64 = 0 //化验费
+
+	var treatCostTotal float64 = 0         //治疗费用
+	var treatCostSelfTotal float64 = 0     //治疗费用
+	var treatCostPartSelfTotal float64 = 0 //治疗费用
+
+	var zhenChaCostTotal float64 = 0         //其他费用
+	var zhenChaCostSelfTotal float64 = 0     //其他费用
+	var zhenChaCostPartSelfTotal float64 = 0 //其他费用
+
+	decimal.DivisionPrecision = 2
+
+	var MedfeeSumamt float64 = 0  //治疗费用
+	var PsnCashPay float64 = 0    //治疗费用
+	var FundPaySumamt float64 = 0 //治疗费用
+
+	var HifpPay float64 = 0 //治疗费用
+	var MafPay float64 = 0  //治疗费用
+	var AcctPay float64 = 0 //治疗费用
+
+	for _, item := range orders {
+		var new_order models.HisOrder
+
+		order_id_num, _ := strconv.ParseInt(item, 10, 64)
+		new_order, _ = service.GetHisOrderByID(order_id_num)
+
+		MedfeeSumamt, _ = decimal.NewFromFloat(MedfeeSumamt).Add(decimal.NewFromFloat(new_order.MedfeeSumamt)).Float64()
+		PsnCashPay, _ = decimal.NewFromFloat(PsnCashPay).Add(decimal.NewFromFloat(new_order.PsnCashPay)).Float64()
+		FundPaySumamt, _ = decimal.NewFromFloat(FundPaySumamt).Add(decimal.NewFromFloat(new_order.FundPaySumamt)).Float64()
+		HifpPay, _ = decimal.NewFromFloat(HifpPay).Add(decimal.NewFromFloat(new_order.HifpPay)).Float64()
+		MafPay, _ = decimal.NewFromFloat(MafPay).Add(decimal.NewFromFloat(new_order.MafPay)).Float64()
+		AcctPay, _ = decimal.NewFromFloat(AcctPay).Add(decimal.NewFromFloat(new_order.AcctPay)).Float64()
+
+		orderInfos_two, _ := service.GetHisOrderDetailByNumber(new_order.Number, adminUser.CurrentOrgId)
+		var balanceAccountsType int64
+		if new_order.IsMedicineInsurance == 1 {
+			balanceAccountsType = 1
+		} else {
+			balanceAccountsType = 2
+		}
+
+		if balanceAccountsType == 2 {
+			//orderInfos_two, _ := service.GetHisOrderDetailByNumber(order.Number, adminUser.CurrentOrgId)
+			for _, item := range orderInfos_two {
+				item.FulamtOwnpayAmt = item.DetItemFeeSumamt
+				if item.HisDoctorAdviceInfo.ID > 0 && item.HisPrescriptionProject.ID == 0 { //药品
+					item.MedChrgitmType = "09"
+				}
+				if item.HisPrescriptionProject.ID > 0 && item.HisDoctorAdviceInfo.ID == 0 {
+					if item.HisPrescriptionProject.Type == 2 {
+						switch item.HisPrescriptionProject.VMHisProject.CostClassify {
+						case 1:
+							item.MedChrgitmType = "14"
+							break
+						case 2:
+							item.MedChrgitmType = "05"
+
+							break
+						case 3:
+							item.MedChrgitmType = "04"
+
+							break
+						case 4:
+							item.MedChrgitmType = "03"
+
+							break
+						case 5:
+							item.MedChrgitmType = "08"
+
+							break
+						case 6:
+							item.MedChrgitmType = "14"
+
+							break
+						case 7:
+							item.MedChrgitmType = "14"
+
+							break
+						case 8:
+							item.MedChrgitmType = "03"
+							break
+						case 9:
+							item.MedChrgitmType = "14"
+							break
+						}
+
+					} else if item.HisPrescriptionProject.Type == 3 {
+						item.MedChrgitmType = "08"
+					}
+				}
+			}
+
+			for _, item := range orderInfos_two {
+				fmt.Println(item.MedChrgitmType)
+				if item.MedChrgitmType == "07" { //床位费
+					hiliCostTotal, _ = decimal.NewFromFloat(hiliCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					hiliCostSelfTotal = hiliCostTotal
+				}
+
+				if item.MedChrgitmType == "01" { //床位费
+					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					bedCostSelfTotal = bedCostTotal
+				}
+
+				if item.MedChrgitmType == "02" { //诊察费
+					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					zhenChaCostSelfTotal = zhenChaCostTotal
+				}
+
+				if item.MedChrgitmType == "03" { //检查费
+					checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					checkCostSelfTotal = checkCostTotal
+				}
+
+				if item.MedChrgitmType == "04" { //化验费
+					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					laboratoryCostSelfTotal = laboratoryCostTotal
+				}
+
+				if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" || item.MedChrgitmType == "201" { //治疗费
+					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					treatCostSelfTotal = treatCostTotal
+				}
+
+				if item.MedChrgitmType == "06" { //手术费
+					treatCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					operationCostSelfTotal = treatCostTotal
+				}
+
+				if item.MedChrgitmType == "08" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "1401" || item.MedChrgitmType == "301" { //材料费
+					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					materialCostSelfTotal = materialCostTotal
+				}
+
+				if item.MedChrgitmType == "09" || item.MedChrgitmType == "101" { //西药费
+					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					westernMedicineCostSelfTotal = westernMedicineCostTotal
+				}
+
+				if item.MedChrgitmType == "11" { //中成费
+					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					chineseTraditionalMedicineCostSelfTotal = chineseTraditionalMedicineCostTotal
+				}
+
+				if c.GetAdminUserInfo().CurrentOrgId == 10106 {
+					if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" || item.MedChrgitmType == "02" { //其他费
+						otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+						otherCostSelfTotal = otherCostTotal
+					}
+				} else {
+					if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+						otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+						otherCostSelfTotal = otherCostTotal
+					}
+
+				}
+
+			}
+
+		} else {
+			for _, item := range orderInfos_two {
+				if item.MedChrgitmType == "01" { //床位费
+					bedCostTotal, _ = decimal.NewFromFloat(bedCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//bedCostSelfTotal, _ = decimal.NewFromFloat(bedCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//bedCostPartSelfTotal, _ = decimal.NewFromFloat(bedCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+
+				if item.MedChrgitmType == "02" { //诊察费
+					zhenChaCostTotal, _ = decimal.NewFromFloat(zhenChaCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//zhenChaCostSelfTotal, _ = decimal.NewFromFloat(zhenChaCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//zhenChaCostPartSelfTotal, _ = decimal.NewFromFloat(zhenChaCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+
+				if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+					if item.MedChrgitmType == "03" { //检查费
+						laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+						//laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+						//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+					}
+				} else {
+					if item.MedChrgitmType == "03" { //检查费
+						checkCostTotal, _ = decimal.NewFromFloat(checkCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+						//checkCostSelfTotal, _ = decimal.NewFromFloat(checkCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+						//checkCostPartSelfTotal, _ = decimal.NewFromFloat(checkCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+					}
+
+				}
+
+				if item.MedChrgitmType == "04" { //化验费
+					laboratoryCostTotal, _ = decimal.NewFromFloat(laboratoryCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//laboratoryCostSelfTotal, _ = decimal.NewFromFloat(laboratoryCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//laboratoryCostPartSelfTotal, _ = decimal.NewFromFloat(laboratoryCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+
+				if item.MedChrgitmType == "05" || item.MedChrgitmType == "14" || item.MedChrgitmType == "201" { //治疗费
+					treatCostTotal, _ = decimal.NewFromFloat(treatCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//treatCostSelfTotal, _ = decimal.NewFromFloat(treatCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//treatCostPartSelfTotal, _ = decimal.NewFromFloat(treatCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+
+				}
+
+				if item.MedChrgitmType == "06" { //手术费
+					operationCostTotal, _ = decimal.NewFromFloat(operationCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//operationCostSelfTotal, _ = decimal.NewFromFloat(operationCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//operationCostPartSelfTotal, _ = decimal.NewFromFloat(operationCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+
+				if item.MedChrgitmType == "08" || item.MedChrgitmType == "1401" || item.MedChrgitmType == "1402" || item.MedChrgitmType == "1403" || item.MedChrgitmType == "301" { //材料费
+					materialCostTotal, _ = decimal.NewFromFloat(materialCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//materialCostSelfTotal, _ = decimal.NewFromFloat(materialCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//materialCostPartSelfTotal, _ = decimal.NewFromFloat(materialCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+
+				if item.MedChrgitmType == "07" { //护理
+					hiliCostTotal, _ = decimal.NewFromFloat(hiliCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//hiliCostSelfTotal, _ = decimal.NewFromFloat(hiliCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//hiliCostPartSelfTotal, _ = decimal.NewFromFloat(hiliCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+
+				if item.MedChrgitmType == "09" || item.MedChrgitmType == "101" { //西药费
+					westernMedicineCostTotal, _ = decimal.NewFromFloat(westernMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//westernMedicineCostSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//westernMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(westernMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+
+				if item.MedChrgitmType == "11" { //中成费
+					chineseTraditionalMedicineCostTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//chineseTraditionalMedicineCostSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//chineseTraditionalMedicineCostPartSelfTotal, _ = decimal.NewFromFloat(chineseTraditionalMedicineCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+
+				if item.MedChrgitmType == "0" || item.MedChrgitmType == "12" { //其他费
+					otherCostTotal, _ = decimal.NewFromFloat(otherCostTotal).Add(decimal.NewFromFloat(item.DetItemFeeSumamt)).Float64()
+					//otherCostSelfTotal, _ = decimal.NewFromFloat(otherCostSelfTotal).Add(decimal.NewFromFloat(item.OverlmtAmt)).Float64()
+					//otherCostPartSelfTotal, _ = decimal.NewFromFloat(otherCostPartSelfTotal).Add(decimal.NewFromFloat(item.PreselfpayAmt)).Float64()
+				}
+			}
+		}
+	}
+
+	//pre_pay_money := service.GetUserMoney(order.PatientId, adminUser.CurrentOrgId)
+	//sum, _ := service.RefundListSum(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, order.PatientId)
+	admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
+	charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, adminUser.AdminUser.Id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"charge_admin_name":                           charge_admin.UserName,
+		"patient":                                     patient,
+		"admin_user_name":                             admin.UserName, //收款员
+		"bedCostTotal":                                bedCostTotal,
+		"bedCostSelfTotal":                            bedCostSelfTotal,
+		"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
+		"operationCostTotal":                          operationCostTotal,
+		"operationCostSelfTotal":                      operationCostSelfTotal,
+		"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
+		"otherCostTotal":                              otherCostTotal,
+		"otherCostSelfTotal":                          otherCostSelfTotal,
+		"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
+		"materialCostTotal":                           materialCostTotal,
+		"materialCostSelfTotal":                       materialCostSelfTotal,
+		"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
+		"westernMedicineCostTotal":                    westernMedicineCostTotal,
+		"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
+		"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
+		"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
+		"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
+		"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
+		"checkCostTotal":                              checkCostTotal,
+		"checkCostSelfTotal":                          checkCostSelfTotal,
+		"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
+		"laboratoryCostTotal":                         laboratoryCostTotal,
+		"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
+		"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
+		"treatCostTotal":                              treatCostTotal,
+		"treatCostSelfTotal":                          treatCostSelfTotal,
+		"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
+		"zhenChaCostTotal":                            zhenChaCostTotal,
+		"zhenChaCostSelfTotal":                        zhenChaCostSelfTotal,
+		"zhenChaCostPartSelfTotal":                    zhenChaCostPartSelfTotal,
+		"hiliCostTotal":                               hiliCostTotal,
+		"hiliCostSelfTotal":                           hiliCostSelfTotal,
+		"medfee_sumamt":                               MedfeeSumamt,
+		"fund_pay_sumamt":                             FundPaySumamt,
+		"hifp_pay":                                    HifpPay,
+		"maf_pay":                                     MafPay,
+		"acct_pay":                                    AcctPay,
+		"psn_cash_pay":                                PsnCashPay,
+	})
+
 }
 
 type FapiaoApiController struct {
@@ -388,15 +724,15 @@ func (c *FapiaoApiController) OpenFaPiao() {
 	//config, _ = service.FindFaPiaoConfigInfo(c.GetAdminUserInfo().CurrentOrgId)
 
 	//认证接口
-	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "test")
-	status := GetQRStatusTwo(c.GetAdminUserInfo().CurrentOrgId)
-	fmt.Println("11112222")
-
-	fmt.Println(status)
-	if status == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAuthWrong)
-		return
-	}
+	sdk := invoice.NewSdk(common.HMAC_SHA256, "5058f0defd12047ee2a7", "51440fbee667ea9a53aaa68c9c408367", "", "")
+	//status := GetQRStatusTwo(c.GetAdminUserInfo().CurrentOrgId)
+	//fmt.Println("11112222")
+	//
+	//fmt.Println(status)
+	//if status == 0 {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAuthWrong)
+	//	return
+	//}
 	//查询余量接口
 	//routerAddress, postData := fapiao.QueryStock(config)
 	//r, err := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData)
@@ -642,6 +978,7 @@ func (c *FapiaoApiController) OpenFaPiao() {
 	}
 
 	postData3["items"] = items
+
 	routerAddress, postData4 := fapiao.Blue(postData3) //发票开具
 	r, err4 := sdk.HttpPost("https://apigw.goldentec.com", routerAddress, postData4)
 	fmt.Println("blue")
@@ -704,23 +1041,21 @@ func (c *FapiaoApiController) OpenFaPiao() {
 						}
 					} else {
 						//错误处理
-
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg": "查询失败" + resp3.Message,
+						})
 					}
 				}
 			} else {
 				//错误处理
-
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg": "开具失败" + resp.Message,
+				})
 			}
 		}
 	}
 }
 func (c *FapiaoApiController) RedFaPiao() {
-	//认证
-	status := GetQRStatusTwo(c.GetAdminUserInfo().CurrentOrgId)
-	if status == 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAuthWrong)
-		return
-	}
 
 	id, _ := c.GetInt64("id")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -776,23 +1111,23 @@ func (c *FapiaoApiController) RedFaPiao() {
 						})
 					} else {
 						c.ServeSuccessJSON(map[string]interface{}{
-							"msg": "红冲失败",
+							"msg": "系统错误,红冲失败",
 						})
 					}
 				} else {
 					c.ServeSuccessJSON(map[string]interface{}{
-						"msg": "红冲失败",
+						"msg": resp3.Message,
 					})
 				}
 			} else {
 				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "红冲失败",
+					"msg": resp.Message,
 				})
 			}
 		} else {
 
 			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "红冲失败",
+				"msg": resp.Message,
 			})
 		}
 	}

models/fapiao.go

@@ -54,6 +54,7 @@ type HisOrderByFaPiao struct {
 	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"`
 }
 
 func (HisOrderByFaPiao) TableName() string {