提交代码

models/his_charge_models.go

@@ -109,10 +109,14 @@ type HisChargeOrder struct {
 	FundPaySumamt      float64 `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
 	AcctPay            float64 `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
 	MedfeeSumamt       float64 `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
-	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"`
-	SetlTime           string  `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+
+	HifpPay  float64 `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	HifmiPay float64 `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+
+	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"`
+	SetlTime          string `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
 
 	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"`

service/his_summary_service.go

@@ -9,7 +9,7 @@ import (
 func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
 
 	err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt,is_medicine_insurance,medfee_sumamt,maf_pay,hifes_pay").
+		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt,is_medicine_insurance,medfee_sumamt,maf_pay,hifes_pay,hifp_pay,hifmi_pay").
 			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type,fulamt_ownpay_amt,overlmt_amt,preselfpay_amt,pric_uplmt_amt").Where("status = 1").
 					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {