20250331 更新

1.处理判断是否检出时的逻辑代码

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java

@@ -184,7 +184,14 @@ public class TestRecordSampledataExpandServiceImpl extends ServiceImpl<TestRecor
                         testRecordSampleData.setIsDetected(1); // 默认检出
                         value.forEach(sampleDataExpand -> {
                             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);