From f923485118918dfe11a2ac26abd79966803813f0 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Mon, 6 Nov 2023 10:57:02 +0800
Subject: [PATCH] =?UTF-8?q?beta=E5=8A=9F=E8=83=BD=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=20beta=E5=8A=9F=E8=83=BD=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=95=B0=E6=8D=AE=E6=9C=AA=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20gamma=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=94=A8=E6=88=B7=E6=A0=B8=E7=B4=A0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=90=8E=E9=87=8D=E6=96=B0=E7=BC=93=E5=AD=98=E6=A0=B8?=
 =?UTF-8?q?=E7=B4=A0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/SpectrumAnalysisMapper.java        |    2 +-
 .../mapper/xml/SpectrumAnalysisMapper.xml     |   31 +-
 .../service/impl/GammaServiceImpl.java        |    9 +
 .../impl/SpectrumAnalysisServiceImpl.java     | 1609 +++++++++--------
 4 files changed, 839 insertions(+), 812 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
index bf5a9ef8..f9bfbc12 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
@@ -20,7 +20,7 @@ public interface SpectrumAnalysisMapper {
 
     List<GardsSampleDataSpectrum> getDBSearchList(String dbName, List<String> stationTypes, List<String> userStations, boolean AllUsers);
 
-    Page<GardsSampleDataSpectrum> getDBSpectrumList(IPage<GardsSampleDataSpectrum> page, GardsSampleDataSpectrum gardsSampleData, String dbName, List<String> stationTypes, boolean CollectStopB, boolean AcqStartB, String startTime, String endTime, List<String> userStations, boolean AllUsers);
+    Page<GardsSampleDataSpectrum> getDBSpectrumList(IPage<GardsSampleDataSpectrum> page, GardsSampleDataSpectrum gardsSampleData, String dbName, List<String> stationTypes, boolean CollectStopB, boolean AcqStartB, String startTime, String endTime, List<String> userStations, boolean AllUsers, String orderField, String orderType);
 
     SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId, Integer analysisID);
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
index 06c5995d..78e61abe 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
@@ -32,19 +32,19 @@
     </select>
 
     <select id="getDBSpectrumList" resultType="org.jeecg.modules.entity.GardsSampleDataSpectrum">
-        select c.sample_id,
+        select c.sample_id sampleId,
                b.station_code stationName,
                a.detector_code detectorsName,
-               c.sample_type,
-               c.data_type,
-               c.spectral_qualifie,
-               c.collect_stop,
-               c.acquisition_start,
-               c.acquisition_real_sec,
-               c.acquisition_live_sec,
-               d.analyst,
-               c.status,
-               c.input_file_name
+               c.sample_type sampleType,
+               c.data_type dataType,
+               c.spectral_qualifie spectralQualifie,
+               c.collect_stop collectStop,
+               c.acquisition_start acquisitionStart,
+               c.acquisition_real_sec acquisitionRealSec,
+               c.acquisition_live_sec acquisitionLiveSec,
+               d.analyst analyst,
+               c.status status,
+               c.input_file_name inputFileName
         from
           CONFIGURATION.GARDS_DETECTORS a,
           CONFIGURATION.GARDS_STATIONS b,
@@ -97,7 +97,12 @@
                 </if>
             </if>
         </where>
-        ORDER BY c.collect_stop DESC
+        <if test=" orderField != 'createTime' and orderField != '' and orderField != null and orderType != '' and orderType != null ">
+            ORDER BY ${orderField} ${orderType}
+        </if>
+        <if test=" orderField == 'createTime' or orderField == '' or orderField == null or orderType == '' or orderType == null ">
+            ORDER BY collectStop DESC
+        </if>
     </select>
 
     <select id="getXeDataList" resultType="org.jeecg.modules.entity.GardsXeResultsSpectrum">
@@ -182,7 +187,6 @@
         <where>
             SAMPLE_ID = #{sampleId}
         </where>
-
     </select>
 
     <select id="findSampleByFilePath" resultType="org.jeecg.modules.entity.GardsSampleDataSpectrum">
@@ -211,7 +215,6 @@
         <where>
             INPUT_FILE_NAME = #{filePath}
         </where>
-
     </select>
 
     <select id="getDetectorList" resultType="org.jeecg.modules.base.entity.configuration.GardsDetectors">
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 1ce5ed1c..66d85061 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
@@ -3568,6 +3568,15 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         boolean save = defaultNuclideSpectrumService.saveNuclidesByUserName(userLibraryName, userName, phd.getHeader().getSystem_type().toUpperCase());
         if (save) {
             result.success("Modified successfully！");
+            // 查询当前用户关联的核素信息
+            List<String> userLib = new LinkedList<>();
+            // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的
+            userLib = defaultNuclideSpectrumService.findNuclidesByUserName(userName, phd.getHeader().getSystem_type().toUpperCase());
+            if (CollectionUtils.isEmpty(userLib)) {
+                userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase());
+            }
+            Map<String, NuclideLines> nuclideMap = GetNuclideLines(userLib);
+            redisUtil.set(fileName+"-"+userName, nuclideMap);
         } else {
             result.success("Modification failure！");
         }
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 89ab1ee7..4df64877 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
@@ -213,7 +213,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
         }
         //声明分页page
         Page<GardsSampleDataSpectrum> page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize());
-        Page<GardsSampleDataSpectrum> sampleDataPage = spectrumAnalysisMapper.getDBSpectrumList(page, gardsSampleData, dbName, stationTypes, CollectStopB, AcqStartB, startTime, endTime, userStations, AllUsers);
+        Page<GardsSampleDataSpectrum> sampleDataPage = spectrumAnalysisMapper.getDBSpectrumList(page, gardsSampleData, dbName, stationTypes, CollectStopB, AcqStartB, startTime, endTime, userStations, AllUsers, queryRequest.getField(), queryRequest.getOrder());
         sampleDataPage.getRecords().stream().forEach(item->{item.setDbName(tempDBName);});
         result.setSuccess(true);
         result.setResult(sampleDataPage);
@@ -387,42 +387,46 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                     betaDataFile = new BetaDataFile();
                     //给公用变量赋值sampleId
                     betaDataFile.setSampleId(String.valueOf(sampleId));
-                    betaDataFile.setSampleFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath());
-                    betaDataFile.setSampleFileName(sampleFileName);
                     if (Objects.nonNull(sample)) {
                         sampleTmp = ftpUtil.downloadFile(betaDataFile.getSampleFilePathName(), "betaGamma");
                         if (Objects.nonNull(sampleTmp)) {
                             EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(sampleTmp.getAbsolutePath());
+                            betaDataFile.setSampleStruct(struct);
+                            betaDataFile.setSampleFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getSampleFilePath());
+                            betaDataFile.setSampleFileName(sampleFileName);
                             sampleMap = phdFileUtil.getSourceData(struct, sample.getSampleId(), sample.getStatus(), "sample", betaDataFile);
                             resultMap.put("sample",sampleMap);
                         }
                     }
-                    betaDataFile.setGasFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getGasBgFilePath());
-                    betaDataFile.setGasFileName(gasFileName);
                     if (Objects.nonNull(gasBg)) {
                         gasTmp = ftpUtil.downloadFile(betaDataFile.getGasFilePathName(), "betaGamma");
                         if (Objects.nonNull(gasTmp)) {
                             EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(gasTmp.getAbsolutePath());
+                            betaDataFile.setGasStruct(struct);
+                            betaDataFile.setGasFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getGasBgFilePath());
+                            betaDataFile.setGasFileName(gasFileName);
                             gasBgMap = phdFileUtil.getSourceData(struct, gasBg.getSampleId(), gasBg.getStatus(), "gas", betaDataFile);
                             resultMap.put("gasBg",gasBgMap);
                         }
                     }
-                    betaDataFile.setDetFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getDetBgFilePath());
-                    betaDataFile.setDetFileName(detFileName);
                     if (Objects.nonNull(detBg)) {
                         detTmp = ftpUtil.downloadFile(betaDataFile.getDetFilePathName(), "betaGamma");
                         if (Objects.nonNull(detTmp)) {
                             EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(detTmp.getAbsolutePath());
+                            betaDataFile.setDetStruct(struct);
+                            betaDataFile.setDetFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbSpectrumFilePath.getDetBgFilePath());
+                            betaDataFile.setDetFileName(detFileName);
                             detBgMap = phdFileUtil.getSourceData(struct, detBg.getSampleId(), detBg.getStatus(), "det", betaDataFile);
                             resultMap.put("detBg",detBgMap);
                         }
                     }
-                    betaDataFile.setQcFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbQcFilePath);
-                    betaDataFile.setQcFileName(qcFileName);
                     if (Objects.nonNull(qc)) {
                         qcTmp = ftpUtil.downloadFile(betaDataFile.getQcFilePathName(), "betaGamma");
                         if (Objects.nonNull(qcTmp)) {
                             EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(qcTmp.getAbsolutePath());
+                            betaDataFile.setQcStruct(struct);
+                            betaDataFile.setQcFilePathName(StringPool.SLASH + ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH +dbQcFilePath);
+                            betaDataFile.setQcFileName(qcFileName);
                             qcMap = phdFileUtil.getSourceData(struct, qc.getSampleId(), qc.getStatus(), "qc", betaDataFile);
                             resultMap.put("qc",qcMap);
                         }
@@ -758,205 +762,207 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             rrrLogInfo.setBBetaEnergyValidDet(betaDataFile.isBBetaEnergyValidDet());
         }
         //对当前文件内容进行分析
-        analyzeRRR(rrrLogInfo, BgCalPara, betaFittingPara, gammaFittingPara);
-        //对分析后的内容进行数据获取
-        List<GardsROIChannelsSpectrum> channelsSpectrums =  rrrLogInfo.getRoiChannelsSpectrumList();
-        List<GardsROIResultsSpectrum> resultsSpectrums =  rrrLogInfo.getRoiResultsSpectrumList();
-        List<GardsXeResultsSpectrum> xeResultsSpectrums =  rrrLogInfo.getXeResultsSpectrumList();
-        //#SAMPLE: LIMITS PER ROI GAMMA
-        List<GardsCalibrationSpectrum> gammaCalibrationParamList = rrrLogInfo.getGammaCalibrationParamList();
-        for (int i=0; i<gammaCalibrationParamList.size(); i++) {
-            if (gammaCalibrationParamList.get(i).getDataType().equals("S")) {
-                gammaCalibrationParamS = gammaCalibrationParamList.get(i);
-            } else if (gammaCalibrationParamList.get(i).getDataType().equals("G")) {
-                gammaCalibrationParamG = gammaCalibrationParamList.get(i);
-            } else if (gammaCalibrationParamList.get(i).getDataType().equals("D")) {
-                gammaCalibrationParamD = gammaCalibrationParamList.get(i);
-            }
-        }
-        //#SAMPLE: LIMITS PER ROI BETA
-        List<GardsCalibrationSpectrum> betaCalibrationParamList = rrrLogInfo.getBetaCalibrationParamList();
-        for (int i=0; i<betaCalibrationParamList.size(); i++) {
-            if (betaCalibrationParamList.get(i).getDataType().equals("S")) {
-                betaCalibrationParamS = betaCalibrationParamList.get(i);
-            } else if (betaCalibrationParamList.get(i).getDataType().equals("G")) {
-                betaCalibrationParamG = betaCalibrationParamList.get(i);
-            } else if (betaCalibrationParamList.get(i).getDataType().equals("D")) {
-                betaCalibrationParamD = betaCalibrationParamList.get(i);
-            }
-        }
-        Information information = new Information();
-        //sampleFile  相关数据
-        try {
-            EnergySpectrumStruct sampleSourceData = betaDataFile.getSampleStruct();
-            if (Objects.nonNull(sampleSourceData)) {
-                information.setSample_measid_name(sampleSourceData.measurement_id);
-                information.setSample_det_measid_name(sampleSourceData.detector_bk_measurement_id);
-                information.setSample_gas_measid_name(sampleSourceData.gas_bk_measurement_id);
-                information.setSit_det_code(sampleSourceData.site_code);
-                information.setSample_type(sampleSourceData.system_type);
-                information.setGeometry(sampleSourceData.sample_geometry);
-                information.setSpectral_qualifie(sampleSourceData.spectrum_quantity);
-                String transmit_dtg_str=sampleSourceData.transmit_date+StringPool.SPACE+sampleSourceData.transmit_time;
-                Date transmit_dtg = DateUtils.parseDate(transmit_dtg_str);
-                information.setTransmit_dtg(transmit_dtg);
-                information.setDetect_code(sampleSourceData.detector_code);
-                information.setMeasurementID(sampleSourceData.measurement_id.replace("\\","/"));
-                information.setBkgdMeasurementID(sampleSourceData.detector_bk_measurement_id.replace("\\","/"));
-                information.setGasBkgdMeasurementID(sampleSourceData.gas_bk_measurement_id.replace("\\","/"));
-                information.setSampleRefId(sampleSourceData.sample_ref_id);
-                String collect_start_str = sampleSourceData.collection_start_date+StringPool.SPACE+sampleSourceData.collection_start_time;
-                Date collect_start = DateUtils.parseDate(collect_start_str);
-                information.setCollect_start(collect_start);
-                String collect_stop_str = sampleSourceData.collection_stop_date+StringPool.SPACE+sampleSourceData.collection_stop_time;
-                Date collect_stop = DateUtils.parseDate(collect_stop_str);
-                information.setCollect_stop(collect_stop);
-                information.setS_xe_stable_volume(sampleSourceData.air_volume);
-                String acquisition_start_str = sampleSourceData.acquisition_start_date+StringPool.SPACE+sampleSourceData.acquisition_start_time;
-                Date acquisition_start = DateUtils.parseDate(acquisition_start_str);
-                information.setAcquisition_start(acquisition_start);
-                long dataTime = (long) (acquisition_start.getTime() + sampleSourceData.acquisition_live_time * 1000);
-                String acquisition_stop_str = DateUtils.formatDate(new Date(dataTime), "yyyy/MM/dd HH:mm:ss");
-                Date acquisition_stop = DateUtils.parseDate(acquisition_stop_str);
-                information.setAcquisition_stop(acquisition_stop);
-                information.setAcquisition_real_sec(sampleSourceData.acquisition_real_time);
-                information.setAcquisition_live_sec(sampleSourceData.acquisition_live_time);
-                information.setS_volume_of_Xe(sampleSourceData.sample_volume_of_Xe);
-            }
-            EnergySpectrumStruct gasSourceData = betaDataFile.getGasStruct();
-            if (Objects.nonNull(gasSourceData)) {
-                information.setGas_measid_name(gasSourceData.measurement_id);
-            }
-            EnergySpectrumStruct detSourceData = betaDataFile.getDetStruct();
-            if (Objects.nonNull(detSourceData)) {
-                information.setDet_measid_name(detSourceData.measurement_id);
-            }
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
+        boolean bRet = analyzeRRR(rrrLogInfo, BgCalPara, betaFittingPara, gammaFittingPara);
         StringBuffer strBuffer = new StringBuffer();
-        strBuffer.append("CNL06 GENERATED REPORT").append("\n");
-        strBuffer.append("REVIEWED RADIONUCLIDE REPORT").append("\n");
-        strBuffer.append("(Noble Gas Version)").append("\n");
-        strBuffer.append("Creation Date "+DateUtils.formatDate(new Date(), "yyyy/MM/dd-HH:mm:ss")).append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#FILE INFORMATION").append("\n");
-        strBuffer.append(" SampleMeasID:               ").append(information.getMeasurementID()).append("\n");
-        strBuffer.append(" GASBKMeasID:                ").append(information.getGasBkgdMeasurementID()).append("\n");
-        strBuffer.append(" SRID:                       ").append(information.getSampleRefId()).append("\n");
-        strBuffer.append(" Detector Type:              ").append("3D b-g").append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#COLLECTION INFORMATION").append("\n");
-        strBuffer.append(" Station CODE:               ").append(information.getSit_det_code()).append("\n");
-        strBuffer.append(" Detector CODE:              ").append(information.getDetect_code()).append("\n");
-        strBuffer.append(" Collection Start:           ").append(DateUtils.formatDate(information.getCollect_start(), "yyyy/MM/dd HH:mm:ss")).append("\n");
-        strBuffer.append(" Collection Stop:            ").append(DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss")).append("\n");
-        strBuffer.append(" Collection TIME(h):         ").append((information.getCollect_stop().getTime()/1000-information.getCollect_start().getTime()/1000)/3600).append("\n");
-        strBuffer.append(" Air Volume[cm3]:            ").append(information.getS_xe_stable_volume()).append("\n");
-        strBuffer.append(" Xe Volume[cm3]:             ").append(information.getS_volume_of_Xe()).append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#ACQUISITION INFORMATION").append("\n");
-        strBuffer.append(" Acquisition Start:          ").append(DateUtils.formatDate(information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss")).append("\n");
-        strBuffer.append(" Acq Real Time(s):           ").append(information.getAcquisition_real_sec()).append("\n");
-        strBuffer.append(" Acq Live Time:              ").append(information.getAcquisition_live_sec()).append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#SOFTWARE").append("\n");
-        strBuffer.append(" version:    ").append("1.0.1").append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#SAMPLE Old CALIBRATION").append("\n");
-        strBuffer.append(" Old Beta                                        Old Gamma                                       ").append("\n");
-        if (rrrLogInfo.isSampleData()){
+        if (bRet) {
+            //对分析后的内容进行数据获取
+            List<GardsROIChannelsSpectrum> channelsSpectrums =  rrrLogInfo.getRoiChannelsSpectrumList();
+            List<GardsROIResultsSpectrum> resultsSpectrums =  rrrLogInfo.getRoiResultsSpectrumList();
+            List<GardsXeResultsSpectrum> xeResultsSpectrums =  rrrLogInfo.getXeResultsSpectrumList();
+            //#SAMPLE: LIMITS PER ROI GAMMA
+            List<GardsCalibrationSpectrum> gammaCalibrationParamList = rrrLogInfo.getGammaCalibrationParamList();
+            for (int i=0; i<gammaCalibrationParamList.size(); i++) {
+                if (gammaCalibrationParamList.get(i).getDataType().equals("S")) {
+                    gammaCalibrationParamS = gammaCalibrationParamList.get(i);
+                } else if (gammaCalibrationParamList.get(i).getDataType().equals("G")) {
+                    gammaCalibrationParamG = gammaCalibrationParamList.get(i);
+                } else if (gammaCalibrationParamList.get(i).getDataType().equals("D")) {
+                    gammaCalibrationParamD = gammaCalibrationParamList.get(i);
+                }
+            }
+            //#SAMPLE: LIMITS PER ROI BETA
+            List<GardsCalibrationSpectrum> betaCalibrationParamList = rrrLogInfo.getBetaCalibrationParamList();
+            for (int i=0; i<betaCalibrationParamList.size(); i++) {
+                if (betaCalibrationParamList.get(i).getDataType().equals("S")) {
+                    betaCalibrationParamS = betaCalibrationParamList.get(i);
+                } else if (betaCalibrationParamList.get(i).getDataType().equals("G")) {
+                    betaCalibrationParamG = betaCalibrationParamList.get(i);
+                } else if (betaCalibrationParamList.get(i).getDataType().equals("D")) {
+                    betaCalibrationParamD = betaCalibrationParamList.get(i);
+                }
+            }
+            Information information = new Information();
+            //sampleFile  相关数据
+            try {
+                EnergySpectrumStruct sampleSourceData = betaDataFile.getSampleStruct();
+                if (Objects.nonNull(sampleSourceData)) {
+                    information.setSample_measid_name(sampleSourceData.measurement_id);
+                    information.setSample_det_measid_name(sampleSourceData.detector_bk_measurement_id);
+                    information.setSample_gas_measid_name(sampleSourceData.gas_bk_measurement_id);
+                    information.setSit_det_code(sampleSourceData.site_code);
+                    information.setSample_type(sampleSourceData.system_type);
+                    information.setGeometry(sampleSourceData.sample_geometry);
+                    information.setSpectral_qualifie(sampleSourceData.spectrum_quantity);
+                    String transmit_dtg_str=sampleSourceData.transmit_date+StringPool.SPACE+sampleSourceData.transmit_time;
+                    Date transmit_dtg = DateUtils.parseDate(transmit_dtg_str);
+                    information.setTransmit_dtg(transmit_dtg);
+                    information.setDetect_code(sampleSourceData.detector_code);
+                    information.setMeasurementID(sampleSourceData.measurement_id.replace("\\","/"));
+                    information.setBkgdMeasurementID(sampleSourceData.detector_bk_measurement_id.replace("\\","/"));
+                    information.setGasBkgdMeasurementID(sampleSourceData.gas_bk_measurement_id.replace("\\","/"));
+                    information.setSampleRefId(sampleSourceData.sample_ref_id);
+                    String collect_start_str = sampleSourceData.collection_start_date+StringPool.SPACE+sampleSourceData.collection_start_time;
+                    Date collect_start = DateUtils.parseDate(collect_start_str);
+                    information.setCollect_start(collect_start);
+                    String collect_stop_str = sampleSourceData.collection_stop_date+StringPool.SPACE+sampleSourceData.collection_stop_time;
+                    Date collect_stop = DateUtils.parseDate(collect_stop_str);
+                    information.setCollect_stop(collect_stop);
+                    information.setS_xe_stable_volume(sampleSourceData.air_volume);
+                    String acquisition_start_str = sampleSourceData.acquisition_start_date+StringPool.SPACE+sampleSourceData.acquisition_start_time;
+                    Date acquisition_start = DateUtils.parseDate(acquisition_start_str);
+                    information.setAcquisition_start(acquisition_start);
+                    long dataTime = (long) (acquisition_start.getTime() + sampleSourceData.acquisition_live_time * 1000);
+                    String acquisition_stop_str = DateUtils.formatDate(new Date(dataTime), "yyyy/MM/dd HH:mm:ss");
+                    Date acquisition_stop = DateUtils.parseDate(acquisition_stop_str);
+                    information.setAcquisition_stop(acquisition_stop);
+                    information.setAcquisition_real_sec(sampleSourceData.acquisition_real_time);
+                    information.setAcquisition_live_sec(sampleSourceData.acquisition_live_time);
+                    information.setS_volume_of_Xe(sampleSourceData.sample_volume_of_Xe);
+                }
+                EnergySpectrumStruct gasSourceData = betaDataFile.getGasStruct();
+                if (Objects.nonNull(gasSourceData)) {
+                    information.setGas_measid_name(gasSourceData.measurement_id);
+                }
+                EnergySpectrumStruct detSourceData = betaDataFile.getDetStruct();
+                if (Objects.nonNull(detSourceData)) {
+                    information.setDet_measid_name(detSourceData.measurement_id);
+                }
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+            strBuffer.append("CNL06 GENERATED REPORT").append("\n");
+            strBuffer.append("REVIEWED RADIONUCLIDE REPORT").append("\n");
+            strBuffer.append("(Noble Gas Version)").append("\n");
+            strBuffer.append("Creation Date "+DateUtils.formatDate(new Date(), "yyyy/MM/dd-HH:mm:ss")).append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#FILE INFORMATION").append("\n");
+            strBuffer.append(" SampleMeasID:               ").append(information.getMeasurementID()).append("\n");
+            strBuffer.append(" GASBKMeasID:                ").append(information.getGasBkgdMeasurementID()).append("\n");
+            strBuffer.append(" SRID:                       ").append(information.getSampleRefId()).append("\n");
+            strBuffer.append(" Detector Type:              ").append("3D b-g").append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#COLLECTION INFORMATION").append("\n");
+            strBuffer.append(" Station CODE:               ").append(information.getSit_det_code()).append("\n");
+            strBuffer.append(" Detector CODE:              ").append(information.getDetect_code()).append("\n");
+            strBuffer.append(" Collection Start:           ").append(DateUtils.formatDate(information.getCollect_start(), "yyyy/MM/dd HH:mm:ss")).append("\n");
+            strBuffer.append(" Collection Stop:            ").append(DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss")).append("\n");
+            strBuffer.append(" Collection TIME(h):         ").append((information.getCollect_stop().getTime()/1000-information.getCollect_start().getTime()/1000)/3600).append("\n");
+            strBuffer.append(" Air Volume[cm3]:            ").append(information.getS_xe_stable_volume()).append("\n");
+            strBuffer.append(" Xe Volume[cm3]:             ").append(information.getS_volume_of_Xe()).append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#ACQUISITION INFORMATION").append("\n");
+            strBuffer.append(" Acquisition Start:          ").append(DateUtils.formatDate(information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss")).append("\n");
+            strBuffer.append(" Acq Real Time(s):           ").append(information.getAcquisition_real_sec()).append("\n");
+            strBuffer.append(" Acq Live Time:              ").append(information.getAcquisition_live_sec()).append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#SOFTWARE").append("\n");
+            strBuffer.append(" version:    ").append("1.0.1").append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#SAMPLE Old CALIBRATION").append("\n");
+            strBuffer.append(" Old Beta                                        Old Gamma                                       ").append("\n");
+            if (rrrLogInfo.isSampleData()){
+                strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
+                strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
+            }else {
+                strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
+                strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#SAMPLE New CALIBRATION").append("\n");
+            strBuffer.append(" New Beta                                        New Gamma                                       ").append("\n");
             strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-            strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
-        }else {
+            strBuffer.append(" E(x) =  ("+betaCalibrationParamS.getCoeff1()+")+("+betaCalibrationParamS.getCoeff2()+")*x+("+betaCalibrationParamS.getCoeff3()+")x*x ").append(" E(x) =  ("+gammaCalibrationParamS.getCoeff1()+")+("+gammaCalibrationParamS.getCoeff2()+")*x+("+gammaCalibrationParamS.getCoeff3()+")x*x").append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#SAMPLE: LIMITS PER ROI").append("\n");
+            strBuffer.append(" Roi                                             Beta                                             Gamma       ").append("\n");
+            for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) {
+                strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+"                                             "+channelsSpectrum.getBChanStart()+"to"+channelsSpectrum.getBChanStop()+"                                             "+channelsSpectrum.getGChanStart()+"to"+channelsSpectrum.getGChanStop()).append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#DET Old CALIBRATION").append("\n");
+            strBuffer.append(" Old Beta                                        Old Gamma                                       ").append("\n");
+            if (rrrLogInfo.isDetBgData()){
+                strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
+                strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
+            }else {
+                strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
+                strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#DET New CALIBRATION").append("\n");
+            strBuffer.append(" New Beta                                        New Gamma                                       ").append("\n");
             strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-            strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#SAMPLE New CALIBRATION").append("\n");
-        strBuffer.append(" New Beta                                        New Gamma                                       ").append("\n");
-        strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-        strBuffer.append(" E(x) =  ("+betaCalibrationParamS.getCoeff1()+")+("+betaCalibrationParamS.getCoeff2()+")*x+("+betaCalibrationParamS.getCoeff3()+")x*x ").append(" E(x) =  ("+gammaCalibrationParamS.getCoeff1()+")+("+gammaCalibrationParamS.getCoeff2()+")*x+("+gammaCalibrationParamS.getCoeff3()+")x*x").append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#SAMPLE: LIMITS PER ROI").append("\n");
-        strBuffer.append(" Roi                                             Beta                                             Gamma       ").append("\n");
-        for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) {
-            strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+"                                             "+channelsSpectrum.getBChanStart()+"to"+channelsSpectrum.getBChanStop()+"                                             "+channelsSpectrum.getGChanStart()+"to"+channelsSpectrum.getGChanStop()).append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#DET Old CALIBRATION").append("\n");
-        strBuffer.append(" Old Beta                                        Old Gamma                                       ").append("\n");
-        if (rrrLogInfo.isDetBgData()){
+            strBuffer.append(" E(x) =  ("+gammaCalibrationParamD.getCoeff1()+")+("+gammaCalibrationParamD.getCoeff2()+")*x+("+gammaCalibrationParamD.getCoeff3()+")x*x ").append(" E(x) =  ("+gammaCalibrationParamD.getCoeff1()+")+("+gammaCalibrationParamD.getCoeff2()+")*x+("+gammaCalibrationParamD.getCoeff3()+")x*x").append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#DET: LIMITS PER ROI").append("\n");
+            strBuffer.append(" Roi                                             Beta                                             Gamma       ").append("\n");
+            for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) {
+                strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+"                                             "+channelsSpectrum.getBChanStart()+"to"+channelsSpectrum.getBChanStop()+"                                             "+channelsSpectrum.getGChanStart()+"to"+channelsSpectrum.getGChanStop()).append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#GAS Old CALIBRATION").append("\n");
+            strBuffer.append(" Old Beta                                        Old Gamma                                       ").append("\n");
+            if (rrrLogInfo.isGasBgData()){
+                strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
+                strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
+            }else {
+                strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
+                strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#GAS New CALIBRATION").append("\n");
+            strBuffer.append(" New Beta                                        New Gamma                                       ").append("\n");
             strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-            strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
-        }else {
-            strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-            strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
+            strBuffer.append(" E(x) =  ("+betaCalibrationParamG.getCoeff1()+")+("+betaCalibrationParamG.getCoeff2()+")*x+("+betaCalibrationParamG.getCoeff3()+")x*x ").append(" E(x) =  ("+gammaCalibrationParamG.getCoeff1()+")+("+gammaCalibrationParamG.getCoeff2()+")*x+("+gammaCalibrationParamG.getCoeff3()+")x*x").append("\n");
+            strBuffer.append("\n");
+            strBuffer.append("#GAS: LIMITS PER ROI").append("\n");
+            strBuffer.append(" Roi                                             Beta                                             Gamma       ").append("\n");
+            for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) {
+                strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+"                                             "+channelsSpectrum.getBChanStart()+"to"+channelsSpectrum.getBChanStop()+"                                             "+channelsSpectrum.getGChanStart()+"to"+channelsSpectrum.getGChanStop()).append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#GROSS COUNTS PER ROI").append("\n");
+            strBuffer.append(" Roi                                             Sample                                          GasBkgnd     DetBkgnd       ").append("\n");
+            for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums) {
+                strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+"                                               "+resultsSpectrum.getSGross()+"                                              "+resultsSpectrum.getGGross()+"           "+resultsSpectrum.getBGross()+"").append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#NET COUNTS AND LC PER ROI").append("\n");
+            strBuffer.append(" Roi                                             Net count                                       ").append("\n");
+            for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
+                strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+"                                               "+resultsSpectrum.getNet()+" +/- "+Math.sqrt(resultsSpectrum.getNetErr())).append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#CONCENTRATION AND LC PER ROI").append("\n");
+            strBuffer.append(" Roi                                             Conc(mBq/m3)                                    LC(mBq/m3)   MDC(mBq/m3):   ");
+            for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
+                strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+"                                               "+resultsSpectrum.getConcErr()+" +/- "+resultsSpectrum.getConcErr()+"                                    "+resultsSpectrum.getLc()+"   "+resultsSpectrum.getMdc()).append("\n");
+            }
+            strBuffer.append("\n");
+            strBuffer.append("#RESULT SUMMARY").append("\n");
+            strBuffer.append(" Nuclide Name                                    Conc                                            LC           MDC            NID Flag   ").append("\n");
+            for (GardsXeResultsSpectrum xeResultsSpectrum:xeResultsSpectrums) {
+                strBuffer.append(StringPool.SPACE+xeResultsSpectrum.getNuclideName()+"                                    "+xeResultsSpectrum.getConc()+" +/- "+xeResultsSpectrum.getConcErr()+"                                            "+xeResultsSpectrum.getLc()+"           "+xeResultsSpectrum.getMdc()+"            "+xeResultsSpectrum.getNidFlag()).append("\n");
+            }
+            strBuffer.append("\n");
         }
-        strBuffer.append("\n");
-        strBuffer.append("#DET New CALIBRATION").append("\n");
-        strBuffer.append(" New Beta                                        New Gamma                                       ").append("\n");
-        strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-        strBuffer.append(" E(x) =  ("+gammaCalibrationParamD.getCoeff1()+")+("+gammaCalibrationParamD.getCoeff2()+")*x+("+gammaCalibrationParamD.getCoeff3()+")x*x ").append(" E(x) =  ("+gammaCalibrationParamD.getCoeff1()+")+("+gammaCalibrationParamD.getCoeff2()+")*x+("+gammaCalibrationParamD.getCoeff3()+")x*x").append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#DET: LIMITS PER ROI").append("\n");
-        strBuffer.append(" Roi                                             Beta                                             Gamma       ").append("\n");
-        for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) {
-            strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+"                                             "+channelsSpectrum.getBChanStart()+"to"+channelsSpectrum.getBChanStop()+"                                             "+channelsSpectrum.getGChanStart()+"to"+channelsSpectrum.getGChanStop()).append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#GAS Old CALIBRATION").append("\n");
-        strBuffer.append(" Old Beta                                        Old Gamma                                       ").append("\n");
-        if (rrrLogInfo.isGasBgData()){
-            strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-            strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
-        }else {
-            strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-            strBuffer.append(" E(x) =  (?1)+(?2)*x+(?3)x*x ").append(" E(x) =  (?1)+(?2)*x+(?3)x*x").append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#GAS New CALIBRATION").append("\n");
-        strBuffer.append(" New Beta                                        New Gamma                                       ").append("\n");
-        strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x ").append(" CH(x) = (?1)+(?2)*x+(?3)x*x").append("\n");
-        strBuffer.append(" E(x) =  ("+betaCalibrationParamG.getCoeff1()+")+("+betaCalibrationParamG.getCoeff2()+")*x+("+betaCalibrationParamG.getCoeff3()+")x*x ").append(" E(x) =  ("+gammaCalibrationParamG.getCoeff1()+")+("+gammaCalibrationParamG.getCoeff2()+")*x+("+gammaCalibrationParamG.getCoeff3()+")x*x").append("\n");
-        strBuffer.append("\n");
-        strBuffer.append("#GAS: LIMITS PER ROI").append("\n");
-        strBuffer.append(" Roi                                             Beta                                             Gamma       ").append("\n");
-        for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) {
-            strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+"                                             "+channelsSpectrum.getBChanStart()+"to"+channelsSpectrum.getBChanStop()+"                                             "+channelsSpectrum.getGChanStart()+"to"+channelsSpectrum.getGChanStop()).append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#GROSS COUNTS PER ROI").append("\n");
-        strBuffer.append(" Roi                                             Sample                                          GasBkgnd     DetBkgnd       ").append("\n");
-        for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums) {
-            strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+"                                               "+resultsSpectrum.getSGross()+"                                              "+resultsSpectrum.getGGross()+"           "+resultsSpectrum.getBGross()+"").append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#NET COUNTS AND LC PER ROI").append("\n");
-        strBuffer.append(" Roi                                             Net count                                       ").append("\n");
-        for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
-            strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+"                                               "+resultsSpectrum.getNet()+" +/- "+Math.sqrt(resultsSpectrum.getNetErr())).append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#CONCENTRATION AND LC PER ROI").append("\n");
-        strBuffer.append(" Roi                                             Conc(mBq/m3)                                    LC(mBq/m3)   MDC(mBq/m3):   ");
-        for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
-        strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+"                                               "+resultsSpectrum.getConcErr()+" +/- "+resultsSpectrum.getConcErr()+"                                    "+resultsSpectrum.getLc()+"   "+resultsSpectrum.getMdc()).append("\n");
-        }
-        strBuffer.append("\n");
-        strBuffer.append("#RESULT SUMMARY").append("\n");
-        strBuffer.append(" Nuclide Name                                    Conc                                            LC           MDC            NID Flag   ").append("\n");
-        for (GardsXeResultsSpectrum xeResultsSpectrum:xeResultsSpectrums) {
-        strBuffer.append(StringPool.SPACE+xeResultsSpectrum.getNuclideName()+"                                    "+xeResultsSpectrum.getConc()+" +/- "+xeResultsSpectrum.getConcErr()+"                                            "+xeResultsSpectrum.getLc()+"           "+xeResultsSpectrum.getMdc()+"            "+xeResultsSpectrum.getNidFlag()).append("\n");
-        }
-        strBuffer.append("\n");
-
         result.setSuccess(true);
         result.setResult(strBuffer.toString());
         return result;
     }
 
-    public void analyzeRRR(RRRLogInfo rrrLogInfo, BgCalibratePara BgCalPara, List<String> betaFittingPara, List<String> gammaFittingPara) {
+    public boolean analyzeRRR(RRRLogInfo rrrLogInfo, BgCalibratePara BgCalPara, List<String> betaFittingPara, List<String> gammaFittingPara) {
+        boolean bRet = true;
         File sampleTmp = null;
         File gasTmp = null;
         File detTmp = null;
@@ -974,196 +980,200 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             } else {
                 bgAnalyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), BgCalPara);
             }
-            //处理XeData的数据
-            List<GardsXeResultsSpectrum> xeResultsSpectrumList = new LinkedList<>();
-            GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum();
-            xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
-            xe131m.setConc(bgAnalyseResult.Xe131m_con);
-            xe131m.setConcErr(bgAnalyseResult.Xe131m_uncer);
-            xe131m.setLc(bgAnalyseResult.LC_Xe131m);
-            xe131m.setMdc(bgAnalyseResult.MDC_Xe131m);
-            xe131m.setNidFlag(bgAnalyseResult.XE_131m_NID_FLAG);
-            xeResultsSpectrumList.add(xe131m);
-            GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum();
-            xe133.setNuclideName(XeNuclideName.XE_133.getType());
-            xe133.setConc(bgAnalyseResult.Xe133_con);
-            xe133.setConcErr(bgAnalyseResult.Xe133_uncer);
-            xe133.setLc(bgAnalyseResult.LC_Xe133);
-            xe133.setMdc(bgAnalyseResult.MDC_Xe133);
-            xe133.setNidFlag(bgAnalyseResult.XE_133_NID_FLAG);
-            xeResultsSpectrumList.add(xe133);
-            GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum();
-            xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
-            xe133m.setConc(bgAnalyseResult.Xe133m_con);
-            xe133m.setConcErr(bgAnalyseResult.Xe133m_uncer);
-            xe133m.setLc(bgAnalyseResult.LC_Xe133m);
-            xe133m.setMdc(bgAnalyseResult.MDC_Xe133m);
-            xe133m.setNidFlag(bgAnalyseResult.XE_133m_NID_FLAG);
-            xeResultsSpectrumList.add(xe133m);
-            GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum();
-            xe135.setNuclideName(XeNuclideName.XE_135.getType());
-            xe135.setConc(bgAnalyseResult.Xe135_con);
-            xe135.setConcErr(bgAnalyseResult.Xe135_uncer);
-            xe135.setLc(bgAnalyseResult.LC_Xe135);
-            xe135.setMdc(bgAnalyseResult.MDC_Xe135);
-            xe135.setNidFlag(bgAnalyseResult.XE_135_NID_FLAG);
-            xeResultsSpectrumList.add(xe135);
-            rrrLogInfo.setXeResultsSpectrumList(xeResultsSpectrumList);
-            //处理GammaCalibration的数据
-            List<GardsCalibrationSpectrum> gammaCalibrationSpectrumList = new LinkedList<>();
-            if (rrrLogInfo.isBGammaEnergyValidSample()) {
-                GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
-                gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                gammaCalibrationS.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationS.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationS.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                gammaCalibrationSpectrumList.add(gammaCalibrationS);
+            if (StringUtils.isNotBlank(bgAnalyseResult.error_log) && !bgAnalyseResult.error_log.equalsIgnoreCase("no error.")) {
+                bRet = false;
             } else {
-                GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
-                gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0));
-                gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1));
-                gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2));
-                gammaCalibrationSpectrumList.add(gammaCalibrationS);
-            }
-            if (rrrLogInfo.isBGammaEnergyValidGas()) {
-                GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
-                gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                gammaCalibrationG.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationG.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationG.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                gammaCalibrationSpectrumList.add(gammaCalibrationG);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
-                gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0));
-                gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1));
-                gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2));
-                gammaCalibrationSpectrumList.add(gammaCalibrationG);
-            }
-            if (rrrLogInfo.isBGammaEnergyValidDet()) {
-                GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
-                gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                gammaCalibrationD.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationD.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationD.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                gammaCalibrationSpectrumList.add(gammaCalibrationD);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
-                gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0));
-                gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1));
-                gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2));
-                gammaCalibrationSpectrumList.add(gammaCalibrationD);
-            }
-            rrrLogInfo.setGammaCalibrationParamList(gammaCalibrationSpectrumList);
-            //处理BetaCalibration数据
-            List<GardsCalibrationSpectrum> betaCalibrationSpectrumList = new LinkedList<>();
-            if (rrrLogInfo.isBBetaEnergyValidSample()) {
-                GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
-                betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                betaCalibrationS.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationS.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationS.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                betaCalibrationSpectrumList.add(betaCalibrationS);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
-                betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0));
-                betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1));
-                betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2));
-                betaCalibrationSpectrumList.add(betaCalibrationS);
-            }
-            if (rrrLogInfo.isBBetaEnergyValidGas()) {
-                GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
-                betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                betaCalibrationG.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationG.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationG.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                betaCalibrationSpectrumList.add(betaCalibrationG);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
-                betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0));
-                betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1));
-                betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2));
-                betaCalibrationSpectrumList.add(betaCalibrationG);
-            }
-            if (rrrLogInfo.isBBetaEnergyValidDet()) {
-                GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
-                betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                betaCalibrationD.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationD.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationD.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                betaCalibrationSpectrumList.add(betaCalibrationD);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
-                betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0));
-                betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1));
-                betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2));
-                betaCalibrationSpectrumList.add(betaCalibrationD);
-            }
-            rrrLogInfo.setBetaCalibrationParamList(betaCalibrationSpectrumList);
-            //存储roiChannel数据
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = new LinkedList<>();
-            for (int i=0; i<bgAnalyseResult.S_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.S_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.S_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.S_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.S_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            for (int i=0; i<bgAnalyseResult.G_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            for (int i=0; i<bgAnalyseResult.D_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            rrrLogInfo.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
-            bgAnalyseResult.LC.add(0, 0.0);
-            bgAnalyseResult.MDC.add(0, 0.0);
-            //存储roiResult的数据
-            List<GardsROIResultsSpectrum> roiResultsSpectrumList = new LinkedList<>();
-            for (int i=0; i<bgAnalyseResult.s_roi_cts.size(); i++) {
-                GardsROIResultsSpectrum roiResults = new GardsROIResultsSpectrum();
-                roiResults.setRoi(i+1);
-                roiResults.setLc(bgAnalyseResult.LC.get(i));
-                roiResults.setSGross(bgAnalyseResult.s_roi_cts.get(i));
-                roiResults.setGGross(bgAnalyseResult.g_roi_cts.get(i));
-                roiResults.setBGross(bgAnalyseResult.d_roi_cts.get(i));
-                roiResults.setSNet(bgAnalyseResult.s_deduct_d_cts.get((i+1)*3));
-                roiResults.setGNet(bgAnalyseResult.g_deduct_d_cts.get((i+1)*3));
-                roiResults.setNet(bgAnalyseResult.ROI_net_coutns.get(i));
-                roiResults.setNetErr(bgAnalyseResult.ROI_net_coutns_err.get(i));
-                roiResults.setConc(bgAnalyseResult.ROI_con_uncer.get(i));
-                roiResults.setConcErr(bgAnalyseResult.ROI_con_uncer_err.get(i));
-                roiResults.setMdc(bgAnalyseResult.MDC.get(i));
-                if(bgAnalyseResult.ROI_con_uncer.get(i)>bgAnalyseResult.MDC.get(i)) {
-                    roiResults.setNidFlag(1);
+                //处理XeData的数据
+                List<GardsXeResultsSpectrum> xeResultsSpectrumList = new LinkedList<>();
+                GardsXeResultsSpectrum xe131m = new GardsXeResultsSpectrum();
+                xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
+                xe131m.setConc(bgAnalyseResult.Xe131m_con);
+                xe131m.setConcErr(bgAnalyseResult.Xe131m_uncer);
+                xe131m.setLc(bgAnalyseResult.LC_Xe131m);
+                xe131m.setMdc(bgAnalyseResult.MDC_Xe131m);
+                xe131m.setNidFlag(bgAnalyseResult.XE_131m_NID_FLAG);
+                xeResultsSpectrumList.add(xe131m);
+                GardsXeResultsSpectrum xe133 = new GardsXeResultsSpectrum();
+                xe133.setNuclideName(XeNuclideName.XE_133.getType());
+                xe133.setConc(bgAnalyseResult.Xe133_con);
+                xe133.setConcErr(bgAnalyseResult.Xe133_uncer);
+                xe133.setLc(bgAnalyseResult.LC_Xe133);
+                xe133.setMdc(bgAnalyseResult.MDC_Xe133);
+                xe133.setNidFlag(bgAnalyseResult.XE_133_NID_FLAG);
+                xeResultsSpectrumList.add(xe133);
+                GardsXeResultsSpectrum xe133m = new GardsXeResultsSpectrum();
+                xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
+                xe133m.setConc(bgAnalyseResult.Xe133m_con);
+                xe133m.setConcErr(bgAnalyseResult.Xe133m_uncer);
+                xe133m.setLc(bgAnalyseResult.LC_Xe133m);
+                xe133m.setMdc(bgAnalyseResult.MDC_Xe133m);
+                xe133m.setNidFlag(bgAnalyseResult.XE_133m_NID_FLAG);
+                xeResultsSpectrumList.add(xe133m);
+                GardsXeResultsSpectrum xe135 = new GardsXeResultsSpectrum();
+                xe135.setNuclideName(XeNuclideName.XE_135.getType());
+                xe135.setConc(bgAnalyseResult.Xe135_con);
+                xe135.setConcErr(bgAnalyseResult.Xe135_uncer);
+                xe135.setLc(bgAnalyseResult.LC_Xe135);
+                xe135.setMdc(bgAnalyseResult.MDC_Xe135);
+                xe135.setNidFlag(bgAnalyseResult.XE_135_NID_FLAG);
+                xeResultsSpectrumList.add(xe135);
+                rrrLogInfo.setXeResultsSpectrumList(xeResultsSpectrumList);
+                //处理GammaCalibration的数据
+                List<GardsCalibrationSpectrum> gammaCalibrationSpectrumList = new LinkedList<>();
+                if (rrrLogInfo.isBGammaEnergyValidSample()) {
+                    GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
+                    gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    gammaCalibrationS.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationS.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationS.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationS);
                 } else {
-                    roiResults.setNidFlag(0);
+                    GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
+                    gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0));
+                    gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1));
+                    gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationS);
                 }
