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 b3831965..719ded1d 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
@@ -691,27 +691,24 @@ public class SelfStationUtil extends SelfBaseUtil {
         sampleVueData.setROIFourPHDFile(createGammaPHD(struct, gammaFourName, path, sampleVueData.getROIFourCounts()));
     }
 
-    public static void createGamma(String path, String sampleFileName, EnergySpectrumStruct struct, SelfStationVueData sampleVueData, boolean roi) {
+    public static void createGamma(String path, String sampleFileName, EnergySpectrumStruct struct, SelfStationVueData sampleVueData, PHDFile phdFile) {
         // 根据ROI生成四个Gamma谱文件, 文件命名为Beta名称后面_ROI_x.PHD
-        String gammaOneName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_1.PHD";
+        String gammaOneName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_1_r.PHD";
         // 创建Gamma文件
-        createGammaFile(path, gammaOneName, struct, sampleVueData.getROIOneCounts());
-        String gammaTwoName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_2.PHD";
-        createGammaFile(path, gammaTwoName, struct, sampleVueData.getROITwoCounts());
+        createGammaFile(path, gammaOneName, struct, sampleVueData.getROIOneCounts(),phdFile);
+        String gammaTwoName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_2_r.PHD";
+        createGammaFile(path, gammaTwoName, struct, sampleVueData.getROITwoCounts(),phdFile);
 
-        String gammaThreeName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_3.PHD";
-        createGammaFile(path, gammaThreeName, struct, sampleVueData.getROIThreeCounts());
+        String gammaThreeName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_3_r.PHD";
+        createGammaFile(path, gammaThreeName, struct, sampleVueData.getROIThreeCounts(),phdFile);
 
-        String gammaFourName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_4.PHD";
-        createGammaFile(path, gammaFourName, struct, sampleVueData.getROIFourCounts());
+        String gammaFourName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_4_r.PHD";
+        createGammaFile(path, gammaFourName, struct, sampleVueData.getROIFourCounts(),phdFile);
 
         // Gamma文件内容转换为PHD实体
         sampleVueData.setROIOneFileName(gammaOneName);
-        if (roi) {
-            sampleVueData.setROIOnePHDFile(createGammaPHD(struct, gammaOneName, path, sampleVueData.getROIOneCounts()));
-        } else {
-            sampleVueData.setROIOnePHDFile(createGammaPHD(struct, gammaOneName, path, sampleVueData.getROIOneCounts()));
-        }
+        sampleVueData.setROIOnePHDFile(createGammaPHD(struct, gammaOneName, path, sampleVueData.getROIOneCounts()));
+
         sampleVueData.setROITwoFileName(gammaTwoName);
         sampleVueData.setROITwoPHDFile(createGammaPHD(struct, gammaTwoName, path, sampleVueData.getROITwoCounts()));
         sampleVueData.setROIThreeFileName(gammaThreeName);