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

service/his_service.go

@@ -891,11 +891,13 @@ func GetHisOrderByIDTwo(order_id int64) (order models.HisOrder, err error) {
 }
 
 func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo, err error) {
-	err = readDb.Model(&models.HisOrderInfo{}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("BaseDrugLib").Where("status = 1")
-	}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("HisProject").Where("status = 1")
-	}).Where("order_number = ? AND status = 1", order_number).Find(&order).Error
+	db := readDb.Model(&models.HisOrderInfo{}).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Preload("BaseDrugLib", "status = 1").Where("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", order_number).Find(&order).Error
 	return
 }