-                roiResultsSpectrumList.add(roiResults);
+                if (rrrLogInfo.isBGammaEnergyValidGas()) {
+                    GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
+                    gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    gammaCalibrationG.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationG.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationG.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationG);
+                } else {
+                    GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
+                    gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0));
+                    gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1));
+                    gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationG);
+                }
+                if (rrrLogInfo.isBGammaEnergyValidDet()) {
+                    GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
+                    gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    gammaCalibrationD.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationD.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationD.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationD);
+                } else {
+                    GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
+                    gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0));
+                    gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1));
+                    gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationD);
+                }
+                rrrLogInfo.setGammaCalibrationParamList(gammaCalibrationSpectrumList);
+                //处理BetaCalibration数据
+                List<GardsCalibrationSpectrum> betaCalibrationSpectrumList = new LinkedList<>();
+                if (rrrLogInfo.isBBetaEnergyValidSample()) {
+                    GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
+                    betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    betaCalibrationS.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationS.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationS.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    betaCalibrationSpectrumList.add(betaCalibrationS);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
+                    betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0));
+                    betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1));
+                    betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2));
+                    betaCalibrationSpectrumList.add(betaCalibrationS);
+                }
+                if (rrrLogInfo.isBBetaEnergyValidGas()) {
+                    GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
+                    betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    betaCalibrationG.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationG.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationG.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    betaCalibrationSpectrumList.add(betaCalibrationG);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
+                    betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0));
+                    betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1));
+                    betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2));
+                    betaCalibrationSpectrumList.add(betaCalibrationG);
+                }
+                if (rrrLogInfo.isBBetaEnergyValidDet()) {
+                    GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
+                    betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    betaCalibrationD.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationD.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationD.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    betaCalibrationSpectrumList.add(betaCalibrationD);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
+                    betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0));
+                    betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1));
+                    betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2));
+                    betaCalibrationSpectrumList.add(betaCalibrationD);
+                }
+                rrrLogInfo.setBetaCalibrationParamList(betaCalibrationSpectrumList);
+                //存储roiChannel数据
+                List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = new LinkedList<>();
+                for (int i=0; i<bgAnalyseResult.S_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.S_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.S_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.S_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.S_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                for (int i=0; i<bgAnalyseResult.G_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                for (int i=0; i<bgAnalyseResult.D_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                rrrLogInfo.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
+                bgAnalyseResult.LC.add(0, 0.0);
+                bgAnalyseResult.MDC.add(0, 0.0);
+                //存储roiResult的数据
+                List<GardsROIResultsSpectrum> roiResultsSpectrumList = new LinkedList<>();
+                for (int i=0; i<bgAnalyseResult.s_roi_cts.size(); i++) {
+                    GardsROIResultsSpectrum roiResults = new GardsROIResultsSpectrum();
+                    roiResults.setRoi(i+1);
+                    roiResults.setLc(bgAnalyseResult.LC.get(i));
+                    roiResults.setSGross(bgAnalyseResult.s_roi_cts.get(i));
+                    roiResults.setGGross(bgAnalyseResult.g_roi_cts.get(i));
+                    roiResults.setBGross(bgAnalyseResult.d_roi_cts.get(i));
+                    roiResults.setSNet(bgAnalyseResult.s_deduct_d_cts.get((i+1)*3));
+                    roiResults.setGNet(bgAnalyseResult.g_deduct_d_cts.get((i+1)*3));
+                    roiResults.setNet(bgAnalyseResult.ROI_net_coutns.get(i));
+                    roiResults.setNetErr(bgAnalyseResult.ROI_net_coutns_err.get(i));
+                    roiResults.setConc(bgAnalyseResult.ROI_con_uncer.get(i));
+                    roiResults.setConcErr(bgAnalyseResult.ROI_con_uncer_err.get(i));
+                    roiResults.setMdc(bgAnalyseResult.MDC.get(i));
+                    if(bgAnalyseResult.ROI_con_uncer.get(i)>bgAnalyseResult.MDC.get(i)) {
+                        roiResults.setNidFlag(1);
+                    } else {
+                        roiResults.setNidFlag(0);
+                    }
+                    roiResultsSpectrumList.add(roiResults);
+                }
+                rrrLogInfo.setRoiResultsSpectrumList(roiResultsSpectrumList);
             }
-            rrrLogInfo.setRoiResultsSpectrumList(roiResultsSpectrumList);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -1177,6 +1187,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
                 detTmp.delete();
             }
         }
