公共方法

service/app_version.go

@@ -553,7 +553,7 @@ type HisOrderTen struct {
 	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"`
-	HisPrescriptionTen    []*HisPrescriptionTen `gorm:"ForeignKey:BatchNumber;AssociationForeignKey:Number" json:"info"`
+	VmHisOrderInfo9504    []*VmHisOrderInfo9504 `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"info"`
 	Patients              Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 }
 
@@ -593,13 +593,13 @@ func (HisPrescriptionTen) TableName() string {
 }
 
 func GetHisOrderDetailThree() (order []*HisOrderTen, err error) {
-	err = readDb.Model(&HisOrderTen{}).Preload("Patients", "status = 1").Preload("HisPrescriptionTen", func(db *gorm.DB) *gorm.DB {
+	err = readDb.Model(&HisOrderTen{}).Preload("Patients", "status = 1").Preload("VmHisOrderInfo9504", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Preload("HisPrescriptionProjectTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("VMHisProject", "status = 1").Preload("VMGoodInfo", "status = 1")
 		}).Preload("HisDoctorAdviceInfoTen", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Preload("Drug", "status = 1")
 		})
-	}).Where("settle_accounts_date >= 1659283200 AND settle_accounts_date <= 1661788800 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-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
 	return
 }