diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java
index 202e4da2..07c90286 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java
@@ -18,7 +18,7 @@ public class FittingBody implements Serializable {
 
     private Integer count;
 
-    private String qcFileName;
+    private String sampleFileName;
 
     private String tabName;
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
index 0310e566..7ff9cae0 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
@@ -711,34 +711,34 @@ public class PHDFileUtil extends AbstractLogOrReport {
         //存入计算后得到的xeData数据
         GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum();
         xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
-        xe131m.setConc(analyseResult.Xe131m_con);
-        xe131m.setConcErr(analyseResult.Xe131m_uncer);
-        xe131m.setLc(analyseResult.LC_Xe131m);
-        xe131m.setMdc(analyseResult.MDC_Xe131m);
+        xe131m.setConc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe131m_con))));
+        xe131m.setConcErr(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe131m_uncer))));
+        xe131m.setLc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe131m))));
+        xe131m.setMdc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe131m))));
         xe131m.setNidFlag(analyseResult.XE_131m_NID_FLAG);
         xeResultsSpectrumList.add(xe131m);
         GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum();
         xe133.setNuclideName(XeNuclideName.XE_133.getType());
-        xe133.setConc(analyseResult.Xe133_con);
-        xe133.setConcErr(analyseResult.Xe133_uncer);
-        xe133.setLc(analyseResult.LC_Xe133);
-        xe133.setMdc(analyseResult.MDC_Xe133);
+        xe133.setConc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133_con))));
+        xe133.setConcErr(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133_uncer))));
+        xe133.setLc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe133))));
+        xe133.setMdc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe133))));
         xe133.setNidFlag(analyseResult.XE_133_NID_FLAG);
         xeResultsSpectrumList.add(xe133);
         GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum();
         xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
-        xe133m.setConc(analyseResult.Xe133m_con);
-        xe133m.setConcErr(analyseResult.Xe133m_uncer);
-        xe133m.setLc(analyseResult.LC_Xe133m);
-        xe133m.setMdc(analyseResult.MDC_Xe133m);
+        xe133m.setConc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133m_con))));
+        xe133m.setConcErr(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133m_uncer))));
+        xe133m.setLc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe133m))));
+        xe133m.setMdc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe133m))));
         xe133m.setNidFlag(analyseResult.XE_133m_NID_FLAG);
         xeResultsSpectrumList.add(xe133m);
         GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum();
         xe135.setNuclideName(XeNuclideName.XE_135.getType());
-        xe135.setConc(analyseResult.Xe135_con);
-        xe135.setConcErr(analyseResult.Xe135_uncer);
-        xe135.setLc(analyseResult.LC_Xe135);
-        xe135.setMdc(analyseResult.MDC_Xe135);
+        xe135.setConc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe135_con))));
+        xe135.setConcErr(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe135_uncer))));
+        xe135.setLc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe135))));
+        xe135.setMdc(Double.valueOf(NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe135))));
         xe135.setNidFlag(analyseResult.XE_135_NID_FLAG);
         xeResultsSpectrumList.add(xe135);
         map.put("XeData", xeResultsSpectrumList);
