diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
index 0242ec63..eb3e8acc 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
@@ -2665,9 +2665,9 @@ public class GammaFileUtil extends AbstractLogOrReport {
             strBuffer.append(rowFormat(nuclideTitle, nuclideData));
             strBuffer.append(System.lineSeparator());
             for (int i=0; i<middleData.nucl_ided_Nuclidename.size(); i++) {
-                rowFormat(nuclideTitle, StringPool.SPACE + middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Halflife.get(i), String.format("%.3f", Double.valueOf(middleData.nucl_ided_activ_key.get(i))),
+                strBuffer.append(rowFormat(nuclideTitle, StringPool.SPACE + middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Halflife.get(i), String.format("%.3f", Double.valueOf(middleData.nucl_ided_activ_key.get(i))),
                         String.format("%.3f", Double.valueOf(middleData.nucl_ided_activ_key_err.get(i))/Double.valueOf(middleData.nucl_ided_activ_key.get(i))*100), middleData.nucl_ided_mda.get(i),
-                        middleData.nucl_ided_Concentration.get(i), middleData.nucl_ided_MDC.get(i));
+                        middleData.nucl_ided_Concentration.get(i), middleData.nucl_ided_MDC.get(i)));
                 //换行
                 strBuffer.append(System.lineSeparator());
             }
@@ -3584,15 +3584,15 @@ public class GammaFileUtil extends AbstractLogOrReport {
         middleData.sample_acquisiton_start = fileAnlyse.getAcq().getAcquisition_start_date()+StringPool.SPACE+fileAnlyse.getAcq().getAcquisition_start_time();
         String acquisition_start = middleData.sample_acquisiton_start;
         Date dataTime = DateUtils.parseDate(acquisition_start);
-        middleData.sample_acquistion_stop = DateUtils.formatDate(new Date((long) (dataTime.getTime()/1000 + fileAnlyse.getAcq().getAcquisition_live_time()))    , "yyyy/MM/dd HH:mm:ss");
+        middleData.sample_acquistion_stop = DateUtils.formatDate(new Date((long) (dataTime.getTime() + fileAnlyse.getAcq().getAcquisition_live_time())), "yyyy/MM/dd HH:mm:ss");
         middleData.sample_acquistion_time = String.format("%.2f", fileAnlyse.getAcq().getAcquisition_real_time()) ;
         middleData.sample_stationID = fileAnlyse.getHeader().getSite_code();
         middleData.sample_detectID = fileAnlyse.getHeader().getDetector_code();
         middleData.sample_Geometry = fileAnlyse.getHeader().getSample_geometry();
         middleData.sample_Type = fileAnlyse.getHeader().getSystem_type();
         middleData.setting_specSetup = fileAnlyse.getUsedSetting();
-        middleData.Collection_Station_Comments = fileAnlyse.getOriTotalCmt();
-        middleData.NDC_Analysis_General_Comments = fileAnlyse.getTotalCmt();
+        middleData.Collection_Station_Comments = StringUtils.isNotBlank(fileAnlyse.getOriTotalCmt())?fileAnlyse.getOriTotalCmt():"";
+        middleData.NDC_Analysis_General_Comments = StringUtils.isNotBlank(fileAnlyse.getTotalCmt())?fileAnlyse.getTotalCmt():"";
         return bRet;
     }
 
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 c774fa9c..cd670af6 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
@@ -3787,9 +3787,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             result.error500("Please select the parse file first！");
             return result;
         }
-        //分析gamma文件
-        Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type());//GetNuclideLines(nuclides);
-        gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
         //生成对应报告内容
         String reportContent = gammaFileUtil.GetReportContent(phd, userName, false, "log");
         result.setSuccess(true);