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 b9d944e1..84f78490 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
@@ -115,8 +115,8 @@ public class PHDFileUtil extends AbstractLogOrReport {
             List<Long> hCounts = struct.h_counts;
             List<HistogramData> histogramDataList = new LinkedList<>();
             List<HistogramData> histogramDataDList = new LinkedList<>();
-            for (int i=0; i<bChannels; i++){
-                for (int j=0; j< gChannels; j++){
+            for (int i=0; i<gChannels; i++){
+                for (int j=0; j< bChannels; j++){
                     Long index = i * bChannels + j;
                     Long count = hCounts.get(index.intValue());
                     if (count > 0){
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
index f01270a1..f2beb69f 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
@@ -138,15 +138,15 @@ public class SelfStationUtil extends AbstractLogOrReport {
                     Long count = hCounts.get(index.intValue());
                     if (count > 0){
                         HistogramData his = new HistogramData();
-                        his.setG(i);
-                        his.setB(j);
+                        his.setB(i);
+                        his.setG(j);
                         his.setC(count);
                         histogramDataList.add(his);
                         histogramDataDList.add(his);
                     }else {
                         HistogramData his = new HistogramData();
-                        his.setG(i);
-                        his.setB(j);
+                        his.setB(i);
+                        his.setG(j);
                         his.setC(count);
                         histogramDataDList.add(his);
                     }
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 a68e5f89..38e12df8 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
@@ -62,10 +62,14 @@ public class SelfStationServiceImpl implements ISelfStationService {
             if (StringUtils.isNotBlank(sampleFileName)) {
                 //拼接sample文件路径
                 String sampleFilePath = path + StringPool.SLASH + sampleFileName;
+
                 //获取sample分析后的对象
                 EnergySpectrumStruct struct = selfStationUtil.getSourceData(sampleFilePath, "sample", selfStationData);
-                selfStationData.setSampleStruct(struct);
-                selfStationUtil.loadFile(selfStationData, null, null, map);
+                if (Objects.nonNull(struct)) {
+                    selfStationData.setSampleStruct(struct);
+                    selfStationData.setSampleTmpPath(sampleFilePath);
+                    selfStationUtil.loadFile(selfStationData, null, null, map);
+                }
             }
             //判断det文件名是否为空
             if (StringUtils.isNotBlank(detFileName)) {
@@ -73,7 +77,10 @@ public class SelfStationServiceImpl implements ISelfStationService {
                 String detFilePath = path + StringPool.SLASH + detFileName;
                 //获取sample分析后的对象
                 EnergySpectrumStruct struct = selfStationUtil.getSourceData(detFilePath, "det", selfStationData);
-                selfStationData.setDetStruct(struct);
+                if (Objects.nonNull(struct)) {
+                    selfStationData.setDetStruct(struct);
+                    selfStationData.setDetTmpPath(detFilePath);
+                }
             }
         }
         //将自建台站的数据封装到缓存对象中