+        return bRet;
     }
 
     @Override
@@ -4129,235 +4140,237 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             } else {
                 bgAnalyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), BgCalPara);
             }
-            List<GardsXeResults> xeResultsSpectrumList = new LinkedList<>();
-            GardsXeResults xe131m = new GardsXeResults();
-            xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
-            xe131m.setConc(bgAnalyseResult.Xe131m_con);
-            xe131m.setConcErr(bgAnalyseResult.Xe131m_uncer);
-            xe131m.setLc(bgAnalyseResult.LC_Xe131m);
-            xe131m.setMdc(bgAnalyseResult.MDC_Xe131m);
-            xe131m.setNidFlag(anlyseResultIn.getXe131mFlag());
-            xeResultsSpectrumList.add(xe131m);
-            GardsXeResults xe133 = new GardsXeResults();
-            xe133.setNuclideName(XeNuclideName.XE_133.getType());
-            xe133.setConc(bgAnalyseResult.Xe133_con);
-            xe133.setConcErr(bgAnalyseResult.Xe133_uncer);
-            xe133.setLc(bgAnalyseResult.LC_Xe133);
-            xe133.setMdc(bgAnalyseResult.MDC_Xe133);
-            xe133.setNidFlag(anlyseResultIn.getXe133Flag());
-            xeResultsSpectrumList.add(xe133);
-            GardsXeResults xe133m = new GardsXeResults();
-            xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
-            xe133m.setConc(bgAnalyseResult.Xe133m_con);
-            xe133m.setConcErr(bgAnalyseResult.Xe133m_uncer);
-            xe133m.setLc(bgAnalyseResult.LC_Xe133m);
-            xe133m.setMdc(bgAnalyseResult.MDC_Xe133m);
-            xe133m.setNidFlag(anlyseResultIn.getXe133mFlag());
-            xeResultsSpectrumList.add(xe133m);
-            GardsXeResults xe135 = new GardsXeResults();
-            xe135.setNuclideName(XeNuclideName.XE_135.getType());
-            xe135.setConc(bgAnalyseResult.Xe135_con);
-            xe135.setConcErr(bgAnalyseResult.Xe135_uncer);
-            xe135.setLc(bgAnalyseResult.LC_Xe135);
-            xe135.setMdc(bgAnalyseResult.MDC_Xe135);
-            xe135.setNidFlag(anlyseResultIn.getXe135Flag());
-            xeResultsSpectrumList.add(xe135);
-            anlyseResultIn.setXeData(xeResultsSpectrumList);
-            if (anlyseResultIn.isBGammaEnergyValidSample()) {
-                GardsCalibrationSpectrum gammaCalibrationSCE = new GardsCalibrationSpectrum();
-                gammaCalibrationSCE.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationSCE.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationSCE.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                GardsCalibrationSpectrum gammaCalibrationSEC = new GardsCalibrationSpectrum();
-                gammaCalibrationSEC.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
-                gammaCalibrationSEC.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
-                gammaCalibrationSEC.setCoeff3(Double.valueOf(gammaFittingParaToUi.get(2)));
-                anlyseResultIn.setGammaCalibrationSCE(gammaCalibrationSCE);
-                anlyseResultIn.setGammaCalibrationSEC(gammaCalibrationSEC);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationSCE = new GardsCalibrationSpectrum();
-                gammaCalibrationSCE.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0));
-                gammaCalibrationSCE.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1));
-                gammaCalibrationSCE.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2));
-                GardsCalibrationSpectrum gammaCalibrationSEC = new GardsCalibrationSpectrum();
-                gammaCalibrationSEC.setCoeff1(bgAnalyseResult.s_g_fitting_e_c.get(0));
-                gammaCalibrationSEC.setCoeff2(bgAnalyseResult.s_g_fitting_e_c.get(1));
-                gammaCalibrationSEC.setCoeff3(bgAnalyseResult.s_g_fitting_e_c.get(2));
-                anlyseResultIn.setGammaCalibrationSCE(gammaCalibrationSCE);
-                anlyseResultIn.setGammaCalibrationSEC(gammaCalibrationSEC);
-            }
-            if (anlyseResultIn.isBGammaEnergyValidGas()) {
-                GardsCalibrationSpectrum gammaCalibrationGCE = new GardsCalibrationSpectrum();
-                gammaCalibrationGCE.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationGCE.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationGCE.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                GardsCalibrationSpectrum gammaCalibrationGEC = new GardsCalibrationSpectrum();
-                gammaCalibrationGEC.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
-                gammaCalibrationGEC.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
-                gammaCalibrationGEC.setCoeff3(Double.valueOf(gammaFittingParaToUi.get(2)));
-                anlyseResultIn.setGammaCalibrationGCE(gammaCalibrationGCE);
-                anlyseResultIn.setGammaCalibrationGEC(gammaCalibrationGEC);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationGCE = new GardsCalibrationSpectrum();
-                gammaCalibrationGCE.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0));
-                gammaCalibrationGCE.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1));
-                gammaCalibrationGCE.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2));
-                GardsCalibrationSpectrum gammaCalibrationGEC = new GardsCalibrationSpectrum();
-                gammaCalibrationGEC.setCoeff1(bgAnalyseResult.g_g_fitting_e_c.get(0));
-                gammaCalibrationGEC.setCoeff2(bgAnalyseResult.g_g_fitting_e_c.get(1));
-                gammaCalibrationGEC.setCoeff3(bgAnalyseResult.g_g_fitting_e_c.get(2));
-                anlyseResultIn.setGammaCalibrationGCE(gammaCalibrationGCE);
-                anlyseResultIn.setGammaCalibrationGEC(gammaCalibrationGEC);
-            }
-            if (anlyseResultIn.isBGammaEnergyValidDet()) {
-                GardsCalibrationSpectrum gammaCalibrationDCE = new GardsCalibrationSpectrum();
-                gammaCalibrationDCE.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationDCE.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationDCE.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                GardsCalibrationSpectrum gammaCalibrationDEC = new GardsCalibrationSpectrum();
-                gammaCalibrationDEC.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
-                gammaCalibrationDEC.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
-                gammaCalibrationDEC.setCoeff3(Double.valueOf(gammaFittingParaToUi.get(2)));
-                anlyseResultIn.setGammaCalibrationDCE(gammaCalibrationDCE);
-                anlyseResultIn.setGammaCalibrationDEC(gammaCalibrationDEC);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationDCE = new GardsCalibrationSpectrum();
-                gammaCalibrationDCE.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0));
-                gammaCalibrationDCE.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1));
-                gammaCalibrationDCE.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2));
-                GardsCalibrationSpectrum gammaCalibrationDEC = new GardsCalibrationSpectrum();
-                gammaCalibrationDEC.setCoeff1(bgAnalyseResult.d_g_fitting_e_c.get(0));
-                gammaCalibrationDEC.setCoeff2(bgAnalyseResult.d_g_fitting_e_c.get(1));
-                gammaCalibrationDEC.setCoeff3(bgAnalyseResult.d_g_fitting_e_c.get(2));
-                anlyseResultIn.setGammaCalibrationDCE(gammaCalibrationDCE);
-                anlyseResultIn.setGammaCalibrationDEC(gammaCalibrationDEC);
-            }
-            if (anlyseResultIn.isBBetaEnergyValidSample()) {
-                GardsCalibrationSpectrum betaCalibrationSCE = new GardsCalibrationSpectrum();
-                betaCalibrationSCE.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationSCE.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationSCE.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                GardsCalibrationSpectrum betaCalibrationSEC = new GardsCalibrationSpectrum();
-                betaCalibrationSEC.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
-                betaCalibrationSEC.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
-                betaCalibrationSEC.setCoeff3(Double.valueOf(betaFittingParaToUi.get(2)));
-                anlyseResultIn.setBetaCalibrationSCE(betaCalibrationSCE);
-                anlyseResultIn.setBetaCalibrationSEC(betaCalibrationSEC);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationSCE = new GardsCalibrationSpectrum();
-                betaCalibrationSCE.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0));
-                betaCalibrationSCE.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1));
-                betaCalibrationSCE.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2));
-                GardsCalibrationSpectrum betaCalibrationSEC = new GardsCalibrationSpectrum();
-                betaCalibrationSEC.setCoeff1(bgAnalyseResult.s_b_fitting_e_c.get(0));
-                betaCalibrationSEC.setCoeff2(bgAnalyseResult.s_b_fitting_e_c.get(1));
-                betaCalibrationSEC.setCoeff3(bgAnalyseResult.s_b_fitting_e_c.get(2));
-                anlyseResultIn.setBetaCalibrationSCE(betaCalibrationSCE);
-                anlyseResultIn.setBetaCalibrationSEC(betaCalibrationSEC);
-            }
-            if (anlyseResultIn.isBBetaEnergyValidGas()) {
-                GardsCalibrationSpectrum betaCalibrationGCE = new GardsCalibrationSpectrum();
-                betaCalibrationGCE.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationGCE.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationGCE.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                GardsCalibrationSpectrum betaCalibrationGEC = new GardsCalibrationSpectrum();
-                betaCalibrationGEC.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
-                betaCalibrationGEC.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
-                betaCalibrationGEC.setCoeff3(Double.valueOf(betaFittingParaToUi.get(2)));
-                anlyseResultIn.setBetaCalibrationGCE(betaCalibrationGCE);
-                anlyseResultIn.setBetaCalibrationGEC(betaCalibrationGEC);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationGCE = new GardsCalibrationSpectrum();
-                betaCalibrationGCE.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0));
-                betaCalibrationGCE.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1));
-                betaCalibrationGCE.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2));
-                GardsCalibrationSpectrum betaCalibrationGEC = new GardsCalibrationSpectrum();
-                betaCalibrationGEC.setCoeff1(bgAnalyseResult.g_b_fitting_e_c.get(0));
-                betaCalibrationGEC.setCoeff2(bgAnalyseResult.g_b_fitting_e_c.get(1));
-                betaCalibrationGEC.setCoeff3(bgAnalyseResult.g_b_fitting_e_c.get(2));
-                anlyseResultIn.setBetaCalibrationGCE(betaCalibrationGCE);
-                anlyseResultIn.setBetaCalibrationGEC(betaCalibrationGEC);
-            }
-            if (anlyseResultIn.isBBetaEnergyValidDet()) {
-                GardsCalibrationSpectrum betaCalibrationDCE = new GardsCalibrationSpectrum();
-                betaCalibrationDCE.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationDCE.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationDCE.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                GardsCalibrationSpectrum betaCalibrationDEC = new GardsCalibrationSpectrum();
-                betaCalibrationDEC.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
-                betaCalibrationDEC.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
-                betaCalibrationDEC.setCoeff3(Double.valueOf(betaFittingParaToUi.get(2)));
-                anlyseResultIn.setBetaCalibrationDCE(betaCalibrationDCE);
-                anlyseResultIn.setBetaCalibrationDEC(betaCalibrationDEC);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationDCE = new GardsCalibrationSpectrum();
-                betaCalibrationDCE.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0));
-                betaCalibrationDCE.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1));
-                betaCalibrationDCE.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2));
-                GardsCalibrationSpectrum betaCalibrationDEC = new GardsCalibrationSpectrum();
-                betaCalibrationDEC.setCoeff1(bgAnalyseResult.d_b_fitting_e_c.get(0));
-                betaCalibrationDEC.setCoeff2(bgAnalyseResult.d_b_fitting_e_c.get(1));
-                betaCalibrationDEC.setCoeff3(bgAnalyseResult.d_b_fitting_e_c.get(2));
-                anlyseResultIn.setBetaCalibrationDCE(betaCalibrationDCE);
-                anlyseResultIn.setBetaCalibrationDEC(betaCalibrationDEC);
-            }
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = new LinkedList<>();
-            for (int i=0; i<bgAnalyseResult.S_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.S_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.S_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.S_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.S_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            for (int i=0; i<bgAnalyseResult.G_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            for (int i=0; i<bgAnalyseResult.D_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            anlyseResultIn.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
-            bgAnalyseResult.LC.add(0, 0.0);
-            bgAnalyseResult.MDC.add(0, 0.0);
-            List<GardsROIResultsSpectrum> roiResultsSpectrumList = new LinkedList<>();
-            for (int i=0; i<bgAnalyseResult.s_roi_cts.size(); i++) {
-                GardsROIResultsSpectrum roiResults = new GardsROIResultsSpectrum();
-                roiResults.setRoi(i+1);
-                roiResults.setLc(bgAnalyseResult.LC.get(i));
-                roiResults.setSGross(bgAnalyseResult.s_roi_cts.get(i));
-                roiResults.setGGross(bgAnalyseResult.g_roi_cts.get(i));
-                roiResults.setBGross(bgAnalyseResult.d_roi_cts.get(i));
-                roiResults.setSNet(bgAnalyseResult.s_deduct_d_cts.get((i+1)*3));
-                roiResults.setGNet(bgAnalyseResult.g_deduct_d_cts.get((i+1)*3));
-                roiResults.setNet(bgAnalyseResult.ROI_net_coutns.get(i));
-                roiResults.setNetErr(bgAnalyseResult.ROI_net_coutns_err.get(i));
-                roiResults.setConc(bgAnalyseResult.ROI_con_uncer.get(i));
-                roiResults.setConcErr(bgAnalyseResult.ROI_con_uncer_err.get(i));
-                roiResults.setMdc(bgAnalyseResult.MDC.get(i));
-                if(bgAnalyseResult.ROI_con_uncer.get(i)>bgAnalyseResult.MDC.get(i)) {
-                    roiResults.setNidFlag(1);
+            if (StringUtils.isBlank(bgAnalyseResult.error_log) || bgAnalyseResult.error_log.equalsIgnoreCase("no error.")) {
+                List<GardsXeResults> xeResultsSpectrumList = new LinkedList<>();
+                GardsXeResults xe131m = new GardsXeResults();
+                xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
+                xe131m.setConc(bgAnalyseResult.Xe131m_con);
+                xe131m.setConcErr(bgAnalyseResult.Xe131m_uncer);
+                xe131m.setLc(bgAnalyseResult.LC_Xe131m);
+                xe131m.setMdc(bgAnalyseResult.MDC_Xe131m);
+                xe131m.setNidFlag(anlyseResultIn.getXe131mFlag());
+                xeResultsSpectrumList.add(xe131m);
+                GardsXeResults xe133 = new GardsXeResults();
+                xe133.setNuclideName(XeNuclideName.XE_133.getType());
+                xe133.setConc(bgAnalyseResult.Xe133_con);
+                xe133.setConcErr(bgAnalyseResult.Xe133_uncer);
+                xe133.setLc(bgAnalyseResult.LC_Xe133);
+                xe133.setMdc(bgAnalyseResult.MDC_Xe133);
+                xe133.setNidFlag(anlyseResultIn.getXe133Flag());
+                xeResultsSpectrumList.add(xe133);
+                GardsXeResults xe133m = new GardsXeResults();
+                xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
+                xe133m.setConc(bgAnalyseResult.Xe133m_con);
+                xe133m.setConcErr(bgAnalyseResult.Xe133m_uncer);
+                xe133m.setLc(bgAnalyseResult.LC_Xe133m);
+                xe133m.setMdc(bgAnalyseResult.MDC_Xe133m);
+                xe133m.setNidFlag(anlyseResultIn.getXe133mFlag());
+                xeResultsSpectrumList.add(xe133m);
+                GardsXeResults xe135 = new GardsXeResults();
+                xe135.setNuclideName(XeNuclideName.XE_135.getType());
+                xe135.setConc(bgAnalyseResult.Xe135_con);
+                xe135.setConcErr(bgAnalyseResult.Xe135_uncer);
+                xe135.setLc(bgAnalyseResult.LC_Xe135);
+                xe135.setMdc(bgAnalyseResult.MDC_Xe135);
+                xe135.setNidFlag(anlyseResultIn.getXe135Flag());
+                xeResultsSpectrumList.add(xe135);
+                anlyseResultIn.setXeData(xeResultsSpectrumList);
+                if (anlyseResultIn.isBGammaEnergyValidSample()) {
+                    GardsCalibrationSpectrum gammaCalibrationSCE = new GardsCalibrationSpectrum();
+                    gammaCalibrationSCE.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationSCE.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationSCE.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    GardsCalibrationSpectrum gammaCalibrationSEC = new GardsCalibrationSpectrum();
+                    gammaCalibrationSEC.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
+                    gammaCalibrationSEC.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
+                    gammaCalibrationSEC.setCoeff3(Double.valueOf(gammaFittingParaToUi.get(2)));
+                    anlyseResultIn.setGammaCalibrationSCE(gammaCalibrationSCE);
+                    anlyseResultIn.setGammaCalibrationSEC(gammaCalibrationSEC);
                 } else {
-                    roiResults.setNidFlag(0);
+                    GardsCalibrationSpectrum gammaCalibrationSCE = new GardsCalibrationSpectrum();
+                    gammaCalibrationSCE.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0));
+                    gammaCalibrationSCE.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1));
+                    gammaCalibrationSCE.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2));
+                    GardsCalibrationSpectrum gammaCalibrationSEC = new GardsCalibrationSpectrum();
+                    gammaCalibrationSEC.setCoeff1(bgAnalyseResult.s_g_fitting_e_c.get(0));
+                    gammaCalibrationSEC.setCoeff2(bgAnalyseResult.s_g_fitting_e_c.get(1));
+                    gammaCalibrationSEC.setCoeff3(bgAnalyseResult.s_g_fitting_e_c.get(2));
+                    anlyseResultIn.setGammaCalibrationSCE(gammaCalibrationSCE);
+                    anlyseResultIn.setGammaCalibrationSEC(gammaCalibrationSEC);
                 }
