From 009f2a99d2e01f2bbb63ab7c3b672654f671d674 Mon Sep 17 00:00:00 2001
From: duwenyuan <15600000461@163.com>
Date: Wed, 6 May 2026 09:56:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20MDC=E5=80=BC=E4=B8=BAnull?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/SelfBaseUtil.java | 8 ++++++++
 .../modules/service/impl/SelfStationServiceImpl.java      | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java
index bc3b3b28..06ab3646 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java
@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -848,8 +849,15 @@ public class SelfBaseUtil extends AbstractLogOrReport {
             xeDataList.forEach(GardsXeResultsSpectrum::getMdc);
             if (CollectionUtils.isNotEmpty(xeDataList)) {
                 for (GardsXeResultsSpectrum xeData : xeDataList) {
+                    if(ObjectUtil.isEmpty(xeData.getConc())){
+                        xeData.setConc(0.0);
+                    }
+                    if(ObjectUtil.isEmpty(xeData.getMdc())){
+                        xeData.setMdc(0.0);
+                    }
                     Double conc = xeData.getConc();
                     Double mdc = xeData.getMdc();
+
                     if (conc <= 0) {
                         xeData.setColor("red");
                         xeData.setNidFlag(0);
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
index aa7cf614..8fb06ae6 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
@@ -6594,6 +6594,8 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
             roiReportPath = rootPath + saveFilePath + StrUtil.SLASH + roiReportPath + FileTypeEnum.arr.getType();
             if (!FileUtil.exist(roiReportPath)) continue;
             result.put("Gamma_ROI_" + roiNum, FileUtil.readUtf8String(roiReportPath));
+            // todo beta报告暂时展示gamma
+            result.put("Beta", FileUtil.readUtf8String(roiReportPath));
         }
         return Result.OK(result);
     }