diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
index cbdfb39a..ce1c6a2e 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
@@ -585,10 +585,8 @@ public class Sample_G_Analysis {
        data.add(item);
        item = new AttributeItemVo("MDC", middleData.getNucl_ided_MDC(), "uBq/m^3");
        data.add(item);
-       writes.addAll(MyLogFormatUtil.getBlockContext(infoMap));
+       writes.addAll(MyLogFormatUtil.getBlockContext(data));
 
-       // Starting Data Quality.....
-       writes.add(MyLogFormatUtil.getHeaderFormat(MyLogFormatUtil.GGetDataQuality));
        data = new ArrayList<>();
        item = new AttributeItemVo("Name", middleData.getQC_CHECK_QC_NAME());
        data.add(item);
@@ -598,7 +596,9 @@ public class Sample_G_Analysis {
        data.add(item);
        item = new AttributeItemVo("Test", middleData.getQC_CHECK_QC_STANDARD());
        data.add(item);
-       writes.addAll(MyLogFormatUtil.getBlockContext(infoMap));
+       writes.addAll(MyLogFormatUtil.getBlockContext(data));
+       // Starting Data Quality.....
+       writes.add(MyLogFormatUtil.getHeaderFormat(MyLogFormatUtil.GGetDataQuality));
 
        // Spectrum Analysis Finished
        writes.add(MyLogFormatUtil.getTitleFormat(MyLogFormatUtil.GTitleSpectrumEnd));
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 055623be..439f9c44 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
@@ -2612,7 +2612,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
         for (int i=0; i<middleData.QC_CHECK_QC_NAME.size();i++){
             String data16 = "Name : %-15s Pass/Fail : %-9s Value : %-14s Test : %-16s";
             String qcName = middleData.QC_CHECK_QC_NAME.get(i);
-            String qcResult = middleData.QC_CHECK_QC_RESULT.get(i).equals("0") ? "Fail" : "Pass";
+            String qcResult = Double.valueOf(middleData.QC_CHECK_QC_RESULT.get(i))< 1? "Fail" : "Pass";
             String qcValue = StringUtils.isBlank(middleData.QC_CHECK_QC_VALUE.get(i))?"null":String.format("%.3f", Double.valueOf(middleData.QC_CHECK_QC_VALUE.get(i)));
             String standard = middleData.QC_CHECK_QC_STANDARD.get(i);
             strBuffer.append(rowFormat(data16, qcName, qcResult, qcValue, standard));
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 e7fe99af..b9d944e1 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
@@ -1663,9 +1663,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第四十四行数据
-            if (bgAnalyseResult.d_b_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_b_fitting_e_c)) {
-                if (bgAnalyseResult.d_b_fitting_e_c.size() > 0) {
-                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.g_b_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_e_c)) {
+                if (bgAnalyseResult.g_b_fitting_e_c.size() > 0) {
+                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2)))));
                 } else {
                     out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1676,9 +1676,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第四十五行数据
-            if (bgAnalyseResult.d_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_b_fitting_c_e)) {
-                if (bgAnalyseResult.d_b_fitting_c_e.size() > 0) {
-                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.g_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_c_e)) {
+                if (bgAnalyseResult.g_b_fitting_c_e.size() > 0) {
+                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2)))));
                 } else {
                     out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1694,9 +1694,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第四十四行数据
-            if (bgAnalyseResult.d_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_e_c)) {
-                if (bgAnalyseResult.d_g_fitting_e_c.size() > 0) {
-                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.g_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_e_c)) {
+                if (bgAnalyseResult.g_g_fitting_e_c.size() > 0) {
+                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2)))));
                 } else {
                     out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1706,9 +1706,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第四十五行数据
-            if (bgAnalyseResult.d_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_c_e)) {
-                if (bgAnalyseResult.d_g_fitting_c_e.size() > 0) {
-                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.g_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_c_e)) {
+                if (bgAnalyseResult.g_g_fitting_c_e.size() > 0) {
+                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2)))));
                 } else {
                     out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1732,12 +1732,12 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第四十八行数据
-            for (int i = 0; i < bgAnalyseResult.D_ROI.size(); i++) {
-                String roi = String.valueOf(bgAnalyseResult.D_ROI.get(i));
-                String bStart = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
-                String bStop = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
-                String gStart = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
-                String gStop = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
+            for (int i = 0; i < bgAnalyseResult.G_ROI.size(); i++) {
+                String roi = String.valueOf(bgAnalyseResult.G_ROI.get(i));
+                String bStart = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
+                String bStop = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
+                String gStart = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
+                String gStop = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
                 out.append(rowFormat(dataFormat7, roi, bStart, bStop, gStart, gStop));
                 //换行
                 out.append(System.lineSeparator());
@@ -1759,9 +1759,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第五十一行数据
-            if (bgAnalyseResult.g_b_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_e_c)) {
-                if (bgAnalyseResult.g_b_fitting_e_c.size() > 0) {
-                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.d_b_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_b_fitting_e_c)) {
+                if (bgAnalyseResult.d_b_fitting_e_c.size() > 0) {
+                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2)))));
                 } else {
                     out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1771,9 +1771,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第五十二行数据
-            if (bgAnalyseResult.g_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_c_e)) {
-                if (bgAnalyseResult.g_b_fitting_c_e.size() > 0) {
-                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.d_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_b_fitting_c_e)) {
+                if (bgAnalyseResult.d_b_fitting_c_e.size() > 0) {
+                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2)))));
                 } else {
                     out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1789,9 +1789,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第五十四行数据
-            if (bgAnalyseResult.g_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_e_c)) {
-                if (bgAnalyseResult.g_g_fitting_e_c.size() > 0) {
-                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2)))));
+            if (bgAnalyseResult.d_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_e_c)) {
+                if (bgAnalyseResult.d_g_fitting_e_c.size() > 0) {
+                    out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2)))));
                 } else {
                     out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1801,9 +1801,9 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第五十五行数据
-            if (bgAnalyseResult.g_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_c_e)) {
-                if (bgAnalyseResult.g_g_fitting_c_e.size() > 0) {
-                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2)))));
+            if (bgAnalyseResult.d_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_c_e)) {
+                if (bgAnalyseResult.d_g_fitting_c_e.size() > 0) {
+                    out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2)))));
                 } else {
                     out.append(rowFormat("channel to energy equation: E(x) =  (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3"));
                 }
