提交代码

service/pharmacy_service.go

@@ -1440,12 +1440,24 @@ func ReplacementDrugs(orgid int64, special bool) (list []*models.ReplacementDrug
 			//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 + " " + v.Number,
-			})
-			lock.Unlock()
+
+			if orgid == 10206 {
+
+				list = append(list, &models.ReplacementDrugs{
+					Id:   v.ID,
+					Name: v.DrugName + " " + v.DrugSpec + " " + v.Number,
+				})
+				lock.Unlock()
+
+			} 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,
+				})
+				lock.Unlock()
+			}
 			return err
 		})
 	}
@@ -1470,10 +1482,18 @@ func ReplacementDrugsT(orgid int64) (list []*models.ReplacementDrugs, err error)
 		//	return
 		//}
 
-		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,
-		})
+		if orgid == 10206 {
+			list = append(list, &models.ReplacementDrugs{
+				Id:   v.ID,
+				Name: v.DrugName + " " + v.DrugSpec + " " + v.Number,
+			})
+
+		} 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,
+			})
+		}
 	}
 	return
 }