@@ -1326,11 +1326,19 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第三十六行数据
-            out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.s_b_fitting_c_e.size() > 0) {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(2)))));
+            } else {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //第三十七行数据
-            out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.s_b_fitting_e_c.size() > 0) {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(2)))));
+            } else {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //换行
@@ -1340,11 +1348,19 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第三十六行数据
-            out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.s_g_fitting_c_e.size() > 0) {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(2)))));
+            } else {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //第三十七行数据
-            out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.s_g_fitting_e_c.size() > 0) {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(2)))));
+            } else {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //换行
@@ -1394,11 +1410,20 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第四十四行数据
-            out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.d_b_fitting_c_e.size() > 0) {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2)))));
+            } else {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //第四十五行数据
-            out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.d_b_fitting_e_c.size() > 0) {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2)))));
+            } else {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
+
             //换行
             out.append(System.lineSeparator());
             //换行
@@ -1408,11 +1433,19 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第四十四行数据
-            out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.d_g_fitting_c_e.size() > 0) {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2)))));
+            } else {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //第四十五行数据
-            out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.d_g_fitting_e_c.size() > 0) {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2)))));
+            } else {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //换行
@@ -1457,11 +1490,19 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第五十一行数据
-            out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.g_b_fitting_c_e.size() > 0) {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2)))));
+            } else {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //第五十二行数据
-            out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.g_b_fitting_e_c.size() > 0) {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2)))));
+            } else {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //换行
@@ -1471,11 +1512,19 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第五十四行数据
-            out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.g_g_fitting_c_e.size() > 0) {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2)))));
+            } else {
+                out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //第五十五行数据
-            out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.g_g_fitting_e_c.size() > 0) {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2)))));
+            } else {
+                out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?", "?", "?"));
+            }
             //换行
             out.append(System.lineSeparator());
             //换行
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
index 6d53b4d0..29cd737b 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
@@ -123,14 +123,14 @@ public class SpectrumAnalysesController {
 
     @GetMapping("viewGammaDetectorCalibration")
     @ApiOperation(value = "查询GammaDetectorCalibration数据", notes = "查询GammaDetectorCalibration数据")
-    public Result viewGammaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request) {
-        return spectrumAnalysisService.viewGammaDetectorCalibration(sampleId, qcFileName, request);
+    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
+        return spectrumAnalysisService.viewGammaDetectorCalibration(sampleId, sampleFileName, qcFileName, request);
     }
 
     @GetMapping("viewBetaDetectorCalibration")
     @ApiOperation(value = "查询BetaDetectorCalibration数据", notes = "查询BetaDetectorCalibration数据")
-    public Result viewBetaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request) {
-        return spectrumAnalysisService.viewBetaDetectorCalibration(sampleId, qcFileName, request);
+    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
+        return spectrumAnalysisService.viewBetaDetectorCalibration(sampleId, sampleFileName, qcFileName, request);
     }
 
     @GetMapping("viewExtrapolation")
@@ -176,7 +176,7 @@ public class SpectrumAnalysesController {
     @PostMapping("fitting")
     @ApiOperation(value = "公式计算新的曲线", notes = "公式计算新的曲线")
     public Result fitting(@RequestBody FittingBody fittingBody, HttpServletRequest request) {
-        return spectrumAnalysisService.fitting(fittingBody.getParamA(), fittingBody.getParamB(), fittingBody.getParamC(), fittingBody.getTempPoints(), fittingBody.getCount(), fittingBody.getQcFileName(), fittingBody.getTabName(), request);
+        return spectrumAnalysisService.fitting(fittingBody.getParamA(), fittingBody.getParamB(), fittingBody.getParamC(), fittingBody.getTempPoints(), fittingBody.getCount(), fittingBody.getSampleFileName(), fittingBody.getTabName(), request);
     }
 
     @GetMapping("getGammaGated")
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
index 4d9cd1f9..307dcf13 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
@@ -46,9 +46,9 @@ public interface ISpectrumAnalysisService {
 
     void exportRLR(BetaRLR betaRLR, HttpServletResponse response);
 
-    Result viewGammaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request);
+    Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request);
 
-    Result viewBetaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request);
+    Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request);
 
     Result viewExtrapolation(Integer sampleId, String sampleFileName, HttpServletRequest request);
 