-                roiResultsSpectrumList.add(roiResults);
+                if (anlyseResultIn.isBGammaEnergyValidGas()) {
+                    GardsCalibrationSpectrum gammaCalibrationGCE = new GardsCalibrationSpectrum();
+                    gammaCalibrationGCE.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationGCE.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationGCE.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    GardsCalibrationSpectrum gammaCalibrationGEC = new GardsCalibrationSpectrum();
+                    gammaCalibrationGEC.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
+                    gammaCalibrationGEC.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
+                    gammaCalibrationGEC.setCoeff3(Double.valueOf(gammaFittingParaToUi.get(2)));
+                    anlyseResultIn.setGammaCalibrationGCE(gammaCalibrationGCE);
+                    anlyseResultIn.setGammaCalibrationGEC(gammaCalibrationGEC);
+                } else {
+                    GardsCalibrationSpectrum gammaCalibrationGCE = new GardsCalibrationSpectrum();
+                    gammaCalibrationGCE.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0));
+                    gammaCalibrationGCE.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1));
+                    gammaCalibrationGCE.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2));
+                    GardsCalibrationSpectrum gammaCalibrationGEC = new GardsCalibrationSpectrum();
+                    gammaCalibrationGEC.setCoeff1(bgAnalyseResult.g_g_fitting_e_c.get(0));
+                    gammaCalibrationGEC.setCoeff2(bgAnalyseResult.g_g_fitting_e_c.get(1));
+                    gammaCalibrationGEC.setCoeff3(bgAnalyseResult.g_g_fitting_e_c.get(2));
+                    anlyseResultIn.setGammaCalibrationGCE(gammaCalibrationGCE);
+                    anlyseResultIn.setGammaCalibrationGEC(gammaCalibrationGEC);
+                }
+                if (anlyseResultIn.isBGammaEnergyValidDet()) {
+                    GardsCalibrationSpectrum gammaCalibrationDCE = new GardsCalibrationSpectrum();
+                    gammaCalibrationDCE.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationDCE.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationDCE.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    GardsCalibrationSpectrum gammaCalibrationDEC = new GardsCalibrationSpectrum();
+                    gammaCalibrationDEC.setCoeff1(Double.valueOf(gammaFittingParaToUi.get(0)));
+                    gammaCalibrationDEC.setCoeff2(Double.valueOf(gammaFittingParaToUi.get(1)));
+                    gammaCalibrationDEC.setCoeff3(Double.valueOf(gammaFittingParaToUi.get(2)));
+                    anlyseResultIn.setGammaCalibrationDCE(gammaCalibrationDCE);
+                    anlyseResultIn.setGammaCalibrationDEC(gammaCalibrationDEC);
+                } else {
+                    GardsCalibrationSpectrum gammaCalibrationDCE = new GardsCalibrationSpectrum();
+                    gammaCalibrationDCE.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0));
+                    gammaCalibrationDCE.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1));
+                    gammaCalibrationDCE.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2));
+                    GardsCalibrationSpectrum gammaCalibrationDEC = new GardsCalibrationSpectrum();
+                    gammaCalibrationDEC.setCoeff1(bgAnalyseResult.d_g_fitting_e_c.get(0));
+                    gammaCalibrationDEC.setCoeff2(bgAnalyseResult.d_g_fitting_e_c.get(1));
+                    gammaCalibrationDEC.setCoeff3(bgAnalyseResult.d_g_fitting_e_c.get(2));
+                    anlyseResultIn.setGammaCalibrationDCE(gammaCalibrationDCE);
+                    anlyseResultIn.setGammaCalibrationDEC(gammaCalibrationDEC);
+                }
+                if (anlyseResultIn.isBBetaEnergyValidSample()) {
+                    GardsCalibrationSpectrum betaCalibrationSCE = new GardsCalibrationSpectrum();
+                    betaCalibrationSCE.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationSCE.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationSCE.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    GardsCalibrationSpectrum betaCalibrationSEC = new GardsCalibrationSpectrum();
+                    betaCalibrationSEC.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
+                    betaCalibrationSEC.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
+                    betaCalibrationSEC.setCoeff3(Double.valueOf(betaFittingParaToUi.get(2)));
+                    anlyseResultIn.setBetaCalibrationSCE(betaCalibrationSCE);
+                    anlyseResultIn.setBetaCalibrationSEC(betaCalibrationSEC);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationSCE = new GardsCalibrationSpectrum();
+                    betaCalibrationSCE.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0));
+                    betaCalibrationSCE.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1));
+                    betaCalibrationSCE.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2));
+                    GardsCalibrationSpectrum betaCalibrationSEC = new GardsCalibrationSpectrum();
+                    betaCalibrationSEC.setCoeff1(bgAnalyseResult.s_b_fitting_e_c.get(0));
+                    betaCalibrationSEC.setCoeff2(bgAnalyseResult.s_b_fitting_e_c.get(1));
+                    betaCalibrationSEC.setCoeff3(bgAnalyseResult.s_b_fitting_e_c.get(2));
+                    anlyseResultIn.setBetaCalibrationSCE(betaCalibrationSCE);
+                    anlyseResultIn.setBetaCalibrationSEC(betaCalibrationSEC);
+                }
+                if (anlyseResultIn.isBBetaEnergyValidGas()) {
+                    GardsCalibrationSpectrum betaCalibrationGCE = new GardsCalibrationSpectrum();
+                    betaCalibrationGCE.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationGCE.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationGCE.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    GardsCalibrationSpectrum betaCalibrationGEC = new GardsCalibrationSpectrum();
+                    betaCalibrationGEC.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
+                    betaCalibrationGEC.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
+                    betaCalibrationGEC.setCoeff3(Double.valueOf(betaFittingParaToUi.get(2)));
+                    anlyseResultIn.setBetaCalibrationGCE(betaCalibrationGCE);
+                    anlyseResultIn.setBetaCalibrationGEC(betaCalibrationGEC);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationGCE = new GardsCalibrationSpectrum();
+                    betaCalibrationGCE.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0));
+                    betaCalibrationGCE.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1));
+                    betaCalibrationGCE.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2));
+                    GardsCalibrationSpectrum betaCalibrationGEC = new GardsCalibrationSpectrum();
+                    betaCalibrationGEC.setCoeff1(bgAnalyseResult.g_b_fitting_e_c.get(0));
+                    betaCalibrationGEC.setCoeff2(bgAnalyseResult.g_b_fitting_e_c.get(1));
+                    betaCalibrationGEC.setCoeff3(bgAnalyseResult.g_b_fitting_e_c.get(2));
+                    anlyseResultIn.setBetaCalibrationGCE(betaCalibrationGCE);
+                    anlyseResultIn.setBetaCalibrationGEC(betaCalibrationGEC);
+                }
+                if (anlyseResultIn.isBBetaEnergyValidDet()) {
+                    GardsCalibrationSpectrum betaCalibrationDCE = new GardsCalibrationSpectrum();
+                    betaCalibrationDCE.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationDCE.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationDCE.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    GardsCalibrationSpectrum betaCalibrationDEC = new GardsCalibrationSpectrum();
+                    betaCalibrationDEC.setCoeff1(Double.valueOf(betaFittingParaToUi.get(0)));
+                    betaCalibrationDEC.setCoeff2(Double.valueOf(betaFittingParaToUi.get(1)));
+                    betaCalibrationDEC.setCoeff3(Double.valueOf(betaFittingParaToUi.get(2)));
+                    anlyseResultIn.setBetaCalibrationDCE(betaCalibrationDCE);
+                    anlyseResultIn.setBetaCalibrationDEC(betaCalibrationDEC);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationDCE = new GardsCalibrationSpectrum();
+                    betaCalibrationDCE.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0));
+                    betaCalibrationDCE.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1));
+                    betaCalibrationDCE.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2));
+                    GardsCalibrationSpectrum betaCalibrationDEC = new GardsCalibrationSpectrum();
+                    betaCalibrationDEC.setCoeff1(bgAnalyseResult.d_b_fitting_e_c.get(0));
+                    betaCalibrationDEC.setCoeff2(bgAnalyseResult.d_b_fitting_e_c.get(1));
+                    betaCalibrationDEC.setCoeff3(bgAnalyseResult.d_b_fitting_e_c.get(2));
+                    anlyseResultIn.setBetaCalibrationDCE(betaCalibrationDCE);
+                    anlyseResultIn.setBetaCalibrationDEC(betaCalibrationDEC);
+                }
+                List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = new LinkedList<>();
+                for (int i=0; i<bgAnalyseResult.S_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.S_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.S_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.S_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.S_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                for (int i=0; i<bgAnalyseResult.G_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                for (int i=0; i<bgAnalyseResult.D_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                anlyseResultIn.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
+                bgAnalyseResult.LC.add(0, 0.0);
+                bgAnalyseResult.MDC.add(0, 0.0);
+                List<GardsROIResultsSpectrum> roiResultsSpectrumList = new LinkedList<>();
+                for (int i=0; i<bgAnalyseResult.s_roi_cts.size(); i++) {
+                    GardsROIResultsSpectrum roiResults = new GardsROIResultsSpectrum();
+                    roiResults.setRoi(i+1);
+                    roiResults.setLc(bgAnalyseResult.LC.get(i));
+                    roiResults.setSGross(bgAnalyseResult.s_roi_cts.get(i));
+                    roiResults.setGGross(bgAnalyseResult.g_roi_cts.get(i));
+                    roiResults.setBGross(bgAnalyseResult.d_roi_cts.get(i));
+                    roiResults.setSNet(bgAnalyseResult.s_deduct_d_cts.get((i+1)*3));
+                    roiResults.setGNet(bgAnalyseResult.g_deduct_d_cts.get((i+1)*3));
+                    roiResults.setNet(bgAnalyseResult.ROI_net_coutns.get(i));
+                    roiResults.setNetErr(bgAnalyseResult.ROI_net_coutns_err.get(i));
+                    roiResults.setConc(bgAnalyseResult.ROI_con_uncer.get(i));
+                    roiResults.setConcErr(bgAnalyseResult.ROI_con_uncer_err.get(i));
+                    roiResults.setMdc(bgAnalyseResult.MDC.get(i));
+                    if(bgAnalyseResult.ROI_con_uncer.get(i)>bgAnalyseResult.MDC.get(i)) {
+                        roiResults.setNidFlag(1);
+                    } else {
+                        roiResults.setNidFlag(0);
+                    }
+                    roiResultsSpectrumList.add(roiResults);
+                }
+                anlyseResultIn.setRoiResultsSpectrumList(roiResultsSpectrumList);
             }
-            anlyseResultIn.setRoiResultsSpectrumList(roiResultsSpectrumList);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -4391,196 +4404,198 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
             } else {
                 bgAnalyseResult = EnergySpectrumHandler.bgReAnalyse(sampleTmp.getAbsolutePath(), gasTmp.getAbsolutePath(), detTmp.getAbsolutePath(), BgCalPara);
             }
-            //处理XeData的数据
-            List<GardsXeResults> xeResultsSpectrumList = new LinkedList<>();
-            GardsXeResults xe131m = new GardsXeResults();
-            xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
-            xe131m.setConc(bgAnalyseResult.Xe131m_con);
-            xe131m.setConcErr(bgAnalyseResult.Xe131m_uncer);
-            xe131m.setLc(bgAnalyseResult.LC_Xe131m);
-            xe131m.setMdc(bgAnalyseResult.MDC_Xe131m);
-            xe131m.setNidFlag(anlyseResultIn.getXe131mFlag());
-            xeResultsSpectrumList.add(xe131m);
-            GardsXeResults xe133 = new GardsXeResults();
-            xe133.setNuclideName(XeNuclideName.XE_133.getType());
-            xe133.setConc(bgAnalyseResult.Xe133_con);
-            xe133.setConcErr(bgAnalyseResult.Xe133_uncer);
-            xe133.setLc(bgAnalyseResult.LC_Xe133);
-            xe133.setMdc(bgAnalyseResult.MDC_Xe133);
-            xe133.setNidFlag(anlyseResultIn.getXe133Flag());
-            xeResultsSpectrumList.add(xe133);
-            GardsXeResults xe133m = new GardsXeResults();
-            xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
-            xe133m.setConc(bgAnalyseResult.Xe133m_con);
-            xe133m.setConcErr(bgAnalyseResult.Xe133m_uncer);
-            xe133m.setLc(bgAnalyseResult.LC_Xe133m);
-            xe133m.setMdc(bgAnalyseResult.MDC_Xe133m);
-            xe133m.setNidFlag(anlyseResultIn.getXe133mFlag());
-            xeResultsSpectrumList.add(xe133m);
-            GardsXeResults xe135 = new GardsXeResults();
-            xe135.setNuclideName(XeNuclideName.XE_135.getType());
-            xe135.setConc(bgAnalyseResult.Xe135_con);
-            xe135.setConcErr(bgAnalyseResult.Xe135_uncer);
-            xe135.setLc(bgAnalyseResult.LC_Xe135);
-            xe135.setMdc(bgAnalyseResult.MDC_Xe135);
-            xe135.setNidFlag(anlyseResultIn.getXe135Flag());
-            xeResultsSpectrumList.add(xe135);
-            anlyseResultIn.setXeData(xeResultsSpectrumList);
-            //处理GammaCalibration的数据
-            List<GardsCalibrationSpectrum> gammaCalibrationSpectrumList = new LinkedList<>();
-            if (anlyseResultIn.isBGammaEnergyValidSample()) {
-                GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
-                gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                gammaCalibrationS.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationS.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationS.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                gammaCalibrationSpectrumList.add(gammaCalibrationS);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
-                gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0));
-                gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1));
-                gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2));
-                gammaCalibrationSpectrumList.add(gammaCalibrationS);
-            }
-            if (anlyseResultIn.isBGammaEnergyValidGas()) {
-                GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
-                gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                gammaCalibrationG.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationG.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationG.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                gammaCalibrationSpectrumList.add(gammaCalibrationG);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
-                gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0));
-                gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1));
-                gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2));
-                gammaCalibrationSpectrumList.add(gammaCalibrationG);
-            }
-            if (anlyseResultIn.isBGammaEnergyValidDet()) {
-                GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
-                gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                gammaCalibrationD.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
-                gammaCalibrationD.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
-                gammaCalibrationD.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
-                gammaCalibrationSpectrumList.add(gammaCalibrationD);
-            } else {
-                GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
-                gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0));
-                gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1));
-                gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2));
-                gammaCalibrationSpectrumList.add(gammaCalibrationD);
-            }
-            anlyseResultIn.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList);
-            //处理BetaCalibration数据
-            List<GardsCalibrationSpectrum> betaCalibrationSpectrumList = new LinkedList<>();
-            if (anlyseResultIn.isBBetaEnergyValidSample()) {
-                GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
-                betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                betaCalibrationS.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationS.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationS.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                betaCalibrationSpectrumList.add(betaCalibrationS);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
-                betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0));
-                betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1));
-                betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2));
-                betaCalibrationSpectrumList.add(betaCalibrationS);
-            }
-            if (anlyseResultIn.isBBetaEnergyValidGas()) {
-                GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
-                betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                betaCalibrationG.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationG.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationG.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                betaCalibrationSpectrumList.add(betaCalibrationG);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
-                betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0));
-                betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1));
-                betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2));
-                betaCalibrationSpectrumList.add(betaCalibrationG);
-            }
-            if (anlyseResultIn.isBBetaEnergyValidDet()) {
-                GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
-                betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                betaCalibrationD.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
-                betaCalibrationD.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
-                betaCalibrationD.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
-                betaCalibrationSpectrumList.add(betaCalibrationD);
-            } else {
-                GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
-                betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0));
-                betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1));
-                betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2));
-                betaCalibrationSpectrumList.add(betaCalibrationD);
-            }
-            anlyseResultIn.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList);
-            //存储roiChannel数据
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = new LinkedList<>();
-            for (int i=0; i<bgAnalyseResult.S_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.S_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.S_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.S_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.S_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            for (int i=0; i<bgAnalyseResult.G_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.GASBKPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            for (int i=0; i<bgAnalyseResult.D_ROI_B_Boundary_start.size(); i++) {
-                GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
-                roiChannels.setDataType(DataTypeAbbr.DETBKPHD.getType());
-                roiChannels.setRoi(i+1);
-                roiChannels.setBChanStart(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
-                roiChannels.setBChanStop(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
-                roiChannels.setGChanStart(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
-                roiChannels.setGChanStop(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
-                roiChannelsSpectrumList.add(roiChannels);
-            }
-            anlyseResultIn.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
-            bgAnalyseResult.LC.add(0, 0.0);
-            bgAnalyseResult.MDC.add(0, 0.0);
-            //存储roiResult的数据
-            List<GardsROIResultsSpectrum> roiResultsSpectrumList = new LinkedList<>();
-            for (int i=0; i<bgAnalyseResult.s_roi_cts.size(); i++) {
-                GardsROIResultsSpectrum roiResults = new GardsROIResultsSpectrum();
-                roiResults.setRoi(i+1);
-                roiResults.setLc(bgAnalyseResult.LC.get(i));
-                roiResults.setSGross(bgAnalyseResult.s_roi_cts.get(i));
-                roiResults.setGGross(bgAnalyseResult.g_roi_cts.get(i));
-                roiResults.setBGross(bgAnalyseResult.d_roi_cts.get(i));
-                roiResults.setSNet(bgAnalyseResult.s_deduct_d_cts.get((i+1)*3));
-                roiResults.setGNet(bgAnalyseResult.g_deduct_d_cts.get((i+1)*3));
-                roiResults.setNet(bgAnalyseResult.ROI_net_coutns.get(i));
-                roiResults.setNetErr(bgAnalyseResult.ROI_net_coutns_err.get(i));
-                roiResults.setConc(bgAnalyseResult.ROI_con_uncer.get(i));
-                roiResults.setConcErr(bgAnalyseResult.ROI_con_uncer_err.get(i));
-                roiResults.setMdc(bgAnalyseResult.MDC.get(i));
-                if(bgAnalyseResult.ROI_con_uncer.get(i)>bgAnalyseResult.MDC.get(i)) {
-                    roiResults.setNidFlag(1);
+            if (StringUtils.isBlank(bgAnalyseResult.error_log) || bgAnalyseResult.error_log.equalsIgnoreCase("no error.")) {
+                //处理XeData的数据
+                List<GardsXeResults> xeResultsSpectrumList = new LinkedList<>();
+                GardsXeResults xe131m = new GardsXeResults();
+                xe131m.setNuclideName(XeNuclideName.XE_131m.getType());
+                xe131m.setConc(bgAnalyseResult.Xe131m_con);
+                xe131m.setConcErr(bgAnalyseResult.Xe131m_uncer);
+                xe131m.setLc(bgAnalyseResult.LC_Xe131m);
+                xe131m.setMdc(bgAnalyseResult.MDC_Xe131m);
+                xe131m.setNidFlag(anlyseResultIn.getXe131mFlag());
+                xeResultsSpectrumList.add(xe131m);
+                GardsXeResults xe133 = new GardsXeResults();
+                xe133.setNuclideName(XeNuclideName.XE_133.getType());
+                xe133.setConc(bgAnalyseResult.Xe133_con);
+                xe133.setConcErr(bgAnalyseResult.Xe133_uncer);
+                xe133.setLc(bgAnalyseResult.LC_Xe133);
+                xe133.setMdc(bgAnalyseResult.MDC_Xe133);
+                xe133.setNidFlag(anlyseResultIn.getXe133Flag());
+                xeResultsSpectrumList.add(xe133);
+                GardsXeResults xe133m = new GardsXeResults();
+                xe133m.setNuclideName(XeNuclideName.XE_133m.getType());
+                xe133m.setConc(bgAnalyseResult.Xe133m_con);
+                xe133m.setConcErr(bgAnalyseResult.Xe133m_uncer);
+                xe133m.setLc(bgAnalyseResult.LC_Xe133m);
+                xe133m.setMdc(bgAnalyseResult.MDC_Xe133m);
+                xe133m.setNidFlag(anlyseResultIn.getXe133mFlag());
+                xeResultsSpectrumList.add(xe133m);
+                GardsXeResults xe135 = new GardsXeResults();
+                xe135.setNuclideName(XeNuclideName.XE_135.getType());
+                xe135.setConc(bgAnalyseResult.Xe135_con);
+                xe135.setConcErr(bgAnalyseResult.Xe135_uncer);
+                xe135.setLc(bgAnalyseResult.LC_Xe135);
+                xe135.setMdc(bgAnalyseResult.MDC_Xe135);
+                xe135.setNidFlag(anlyseResultIn.getXe135Flag());
+                xeResultsSpectrumList.add(xe135);
+                anlyseResultIn.setXeData(xeResultsSpectrumList);
+                //处理GammaCalibration的数据
+                List<GardsCalibrationSpectrum> gammaCalibrationSpectrumList = new LinkedList<>();
+                if (anlyseResultIn.isBGammaEnergyValidSample()) {
+                    GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
+                    gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    gammaCalibrationS.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationS.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationS.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationS);
                 } else {
-                    roiResults.setNidFlag(0);
+                    GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum();
+                    gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0));
+                    gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1));
+                    gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationS);
                 }
-                roiResultsSpectrumList.add(roiResults);
+                if (anlyseResultIn.isBGammaEnergyValidGas()) {
+                    GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
+                    gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    gammaCalibrationG.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationG.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationG.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationG);
+                } else {
+                    GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum();
+                    gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0));
+                    gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1));
+                    gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationG);
+                }
+                if (anlyseResultIn.isBGammaEnergyValidDet()) {
+                    GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
+                    gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    gammaCalibrationD.setCoeff1(Double.valueOf(gammaFittingPara.get(0)));
+                    gammaCalibrationD.setCoeff2(Double.valueOf(gammaFittingPara.get(1)));
+                    gammaCalibrationD.setCoeff3(Double.valueOf(gammaFittingPara.get(2)));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationD);
+                } else {
+                    GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum();
+                    gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0));
+                    gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1));
+                    gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2));
+                    gammaCalibrationSpectrumList.add(gammaCalibrationD);
+                }
+                anlyseResultIn.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList);
+                //处理BetaCalibration数据
+                List<GardsCalibrationSpectrum> betaCalibrationSpectrumList = new LinkedList<>();
+                if (anlyseResultIn.isBBetaEnergyValidSample()) {
+                    GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
+                    betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    betaCalibrationS.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationS.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationS.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    betaCalibrationSpectrumList.add(betaCalibrationS);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum();
+                    betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0));
+                    betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1));
+                    betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2));
+                    betaCalibrationSpectrumList.add(betaCalibrationS);
+                }
+                if (anlyseResultIn.isBBetaEnergyValidGas()) {
+                    GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
+                    betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    betaCalibrationG.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationG.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationG.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    betaCalibrationSpectrumList.add(betaCalibrationG);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum();
+                    betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0));
+                    betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1));
+                    betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2));
+                    betaCalibrationSpectrumList.add(betaCalibrationG);
+                }
+                if (anlyseResultIn.isBBetaEnergyValidDet()) {
+                    GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
+                    betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    betaCalibrationD.setCoeff1(Double.valueOf(betaFittingPara.get(0)));
+                    betaCalibrationD.setCoeff2(Double.valueOf(betaFittingPara.get(1)));
+                    betaCalibrationD.setCoeff3(Double.valueOf(betaFittingPara.get(2)));
+                    betaCalibrationSpectrumList.add(betaCalibrationD);
+                } else {
+                    GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum();
+                    betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0));
+                    betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1));
+                    betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2));
+                    betaCalibrationSpectrumList.add(betaCalibrationD);
+                }
+                anlyseResultIn.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList);
+                //存储roiChannel数据
+                List<GardsROIChannelsSpectrum> roiChannelsSpectrumList = new LinkedList<>();
+                for (int i=0; i<bgAnalyseResult.S_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.SAMPLEPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.S_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.S_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.S_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.S_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                for (int i=0; i<bgAnalyseResult.G_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.GASBKPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.G_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.G_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                for (int i=0; i<bgAnalyseResult.D_ROI_B_Boundary_start.size(); i++) {
+                    GardsROIChannelsSpectrum roiChannels = new GardsROIChannelsSpectrum();
+                    roiChannels.setDataType(DataTypeAbbr.DETBKPHD.getType());
+                    roiChannels.setRoi(i+1);
+                    roiChannels.setBChanStart(bgAnalyseResult.D_ROI_B_Boundary_start.get(i));
+                    roiChannels.setBChanStop(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i));
+                    roiChannels.setGChanStart(bgAnalyseResult.D_ROI_G_Boundary_start.get(i));
+                    roiChannels.setGChanStop(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i));
+                    roiChannelsSpectrumList.add(roiChannels);
+                }
+                anlyseResultIn.setRoiChannelsSpectrumList(roiChannelsSpectrumList);
+                bgAnalyseResult.LC.add(0, 0.0);
+                bgAnalyseResult.MDC.add(0, 0.0);
+                //存储roiResult的数据
+                List<GardsROIResultsSpectrum> roiResultsSpectrumList = new LinkedList<>();
+                for (int i=0; i<bgAnalyseResult.s_roi_cts.size(); i++) {
+                    GardsROIResultsSpectrum roiResults = new GardsROIResultsSpectrum();
+                    roiResults.setRoi(i+1);
+                    roiResults.setLc(bgAnalyseResult.LC.get(i));
+                    roiResults.setSGross(bgAnalyseResult.s_roi_cts.get(i));
+                    roiResults.setGGross(bgAnalyseResult.g_roi_cts.get(i));
+                    roiResults.setBGross(bgAnalyseResult.d_roi_cts.get(i));
+                    roiResults.setSNet(bgAnalyseResult.s_deduct_d_cts.get((i+1)*3));
+                    roiResults.setGNet(bgAnalyseResult.g_deduct_d_cts.get((i+1)*3));
+                    roiResults.setNet(bgAnalyseResult.ROI_net_coutns.get(i));
+                    roiResults.setNetErr(bgAnalyseResult.ROI_net_coutns_err.get(i));
+                    roiResults.setConc(bgAnalyseResult.ROI_con_uncer.get(i));
+                    roiResults.setConcErr(bgAnalyseResult.ROI_con_uncer_err.get(i));
+                    roiResults.setMdc(bgAnalyseResult.MDC.get(i));
+                    if(bgAnalyseResult.ROI_con_uncer.get(i)>bgAnalyseResult.MDC.get(i)) {
+                        roiResults.setNidFlag(1);
+                    } else {
+                        roiResults.setNidFlag(0);
+                    }
+                    roiResultsSpectrumList.add(roiResults);
+                }
+                anlyseResultIn.setRoiResultsSpectrumList(roiResultsSpectrumList);
             }
-            anlyseResultIn.setRoiResultsSpectrumList(roiResultsSpectrumList);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {