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 cc3141f7..98d20232 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
@@ -2473,7 +2473,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     String sampleFilePath = dbSpectrumFilePath.getSampleFilePath().substring(0, dbSpectrumFilePath.getSampleFilePath().lastIndexOf(StringPool.SLASH));
                     String gasFilePath = dbSpectrumFilePath.getGasBgFilePath().substring(0, dbSpectrumFilePath.getGasBgFilePath().lastIndexOf(StringPool.SLASH));
                     String detFilePath = dbSpectrumFilePath.getDetBgFilePath().substring(0, dbSpectrumFilePath.getDetBgFilePath().lastIndexOf(StringPool.SLASH));
-                    List<GardsXeResults> analyseResult = BetaGammaAnalyzeCurrentProcess(analyseData, sampleFilePath, gasFilePath, detFilePath, userName);
+                    List<GardsXeResultsSpectrum> analyseResult = BetaGammaAnalyzeCurrentProcess(analyseData, sampleFilePath, gasFilePath, detFilePath, userName);
                     map.put("xeData", analyseResult);
                     map.put("bProcessed", true);
                     map.put("savedAnalysisResult", true);
@@ -2482,7 +2482,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 }
             } else {
                 String path = StringPool.SLASH + spectrumPathProperties.getUploadPath() + StringPool.SLASH + userName;
-                List<GardsXeResults> analyseResult = BetaGammaAnalyzeCurrentProcess(analyseData, path, path, path, userName);
+                List<GardsXeResultsSpectrum> analyseResult = BetaGammaAnalyzeCurrentProcess(analyseData, path, path, path, userName);
                 map.put("XeData", analyseResult);
                 map.put("bProcessed", true);
                 map.put("savedAnalysisResult", true);
@@ -2533,7 +2533,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 m_loadData.put("qcFileName", qcFileName);
                 loadDataList.add(m_loadData);
             }
-            List<GardsXeResults> analyseResultList = BetaGammaAnalyzeAllProcess(loadDataList, analyseData, userName, currentFileName);
+            List<GardsXeResultsSpectrum> analyseResultList = BetaGammaAnalyzeAllProcess(loadDataList, analyseData, userName, currentFileName);
             map.put("XeData", analyseResultList);
             map.put("bProcessed", true);
             map.put("savedAnalysisResult", true);
@@ -2543,13 +2543,13 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         return result;
     }
 
