|
|
|
|
@ -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) { |
|
|
|
|
|