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

controllers/his_api_controller.go

@@ -6201,8 +6201,10 @@ func (c *HisApiController) GetUploadInfo() {
 	id, _ := c.GetInt64("id")
 	record_time := c.GetString("record_time")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
-
+	oth_desc := c.GetString("oth_desc")
 	pay_way, _ := c.GetInt64("pay_way")
+	pay_ways := c.GetString("pay_ways")
+
 	pay_price, _ := c.GetFloat("pay_price")
 	pay_card_no := c.GetString("pay_card_no")
 	discount_price, _ := c.GetFloat("discount_price")
@@ -6505,6 +6507,7 @@ func (c *HisApiController) GetUploadInfo() {
 			Number:                chrg_bchno,
 			MedfeeSumamt:          totals,
 			PayWay:                pay_way,
+			PayWays:               pay_ways,
 			PayPrice:              pay_price,
 			MedType:               strconv.Itoa(int(reg_type)),
 			PayCardNo:             pay_card_no,
@@ -6525,6 +6528,7 @@ func (c *HisApiController) GetUploadInfo() {
 			PType:                 2,
 			SetlTime:              tm.Format("2006-01-02 15:04:05"),
 			Decimal:               decimal,
+			OthDesc:               oth_desc,
 		}
 		err = service.CreateOrderTX(order, tx)
 		if err != nil {

models/his_hospital_models.go

@@ -1,18 +1,21 @@
 package models
 
 type HisHospitalOrder 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"`
-	MedfeeSumamt          float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	OrderStatus           float64 `gorm:"column:order_status" json:"order_status" form:"order_status"`
-	PayWay                int64   `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	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"`
+	MedfeeSumamt       float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	OrderStatus        float64 `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PayWay             int64   `gorm:"column:" json:"pay_way" form:"pay_way"`
+	OthDesc            string  `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays            string  `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
+
 	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"`

models/his_models.go

@@ -427,81 +427,84 @@ func (HisPrescriptionInfo) TableName() string {
 }
 
 type TempHisOrder 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"`
-	AccountPrice          float64   `gorm:"column:account_price" json:"account_price" form:"account_price"`
-	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"`
+	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"`
+	OthDesc             string    `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays             string    `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
+
+	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"`
+	AccountPrice          float64 `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	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"`
 
 	AdminUser         AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	IsUploadDiagnose  int64     `gorm:"column:is_upload_diagnose" json:"is_upload_diagnose" form:"is_upload_diagnose"`
@@ -964,79 +967,82 @@ func (XtHisPatient) TableName() string {
 }
 
 type HisOrder 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"`
+	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"`
+	OthDesc               string  `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays               string  `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 
 	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"`
@@ -1621,78 +1627,81 @@ func (NewHisOrder) TableName() string {
 }
 
 type VMHisOrderTwo 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"`
+	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"`
+	OthDesc             string    `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays             string    `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
+
+	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"`
 
 	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"`
@@ -1861,6 +1870,8 @@ type NewCustomHisOrder 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"`
+	OthDesc               string    `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays               string    `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 
 	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"`
@@ -2133,6 +2144,8 @@ type VmHisOrder 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"`
+	OthDesc                 string    `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays                 string    `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 }
 
 func (VmHisOrder) TableName() string {
@@ -2301,6 +2314,8 @@ type HisOrderTenty 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"`
+	OthDesc                      string                       `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays                      string                       `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 }
 
 func (HisOrderTenty) TableName() string {

models/his_summary_models.go

@@ -376,6 +376,8 @@ type GatherHisOrder struct {
 	Diagnosis               string    `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	FaPiaoBatchnumberId     int64     `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
 	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"`
 }
 
 func (GatherHisOrder) TableName() string {

service/his_hospital_service.go

@@ -65,6 +65,8 @@ type HisHospitalOrder struct {
 	Diagnosis              string                        `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	Patient                models.Patients               `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
 	HisHospitalCheckRecord models.HisHospitalCheckRecord `gorm:"ForeignKey:Number;AssociationForeignKey:MdtrtId" json:"his_patient"`
+	OthDesc                string                        `gorm:"oth_desc" json:"oth_desc" form:"oth_desc"`
+	PayWays                string                        `gorm:"pay_ways" json:"pay_ways" form:"pay_ways"`
 }
 
 func (HisHospitalOrder) TableName() string {