-    private List<GardsXeResults> BetaGammaAnalyzeCurrentProcess(AnalyseData analyseData, String sampleFilePath, String gasFilePath, String detFilePath, String userName) {
+    private List<GardsXeResultsSpectrum> BetaGammaAnalyzeCurrentProcess(AnalyseData analyseData, String sampleFilePath, String gasFilePath, String detFilePath, String userName) {
         //根据文件路径 文件名称获取对应的临时文件
         File sampleTmp = null;
         File gasTmp = null;
         File detTmp = null;
         //需要返回到前端的XeData数据
-        List<GardsXeResults> xeResultsSpectrumList = new LinkedList<>();
+        List<GardsXeResultsSpectrum> xeResultsSpectrumList = new LinkedList<>();
         try {
             //sample文件名称
             List<String> sampleFileNames = analyseData.getSampleFileNames();
@@ -2662,7 +2662,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             //存入分析用到的数据
             map.put("reAnalyseParam", spectrum_group.BgCalPara);
             //存入计算后得到的xeData数据
-            GardsXeResults xe131m = new GardsXeResults();
+            GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum();
             xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
             xe131m.setConc(analyseResult.Xe131m_con);
             xe131m.setConcErr(analyseResult.Xe131m_uncer);
@@ -2670,7 +2670,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             xe131m.setMdc(analyseResult.MDC_Xe131m);
             xe131m.setNidFlag(analyseResult.XE_131m_NID_FLAG);
             xeResultsSpectrumList.add(xe131m);
-            GardsXeResults xe133 = new GardsXeResults();
+            GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum();
             xe133.setNuclideName(XeNuclideName.XE_133.getType());
             xe133.setConc(analyseResult.Xe133_con);
             xe133.setConcErr(analyseResult.Xe133_uncer);
@@ -2678,7 +2678,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             xe133.setMdc(analyseResult.MDC_Xe133);
             xe133.setNidFlag(analyseResult.XE_133_NID_FLAG);
             xeResultsSpectrumList.add(xe133);
-            GardsXeResults xe133m = new GardsXeResults();
+            GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum();
             xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
             xe133m.setConc(analyseResult.Xe133m_con);
             xe133m.setConcErr(analyseResult.Xe133m_uncer);
@@ -2686,7 +2686,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             xe133m.setMdc(analyseResult.MDC_Xe133m);
             xe133m.setNidFlag(analyseResult.XE_133m_NID_FLAG);
             xeResultsSpectrumList.add(xe133m);
-            GardsXeResults xe135 = new GardsXeResults();
+            GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum();
             xe135.setNuclideName(XeNuclideName.XE_135.getType());
             xe135.setConc(analyseResult.Xe135_con);
             xe135.setConcErr(analyseResult.Xe135_uncer);
@@ -2752,8 +2752,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         return xeResultsSpectrumList;
     }
 
-    private List<GardsXeResults> BetaGammaAnalyzeAllProcess(List<Map<String, String>> loadDataList, AnalyseData analyseData, String userName, String currentFileName){
-        Map<String, List<GardsXeResults>> analyseResultMap = new HashMap<>();
+    private List<GardsXeResultsSpectrum> BetaGammaAnalyzeAllProcess(List<Map<String, String>> loadDataList, AnalyseData analyseData, String userName, String currentFileName){
+        Map<String, List<GardsXeResultsSpectrum>> analyseResultMap = new HashMap<>();
         File sampleTmp = null;
         File gasTmp = null;
         File detTmp = null;
@@ -2856,8 +2856,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 //存入重新分析的参数
                 map.put("reAnalyseParam", spectrum_group.BgCalPara);
                 //存入xeData数据
-                List<GardsXeResults> xeResultsSpectrumList = new LinkedList<>();
-                GardsXeResults xe131m = new GardsXeResults();
+                List<GardsXeResultsSpectrum> xeResultsSpectrumList = new LinkedList<>();
+                GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum();
                 xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
                 xe131m.setConc(analyseResult.Xe131m_con);
                 xe131m.setConcErr(analyseResult.Xe131m_uncer);
@@ -2865,7 +2865,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 xe131m.setMdc(analyseResult.MDC_Xe131m);
                 xe131m.setNidFlag(analyseResult.XE_131m_NID_FLAG);
                 xeResultsSpectrumList.add(xe131m);
-                GardsXeResults xe133 = new GardsXeResults();
+                GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum();
                 xe133.setNuclideName(XeNuclideName.XE_133.getType());
                 xe133.setConc(analyseResult.Xe133_con);
                 xe133.setConcErr(analyseResult.Xe133_uncer);
@@ -2873,7 +2873,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 xe133.setMdc(analyseResult.MDC_Xe133);
                 xe133.setNidFlag(analyseResult.XE_133_NID_FLAG);
                 xeResultsSpectrumList.add(xe133);
-                GardsXeResults xe133m = new GardsXeResults();
+                GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum();
                 xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
                 xe133m.setConc(analyseResult.Xe133m_con);
                 xe133m.setConcErr(analyseResult.Xe133m_uncer);
@@ -2881,7 +2881,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 xe133m.setMdc(analyseResult.MDC_Xe133m);
                 xe133m.setNidFlag(analyseResult.XE_133m_NID_FLAG);
                 xeResultsSpectrumList.add(xe133m);
-                GardsXeResults xe135 = new GardsXeResults();
+                GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum();
                 xe135.setNuclideName(XeNuclideName.XE_135.getType());
                 xe135.setConc(analyseResult.Xe135_con);
                 xe135.setConcErr(analyseResult.Xe135_uncer);