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

service/his_service.go

@@ -953,7 +953,7 @@ func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo,
 
 func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderInfo, err error) {
 	db := readDb.Model(&models.HisOrderInfo{})
-	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id")
+	//db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id")
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")
 	})
@@ -963,7 +963,7 @@ func GetHisOrderInfoByNumberTwo(order_number string) (order []*models.HisOrderIn
 
 func GetHisOrderInfoByNumberThree(order_number string) (order []*models.HisOrderInfo, err error) {
 	db := readDb.Model(&models.HisOrderInfo{})
-	db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id > 0")
+	//db = db.Joins("Join his_prescription_project as p  On p.id = his_order_info.project_id AND p.team_id > 0")
 
 	db = db.Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("status = 1")