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 095fff1b..be865e00 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
@@ -2345,30 +2345,66 @@ public class GammaFileUtil extends AbstractLogOrReport {
         //文本日志内容第六部分数据
         if(middleData.calibration_pairs_E_idCalPoint.size()>0) {
             String title = String.format("Energy Calibration [%s ]", middleData.calibration_pairs_E_Input);
-            String[] dataTitle = new String[]{title, "Function:", "E:", "P:", "Err:", "Data:"};
-            String[] dataContent = new String[]{"", middleData.calibration_E_functionTypeDef, middleData.calibration_E_functionDef, middleData.calibration_E_coeff_string, middleData.calibration_E_uncoeff_string, middleData.calibration_pairs_E_Input};
-            strBuffer.append(attributeGFormat(dataTitle, dataContent));
+            strBuffer.append(title);
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-17s%s", "Function:", " ", middleData.calibration_E_functionTypeDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "E:", " ", middleData.calibration_E_functionDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "P:", " ", middleData.calibration_E_coeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-22s%s", "Err:", " ", middleData.calibration_E_uncoeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-21s%s", "Data:", " ", middleData.calibration_pairs_E_Input));
+            strBuffer.append(System.lineSeparator());
         }
         //文本日志内容第七部分数据
         if(middleData.calibration_pairs_R_idCalPoint.size()>0) {
             String title = String.format("Resolution Calibration [%s ]", middleData.calibration_pairs_R_Input);
-            String[] dataTitle = new String[]{title, "Function:", "E:", "P:", "Err:", "Data:"};
-            String[] dataContent = new String[]{"", middleData.calibration_R_functionTypeDef, middleData.calibration_R_functionDef, middleData.calibration_R_coeff_string, middleData.calibration_R_uncoeff_string, middleData.calibration_pairs_R_Input};
-            strBuffer.append(attributeGFormat(dataTitle, dataContent));
+            strBuffer.append(title);
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-17s%s", "Function:", " ", middleData.calibration_R_functionTypeDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "E:", " ", middleData.calibration_R_functionDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "P:", " ", middleData.calibration_R_coeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-22s%s", "Err:", " ", middleData.calibration_R_uncoeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-21s%s", "Data:", " ", middleData.calibration_pairs_R_Input));
+            strBuffer.append(System.lineSeparator());
         }
         //文本日志内容第八部分数据
         if(middleData.calibration_pairs_EF_idCalPoint.size()>0) {
             String title = String.format("Efficiency Calibration [%s ]", middleData.calibration_pairs_EF_Input);
-            String[] dataTitle = new String[]{title, "Function:", "E:", "P:", "Err:", "Data:"};
-            String[] dataContent = new String[]{"", middleData.calibration_EF_functionTypeDef, middleData.calibration_EF_functionDef, middleData.calibration_EF_coeff_string, middleData.calibration_EF_uncoeff_string, middleData.calibration_pairs_EF_Input};
-            strBuffer.append(attributeGFormat(dataTitle, dataContent));
+            strBuffer.append(title);
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-17s%s", "Function:", " ", middleData.calibration_EF_functionTypeDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "E:", " ", middleData.calibration_EF_functionDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "P:", " ", middleData.calibration_EF_coeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-22s%s", "Err:", " ", middleData.calibration_EF_uncoeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-21s%s", "Data:", " ", middleData.calibration_pairs_EF_Input));
+            strBuffer.append(System.lineSeparator());
         }
         //文本日志内容第九部分数据
         if(middleData.calibration_pairs_T_idCalPoint.size()>0) {
             String title = String.format("Tot_efficiency Calibration [%s ]", middleData.calibration_pairs_T_Input);
-            String[] dataTitle = new String[]{title, "Function:", "E:", "P:", "Err:", "Data:"};
-            String[] dataContent = new String[]{"", middleData.calibration_T_functionTypeDef, middleData.calibration_T_functionDef, middleData.calibration_T_coeff_string, middleData.calibration_T_uncoeff_string, middleData.calibration_pairs_T_Input};
-            strBuffer.append(attributeGFormat(dataTitle, dataContent));
+            strBuffer.append(title);
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-17s%s", "Function:", " ", middleData.calibration_T_functionTypeDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "E:", " ", middleData.calibration_T_functionDef));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-24s%s", "P:", " ", middleData.calibration_T_coeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-22s%s", "Err:", " ", middleData.calibration_T_uncoeff_string));
+            strBuffer.append(System.lineSeparator());
+            strBuffer.append(rowFormat("%s%-21s%s", "Data:", " ", middleData.calibration_pairs_T_Input));
+            strBuffer.append(System.lineSeparator());
         }
         //文本日志内容第十一部分头部信息
         String logHead11 = "%s Calibration Finished %s";
@@ -2569,33 +2605,33 @@ public class GammaFileUtil extends AbstractLogOrReport {
             //换行
             strBuffer.append(System.lineSeparator());
             //报告内容第一部分数据
-            strBuffer.append(rowFormat("%sStation ID:%-29s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_stationID));
+            strBuffer.append(rowFormat("%sStation ID:%-25s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_stationID));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sDetector ID:%-28s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_detectID));
+            strBuffer.append(rowFormat("%sDetector ID:%-24s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_detectID));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sSample ID:%-30s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_id));
+            strBuffer.append(rowFormat("%sSample ID:%-26s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_id));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sSample Geometry:%-24s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_Geometry));
+            strBuffer.append(rowFormat("%sSample Geometry:%-20s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_Geometry));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sSample Quantity[m3]:%-20s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_quantity));
+            strBuffer.append(rowFormat("%sSample Quantity[m3]:%-16s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_quantity));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sSample Type:%-28s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_Type));
+            strBuffer.append(rowFormat("%sSample Type:%-24s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_Type));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sCollection Start:%-23s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_collection_start));
+            strBuffer.append(rowFormat("%sCollection Start:%-19s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_collection_start));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sCollection Stop:%-24s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_collection_stop));
+            strBuffer.append(rowFormat("%sCollection Stop:%-20s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_collection_stop));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sSampling Time[h]:%-23s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_time));
+            strBuffer.append(rowFormat("%sSampling Time[h]:%-19s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_time));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sDecay Time[h]:%-26s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_decay_time));
+            strBuffer.append(rowFormat("%sDecay Time[h]:%-22s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_decay_time));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sAcquisition Start:%-22s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_acquisiton_start));
+            strBuffer.append(rowFormat("%sAcquisition Start:%-18s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_acquisiton_start));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sAcquisition Stop:%-23s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_acquistion_stop));
+            strBuffer.append(rowFormat("%sAcquisition Stop:%-19s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_acquistion_stop));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sAcquisition Time[s]:%-20s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_acquistion_time));
+            strBuffer.append(rowFormat("%sAcquisition Time[s]:%-16s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_acquistion_time));
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sAvg Flow Rate[m3/h]:%-20s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_Avg_Flow_Rate));
+            strBuffer.append(rowFormat("%sAvg Flow Rate[m3/h]:%-16s%s", StringPool.SPACE, StringPool.SPACE, middleData.sample_Avg_Flow_Rate));
             strBuffer.append(System.lineSeparator());
             String[] cells1 = new String[]{" Collection Station Comments"};
             String[] datas1 = new String[]{middleData.Collection_Station_Comments};
@@ -2606,7 +2642,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
             for (int i=0; i< title1.size(); i++) {
                 String title = title1.get(i);
                 String content = content1.get(i);
-                strBuffer.append(String.format("%s:%-12s%s", title, StringPool.SPACE, content));
+                strBuffer.append(String.format("%s:%-8s%s", title, StringPool.SPACE, content));
                 //换行
                 strBuffer.append(System.lineSeparator());
             }
@@ -2620,7 +2656,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
             for (int i=0; i< title2.size(); i++) {
                 String title = title2.get(i);
                 String content = content2.get(i);
-                strBuffer.append(String.format("%s:%-14s%s", title, StringPool.SPACE, content));
+                strBuffer.append(String.format("%s:%-10s%s", title, StringPool.SPACE, content));
                 //换行
                 strBuffer.append(System.lineSeparator());
             }
@@ -2649,20 +2685,20 @@ public class GammaFileUtil extends AbstractLogOrReport {
             for (int i=0; i< title3.size(); i++) {
                 String title = title3.get(i);
                 String content = content3.get(i);
-                strBuffer.append(String.format("%s:%-20s%s", title, StringPool.SPACE, content));
+                strBuffer.append(String.format("%s:%-16s%s", title, StringPool.SPACE, content));
                 //换行
                 strBuffer.append(System.lineSeparator());
             }
-            strBuffer.append(String.format("%s:%-8s%s", " Keyline Activities for Nuclides", StringPool.SPACE, ""));
+            strBuffer.append(String.format("%s:%-4s%s", " Keyline Activities for Nuclides", StringPool.SPACE, ""));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(String.format("%s:%-12s%s", " with defined Reference Line", StringPool.SPACE, ""));
+            strBuffer.append(String.format("%s:%-8s%s", " with defined Reference Line", StringPool.SPACE, ""));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(String.format("%s:%-16s%s", " Activity Reference Time", StringPool.SPACE, middleData.sample_acquisiton_start));
+            strBuffer.append(String.format("%s:%-12s%s", " Activity Reference Time", StringPool.SPACE, middleData.sample_acquisiton_start));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(String.format("%s:%-11s%s", " Concentration Reference Time", StringPool.SPACE, middleData.sample_collection_start));
+            strBuffer.append(String.format("%s:%-7s%s", " Concentration Reference Time", StringPool.SPACE, middleData.sample_collection_start));
             //换行
             strBuffer.append(System.lineSeparator());
             //换行
@@ -2725,38 +2761,38 @@ public class GammaFileUtil extends AbstractLogOrReport {
             strBuffer.append("#PROCESSING PARAMETERS");
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sECutAnalysis_Low:%-23s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getECutAnalysis_Low())));
+            strBuffer.append(rowFormat("%sECutAnalysis_Low:%-19s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getECutAnalysis_Low())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sECutAnalysis_High:%-22s%s", StringPool.SPACE, StringPool.SPACE, middleData.setting_specSetup.getECutAnalysis_High()==-9999?"inf":String.valueOf(middleData.setting_specSetup.getECutAnalysis_High())));
+            strBuffer.append(rowFormat("%sECutAnalysis_High:%-18s%s", StringPool.SPACE, StringPool.SPACE, middleData.setting_specSetup.getECutAnalysis_High()==-9999?"inf":String.valueOf(middleData.setting_specSetup.getECutAnalysis_High())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sEnergyTolerance:%-24s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getEnergyTolerance())));
+            strBuffer.append(rowFormat("%sEnergyTolerance:%-20s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getEnergyTolerance())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sBaseImprovePSS:%-25s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getBaseImprovePSS())));
+            strBuffer.append(rowFormat("%sBaseImprovePSS:%-21s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getBaseImprovePSS())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sPSS_low:%-32s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getPss_low())));
+            strBuffer.append(rowFormat("%sPSS_low:%-28s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getPss_low())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sk_back:%-33s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getK_back())));
+            strBuffer.append(rowFormat("%sk_back:%-29s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getK_back())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sk_alpha:%-32s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getK_alpha())));
+            strBuffer.append(rowFormat("%sk_alpha:%-28s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getK_alpha())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sk_beta:%-33s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getK_beta())));
+            strBuffer.append(rowFormat("%sk_beta:%-29s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getK_beta())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sRiskLevelK:%-29s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getRiskLevelK())));
+            strBuffer.append(rowFormat("%sRiskLevelK:%-25s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getRiskLevelK())));
             //换行
             strBuffer.append(System.lineSeparator());
             Date refTimeAct = middleData.setting_specSetup.getRefTime_act();
-            strBuffer.append(rowFormat("%srefTime_act:%-28s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(refTimeAct), "yyyy-MM-dd HH:mm:ss"));
+            strBuffer.append(rowFormat("%srefTime_act:%-24s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(refTimeAct), "yyyy-MM-dd HH:mm:ss"));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%srefTime_conc:%-27s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(middleData.setting_specSetup.getRefTime_conc(), "yyyy-MM-dd HH:mm:ss")));
+            strBuffer.append(rowFormat("%srefTime_conc:%-23s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(middleData.setting_specSetup.getRefTime_conc(), "yyyy-MM-dd HH:mm:ss")));
             //换行
             strBuffer.append(System.lineSeparator());
             //换行
@@ -2764,16 +2800,16 @@ public class GammaFileUtil extends AbstractLogOrReport {
             strBuffer.append("#CALIBRATION PARAMETERS");
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sCalibrationPSS_low:%-21s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getCalibrationPSS_low())));
+            strBuffer.append(rowFormat("%sCalibrationPSS_low:%-17s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getCalibrationPSS_low())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sCalibrationPSS_high:%-20s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getCalibrationPSS_high())));
+            strBuffer.append(rowFormat("%sCalibrationPSS_high:%-16s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getCalibrationPSS_high())));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sbUpdateCal:%-29s%s", StringPool.SPACE, StringPool.SPACE, (middleData.setting_specSetup.isBUpdateCal()?"1":"0")));
+            strBuffer.append(rowFormat("%sbUpdateCal:%-25s%s", StringPool.SPACE, StringPool.SPACE, (middleData.setting_specSetup.isBUpdateCal()?"1":"0")));
             //换行
             strBuffer.append(System.lineSeparator());
-            strBuffer.append(rowFormat("%sKeepCalPeakSearchPeaks:%-17s%s", StringPool.SPACE, StringPool.SPACE, (middleData.setting_specSetup.isKeepCalPeakSearchPeaks()?"1":"0")));
+            strBuffer.append(rowFormat("%sKeepCalPeakSearchPeaks:%-13s%s", StringPool.SPACE, StringPool.SPACE, (middleData.setting_specSetup.isKeepCalPeakSearchPeaks()?"1":"0")));
             //换行
             strBuffer.append(System.lineSeparator());
             //换行
@@ -2785,7 +2821,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 strBuffer.append(" Energy Calibration ["+middleData.calibration_pairs_E_Input+" ]");
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sFunction:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_E_functionTypeDef));
+                strBuffer.append(rowFormat("%sFunction:%-27s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_E_functionTypeDef));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 String[] cellsE4 = new String[]{" E"};
@@ -2797,7 +2833,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< titleE4.size(); i++) {
                     String title = titleE4.get(i);
                     String content = contentE4.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
@@ -2810,16 +2846,16 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< title4.size(); i++) {
                     String title = title4.get(i);
                     String content = content4.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sErr:%-36s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_E_uncoeff_string));
+                strBuffer.append(rowFormat("%sErr:%-32s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_E_uncoeff_string));
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sData:%-35s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_E_Input));
+                strBuffer.append(rowFormat("%sData:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_E_Input));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 //换行
@@ -2831,7 +2867,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 strBuffer.append(" Resolution Calibration ["+middleData.calibration_pairs_R_Input+" ]");
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sFunction:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_R_functionTypeDef));
+                strBuffer.append(rowFormat("%sFunction:%-27s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_R_functionTypeDef));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 String[] cellsE5 = new String[]{" E"};
@@ -2843,7 +2879,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< titleE5.size(); i++) {
                     String title = titleE5.get(i);
                     String content = contentE5.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
@@ -2856,14 +2892,14 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< title5.size(); i++) {
                     String title = title5.get(i);
                     String content = content5.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
-                strBuffer.append(rowFormat("%sErr:%-36s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_R_uncoeff_string));
+                strBuffer.append(rowFormat("%sErr:%-32s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_R_uncoeff_string));
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sData:%-35s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_R_Input));
+                strBuffer.append(rowFormat("%sData:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_R_Input));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 //换行
@@ -2873,7 +2909,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 strBuffer.append(" Efficiency Calibration ["+middleData.calibration_pairs_EF_Input+" ]");
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sFunction:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_EF_functionTypeDef));
+                strBuffer.append(rowFormat("%sFunction:%-27s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_EF_functionTypeDef));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 String[] cellsE6 = new String[]{" E"};
@@ -2885,7 +2921,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< titleE6.size(); i++) {
                     String title = titleE6.get(i);
                     String content = contentE6.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
@@ -2898,14 +2934,14 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< title6.size(); i++) {
                     String title = title6.get(i);
                     String content = content6.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
-                strBuffer.append(rowFormat("%sErr:%-36s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_EF_uncoeff_string));
+                strBuffer.append(rowFormat("%sErr:%-32s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_EF_uncoeff_string));
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sData:%-35s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_EF_Input));
+                strBuffer.append(rowFormat("%sData:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_EF_Input));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 //换行
@@ -2915,7 +2951,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 strBuffer.append(" Tot_efficiency Calibration ["+middleData.calibration_pairs_T_Input+" ]");
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sFunction:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_T_functionTypeDef));
+                strBuffer.append(rowFormat("%sFunction:%-27s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_T_functionTypeDef));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 String[] cellsE7 = new String[]{" E"};
@@ -2927,7 +2963,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< titleE7.size(); i++) {
                     String title = titleE7.get(i);
                     String content = contentE7.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
@@ -2940,14 +2976,14 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 for (int i=0; i< title7.size(); i++) {
                     String title = title7.get(i);
                     String content = content7.get(i);
-                    strBuffer.append(rowFormat("%s:%-38s%s", title, StringPool.SPACE, content));
+                    strBuffer.append(rowFormat("%s:%-34s%s", title, StringPool.SPACE, content));
                     //换行
                     strBuffer.append(System.lineSeparator());
                 }
-                strBuffer.append(rowFormat("%sErr:%-36s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_T_uncoeff_string));
+                strBuffer.append(rowFormat("%sErr:%-32s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_T_uncoeff_string));
                 //换行
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sData:%-35s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_T_Input));
+                strBuffer.append(rowFormat("%sData:%-31s%s", StringPool.SPACE, StringPool.SPACE, middleData.calibration_pairs_T_Input));
                 //换行
                 strBuffer.append(System.lineSeparator());
                 //换行
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
index e4b96acb..161cce2c 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
@@ -1001,44 +1001,44 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append("#FILE INFORMATION");
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sSampleMeasID:%-38s%s", StringPool.SPACE, StringPool.SPACE, information.getMeasurementID()));
+                strBuffer.append(rowFormat("%sSampleMeasID:%-15s%s", StringPool.SPACE, StringPool.SPACE, information.getMeasurementID()));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sGASBKMeasID:%-39s%s", StringPool.SPACE, StringPool.SPACE, information.getGasBkgdMeasurementID()));
+                strBuffer.append(rowFormat("%sGASBKMeasID:%-16s%s", StringPool.SPACE, StringPool.SPACE, information.getGasBkgdMeasurementID()));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sSRID:%-46s%s", StringPool.SPACE, StringPool.SPACE, information.getSampleRefId()));
+                strBuffer.append(rowFormat("%sSRID:%-23s%s", StringPool.SPACE, StringPool.SPACE, information.getSampleRefId()));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sDetector Type:%-37s%s", StringPool.SPACE, StringPool.SPACE, "3D b-g"));
+                strBuffer.append(rowFormat("%sDetector Type:%-14s%s", StringPool.SPACE, StringPool.SPACE, "3D b-g"));
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append("#COLLECTION INFORMATION");
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sStation CODE:%-38s%s", StringPool.SPACE, StringPool.SPACE, information.getSit_det_code()));
+                strBuffer.append(rowFormat("%sStation CODE:%-15s%s", StringPool.SPACE, StringPool.SPACE, information.getSit_det_code()));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sDetector CODE:%-37s%s", StringPool.SPACE, StringPool.SPACE, information.getDetect_code()));
+                strBuffer.append(rowFormat("%sDetector CODE:%-14s%s", StringPool.SPACE, StringPool.SPACE, information.getDetect_code()));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sCollection Start:%-34s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getCollect_start(), "yyyy/MM/dd HH:mm:ss")));
+                strBuffer.append(rowFormat("%sCollection Start:%-11s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getCollect_start(), "yyyy/MM/dd HH:mm:ss")));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sCollection Stop:%-35s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss")));
+                strBuffer.append(rowFormat("%sCollection Stop:%-12s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss")));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sCollection TIME(h):%-32s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(((information.getCollect_stop().getTime()-information.getCollect_start().getTime())/1000)/3600)));
+                strBuffer.append(rowFormat("%sCollection TIME(h):%-9s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(((information.getCollect_stop().getTime()-information.getCollect_start().getTime())/1000)/3600)));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sAir Volume[cm3]:%-35s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getS_xe_stable_volume())));
+                strBuffer.append(rowFormat("%sAir Volume[cm3]:%-12s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getS_xe_stable_volume())));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sXe Volume[cm3]:%-36s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getS_volume_of_Xe())));
+                strBuffer.append(rowFormat("%sXe Volume[cm3]:%-13s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getS_volume_of_Xe())));
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append("#ACQUISITION INFORMATION");
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sAcquisition Start:%-33s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss")));
+                strBuffer.append(rowFormat("%sAcquisition Start:%-10s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss")));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sAcq Real Time(s):%-34s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getAcquisition_real_sec())));
+                strBuffer.append(rowFormat("%sAcq Real Time(s):%-11s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getAcquisition_real_sec())));
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sAcq Live Time:%-37s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getAcquisition_live_sec())));
+                strBuffer.append(rowFormat("%sAcq Live Time:%-14s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getAcquisition_live_sec())));
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append("#SOFTWARE");
                 strBuffer.append(System.lineSeparator());
-                strBuffer.append(rowFormat("%sversion:%-43s%s", StringPool.SPACE, StringPool.SPACE, "1.0.1"));
+                strBuffer.append(rowFormat("%sversion:%-20s%s", StringPool.SPACE, StringPool.SPACE, "1.0.1"));
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append(System.lineSeparator());
                 strBuffer.append("#SAMPLE Old CALIBRATION");
@@ -3297,7 +3297,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
                         gammaList = betaDataFile.getGammaList();
                         gammaFittingPara = betaDataFile.getGammaFittingPara();
                         gammaFittingParaToUi = betaDataFile.getGammaFittingParaToUi();
-
                     }
                     List<Double> geCal = new LinkedList<>();
                     geCal.add(Double.valueOf(gammaFittingParaToUi.get(0)));