提交代码

service/app_version.go

 //}
 
 type HisOrderTen 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"`
-	VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
-	Patients              Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	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"`
+	//VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
+	HisPrescriptionTen []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
+	Patients           Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 }
 
 func (HisOrderTen) TableName() string {
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("Drug", "status = 1")
 		})
-	}).Where("setl_time >= '2023-03-01 00:00:00' AND setl_time <= '2023-03-31 23:59:59' AND status = 1 AND order_status =2 and p_type = 1 AND user_org_id = 10215").Find(&order).Order("patient_id").Error
+	}).Where("setl_time >= '2023-07-01 00:00:00' AND setl_time <= '2023-07-31 23:59:59' AND status = 1 AND order_status =2  AND user_org_id = 10215").Find(&order).Order("patient_id").Error
 	return
 }
 
 
 func GetHisPatient11111(orgid int64) (paitent []*models.HisHospitalCheckRecord, err error) {
 
-	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2022-12-01 00:00:00' AND in_hosptial_time <= '2022-12-31 23:59:59'", orgid).Find(&paitent).Error
+	err = XTReadDB().Model(&paitent).Where("user_org_id = ?  and status = 1 AND in_hosptial_time >= '2023-07-01 00:00:00' AND in_hosptial_time <= '2023-07-31 23:59:59'", orgid).Find(&paitent).Error
 	return paitent, err
 }
 
 		return db.Where("status = 1 AND order_status = 2").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject")
 		})
-	}).Where("settle_accounts_date >= 1664553600 AND settle_accounts_date <= 1672416000 AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
+	}).Where("setl_time >= '2022-04-01 00:00:00' AND setl_time <= '2022-06-30 23:00:00' AND status = 1 AND order_status =2  AND user_org_id = 10278").Find(&order).Error
 	return
 }
 
 }
 
 func GetHisOrder10265() (order_infos []*VmHisOrderInfo9504, err error) {
-	err = readDb.Model(&VmHisOrderInfo95042{}).Where(" status = 1  AND user_org_id = 10265 AND order_number = '2022092912130116192' AND project_id > 0").Find(&order_infos).Error
+	err = readDb.Model(&VmHisOrderInfo95042{}).Where(" status = 1  AND user_org_id = 10265 AND order_number = '2023031016334716192' AND project_id > 0").Find(&order_infos).Error
+	return
+}
+
+func GetHisOrder10265two() (order_infos []*VmHisOrderInfo9504, err error) {
+	err = readDb.Model(&VmHisOrderInfo95042{}).Where(" status = 1  AND user_org_id = 10265 AND order_number = '2023031016334716192'").Find(&order_infos).Error
 	return
 }