提交代码

service/pharmacy_service.go

@@ -1435,15 +1435,15 @@ func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrug
 	for _, v := range lib {
 		v := v
 		g.Go(func() error {
-			var tmp models.Manufacturer
-			err := readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
-			if err != nil {
-				return err
-			}
+			//var tmp models.Manufacturer
+			//err := readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
+			//if err != nil {
+			//	return err
+			//}
 			lock.Lock()
 			list = append(list, &models.ReplacementDrugs{
 				Id:   v.ID,
-				Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.MaxUnit + " " + tmp.ManufacturerName,
+				Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.MaxUnit + " " + v.Number,
 			})
 			lock.Unlock()
 			return err
@@ -1464,15 +1464,15 @@ func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error)
 		return
 	}
 	for _, v := range lib {
-		var tmp models.Manufacturer
-		err = readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
-		if err != nil {
-			return
-		}
+		//var tmp models.Manufacturer
+		//err = readDb.Model(&models.Manufacturer{}).Where("id = ?", v.Manufacturer).Find(&tmp).Error
+		//if err != nil {
+		//	return
+		//}
 
 		list = append(list, &models.ReplacementDrugs{
 			Id:   v.ID,
-			Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.PrescribingNumberUnit + " " + tmp.ManufacturerName,
+			Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.PrescribingNumberUnit + " " + v.Number,
 		})
 	}
 	return