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 2767be0..b7bf3be 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 @@ -184,7 +184,14 @@ public class TestRecordSampledataExpandServiceImpl extends ServiceImpl { calculateIonAbundanceRatio(basePeakData, testRecord, finalStdDataExpandList, sampleDataExpand); - if (!isSTDSample && testRecordSampleData.getIsDetected().equals(1) && testRecordSampleData.getRtTimeWithinError().equals(TestRecordSampleDataConstant.NO) && sampleDataExpand.getIonAbundanceRatioWithinError().equals(TestRecordSampleDataConstant.NO)) { + if ( + !isSTDSample && + testRecordSampleData.getIsDetected().equals(1) && + ( + testRecordSampleData.getRtTimeWithinError().equals(TestRecordSampleDataConstant.NO) + || sampleDataExpand.getIonAbundanceRatioWithinError().equals(TestRecordSampleDataConstant.NO) + ) + ) { testRecordSampleData.setIsDetected(0); } // calculateAfterResult.add(sampleDataExpand);