From 83244629be244973ca5180405a4f2a9dd50d8b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=B5=B7=E8=88=AA?=
 <11918452+yang-haihang@user.noreply.gitee.com>
Date: Tue, 18 Mar 2025 11:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E8=B4=B5=E9=98=B3=E5=B8=82=E5=B1=80=E7=9A=84?=
 =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=88=91?=
 =?UTF-8?q?=E4=BB=AC=E4=B8=8D=E9=9C=80=E8=A6=81=E5=AF=BC=E5=85=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E9=80=9A=E8=BF=87=E6=89=8B=E5=8A=A8=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=B9=E5=BC=8F=E6=9D=A5?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=A3=80=E9=AA=8C=E5=88=86=E6=9E=90=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=94=9F=E6=88=90=E6=A3=80=E9=AA=8C=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/entity/TestRecordSampleData.java     |  8 ++++----
 .../impl/TestRecordSampleDataServiceImpl.java       | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleData.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleData.java
index b38001a..47beed0 100644
--- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleData.java
+++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleData.java
@@ -34,9 +34,9 @@ public class TestRecordSampleData extends BaseEntity {
 
     private String rtTimeWithinError;//保留时间是否在误差范围 ±1 以内
 
-    private double targetRtTime;//目标物保留时间
+    private Double targetRtTime;//目标物保留时间
 
-    private double stdRtTime;//标准物保留时间
+    private Double stdRtTime;//标准物保留时间
 
     private int isDetected;//是否检出目标化合物
 
@@ -48,9 +48,9 @@ public class TestRecordSampleData extends BaseEntity {
 
     private String compoundCnName;//检测的化合物的中文名字
 
-    private double mainArea;//主要产物峰面积
+    private Double mainArea;//主要产物峰面积
 
-    private double minorArea;//次要产物峰面积
+    private Double minorArea;//次要产物峰面积
 
     @ApiModelProperty("任务数据审核状态, 状态：\n" +
             "0 待审核，\n" +
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 92dceda..407371f 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
@@ -1998,12 +1998,13 @@ public class TestRecordSampleDataServiceImpl extends ServiceImpl<TestRecordSampl
                 .eq(TestRecordSampleData::getTestId, data.getTestId())
                 .eq(TestRecordSampleData::getSampleType, "STD"));
 
-        if (data.getMainArea() != 0.0 &&
-                data.getMinorArea() != 0.0 &&
-                data.getTargetRtTime() != 0.0 &&
-                std.getMainArea() != 0.0 &&
-                std.getMinorArea() != 0.0 &&
-                std.getTargetRtTime() != 0.0) {
+        if (data.getMainArea() != null &&
+                data.getMinorArea() != null &&
+                data.getTargetRtTime() != null &&
+                std.getMainArea() != null &&
+                std.getMinorArea() != null &&
+                std.getTargetRtTime() != null) {
+            System.out.println("所有属性都不为 null");
         }
         return this.updateById(data) ? data : null;
     }