xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 MDC值为null时的默认值为0

Browse Source
This commit is contained in:
duwenyuan 2026-05-06 09:56:23 +08:00
parent 8bac595897
commit 009f2a99d2
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java
View File

@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -848,8 +849,15 @@ public class SelfBaseUtil extends AbstractLogOrReport {
xeDataList.forEach(GardsXeResultsSpectrum::getMdc); xeDataList.forEach(GardsXeResultsSpectrum::getMdc);
if (CollectionUtils.isNotEmpty(xeDataList)) { if (CollectionUtils.isNotEmpty(xeDataList)) {
for (GardsXeResultsSpectrum xeData : 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 conc = xeData.getConc();
Double mdc = xeData.getMdc(); Double mdc = xeData.getMdc();
if (conc <= 0) { if (conc <= 0) {
xeData.setColor("red"); xeData.setColor("red");
xeData.setNidFlag(0); xeData.setNidFlag(0);

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

@ -6594,6 +6594,8 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
roiReportPath = rootPath + saveFilePath + StrUtil.SLASH + roiReportPath + FileTypeEnum.arr.getType(); roiReportPath = rootPath + saveFilePath + StrUtil.SLASH + roiReportPath + FileTypeEnum.arr.getType();
if (!FileUtil.exist(roiReportPath)) continue; if (!FileUtil.exist(roiReportPath)) continue;
result.put("Gamma_ROI_" + roiNum, FileUtil.readUtf8String(roiReportPath)); result.put("Gamma_ROI_" + roiNum, FileUtil.readUtf8String(roiReportPath));
// todo beta报告暂时展示gamma
result.put("Beta", FileUtil.readUtf8String(roiReportPath));
} }
return Result.OK(result); return Result.OK(result);
} }