@@ -1827,12 +1827,12 @@ public class PHDFileUtil extends AbstractLogOrReport {
             //换行
             out.append(System.lineSeparator());
             //第五十八行数据
-            for (int i = 0; i < bgAnalyseResult.G_ROI.size(); i++) {
-                String roi = String.valueOf(bgAnalyseResult.G_ROI.get(i));
-                String bStart = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
-                String bStop = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
-                String gStart = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
-                String gStop = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
+            for (int i = 0; i < bgAnalyseResult.D_ROI.size(); i++) {
+                String roi = String.valueOf(bgAnalyseResult.D_ROI.get(i));
+                String bStart = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
+                String bStop = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
+                String gStart = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
+                String gStop = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
                 out.append(rowFormat(dataFormat7, roi, bStart, bStop, gStart, gStop));
                 //换行
                 out.append(System.lineSeparator());
@@ -1851,8 +1851,8 @@ public class PHDFileUtil extends AbstractLogOrReport {
             out.append(System.lineSeparator());
             //第六十行数据
             String dataFormat8 = "ROI : %-8sSample : %-8sGasBkgnd : %-7sDetBkgnd : %-8s";
-            for (int i = 0; i < bgAnalyseResult.G_ROI_G_Boundary_stop.size(); i++) {
-                String roi = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
+            for (int i = 0; i < bgAnalyseResult.D_ROI_G_Boundary_stop.size(); i++) {
+                String roi = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
                 String sCts = String.valueOf(bgAnalyseResult.s_roi_cts.get(i));
                 String gCts = String.valueOf(bgAnalyseResult.g_roi_cts.get(i));
                 String dCts = String.valueOf(bgAnalyseResult.d_roi_cts.get(i));
@@ -1880,8 +1880,8 @@ public class PHDFileUtil extends AbstractLogOrReport {
 //            out.append(System.lineSeparator());
             //第六十三行数据
             String dataFormat9 = "ROI : %-8sNet count : %-2s+/- %-20sLC : %-12s";
-            for (int i = 0; i < bgAnalyseResult.G_ROI_G_Boundary_stop.size(); i++) {
-                String roi = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
+            for (int i = 0; i < bgAnalyseResult.D_ROI_G_Boundary_stop.size(); i++) {
+                String roi = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
                 String net = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_net_coutns.get(i)));
                 String netErr = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_net_coutns_err.get(i)));
                 String lcCts = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.LC_CTS.get(i)));
@@ -1903,8 +1903,8 @@ public class PHDFileUtil extends AbstractLogOrReport {
             out.append(System.lineSeparator());
             //第六十五行数据
             String dataFormat10 = "ROI : %-8sConc : %-2s+/- %-2smBq/m3                      LC : %-2smBq/m3            MDC : %-2smBq/m3            ";
-            for (int i = 0; i < bgAnalyseResult.G_ROI_G_Boundary_stop.size(); i++) {
-                String roi = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
+            for (int i = 0; i < bgAnalyseResult.D_ROI_G_Boundary_stop.size(); i++) {
+                String roi = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
                 String conc = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_con_uncer.get(i)));
                 String concErr = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_con_uncer_err.get(i)));
                 String lc = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.LC.get(i)));