From dac0736e7286e9abe16b3c865eb36482501bcf65 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Fri, 26 Jan 2024 16:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=B4=A0=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9=E6=95=B0=E6=8D=AE=E6=98=AFinf=EF=BC=8Cnan=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B5=8B=E5=80=BC=E7=A9=BA=E5=80=BC=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GardsSampleDataWebServiceImpl.java    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
index d76ca472..5c49cb00 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
@@ -1213,7 +1213,11 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                             Object conc = nuclideStatistics.get(columnName);
                             //判断如果浓度不为空 正常存储
                             if (Objects.nonNull(conc)) {
-                                concList.add(Double.valueOf(conc.toString()));
+                                if (conc.toString().toLowerCase().contains("inf") || conc.toString().toLowerCase().contains("nan")) {
+                                    concList.add(null);
+                                } else {
+                                    concList.add(Double.valueOf(conc.toString()));
+                                }
                             } else {
                                 concList.add(null);
                             }
@@ -1221,7 +1225,11 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                             Object mdc = nuclideStatistics.get(columnName + "MDC");
                             //判断如果mdc结果不为空 正常存储
                             if (Objects.nonNull(mdc)) {
-                                mdcList.add(Double.valueOf(mdc.toString()));
+                                if (mdc.toString().toLowerCase().contains("inf") || mdc.toString().toLowerCase().contains("nan")) {
+                                    mdcList.add(null);
+                                } else {
+                                    mdcList.add(Double.valueOf(mdc.toString()));
+                                }
                             } else {
                                 mdcList.add(null);
                             }
@@ -1235,7 +1243,11 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                             Object conc = nuclideStatistics.get(columnName);
                             //判断如果浓度不为空 正常存储
                             if (Objects.nonNull(conc)) {
-                                concList.add(Double.valueOf(conc.toString()));
+                                if (conc.toString().toLowerCase().contains("inf") || conc.toString().toLowerCase().contains("nan")) {
+                                    concList.add(null);
+                                } else {
+                                    concList.add(Double.valueOf(conc.toString()));
+                                }
                             } else {
                                 concList.add(null);
                             }