@@ -64,7 +64,7 @@ public interface ISpectrumAnalysisService {
 
     Result statisticsQueryBtn(Integer detectorId, String detectorName, Integer stationId, String statisticsType, Date startTime, Date endTime);
 
-    Result fitting(Double paramA, Double paramB, Double paramC, List<SeriseData> tempPointsArray, Integer count, String qcFileName, String tabName, HttpServletRequest request);
+    Result fitting(Double paramA, Double paramB, Double paramC, List<SeriseData> tempPointsArray, Integer count, String sampleFileName, String tabName, HttpServletRequest request);
 
     Result getGammaGated(Integer chartHeight, Integer channelWidth, Integer gammaChannel, Integer sampleId, String qcFileName, HttpServletRequest request);
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
index 63144239..8d32d335 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
@@ -998,13 +998,13 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         phd.setXmlFilePath(parameterProperties.getFilePath());
         // 获取当前角色的颜色配置
         Map<String, String> colorMap = sysUserColorService.initColor(userName);
-        // 查询当前用户关联的核素信息
-        List<String> nuclides = new LinkedList<>();
-        // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的
-        nuclides = defaultNuclideSpectrumService.findNuclidesByUserName(userName, phd.getHeader().getSystem_type().toUpperCase());
-        if (CollectionUtils.isEmpty(nuclides)) {
-            nuclides = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase());
-        }
+//        // 查询当前用户关联的核素信息
+//        List<String> nuclides = new LinkedList<>();
+//        // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的
+//        nuclides = defaultNuclideSpectrumService.findNuclidesByUserName(userName, phd.getHeader().getSystem_type().toUpperCase());
+//        if (CollectionUtils.isEmpty(nuclides)) {
+//            nuclides = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase());
+//        }
         // 分析文件数据
         int flag = gammaFileUtil.AnalyseData(phd);
         if (flag == 0) {
@@ -1013,7 +1013,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
                     "2. You didn't change any setting or calibration.";
             result.error500(warning);
         } else if (flag == -1) {
-            Map<String, NuclideLines> nuclideLinesMap = GetNuclideLines(nuclides);
+            Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(fileName+"-"+userName);//GetNuclideLines(nuclides);
             gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
             gammaFileUtil.RunQC(phd);
             String warning = "Finish three tasks:\n" +
@@ -1022,7 +1022,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
                     "\t3.Test QC again.";
             result.error500(warning);
         } else {
-            Map<String, NuclideLines> nuclideLinesMap = GetNuclideLines(nuclides);
+            Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(fileName+"-"+userName);//GetNuclideLines(nuclides);
             gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
             // 重新分析各峰值对应的核素信息
 //            gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
@@ -1609,14 +1609,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         // 根据要进行修改的列的数据下标 操作Vpeak数据
         phd.getVPeak().get(curRow).nuclides.add(nuclideName);
         // 查询当前用户所关心的核素名称
-        // 查询当前用户关联的核素信息
-        List<String> userLib = new LinkedList<>();
-        // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的
-        userLib = defaultNuclideSpectrumService.findNuclidesByUserName(userName, phd.getHeader().getSystem_type().toUpperCase());
-        if (CollectionUtils.isEmpty(userLib)) {
-            userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase());
-        }
-        Map<String, NuclideLines> mapNucLines = GetNuclideLines(userLib);
+//        // 查询当前用户关联的核素信息
+//        List<String> userLib = new LinkedList<>();
+//        // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的
+//        userLib = defaultNuclideSpectrumService.findNuclidesByUserName(userName, phd.getHeader().getSystem_type().toUpperCase());
+//        if (CollectionUtils.isEmpty(userLib)) {
+//            userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase());
+//        }
+        Map<String, NuclideLines> mapNucLines = (Map<String, NuclideLines>) redisUtil.get(fileName+"-"+userName);//GetNuclideLines(userLib);
         // 查询出核素信息
         NuclideLines it_line = mapNucLines.get(nuclideName);
         // 如果核素信息不存在返回
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 ba3b9d46..6165cd2b 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
@@ -585,9 +585,9 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
     @Override
     public void deleteSpectrumCacheData(String sampleFileName, String qcFileName, HttpServletRequest request) {
         String userName = JwtUtil.getUserNameByToken(request);
-        String betaKey = qcFileName + "-" + userName + "-beta";
+        String betaKey = sampleFileName + "-" + userName + "-beta";
         betaCache.deleteBetaCache(betaKey);
-        String gammaKey = qcFileName + "-" + userName + "-gamma";
+        String gammaKey = sampleFileName + "-" + userName + "-gamma";
         betaCache.deleteBetaCache(gammaKey);
         String analyseKey = sampleFileName + "-" + userName + "-reAnalyseParam";
         betaCache.deleteBetaCache(analyseKey);
@@ -767,12 +767,12 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         List<String> gammaFittingPara = new LinkedList<>();
         if (Objects.nonNull(cache)) {
             //根据qc文件名称-用户名-beta的方式获取beta的内容
-            Map<String, Object> betaMap = cache.getIfPresent(rrrLogInfo.getQcFileName() + "-" + userName + "-beta");
+            Map<String, Object> betaMap = cache.getIfPresent(rrrLogInfo.getSampleFileName() + "-" + userName + "-beta");
             if (CollectionUtils.isNotEmpty(betaMap)) {
                 betaFittingPara = (List<String>) betaMap.get("fittingPara");
             }
             //根据qc文件名称-用户名-gamma的方式获取gamma的内容
-            Map<String, Object> gammaMap = cache.getIfPresent(rrrLogInfo.getQcFileName() + "-" + userName + "-gamma");
+            Map<String, Object> gammaMap = cache.getIfPresent(rrrLogInfo.getSampleFileName() + "-" + userName + "-gamma");
             if (CollectionUtils.isNotEmpty(gammaMap)) {
                 gammaFittingPara = (List<String>) gammaMap.get("fittingPara");
             }
@@ -1705,7 +1705,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
     }
 
     @Override
-    public Result viewGammaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request) {
+    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
         String userName = JwtUtil.getUserNameByToken(request);
@@ -1825,7 +1825,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     cacheMap.put("Series", oldScatterSeries);
                     cacheMap.put("fittingPara", fittingParaStr);
                     cacheMap.put("fittingParaToUi", fittingParaToUiStr);
-                    cache.put(qcFileName+"-"+userName+"-gamma", cacheMap);
+                    cache.put(sampleFileName+"-"+userName+"-gamma", cacheMap);
                     betaCache.setBetaCache(cache);
                 }
             }
