diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java index bf612e1..7febb59 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java @@ -1622,7 +1622,7 @@ public class TestRecordSampleDataServiceImpl extends ServiceImpl<TestRecordSampl public boolean autoDelData(String testId, String reagentId) { TestRecordReagentVO reagentVO = testRecordReagentService.getVOById(reagentId); Drug drug = reagentVO.getDrug(); - String compoundName = drug.getName(); + String compoundName = drug.getEnglishName(); List<TestRecordSampleData> removeDataList = this.list(Wrappers.<TestRecordSampleData>lambdaQuery() .eq(TestRecordSampleData::getTestId, testId) .eq(TestRecordSampleData::getCompoundName, compoundName)); diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java index 1abebec..8993060 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java @@ -114,7 +114,7 @@ public class TestRecordSampledataExpandServiceImpl extends ServiceImpl<TestRecor */ @Override public List<TestRecordSampleDataExpand> saveExpDataByBusinessType(String testDataId, Drug drug, String businessType) { - List<TestRecordSampleDataExpand> testRecordSampleDataExpandList = null; + List<TestRecordSampleDataExpand> testRecordSampleDataExpandList = new ArrayList<>(); if (BusinessType.NPS_CASE.getBusinessType().equals(businessType)) { List<String> characteristicIonsList = StrUtil.split(drug.getCharacteristicIons(), "、");