提交代码

service/pharmacy_service.go

@@ -1438,11 +1438,11 @@ 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()
 
@@ -1457,7 +1457,7 @@ func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrug
 			} else {
 				list = append(list, &models.ReplacementDrugs{
 					Id:   v.ID,
-					Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.MaxUnit + " " + v.Number,
+					Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.MaxUnit + " " + tmp.ManufacturerName,
 				})
 				lock.Unlock()
 			}
@@ -1479,11 +1479,11 @@ 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
+		}
 
 		if orgid == 10206 {
 			list = append(list, &models.ReplacementDrugs{
@@ -1494,7 +1494,7 @@ func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error)
 		} else {
 			list = append(list, &models.ReplacementDrugs{
 				Id:   v.ID,
-				Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.PrescribingNumberUnit + " " + v.Number,
+				Name: v.DrugName + " " + v.Dose + v.DoseUnit + "*" + config.ToString(v.MinNumber) + v.MinUnit + "/" + v.PrescribingNumberUnit + " " + tmp.ManufacturerName,
 			})
 		}
 	}
@@ -1581,7 +1581,7 @@ func ProjectConsumables2(orgid int64, special bool) (list []*models.DropDownList
 	for _, v := range good {
 		list = append(list, &models.DropDownList{
 			Id:   "i" + config.ToString(v.ID),
-			Name: v.GoodName + " " + v.SpecificationName,
+			Name: v.GoodName + " " + v.SpecificationName + " " + v.GoodNumber,
 		})
 	}