@@ -1852,7 +1852,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
     }
 
     @Override
-    public Result viewBetaDetectorCalibration(Integer sampleId, String qcFileName, HttpServletRequest request) {
+    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, HttpServletRequest request) {
         Result result = new Result();
         Map<String, Object> map = new HashMap<>();
         String userName = JwtUtil.getUserNameByToken(request);
@@ -1974,7 +1974,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     cacheMap.put("Series", oldScatterSeries);
                     cacheMap.put("fittingPara", fittingParaStr);
                     cacheMap.put("fittingParaToUi", fittingParaToUiStr);
-                    cache.put(qcFileName+"-"+userName+"-beta", cacheMap);
+                    cache.put(sampleFileName+"-"+userName+"-beta", cacheMap);
                     betaCache.setBetaCache(cache);
                 }
             }
@@ -2802,7 +2802,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
     }
 
     @Override
-    public Result fitting(Double paramA, Double paramB, Double paramC, List<SeriseData> tempPoints, Integer count, String qcFileName, String tabName, HttpServletRequest request) {
+    public Result fitting(Double paramA, Double paramB, Double paramC, List<SeriseData> tempPoints, Integer count, String sampleFileName, String tabName, HttpServletRequest request) {
         Result result = new Result();
         String userName = JwtUtil.getUserNameByToken(request);
         Cache<String, Map<String, Object>> cache = betaCache.getBetaCache();
@@ -2851,7 +2851,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             cacheMap.put("Series", tempPoints);
             cacheMap.put("fittingPara", fittingParaStr);
             cacheMap.put("fittingParaToUi", fittingParaToUiStr);
-            cache.put(qcFileName+"-"+userName+"-"+tabName, cacheMap);
+            cache.put(sampleFileName+"-"+userName+"-"+tabName, cacheMap);
             betaCache.setBetaCache(cache);
         } else {
             List<Double> fittingPara = new LinkedList<>();
@@ -2909,7 +2909,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             cacheMap.put("Series", seriseDataList);
             cacheMap.put("fittingPara", fittingParaStr);
             cacheMap.put("fittingParaToUi", fittingParaToUiStr);
-            cache.put(qcFileName+"-"+userName+"-"+tabName, cacheMap);
+            cache.put(sampleFileName+"-"+userName+"-"+tabName, cacheMap);
             betaCache.setBetaCache(cache);
         }
         result.setSuccess(true);
@@ -3145,7 +3145,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             //从本地缓存获取beta gamma的数组
             Cache<String, Map<String, Object>> cache = betaCache.getBetaCache();
             //根据qc文件名称-用户名-beta的方式获取beta的内容
-            Map<String, Object> betaMap = cache.getIfPresent(qcFileName + "-" + userName + "-beta");
+            Map<String, Object> betaMap = cache.getIfPresent(sampleFileName + "-" + userName + "-beta");
             List<SeriseData> betaList = new LinkedList<>();
             List<String> betaFittingPara = new LinkedList<>();
             List<String> betaFittingParaToUi = new LinkedList<>();
@@ -3155,7 +3155,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 betaFittingParaToUi = (List<String>) betaMap.get("fittingParaToUi");
             }
             //根据qc文件名称-用户名-gamma的方式获取gamma的内容
