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); }