diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java index 7c2f240..7b7752e 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java @@ -1048,12 +1048,27 @@ public class EntrustController extends BladeController { } String reagentId = examineResult.getReagentId(); if (reagentId != null) { - Reagent reagent = reagentService.getById(reagentId); - if (reagent != null) { - examineResult.setReagentName(reagent.getName()); - examineResult.setReagentManufacturerName(reagent.getManufacturer()); - examineResult.setReagentBatchNo(reagent.getBatchNo()); + String[] split = reagentId.split(","); + String name = ""; + String manufacturer = ""; + String batchNo = ""; + for (int i = 0; i < split.length; i++) { + Reagent reagent = reagentService.getById(split[i]); + if (reagent != null) { + if (i == split.length - 1) { + name += reagent.getName(); + manufacturer += reagent.getManufacturer(); + batchNo += reagent.getBatchNo(); + } else { + name += reagent.getName() + ","; + manufacturer += reagent.getManufacturer() + ","; + batchNo += reagent.getBatchNo() + ","; + } + } } + examineResult.setReagentName(name); + examineResult.setReagentManufacturerName(manufacturer); + examineResult.setReagentBatchNo(batchNo); } String instrumentId = examineResult.getInstrumentId(); if (instrumentId != null) {