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 61b27367..d3cb9cef 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
@@ -176,7 +176,6 @@ public class SelfStationUtil extends AbstractLogOrReport {
                     detVueData.setROITwoBetaStart(startChannel);
                     detVueData.setROITwoBetaStop(endChannel);
                     detVueData.setROITwoList(seriseDataList);
-                    sampleVueData.setROITwoCounts((List<Long>)twoMap.get("counts"));
                 }
                 map.put("ROITwoStart",  roiBBoundaryStart.get(1));
                 map.put("ROITwoStop", roiBBoundaryStop.get(1));
@@ -894,7 +893,7 @@ public class SelfStationUtil extends AbstractLogOrReport {
             out.println("MSG_ID " + struct.msg_id + " " + struct.msg_type + "\n" + "DATA_TYPE " + struct.data_type);
             out.println("#Header 3");
             // 解析出的Gamma谱 系统类型暂时使用G
-            out.println(struct.site_code + " " + struct.detector_code + " G " +
+            out.println(struct.site_code + " " + struct.detector_code + " C " +
                     struct.sample_geometry + "          " + struct.spectrum_quantity);
             out.println(struct.sample_ref_id);
             out.println(struct.measurement_id + "      " + struct.detector_bk_measurement_id + "      0");
@@ -924,9 +923,9 @@ public class SelfStationUtil extends AbstractLogOrReport {
                 String str = g_counts.get(i).toString();
                 if(i % 5 == 0) {
                     if (i == 0) {
-                        out.printf(i+"");
+                        out.printf((i+1)+"");
                     } else {
-                        out.printf("\n" + i );
+                        out.printf("\n" + (i+1) );
                     }
                     beforeStr = i+"";
                 }
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 55761b08..771047e7 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
@@ -5666,6 +5666,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
                                 }
                                 if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
                                     redisUtil.set("mdcInfoMap-G", mdcInfoMap);
+                                    // todo 暂时和气体使用一样的
+                                    redisUtil.set("mdcInfoMap-C", mdcInfoMap);
                                 }
                             }
                         }
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 2004d8e8..1ad3a87e 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
@@ -263,13 +263,13 @@ public class SelfStationServiceImpl implements ISelfStationService {
 
                     // Gamma文件内容转换为PHD实体
                     sampleVueData.setROIOneFileName(gammaOneName);
-                    sampleVueData.setROIOnePHDFile(selfStationUtil.getGammaPHD(gammaTwoName, path));
+                    sampleVueData.setROIOnePHDFile(selfStationUtil.getGammaPHD(gammaOneName, path));
                     sampleVueData.setROITwoFileName(gammaTwoName);
                     sampleVueData.setROITwoPHDFile(selfStationUtil.getGammaPHD(gammaTwoName, path));
                     sampleVueData.setROIThreeFileName(gammaThreeName);
-                    sampleVueData.setROIThreePHDFile(selfStationUtil.getGammaPHD(gammaTwoName, path));
+                    sampleVueData.setROIThreePHDFile(selfStationUtil.getGammaPHD(gammaThreeName, path));
                     sampleVueData.setROIFourFileName(gammaFourName);
-                    sampleVueData.setROIFourPHDFile(selfStationUtil.getGammaPHD(gammaTwoName, path));
+                    sampleVueData.setROIFourPHDFile(selfStationUtil.getGammaPHD(gammaFourName, path));
 
                     resultMap.put("sample", map);
                     // 初始化Configure
@@ -3324,6 +3324,11 @@ public class SelfStationServiceImpl implements ISelfStationService {
                 Map<String, Object> map = new HashMap<>();
                 //分析时将phd的核素map重置
                 phd.setPhdNuclideMap(nuclideLinesMap);
+                //读取redis缓存的计算mdc信息
+                Map<String, CalMDCInfo> mdcInfoMap = (Map<String, CalMDCInfo>) redisUtil.get("mdcInfoMap-"+phd.getHeader().getSystem_type());
+                if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
+                    phd.setMdcInfoMap(mdcInfoMap);
+                }
                 //调用分析算法
                 boolean analyseSpectrum = gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
                 if (analyseSpectrum) {