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

beta提前加载好的数据二次载入时缺少文件名称返回值问题修改

Browse Source 
beta查看RRR报告时缺少数组判断问题修改
This commit is contained in:
qiaoqinzheng 2023-11-16 09:34:41 +08:00
parent 132a1e18c1
commit a36a101a08
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -482,12 +482,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} else { } else {
xeResultsSpectrumList = betaDataFile.getXeResultsSpectrumList(); xeResultsSpectrumList = betaDataFile.getXeResultsSpectrumList();
sampleMap = loadData("sample", betaDataFile); sampleMap = loadData("sample", betaDataFile);
sampleMap.put("fileName", betaDataFile.getSampleFileName());
resultMap.put("sample",sampleMap); resultMap.put("sample",sampleMap);
gasBgMap = loadData("gas", betaDataFile); gasBgMap = loadData("gas", betaDataFile);
gasBgMap.put("fileName", betaDataFile.getGasFileName());
resultMap.put("gasBg",gasBgMap); resultMap.put("gasBg",gasBgMap);
detBgMap = loadData("det", betaDataFile); detBgMap = loadData("det", betaDataFile);
detBgMap.put("fileName", betaDataFile.getDetFileName());
resultMap.put("detBg",detBgMap); resultMap.put("detBg",detBgMap);
qcMap = loadData("qc", betaDataFile); qcMap = loadData("qc", betaDataFile);
qcMap.put("fileName", betaDataFile.getQcFileName());
resultMap.put("qc",qcMap); resultMap.put("qc",qcMap);
} }
//分析状态颜色 //分析状态颜色
@ -608,12 +612,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} else { } else {
xeResultsSpectrumList = betaDataFile.getXeResultsSpectrumList(); xeResultsSpectrumList = betaDataFile.getXeResultsSpectrumList();
sampleMap = loadData("sample", betaDataFile); sampleMap = loadData("sample", betaDataFile);
sampleMap.put("fileName", betaDataFile.getSampleFileName());
resultMap.put("sample",sampleMap); resultMap.put("sample",sampleMap);
gasBgMap = loadData("gas", betaDataFile); gasBgMap = loadData("gas", betaDataFile);
gasBgMap.put("fileName", betaDataFile.getGasFileName());
resultMap.put("gasBg",gasBgMap); resultMap.put("gasBg",gasBgMap);
detBgMap = loadData("det", betaDataFile); detBgMap = loadData("det", betaDataFile);
detBgMap.put("fileName", betaDataFile.getDetFileName());
resultMap.put("detBg",detBgMap); resultMap.put("detBg",detBgMap);
qcMap = loadData("qc", betaDataFile); qcMap = loadData("qc", betaDataFile);
qcMap.put("fileName", betaDataFile.getQcFileName());
resultMap.put("qc",qcMap); resultMap.put("qc",qcMap);
} }
phdFileUtil.getLightColor(sampleMap,gasBgMap,detBgMap,qcMap); phdFileUtil.getLightColor(sampleMap,gasBgMap,detBgMap,qcMap);
@ -1221,6 +1229,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
} }
} }
} else {
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC"));
strBuffer.append(System.lineSeparator());
} }
} else { } else {
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
@ -1243,6 +1254,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
} }
} }
} else {
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC"));
strBuffer.append(System.lineSeparator());
} }
} }
strBuffer.append(System.lineSeparator()); strBuffer.append(System.lineSeparator());