diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
index 04b03179..edf3d51e 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
@@ -28,8 +28,7 @@ import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
 import org.jeecg.modules.base.entity.original.GardsSampleData;
 import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
 import org.jeecg.modules.base.enums.SampleFileHeader;
-import org.jeecg.modules.entity.GardsSampleDataSpectrum;
-import org.jeecg.modules.entity.GardsXeResultsSpectrum;
+import org.jeecg.modules.entity.*;
 import org.jeecg.modules.entity.vo.*;
 import org.jeecg.modules.mapper.SpectrumAnalysisMapper;
 import org.jeecg.modules.native_jni.CalValuesHandler;
@@ -148,6 +147,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
         if (dbName.equalsIgnoreCase("auto")){
             dbName = "RNAUTO";
             analysisID = spectrumAnalysisMapper.getAnalysisID(dbName, sampleId, "RNAUTO");
+            // 获取gamma谱
             roiPaths = spectrumAnalysisMapper.roiPaths(dbName, analysisID);
         } else if (dbName.equalsIgnoreCase("man")){
             dbName = "RNMAN";
@@ -325,8 +325,8 @@ public class SelfStationServiceImpl implements ISelfStationService {
                 EnergySpectrumStruct struct = selfStationUtil.getSourceData(sampleFilePath, "sample", selfStationData);
                 if (Objects.nonNull(struct)) {
                     selfStationData.setSampleStruct(struct);
-                    selfStationData.setSampleTmpPath(sampleFilePath);
                     selfStationData.setSampleFileName(sampleFileName);
+                    selfStationData.setSampleFilePathName(sampleFilePath);
                     selfStationUtil.loadFile(selfStationData, null, null, "sample", map);
 
                     SelfStationVueData sampleVueData = selfStationData.getSampleVueData();
@@ -372,7 +372,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
                 EnergySpectrumStruct struct = selfStationUtil.getSourceData(detFilePath, "det", selfStationData);
                 if (Objects.nonNull(struct)) {
                     selfStationData.setDetStruct(struct);
-                    selfStationData.setDetTmpPath(detFilePath);
+                    selfStationData.setDetFilePathName(detFilePath);
                     selfStationData.setDetFileName(detFileName);
                     selfStationUtil.loadFile(selfStationData, null, null, "det", map);
                     resultMap.put("det", map);
@@ -388,7 +388,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
                 EnergySpectrumStruct struct = selfStationUtil.getSourceData(qcFilePath, "qc", selfStationData);
                 if (Objects.nonNull(struct)) {
                     selfStationData.setQcStruct(struct);
-                    selfStationData.setQcTmpPath(qcFilePath);
+                    selfStationData.setQcFilePathName(qcFilePath);
                     selfStationData.setQcFileName(qcFileName);
                     selfStationUtil.loadFile(selfStationData, null, null, "qc", map);
                     resultMap.put("qc", map);
@@ -4933,23 +4933,28 @@ public class SelfStationServiceImpl implements ISelfStationService {
         String sampleFilePathName = selfStationData.getSampleFilePathName();
         String detFilePathName = selfStationData.getDetFilePathName();
         String qcFilePathName = selfStationData.getQcFilePathName();
+
+        String sampleFileName = selfStationData.getSampleFileName();
+        String detFileName = selfStationData.getDetFileName();
+        String qcFileName = selfStationData.getQcFileName();
+
         String sampleTmpPath = selfStationData.getSampleTmpPath();
         String detTmpPath = selfStationData.getDetTmpPath();
         String qcTmpPath = selfStationData.getQcTmpPath();
 
         //根据sample文件名称模糊查询sampleId
         String sampleFilePath = "", qcFilePath = "", detFilePath = "";
-        if (StringUtils.isNotBlank(sampleFilePathName)) {
+        if (StringUtils.isNotBlank(sampleFilePathName) && StringUtils.isNotBlank(sampleFileName)) {
             sampleFilePath = StrUtil.subBefore(sampleFilePathName, StringPool.SLASH, true);
-            sampleFilePathName = phdFileUtil.NameStandardBy(sampleFilePath, sampleFilePathName);
+            sampleFilePathName = phdFileUtil.NameStandardBy(sampleFilePath, sampleFileName);
         }
-        if (StringUtils.isNotBlank(detFilePathName)) {
+        if (StringUtils.isNotBlank(detFilePathName) && StringUtils.isNotBlank(detFileName)) {
             detFilePath = StrUtil.subBefore(detFilePathName, StringPool.SLASH, true);
-            detFilePathName = phdFileUtil.NameStandardBy(detFilePath, detFilePathName);
+            detFilePathName = phdFileUtil.NameStandardBy(detFilePath, detFileName);
         }
-        if (StringUtils.isNotBlank(qcFilePathName)) {
+        if (StringUtils.isNotBlank(qcFilePathName) && StringUtils.isNotBlank(qcFileName)) {
             qcFilePath = StrUtil.subBefore(qcFilePathName, StringPool.SLASH, true);
-            qcFilePathName = phdFileUtil.NameStandardBy(qcFilePath, qcFilePathName);
+            qcFilePathName = phdFileUtil.NameStandardBy(qcFilePath, qcFileName);
         }
 
         // 读取参数内容