diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index fea65e37..a3f4e952 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -482,12 +482,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { xeResultsSpectrumList = betaDataFile.getXeResultsSpectrumList(); sampleMap = loadData("sample", betaDataFile); + sampleMap.put("fileName", betaDataFile.getSampleFileName()); resultMap.put("sample",sampleMap); gasBgMap = loadData("gas", betaDataFile); + gasBgMap.put("fileName", betaDataFile.getGasFileName()); resultMap.put("gasBg",gasBgMap); detBgMap = loadData("det", betaDataFile); + detBgMap.put("fileName", betaDataFile.getDetFileName()); resultMap.put("detBg",detBgMap); qcMap = loadData("qc", betaDataFile); + qcMap.put("fileName", betaDataFile.getQcFileName()); resultMap.put("qc",qcMap); } //分析状态颜色 @@ -608,12 +612,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { xeResultsSpectrumList = betaDataFile.getXeResultsSpectrumList(); sampleMap = loadData("sample", betaDataFile); + sampleMap.put("fileName", betaDataFile.getSampleFileName()); resultMap.put("sample",sampleMap); gasBgMap = loadData("gas", betaDataFile); + gasBgMap.put("fileName", betaDataFile.getGasFileName()); resultMap.put("gasBg",gasBgMap); detBgMap = loadData("det", betaDataFile); + detBgMap.put("fileName", betaDataFile.getDetFileName()); resultMap.put("detBg",detBgMap); qcMap = loadData("qc", betaDataFile); + qcMap.put("fileName", betaDataFile.getQcFileName()); resultMap.put("qc",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 { 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());