-            Map<String, Object> gammaMap = cache.getIfPresent(qcFileName + "-" + userName + "-gamma");
+            Map<String, Object> gammaMap = cache.getIfPresent(sampleFileName + "-" + userName + "-gamma");
             List<SeriseData> gammaList = new LinkedList<>();
             List<String> gammaFittingPara = new LinkedList<>();
             List<String> gammaFittingParaToUi = new LinkedList<>();
@@ -3367,7 +3367,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 //从本地缓存获取beta gamma的数组
                 Cache<String, Map<String, Object>> cache = betaCache.getBetaCache();
                 //根据qc文件名称-用户名-beta的方式获取beta的内容
-                Map<String, Object> betaMap = cache.getIfPresent(currentQCFileName + "-" + userName + "-beta");
+                Map<String, Object> betaMap = cache.getIfPresent(currentFileName + "-" + userName + "-beta");
                 List<SeriseData> betaList = new LinkedList<>();
                 List<String> betaFittingPara = new LinkedList<>();
                 List<String> betaFittingParaToUi = new LinkedList<>();
@@ -3375,10 +3375,10 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     betaList = (List<SeriseData>)betaMap.get("Series");
                     betaFittingPara = (List<String>) betaMap.get("fittingPara");
                     betaFittingParaToUi = (List<String>) betaMap.get("fittingParaToUi");
-                    cache.put(qcFileName+ "-" + userName + "-beta", betaMap);
+                    cache.put(sampleFileName+ "-" + userName + "-beta", betaMap);
                 }
                 //根据qc文件名称-用户名-gamma的方式获取gamma的内容
-                Map<String, Object> gammaMap = cache.getIfPresent(currentQCFileName + "-" + userName + "-gamma");
+                Map<String, Object> gammaMap = cache.getIfPresent(currentFileName + "-" + userName + "-gamma");
                 List<SeriseData> gammaList = new LinkedList<>();
                 List<String> gammaFittingPara = new LinkedList<>();
                 List<String> gammaFittingParaToUi = new LinkedList<>();
@@ -3386,7 +3386,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     gammaList = (List<SeriseData>)gammaMap.get("Series");
                     gammaFittingPara = (List<String>) gammaMap.get("fittingPara");
                     gammaFittingParaToUi = (List<String>) gammaMap.get("fittingParaToUi");
