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

controllers/his_api_controller.go

@@ -259,6 +259,10 @@ func (c *HisApiController) ChangeOrderDesc() {
 	case "jifen_pay":
 		order.JifenPay = desc
 
+		break
+	case "card_desc":
+		order.CardDesc = desc
+
 		break
 	case "band_card_pay":
 		order.BandCardPay = desc
@@ -10323,6 +10327,8 @@ func (c *HisApiController) GetUploadInfo() {
 	wechat_pay := c.GetString("wechat_pay")
 	ali_pay := c.GetString("ali_pay")
 	jifen_pay := c.GetString("jifen_pay")
+	card_desc := c.GetString("card_desc")
+
 	band_card_pay := c.GetString("band_card_pay")
 
 	dec_way := c.GetString("dec_way") //是否使用押金支付bool类型
@@ -10632,6 +10638,7 @@ func (c *HisApiController) GetUploadInfo() {
 			JifenPay:              jifen_pay,
 			BandCardPay:           band_card_pay,
 			Creator:               adminUser.AdminUser.Id,
+			CardDesc:              card_desc,
 		}
 		err = service.CreateOrderTX(order, tx)
 		if err != nil {

models/his_charge_models.go

@@ -133,6 +133,7 @@ type HisChargeOrder struct {
 	IsMedicineInsurance int64                 `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
 	HisChargeOrderInfo  []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
 	Patients            Patients              `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
+	CardDesc            string                `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (HisChargeOrder) TableName() string {
@@ -209,6 +210,7 @@ type HisChargeSettleOrder struct {
 	IsUploadSuccess   int64 `gorm:"column:is_upload_success" json:"is_upload_success" form:"is_upload_success"`
 
 	SickName string `gorm:"sick_name" json:"sick_name" form:"sick_name"`
+	CardDesc string `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 
 	//OrderHisPatient OrderHisPatient `gorm:"ForeignKey:Number;AssociationForeignKey:MdtrtId" json:"his"`
 }
@@ -328,6 +330,7 @@ type HisChargeOrderTwo struct {
 	MdtrtId               string                   `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
 	PatientId             int64                    `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	HisChargeOrderInfoTwo []*HisChargeOrderInfoTwo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
+	CardDesc              string                   `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (HisChargeOrderTwo) TableName() string {
@@ -414,6 +417,7 @@ type NewHisChargeOrder struct {
 	PsnCashPay          float64                     `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
 	IsMedicineInsurance int64                       `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
 	HisChargeOrderInfo  []*NewHisChargeOrderInfoTwo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
+	CardDesc            string                      `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (NewHisChargeOrder) TableName() string {

models/his_models.go

@@ -534,9 +534,10 @@ type TempHisOrder struct {
 	IsPre           int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis       string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 
-	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"`
+	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"`
+	CardDesc          string `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (TempHisOrder) TableName() string {
@@ -1092,7 +1093,7 @@ type HisOrder struct {
 	Patients               Patients               `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient             HisPatient             `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_patient"`
 	HisHospitalCheckRecord HisHospitalCheckRecord `gorm:"ForeignKey:MdtrtId;AssociationForeignKey:Number" json:"his_hospital_patient"`
-	HisPrescriptionInfo    HisPrescriptionInfo    `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"p_info"`
+	HisPrescriptionInfo    HisPrescriptionInfo    `gorm:"ForeignKey:HisPatientId;AssociationForeignKey:HisPatientId" json:"p_info"`
 
 	HisFundSettleListResult HisFundSettleListResult `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"result"`
 	IsPre                   int64                   `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
@@ -1102,6 +1103,7 @@ type HisOrder struct {
 	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"`
+	CardDesc                string                  `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (HisOrder) TableName() string {
@@ -1255,6 +1257,7 @@ type HisOrderOther struct {
 	WechatPay             string   `gorm:"wechat_pay" json:"wechat_pay" form:"wechat_pay"`
 	AliPay                string   `gorm:"ali_pay" json:"ali_pay" form:"ali_pay"`
 	JifenPay              string   `gorm:"jifen_pay" json:"jifen_pay" form:"jifen_pay"`
+	CardDesc              string   `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 	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"`
 	SettleType            int64    `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`

models/his_summary_models.go

@@ -379,6 +379,7 @@ type GatherHisOrder struct {
 	Decimal                 float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
 	OthDesc                 string    `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
 	PayWays                 string    `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
+	CardDesc                string    `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (GatherHisOrder) TableName() string {

service/his_service.go

@@ -101,6 +101,7 @@ type VMHisOrder struct {
 	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
 	IsPre        int64  `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
 	Diagnosis    string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	CardDesc     string `gorm:"card_desc" json:"card_desc" form:"card_desc"`
 }
 
 func (VMHisOrder) TableName() string {