Merge branch 'master' of http://git.shengws.com/csx/gdyb

models/his_models.go

@@ -727,7 +727,7 @@ type HisOrderInfo struct {
 	OverPricPsnPay         float64                `gorm:"column:over_pric_psn_pay" json:"over_pric_psn_pay" form:"over_pric_psn_pay"`
 	AllowReimburse         float64                `gorm:"column:allow_reimburse" json:"allow_reimburse" form:"allow_reimburse"`
 	HisDoctorAdviceInfo    HisDoctorAdviceInfo    `gorm:"ForeignKey:AdviceId;AssociationForeignKey:ID" json:"advice"`
-	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	HisPrescriptionProject HisPrescriptionProject `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"project"`
 }
 
 func (HisOrderInfo) TableName() string {

service/his_service.go

@@ -898,21 +898,12 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 	return
 }
 
-func GetProjectDetailTwo(id int64) (models.HisProject, error) {
-	project := models.HisProject{}
-	err := XTReadDB().Model(&project).Where("id=? and status = 1", id).Find(&project).Error
-	return project, err
-}
-
 func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfo, err error) {
 	db := readDb.Model(&models.HisOrderInfo{})
-	db = db.Preload("HisPrescriptionProject", "status = 1")
+	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("HisProject", "status = 1").Where("status = 1")
+	})
 	err = db.Where("order_number = ? AND status = 1 AND project_id > 0", order_number).Find(&order).Error
-	for _, item := range order {
-		project, _ := GetProjectDetailTwo(item.HisPrescriptionProject.ProjectId)
-		item.HisPrescriptionProject.HisProject = project
-
-	}
 	return
 }