-                    cache.put(qcFileName+ "-" + userName + "-gamma", gammaMap);
+                    cache.put(sampleFileName+ "-" + userName + "-gamma", gammaMap);
                 }
 
                 if (analyseData.isBetaEnergyValid()) {
@@ -3621,7 +3621,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             //获取本地缓存的数据信息
             Cache<String, Map<String, Object>> cache = betaCache.getBetaCache();
             //根据qc文件名称-用户名-beta的方式获取beta的内容
-            Map<String, Object> betaMap = cache.getIfPresent(qcFileName + "-" + userName + "-beta");
+            Map<String, Object> betaMap = cache.getIfPresent(sampleFileName + "-" + userName + "-beta");
             List<SeriseData> betaList = new LinkedList<>();
             List<String> betaFittingParaToUi = new LinkedList<>();
             if (CollectionUtils.isNotEmpty(betaMap)) {
@@ -3629,7 +3629,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 betaFittingParaToUi = (List<String>) betaMap.get("fittingParaToUi");
             }
             //根据qc文件名称-用户名-gamma的方式获取gamma的内容
-            Map<String, Object> gammaMap = cache.getIfPresent(qcFileName + "-" + userName + "-gamma");
+            Map<String, Object> gammaMap = cache.getIfPresent(sampleFileName + "-" + userName + "-gamma");
             List<SeriseData> gammaList = new LinkedList<>();
             List<String> gammaFittingParaToUi = new LinkedList<>();
             if (CollectionUtils.isNotEmpty(gammaMap)) {
@@ -3763,7 +3763,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     //获取本地缓存的数据信息
                     Cache<String, Map<String, Object>> cache = betaCache.getBetaCache();
                     //根据qc文件名称-用户名-beta的方式获取beta的内容
-                    Map<String, Object> betaMap = cache.getIfPresent(qcFileName + "-" + userName + "-beta");
+                    Map<String, Object> betaMap = cache.getIfPresent(sampleFileName + "-" + userName + "-beta");
                     List<SeriseData> betaList = new LinkedList<>();
                     List<String> betaFittingParaToUi = new LinkedList<>();
                     if (CollectionUtils.isNotEmpty(betaMap)) {
@@ -3771,7 +3771,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                         betaFittingParaToUi = (List<String>) betaMap.get("fittingParaToUi");
                     }
                     //根据qc文件名称-用户名-gamma的方式获取gamma的内容
-                    Map<String, Object> gammaMap = cache.getIfPresent(qcFileName + "-" + userName + "-gamma");
+                    Map<String, Object> gammaMap = cache.getIfPresent(sampleFileName + "-" + userName + "-gamma");
                     List<SeriseData> gammaList = new LinkedList<>();
                     List<String> gammaFittingParaToUi = new LinkedList<>();
                     if (CollectionUtils.isNotEmpty(gammaMap)) {
@@ -3930,7 +3930,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         //从本地缓存获取beta gamma的数组
         Cache<String, Map<String, Object>> cache = betaCache.getBetaCache();
         //根据qc文件名称-用户名-beta的方式获取beta的内容
-        Map<String, Object> betaMap = cache.getIfPresent(anlyseResultIn.getQcFileName() + "-" + userName + "-beta");
+        Map<String, Object> betaMap = cache.getIfPresent(anlyseResultIn.getSampleFileName() + "-" + userName + "-beta");
         List<SeriseData> betaList = new LinkedList<>();
         List<String> betaFittingPara = new LinkedList<>();
         if (CollectionUtils.isNotEmpty(betaMap)) {
@@ -3938,7 +3938,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             betaFittingPara = (List<String>) betaMap.get("fittingPara");
         }
         //根据qc文件名称-用户名-gamma的方式获取gamma的内容
-        Map<String, Object> gammaMap = cache.getIfPresent(anlyseResultIn.getQcFileName() + "-" + userName + "-gamma");
+        Map<String, Object> gammaMap = cache.getIfPresent(anlyseResultIn.getSampleFileName() + "-" + userName + "-gamma");
         List<SeriseData> gammaList = new LinkedList<>();
         List<String> gammaFittingPara = new LinkedList<>();
         if (CollectionUtils.isNotEmpty(gammaMap)) {
@@ -4198,7 +4198,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         //从本地缓存获取beta gamma的数组
         Cache<String, Map<String, Object>> cache = betaCache.getBetaCache();
         //根据qc文件名称-用户名-beta的方式获取beta的内容
-        Map<String, Object> betaMap = cache.getIfPresent(anlyseResultIn.getQcFileName() + "-" + userName + "-beta");
+        Map<String, Object> betaMap = cache.getIfPresent(anlyseResultIn.getSampleFileName() + "-" + userName + "-beta");
         List<SeriseData> betaList = new LinkedList<>();
         List<String> betaFittingPara = new LinkedList<>();
         List<String> betaFittingParaToUi = new LinkedList<>();
@@ -4208,7 +4208,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             betaFittingParaToUi = (List<String>) betaMap.get("fittingParaToUi");
         }
         //根据qc文件名称-用户名-gamma的方式获取gamma的内容
-        Map<String, Object> gammaMap = cache.getIfPresent(anlyseResultIn.getQcFileName() + "-" + userName + "-gamma");
+        Map<String, Object> gammaMap = cache.getIfPresent(anlyseResultIn.getSampleFileName() + "-" + userName + "-gamma");
         List<SeriseData> gammaList = new LinkedList<>();
         List<String> gammaFittingPara = new LinkedList<>();
         List<String> gammaFittingParaToUi = new LinkedList<>();