diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
index 936c02e9..32e378c7 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java
@@ -26,8 +26,11 @@ public class SpectrumAnalysesController {
 
     @GetMapping("initValue")
     @ApiOperation(value = "初始化数据", notes = "初始化数据")
-    public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) {
-        spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName, detFileName, qcFileName, request);
+    public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName,
+                          String gasFileName, String detFileName, String qcFileName,
+                          HttpServletRequest request) {
+        spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName,
+                detFileName, qcFileName, request);
     }
 
     @GetMapping("getDBSearchList")
@@ -38,9 +41,15 @@ public class SpectrumAnalysesController {
 
     @GetMapping("getDBSpectrumList")
     @ApiOperation(value = "获取数据库中交互分析基础数据", notes = "获取数据库中交互分析基础数据")
-    public Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB,
-                                    @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate, HttpServletRequest request) {
-        return spectrumAnalysisService.getDBSpectrumList(queryRequest, gardsSampleData, dbName, menuTypes, AllUsers, CollectStopB, AcqStartB, startDate, endDate, request);
+    public Result getDBSpectrumList(QueryRequest queryRequest,
+                                    GardsSampleDataSpectrum gardsSampleData, String dbName,
+                                    String[] menuTypes, boolean AllUsers, boolean CollectStopB,
+                                    boolean AcqStartB,
+                                    @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+                                    @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
+                                    HttpServletRequest request) {
+        return spectrumAnalysisService.getDBSpectrumList(queryRequest, gardsSampleData, dbName,
+                menuTypes, AllUsers, CollectStopB, AcqStartB, startDate, endDate, request);
     }
 
     @GetMapping("getFilesBySampleFile")
@@ -51,32 +60,39 @@ public class SpectrumAnalysesController {
 
     @GetMapping("getDBSpectrumChart")
     @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
-    public Result getDBSpectrumChart(String dbName, Integer sampleId, String analyst, HttpServletRequest request) {
+    public Result getDBSpectrumChart(String dbName, Integer sampleId, String analyst,
+                                     HttpServletRequest request) {
         return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
     }
 
     @GetMapping("getDBSpectrumChartApp")
     @ApiOperation(value = "查询折线图相关信息接口", notes = "查询折线图相关信息接口")
-    public Result getDBSpectrumChartApp(@RequestParam("dbName") String dbName,@RequestParam("sampleId") Integer sampleId,
-                                        @RequestParam("analyst") String analyst, HttpServletRequest request) {
+    public Result getDBSpectrumChartApp(@RequestParam("dbName") String dbName,
+                                        @RequestParam("sampleId") Integer sampleId,
+                                        @RequestParam("analyst") String analyst,
+                                        HttpServletRequest request) {
         return spectrumAnalysisService.getDBSpectrumChart(dbName, sampleId, analyst, request);
     }
 
     @GetMapping("getFileSpectrumChart")
     @ApiOperation(value = "查询文件折线图相关信息接口", notes = "查询文件折线图相关信息接口")
-    public Result getFileSpectrumChart(String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) {
-        return spectrumAnalysisService.getFileSpectrumChart(sampleFileName, gasFileName, detFileName, qcFileName, request);
+    public Result getFileSpectrumChart(String sampleFileName, String gasFileName,
+                                       String detFileName, String qcFileName,
+                                       HttpServletRequest request) {
+        return spectrumAnalysisService.getFileSpectrumChart(sampleFileName, gasFileName,
+                detFileName, qcFileName, request);
     }
 
     @DeleteMapping("deleteSpectrumCacheData")
-    @ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
+    @ApiOperation(value = "删除缓存数据", notes = "删除缓存数据")
     public void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request) {
         spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, request);
     }
 
     @DeleteMapping("deleteSpectrumCacheDataApp")
-    @ApiOperation(value = "删除缓存数据",notes = "删除缓存数据")
-    public void deleteSpectrumCacheDataApp(@RequestParam("sampleFileName") String sampleFileName, HttpServletRequest request) {
+    @ApiOperation(value = "删除缓存数据", notes = "删除缓存数据")
+    public void deleteSpectrumCacheDataApp(@RequestParam("sampleFileName") String sampleFileName,
+                                           HttpServletRequest request) {
         spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, request);
     }
 
@@ -98,78 +114,110 @@ public class SpectrumAnalysesController {
         return spectrumAnalysisService.viewRRR(rrrLogInfo, request);
     }
 
+    @PostMapping("viewRRRHtml")
+    @ApiOperation(value = "查看RRRHtml报告", notes = "查看RRRHtml报告")
+    public Result viewRRRHtml(@RequestBody RRRLogInfo rrrLogInfo, HttpServletRequest request){
+        return spectrumAnalysisService.viewRRRHtml(rrrLogInfo, request);
+    }
+
+
     @GetMapping("viewSpectrum")
     @ApiOperation(value = "查看Spectrum数据", notes = "查看Spectrum数据")
-    public Result viewSpectrum(Integer sampleId, String dbName, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) {
-        return spectrumAnalysisService.viewSpectrum(sampleId, dbName, sampleFileName, gasFileName, detFileName, qcFileName, request);
+    public Result viewSpectrum(Integer sampleId, String dbName, String sampleFileName,
+                               String gasFileName, String detFileName, String qcFileName,
+                               HttpServletRequest request) {
+        return spectrumAnalysisService.viewSpectrum(sampleId, dbName, sampleFileName, gasFileName,
+                detFileName, qcFileName, request);
     }
 
     @GetMapping("viewSampleInformation")
     @ApiOperation(value = "查看SampleInformation数据", notes = "查看SampleInformation数据")
-    public Result viewSampleInformation(Integer sampleId, String sampleFileName, HttpServletRequest request) {
+    public Result viewSampleInformation(Integer sampleId, String sampleFileName,
+                                        HttpServletRequest request) {
         return spectrumAnalysisService.viewSampleInformation(sampleId, sampleFileName, request);
     }
 
     @GetMapping("exportSampleInformation")
     @ApiOperation(value = "导出SampleInformation数据", notes = "导出SampleInformation数据")
-    public void exportSampleInformation(Integer sampleId, String sampleFileName, HttpServletRequest request, HttpServletResponse response){
-        spectrumAnalysisService.exportSampleInformation(sampleId, sampleFileName, request,response);
+    public void exportSampleInformation(Integer sampleId, String sampleFileName,
+                                        HttpServletRequest request, HttpServletResponse response) {
+        spectrumAnalysisService.exportSampleInformation(sampleId, sampleFileName, request,
+                response);
     }
 
     @GetMapping("viewQCResult")
     @ApiOperation(value = "查看QC Result数据", notes = "查看QC Result数据")
-    public Result viewQCResult(Integer sampleId, String dbName, String sampleFileName, String gasFileName, String detFileName, HttpServletRequest request) {
-        return spectrumAnalysisService.viewQCResult(sampleId, dbName, sampleFileName, gasFileName ,detFileName, request);
+    public Result viewQCResult(Integer sampleId, String dbName, String sampleFileName,
+                               String gasFileName, String detFileName, HttpServletRequest request) {
+        return spectrumAnalysisService.viewQCResult(sampleId, dbName, sampleFileName, gasFileName,
+                detFileName, request);
     }
 
     @GetMapping("exportQCResult")
     @ApiOperation(value = "导出QC Result数据", notes = "导出QC Result数据")
-    public void exportQCResult(Integer sampleId, String dbName, String sampleFileName, String gasFileName, String detFileName, HttpServletRequest request, HttpServletResponse response){
-        spectrumAnalysisService.exportQCResult(sampleId, dbName, sampleFileName, gasFileName ,detFileName, request,response);
+    public void exportQCResult(Integer sampleId, String dbName, String sampleFileName,
+                               String gasFileName, String detFileName, HttpServletRequest request,
+                               HttpServletResponse response) {
+        spectrumAnalysisService.exportQCResult(sampleId, dbName, sampleFileName, gasFileName,
+                detFileName, request, response);
     }
 
     @GetMapping("exportQCResultTXT")
-    public void exportQCResultTXT(Integer sampleId, String dbName, String sampleFileName, String gasFileName, String detFileName, HttpServletRequest request, HttpServletResponse response) {
-        spectrumAnalysisService.exportQCResultTXT(sampleId, dbName, sampleFileName, gasFileName, detFileName, request, response);
+    public void exportQCResultTXT(Integer sampleId, String dbName, String sampleFileName,
+                                  String gasFileName, String detFileName,
+                                  HttpServletRequest request, HttpServletResponse response) {
+        spectrumAnalysisService.exportQCResultTXT(sampleId, dbName, sampleFileName, gasFileName,
+                detFileName, request, response);
     }
 
     @GetMapping("viewRLR")
     @ApiOperation(value = "查看RLR数据", notes = "查看RLR数据")
-    public Result viewRLR(Integer sampleId, String sampleFileName, String gasFileName, String detFileName, HttpServletRequest request) {
-        return spectrumAnalysisService.viewRLR(sampleId, sampleFileName, gasFileName, detFileName, request);
+    public Result viewRLR(Integer sampleId, String sampleFileName, String gasFileName,
+                          String detFileName, HttpServletRequest request) {
+        return spectrumAnalysisService.viewRLR(sampleId, sampleFileName, gasFileName, detFileName,
+                request);
     }
 
     @PostMapping("exportRLR")
     @ApiOperation(value = "导出RLR数据", notes = "导出RLR数据")
-    public void exportRLR(@RequestBody BetaRLR betaRLR , HttpServletResponse response) {
+    public void exportRLR(@RequestBody BetaRLR betaRLR, HttpServletResponse response) {
         spectrumAnalysisService.exportRLR(betaRLR, response);
     }
 
     @GetMapping("viewGammaDetectorCalibration")
     @ApiOperation(value = "查询GammaDetectorCalibration数据", notes = "查询GammaDetectorCalibration数据")
-    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request) {
-        return spectrumAnalysisService.viewGammaDetectorCalibration(sampleId, sampleFileName, qcFileName, fittingBtn, request);
+    public Result viewGammaDetectorCalibration(Integer sampleId, String sampleFileName,
+                                               String qcFileName, boolean fittingBtn,
+                                               HttpServletRequest request) {
+        return spectrumAnalysisService.viewGammaDetectorCalibration(sampleId, sampleFileName,
+                qcFileName, fittingBtn, request);
     }
 
     @GetMapping("viewBetaDetectorCalibration")
     @ApiOperation(value = "查询BetaDetectorCalibration数据", notes = "查询BetaDetectorCalibration数据")
-    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName, String qcFileName, boolean fittingBtn, HttpServletRequest request) {
-        return spectrumAnalysisService.viewBetaDetectorCalibration(sampleId, sampleFileName, qcFileName, fittingBtn, request);
+    public Result viewBetaDetectorCalibration(Integer sampleId, String sampleFileName,
+                                              String qcFileName, boolean fittingBtn,
+                                              HttpServletRequest request) {
+        return spectrumAnalysisService.viewBetaDetectorCalibration(sampleId, sampleFileName,
+                qcFileName, fittingBtn, request);
     }
 
     @GetMapping("viewExtrapolation")
     @ApiOperation(value = "查询Extrapolation数据", notes = "查询Extrapolation数据")
-    public Result viewExtrapolation(Integer sampleId, String sampleFileName, HttpServletRequest request) {
+    public Result viewExtrapolation(Integer sampleId, String sampleFileName,
+                                    HttpServletRequest request) {
         return spectrumAnalysisService.viewExtrapolation(sampleId, sampleFileName, request);
     }
 
     @PostMapping("changeDataExtrapolation")
-    public Result changeDataExtrapolation(@RequestBody ChangeExtInfo extInfo, HttpServletRequest request) {
+    public Result changeDataExtrapolation(@RequestBody ChangeExtInfo extInfo,
+                                          HttpServletRequest request) {
         return spectrumAnalysisService.changeDataExtrapolation(extInfo, request);
     }
 
     @PostMapping("analyseExtrapolation")
-    public Result analyseExtrapolation(@RequestBody AnalyseExtInfo extInfo, HttpServletRequest request) {
+    public Result analyseExtrapolation(@RequestBody AnalyseExtInfo extInfo,
+                                       HttpServletRequest request) {
         return spectrumAnalysisService.analyseExtrapolation(extInfo, request);
     }
 
@@ -193,20 +241,30 @@ public class SpectrumAnalysesController {
 
     @GetMapping("statisticsQueryBtn")
     @ApiOperation(value = "报警按钮分析数据", notes = "报警按钮分析数据")
-    public Result statisticsQueryBtn(Integer detectorId, String detectorName, Integer stationId, String statisticsType, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
-        return spectrumAnalysisService.statisticsQueryBtn(detectorId, detectorName, stationId, statisticsType, startTime, endTime);
+    public Result statisticsQueryBtn(Integer detectorId, String detectorName, Integer stationId,
+                                     String statisticsType,
+                                     @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+                                     @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        return spectrumAnalysisService.statisticsQueryBtn(detectorId, detectorName, stationId,
+                statisticsType, startTime, endTime);
     }
 
     @PostMapping("fitting")
     @ApiOperation(value = "公式计算新的曲线", notes = "公式计算新的曲线")
     public Result fitting(@RequestBody FittingBody fittingBody, HttpServletRequest request) {
-        return spectrumAnalysisService.fitting(fittingBody.getParamA(), fittingBody.getParamB(), fittingBody.getParamC(), fittingBody.getTempPoints(), fittingBody.getCount(), fittingBody.getSampleFileName(), fittingBody.getTabName(), fittingBody.isFittingBtn(), request);
+        return spectrumAnalysisService.fitting(fittingBody.getParamA(), fittingBody.getParamB(),
+                fittingBody.getParamC(), fittingBody.getTempPoints(), fittingBody.getCount(),
+                fittingBody.getSampleFileName(), fittingBody.getTabName(),
+                fittingBody.isFittingBtn(), request);
     }
 
     @GetMapping("getGammaGated")
     @ApiOperation(value = "获取gamma对应count数据", notes = "获取gamma对应count数据")
-    public Result getGammaGated(Integer chartHeight, Integer channelWidth, Integer gammaChannel, Integer sampleId, String qcFileName, String sampleFileName, HttpServletRequest request) {
-        return spectrumAnalysisService.getGammaGated(chartHeight, channelWidth, gammaChannel, sampleId, qcFileName, sampleFileName, request);
+    public Result getGammaGated(Integer chartHeight, Integer channelWidth, Integer gammaChannel,
+                                Integer sampleId, String qcFileName, String sampleFileName,
+                                HttpServletRequest request) {
+        return spectrumAnalysisService.getGammaGated(chartHeight, channelWidth, gammaChannel,
+                sampleId, qcFileName, sampleFileName, request);
     }
 
     @PostMapping("resetButton")
@@ -222,20 +280,26 @@ public class SpectrumAnalysesController {
 
     @PostMapping("analyseCurrentSpectrum")
     @ApiOperation(value = "解析当前加载文件数据", notes = "解析当前加载文件数据")
-    public Result analyseCurrentSpectrum(@RequestBody AnalyseBetaInfo analyseBetaInfo, HttpServletRequest request) {
+    public Result analyseCurrentSpectrum(@RequestBody AnalyseBetaInfo analyseBetaInfo,
+                                         HttpServletRequest request) {
         String dbName = analyseBetaInfo.getDbNames().get(0);
         Integer sampleId = analyseBetaInfo.getSampleIds().get(0);
         String sampleFileName = analyseBetaInfo.getSampleFileNames().get(0);
         String gasFileName = analyseBetaInfo.getGasFileNames().get(0);
         String detFileName = analyseBetaInfo.getDetFileNames().get(0);
         String qcFileName = analyseBetaInfo.getQcFileNames().get(0);
-        return spectrumAnalysisService.analyseCurrentSpectrum(dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName, request);
+        return spectrumAnalysisService.analyseCurrentSpectrum(dbName, sampleId, sampleFileName,
+                gasFileName, detFileName, qcFileName, request);
     }
 
     @PostMapping("analyseAllSpectrum")
     @ApiOperation(value = "解析全部加载文件数据", notes = "解析全部加载文件数据")
-    public Result analyseAllSpectrum(@RequestBody AnalyseBetaInfo analyseBetaInfo, HttpServletRequest request) {
-        return spectrumAnalysisService.analyseAllSpectrum(analyseBetaInfo.getDbNames(), analyseBetaInfo.getSampleIds(), analyseBetaInfo.getSampleFileNames(), analyseBetaInfo.getGasFileNames(), analyseBetaInfo.getDetFileNames(), analyseBetaInfo.getQcFileNames(), analyseBetaInfo.getCurrentFileName(), request);
+    public Result analyseAllSpectrum(@RequestBody AnalyseBetaInfo analyseBetaInfo,
+                                     HttpServletRequest request) {
+        return spectrumAnalysisService.analyseAllSpectrum(analyseBetaInfo.getDbNames(),
+                analyseBetaInfo.getSampleIds(), analyseBetaInfo.getSampleFileNames(),
+                analyseBetaInfo.getGasFileNames(), analyseBetaInfo.getDetFileNames(),
+                analyseBetaInfo.getQcFileNames(), analyseBetaInfo.getCurrentFileName(), request);
     }
 
     @GetMapping("viewAutomaticAnalysisLog")
@@ -251,25 +315,26 @@ public class SpectrumAnalysesController {
     }
 
     @PostMapping("saveToDB")
-    public Result saveToDB(@RequestBody BgDataAnlyseResultIn anlyseResultIn, HttpServletRequest request) {
+    public Result saveToDB(@RequestBody BgDataAnlyseResultIn anlyseResultIn,
+                           HttpServletRequest request) {
         return spectrumAnalysisService.saveToDB(anlyseResultIn, request);
     }
 
     @PostMapping("saveToHTML")
     public void saveToHTML(HttpServletRequest request, HttpServletResponse response,
-                           @RequestBody RRRLogInfo rrrLogInfo){
+                           @RequestBody RRRLogInfo rrrLogInfo) {
         spectrumAnalysisService.saveToHTML(rrrLogInfo, request, response);
     }
 
     @PostMapping("saveToExcel")
     public void saveToExcel(HttpServletRequest request, HttpServletResponse response,
-                            @RequestBody RRRLogInfo rrrLogInfo){
+                            @RequestBody RRRLogInfo rrrLogInfo) {
         spectrumAnalysisService.saveToExcel(rrrLogInfo, request, response);
     }
 
     @PostMapping("saveToTxt")
     public void saveToTxt(HttpServletRequest request, HttpServletResponse response,
-                          @RequestBody RRRLogInfo rrrLogInfo){
+                          @RequestBody RRRLogInfo rrrLogInfo) {
         spectrumAnalysisService.saveToTxt(rrrLogInfo, request, response);
     }
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideRatioResult.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideRatioResult.java
index 3e6816a8..a2319f8e 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideRatioResult.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/NuclideRatioResult.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.jeecg.modules.entity.RatioType;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -9,16 +10,42 @@ import java.util.Date;
 @Data
 public class NuclideRatioResult {
     private String sampleId;
-    private Double ratio; // Xe-133 / Xe-131m
+    private RatioType ratioType;   // ← 新增：标识哪种比值
+    private Double ratio;
+    private Double numerator;      // ← 新增：分子值（调试用）
+    private Double denominator;    // ← 新增：分母值（调试用）
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date collectStop; // 停止采集时间
-    private String status; // 计算状态，如 SUCCESS, MISSING_DATA, ZERO_DENOMINATOR
+    private Date collectStop;
 
-    public NuclideRatioResult(String sampleId, Double ratio, Date collectStop, String status) {
+    private String status;  // SUCCESS, MISSING_DATA, ZERO_DENOMINATOR
+
+    /**
+     * 成功时的构造
+     */
+    public NuclideRatioResult(String sampleId, RatioType ratioType,
+                              Double ratio, Double numerator,
+                              Double denominator, Date collectStop) {
         this.sampleId = sampleId;
+        this.ratioType = ratioType;
         this.ratio = ratio;
+        this.numerator = numerator;
+        this.denominator = denominator;
         this.collectStop = collectStop;
+        this.status = "SUCCESS";
+    }
+    /**
+     * 失败时的构造（无比值结果）
+     */
+    public NuclideRatioResult(String sampleId, RatioType ratioType,
+                              String status) {
+        this.sampleId = sampleId;
+        this.ratioType = ratioType;
+        this.ratio = null;
+        this.numerator = null;
+        this.denominator = null;
+        this.collectStop = null;
         this.status = status;
     }
 }
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 45acf235..f173f664 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
@@ -240,9 +240,13 @@ public interface SpectrumAnalysisMapper {
             @Param("startTime") Date startTime);
 
     List<NuclideAnalysisInfo> selectXeDataPastYear(@Param("schemaName") String schemaName,
-                                                   @Param("sampleId") String sampleId,
+                                                   @Param("stationId") String stationId,
                                                    @Param(value = "userName") String userName,
                                                    @Param("startTime") Date startTime,
                                                    @Param("endTime") Date endTime);
+    List<NuclideAnalysisInfo>  selectXeData(@Param("schemaName") String schemaName,
+                                                   @Param("sampleId") String sampleId,
+                                                   @Param(value = "userName") String userName
+                                                  );
 
 }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml
index 5cbb74a4..de540146 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml
@@ -58,4 +58,40 @@
         WHERE IDANALYSIS = #{analyses.idAnalysis}
     </update>
 
+
+    <update id="updateEntity">
+        UPDATE RNMAN.GARDS_ANALYSES
+        SET ANALYSISBEGIN      =
+        <choose>
+            <when test="dbType == 'Oracle'">
+                TO_DATE(#{analyses.analysisBeginStr}, 'YYYY/MM/DD HH24:MI:SS')
+            </when>
+            <otherwise>
+                TO_TIMESTAMP(#{analyses.analysisBeginStr}, 'YYYY/MM/DD HH24:MI:SS')
+            </otherwise>
+        </choose>,
+        ANALYSISEND        =
+        <choose>
+            <when test="dbType == 'PostgreSQL'">
+                TO_DATE(#{analyses.analysisEndStr}, 'YYYY/MM/DD HH24:MI:SS')
+            </when>
+            <otherwise>
+                TO_TIMESTAMP(#{analyses.analysisEndStr}, 'YYYY/MM/DD HH24:MI:SS')
+            </otherwise>
+        </choose>,
+        SOFTWARE           = #{analyses.software},
+        SWVERSION          = #{analyses.swVersion},
+        COMMENTS           = #{analyses.comments},
+        SEARCHSTARTCHANNEL = #{analyses.searchStartChannel},
+        SEARCHENDCHANNEL   = #{analyses.searchEndChannel},
+        SEARCHTHRESHOLD    = #{analyses.searchThreshold},
+        NUMBEROFPEAKS      = #{analyses.numberOfPeaks},
+        TOTALCOUNTS        = #{analyses.totalCounts},
+        BASELINE_PATH      = #{analyses.baselinePath},
+        LC_PATH            = #{analyses.lcPath},
+        SCAC_PATH          = #{analyses.scacPath},
+        LOG_PATH           = #{analyses.logPath},
+        REPORT_PAHT        = #{analyses.reportPath}
+        WHERE IDANALYSIS = #{analyses.idAnalysis}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/IDCDataMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/IDCDataMapper.xml
index 39d4f450..f3c76b5a 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/IDCDataMapper.xml
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/IDCDataMapper.xml
@@ -40,7 +40,11 @@
                                WHEN 10 THEN 'XE133'
                                WHEN 11 THEN 'XE135'
                                ELSE 'UNKNOWN'
-            END as NUCLIDE_NAME, CONC, CONC_ERR, MDC, NID_FLAG
+            END as NUCLIDE_NAME,
+               TRIM(TO_CHAR(CONC, 'FM999990.099999'))      AS CONC,
+               TRIM(TO_CHAR(CONC_ERR, 'FM999990.099999'))  AS CONC_ERR,
+               TRIM(TO_CHAR(MDC, 'FM999990.099999'))        AS MDC,
+            NID_FLAG
         FROM rmsman.gards_bg_isotope_concs
         WHERE SAMPLE_ID = #{sampleId}
     </select>
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 2df53528..ca5a1f91 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
@@ -1291,11 +1291,31 @@
                                AND xe.IDANALYSIS = b.IDANALYSIS
                  LEFT JOIN ORIGINAL.GARDS_SAMPLE_DATA a
                            ON xe.SAMPLE_ID = a.SAMPLE_ID
-        WHERE a.SAMPLE_ID = #{sampleId}
+        WHERE a.STATION_ID = #{stationId}
           AND b.ANALYST = #{userName}
           AND a.COLLECT_STOP IS NOT NULL
           AND a.COLLECT_STOP BETWEEN #{startTime} AND #{endTime}
 
+    </select>
+    <select id="selectXeData" resultType="org.jeecg.modules.entity.vo.NuclideAnalysisInfo">
+        SELECT a.SAMPLE_ID,
+               a.COLLECT_STOP,
+               b.CATEGORY,
+               xe.CONC,
+               xe.CONC_ERR,
+               xe.MDC,
+               xe.NUCLIDE_NAME,
+               xe.LC
+        FROM ${schemaName}.GARDS_XE_RESULTS xe
+                 LEFT JOIN ${schemaName}.GARDS_ANALYSES b
+                           ON xe.SAMPLE_ID = b.SAMPLE_ID
+                               AND xe.IDANALYSIS = b.IDANALYSIS
+                 LEFT JOIN ORIGINAL.GARDS_SAMPLE_DATA a
+                           ON xe.SAMPLE_ID = a.SAMPLE_ID
+        WHERE a.SAMPLE_ID = #{sampleId}
+          AND b.ANALYST = #{userName}
+          AND a.COLLECT_STOP IS NOT NULL
+
     </select>
     <select id="roiPaths" resultType="org.jeecg.modules.base.dto.RoiDto">
         SELECT ROI_NUM, PHD_PATH
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
index d94ecc8b..ac6e2240 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
@@ -148,6 +148,8 @@ public interface IGammaService{
 
     Result viewRRR(Integer sampleId, String fileName, HttpServletRequest request);
 
+    Result  viewRRRHtml(Integer sampleId, String fileName, HttpServletRequest request);
+
     void exportRRR(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response);
 
     Result<?> radionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request);
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGenerateHtmlReport.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGenerateHtmlReport.java
index 783af986..7fba457c 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGenerateHtmlReport.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGenerateHtmlReport.java
@@ -34,7 +34,14 @@ public interface IGenerateHtmlReport {
      * @return 生成的HTML字符串
      */
     String generateHtmlReportWithTemplate(Map<String, Object> data, String templatePath);
-
+    /**
+     * 使用自定义模板路径生成报告，并保存到指定输出目录
+     * @param data 报告数据，键值对形式
+     * @param templatePath 模板文件路径（相对于classpath，例如 "templates/custom-report.html"）
+     * @param outputPath 目标文件保存路径（包含文件名和后缀，例如 "D:/reports/report_2026.html"）
+     * @return 保存成功返回true，失败返回false
+     */
+    boolean generateHtmlReportWithTemplateToFile(Map<String, Object> data, String templatePath, String outputPath);
     /**
      * 生成带图表和交互功能的HTML报告
      * @param data 报告数据
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
index 15ff5d0a..0a3c3690 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java
@@ -33,6 +33,7 @@ public interface ISpectrumAnalysisService {
     void viewARR(Integer sampleId, HttpServletResponse response);
 
     Result viewRRR(RRRLogInfo rrrLogInfo, HttpServletRequest request);
+    Result  viewRRRHtml(RRRLogInfo rrrLogInfo, HttpServletRequest request);
 
     Result viewSpectrum(Integer sampleId, String dbName, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request);
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java
index bc1dd1cf..083e9e6e 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java
@@ -2,13 +2,16 @@ package org.jeecg.modules.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.constant.enums.DbType;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.DynamicDsProperties;
 import org.jeecg.modules.base.entity.rnman.GardsAnalyses;
 import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
 import org.jeecg.modules.entity.vo.PHDFile;
 import org.jeecg.modules.entity.GardsAnalysesSpectrum;
 import org.jeecg.modules.mapper.GardsAnalysesManMapper;
 import org.jeecg.modules.service.IGardsAnalysesSpectrumService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,6 +22,8 @@ import java.util.Date;
 @DS("ora")
 public class GardsAnalysesSpectrumServiceImpl extends ServiceImpl<GardsAnalysesManMapper, GardsAnalyses> implements IGardsAnalysesSpectrumService {
 
+    @Autowired
+    private DynamicDsProperties dynamicDsProperties;
     @Override
     @Transactional
     public Integer insertEntity(GStoreMiddleProcessData middleData, PHDFile phd, String userName, String comments) {
@@ -71,7 +76,8 @@ public class GardsAnalysesSpectrumServiceImpl extends ServiceImpl<GardsAnalysesM
         analyses.setScacPath(middleData.analyses_scac_filePath);
         analyses.setLogPath(middleData.analyses_LogPath);
         analyses.setReportPath(middleData.analyses_ReportPath);
-        this.baseMapper.updateEntity(analyses);
+        DbType dbType = dynamicDsProperties.getDatasource().get("ora").getDbTypeEnum();
+        this.baseMapper.updateEntity(analyses,dbType.getText());
     }
 
 }
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/HtmlReportGenerator.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/HtmlReportGenerator.java
index 597140dd..22ec4249 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/HtmlReportGenerator.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/HtmlReportGenerator.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.service.impl;
 
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.service.IGenerateHtmlReport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,11 +12,12 @@ import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Base64;
 import java.util.List;
 import java.util.Map;
-
+@Slf4j
 @Service
 public class HtmlReportGenerator implements IGenerateHtmlReport {
 
@@ -100,7 +102,36 @@ public class HtmlReportGenerator implements IGenerateHtmlReport {
 
         return tempEngine.process(templatePath, context);
     }
+    /**
+     * 使用自定义模板路径生成报告，并保存到指定输出目录
+     * @param data 报告数据，键值对形式
+     * @param templatePath 模板文件路径（相对于classpath）
+     * @param outputPath 目标文件保存路径（包含文件名）
+     * @return 保存成功返回true，失败返回false
+     */
+    @Override
+    public boolean generateHtmlReportWithTemplateToFile(Map<String, Object> data, String templatePath, String outputPath) {
+        try {
+            // 使用自定义模板路径解析并生成 HTML 字符串
+            String htmlContent = generateHtmlReportWithTemplate(data, templatePath);
 
+            // 获取输出文件的 Path 对象
+            Path path = Paths.get(outputPath);
+
+            // 如果目标文件的父级目录不存在，则自动创建目录
+            Path parentDir = path.getParent();
+            if (parentDir != null && Files.notExists(parentDir)) {
+                Files.createDirectories(parentDir);
+            }
+
+            // 将 HTML 字符串以 UTF-8 编码写入指定的目标文件中
+            Files.write(path, htmlContent.getBytes(StandardCharsets.UTF_8));
+            return true;
+        } catch (IOException e) {
+            log.error("使用自定义模板路径生成报告，并保存到指定输出目录错误：",e);
+            return false;
+        }
+    }
     /**
      * 生成高级HTML报告（可选包含图表和交互功能）
      * @param data 报告数据，键值对形式
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
index 802de0da..4fa076d9 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -22,22 +21,20 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.log.Log;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.math3.fitting.WeightedObservedPoints;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.cache.SelfCache;
+import org.jeecg.common.constant.DateConstant;
 import org.jeecg.common.constant.RedisConstant;
 import org.jeecg.common.constant.SelfStationConstant;
 import org.jeecg.common.constant.StringConstant;
 import org.jeecg.common.constant.enums.DbType;
 import org.jeecg.common.constant.enums.FileTypeEnum;
-import org.jeecg.common.constant.enums.SampleType;
-import org.jeecg.common.constant.enums.SpectrumSystemType;
 import org.jeecg.common.properties.ParameterProperties;
 import org.jeecg.common.properties.SpectrumPathProperties;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.*;
 import org.jeecg.modules.base.abstracts.AbstractLogOrReport;
-import org.jeecg.modules.base.dto.RoiDto;
+import org.jeecg.modules.base.dto.*;
 import org.jeecg.modules.base.entity.configuration.GardsNuclLib;
 import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
 import org.jeecg.modules.base.entity.original.GardsSampleData;
@@ -49,7 +46,6 @@ import org.jeecg.modules.base.entity.rnman.GardsXeResults;
 import org.jeecg.modules.base.enums.*;
 import org.jeecg.modules.entity.*;
 import org.jeecg.modules.entity.vo.*;
-import org.jeecg.modules.exception.AnalyseException;
 import org.jeecg.modules.mapper.SpectrumAnalysisMapper;
 import org.jeecg.modules.native_jni.CalValuesHandler;
 import org.jeecg.modules.native_jni.EnergySpectrumHandler;
@@ -69,11 +65,16 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -83,7 +84,8 @@ import java.util.stream.Collectors;
 @Service("SelfStationService")
 @DS("ora")
 public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelfStationService {
-
+    //region 字段注入
+    List<String> validNuclides = Arrays.asList("Xe131m", "Xe133", "Xe133m", "Xe135");
     @Autowired
     private GammaFileUtil gammaFileUtil;
     @Autowired
@@ -147,7 +149,9 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
     @Autowired
     private DynamicDsProperties dynamicDsProperties;
 
-
+    @Autowired
+    private HtmlReportGenerator reportByThymeleaf;
+    //endregion
     @Override
     public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName,
                           String detFileName,
@@ -7022,6 +7026,26 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
                     try (FileInputStream in = new FileInputStream(rptFile)) {
                         ftpUtil.saveFile(spectrumPathProperties.getRootPath() + reportPath + ".txt",
                                 in);
+
+                        Map<String, Object> rrrMap = OutPutRrrHtml(betaDataFile, userName);
+                        String targetDir =
+                                spectrumPathProperties.getRootPath() + reportPath;
+                        Path destinationDir = Paths.get(targetDir);
+                        try {
+                            // 创建目录（及所有不存在的父目录）
+                            if (!Files.exists(destinationDir)) {
+                                Files.createDirectories(destinationDir);
+                            }
+                            // 完整文件路径
+                            Path htmlFile =
+                                    destinationDir.resolve(destinationDir.getFileName() + ".html");
+                            reportByThymeleaf.generateHtmlReportToFile(rrrMap, htmlFile.toString());
+                            copyEchartsLib(targetDir);
+                        } catch (IOException e) {
+                            System.err.println("目录创建失败: " + e.getMessage());
+                            e.printStackTrace();
+                        }
+
                     }
                 } catch (FileNotFoundException e) {
                     log.error("存储报告文件错误：{},错误路径：{}", e,
@@ -7675,6 +7699,1070 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
         result.setResult(resultMap);
         return result;
     }
+    private Map<String, Object> OutPutRrrHtml(BetaDataFile betaDataFile, String userName) {
+        //region 设置局部变量
 
+        Map<String, Object> result = new HashMap<>();
+        GardsCalibrationSpectrum gammaCalibrationParamS = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum gammaCalibrationParamG = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum gammaCalibrationParamD = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum gammaCalibrationParamES = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum gammaCalibrationParamEG = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum gammaCalibrationParamED = new GardsCalibrationSpectrum();
+
+        GardsCalibrationSpectrum betaCalibrationParamS = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum betaCalibrationParamG = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum betaCalibrationParamD = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum betaCalibrationParamES = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum betaCalibrationParamEG = new GardsCalibrationSpectrum();
+        GardsCalibrationSpectrum betaCalibrationParamED = new GardsCalibrationSpectrum();
+
+        StringBuffer strBuffer = new StringBuffer();
+        String sampleId = betaDataFile.getSampleId();
+        //endregion
+        //判断
+        if (betaDataFile.isSaveAnalysisResult()) {
+            //region 对分析后的内容进行数据获取
+            List<GardsROIChannelsSpectrum> channelsSpectrums =
+                    betaDataFile.getRoiChannelsSpectrumList();
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream()
+                    .filter(item -> item.getDataType()
+                            .equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType()))
+                    .collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream()
+                    .filter(item -> item.getDataType()
+                            .equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType()))
+                    .collect(Collectors.toList());
+            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream()
+                    .filter(item -> item.getDataType()
+                            .equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType()))
+                    .collect(Collectors.toList());
+            List<GardsROIResultsSpectrum> resultsSpectrums =
+                    betaDataFile.getRoiResultsSpectrumList();
+            List<GardsXeResultsSpectrum> xeResultsSpectrums =
+                    betaDataFile.getXeResultsSpectrumList();
+
+            //endregion
+
+            //region #SAMPLE: LIMITS PER ROI GAMMA
+            List<GardsCalibrationSpectrum> gammaCalibrationParamList =
+                    betaDataFile.getGammaCalibrationSpectrumList();
+            List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList =
+                    betaDataFile.getGammaCalibrationSpectrumEList();
+            for (int i = 0; i < gammaCalibrationParamList.size(); i++) {
+                if (gammaCalibrationParamList.get(i).getDataType()
+                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
+                    gammaCalibrationParamS = gammaCalibrationParamList.get(i);
+                } else if (gammaCalibrationParamList.get(i).getDataType()
+                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
+                    gammaCalibrationParamG = gammaCalibrationParamList.get(i);
+                } else if (gammaCalibrationParamList.get(i).getDataType()
+                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
+                    gammaCalibrationParamD = gammaCalibrationParamList.get(i);
+                }
+            }
+            for (int i = 0; i < gammaCalibrationSpectrumEList.size(); i++) {
+                if (gammaCalibrationSpectrumEList.get(i).getDataType()
+                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
+                    gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i);
+                } else if (gammaCalibrationSpectrumEList.get(i).getDataType()
+                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
+                    gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i);
+                } else if (gammaCalibrationSpectrumEList.get(i).getDataType()
+                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
+                    gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i);
+                }
+            }
+            //endregion
+
+            //region #SAMPLE: LIMITS PER ROI BETA
+            List<GardsCalibrationSpectrum> betaCalibrationParamList =
+                    betaDataFile.getBetaCalibrationSpectrumList();
+            List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList =
+                    betaDataFile.getBetaCalibrationSpectrumEList();
+            for (int i = 0; i < betaCalibrationParamList.size(); i++) {
+                if (betaCalibrationParamList.get(i).getDataType()
+                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
+                    betaCalibrationParamS = betaCalibrationParamList.get(i);
+                } else if (betaCalibrationParamList.get(i).getDataType()
+                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
+                    betaCalibrationParamG = betaCalibrationParamList.get(i);
+                } else if (betaCalibrationParamList.get(i).getDataType()
+                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
+                    betaCalibrationParamD = betaCalibrationParamList.get(i);
+                }
+            }
+            for (int i = 0; i < betaCalibrationSpectrumEList.size(); i++) {
+                if (betaCalibrationSpectrumEList.get(i).getDataType()
+                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
+                    betaCalibrationParamES = betaCalibrationSpectrumEList.get(i);
+                } else if (betaCalibrationSpectrumEList.get(i).getDataType()
+                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
+                    betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i);
+                } else if (betaCalibrationSpectrumEList.get(i).getDataType()
+                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
+                    betaCalibrationParamED = betaCalibrationSpectrumEList.get(i);
+                }
+            }
+            //endregion
+
+            //region sampleFile  相关数据
+            try {
+                Information information = new Information();
+                //region 获取Information数据
+                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_real_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);
+                }
+                //endregion
+                /* 开始装配数据 */
+                //region 设置标题中的时间
+                result.put("reportTitle", betaDataFile.getSampleSpectrumData().getStationCode());
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateConstant.DATE_TIME_S);
+                result.put("now", LocalDateTime.now().format(formatter));
+                result.put("measurement_id", information.getMeasurementID());
+                result.put("gas_bk_measurement_id", information.getGasBkgdMeasurementID());
+                result.put("sample_ref_id", information.getSampleRefId());
+                result.put("site_code", information.getSit_det_code());
+                result.put("detector_code", information.getDetect_code());
+                result.put("collection_start", DateUtils.formatDate(information.getCollect_start(),
+                        "yyyy/MM/dd HH:mm:ss"));
+                result.put("collection_stop",
+                        DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss"));
+                result.put("collection_time", (information.getCollect_stop().getTime() / 1000 -
+                        information.getCollect_start().getTime() / 1000) / 3600);
+                result.put("air_volume", information.getS_xe_stable_volume());
+                result.put("sample_volume_of_Xe", information.getS_volume_of_Xe());
+                result.put("acquisition_start",
+                        DateUtils.formatDate(information.getAcquisition_start(),
+                                "yyyy/MM/dd HH:mm:ss"));
+                result.put("acquisition_real_time", information.getAcquisition_real_sec());
+                result.put("acquisition_live_time", information.getAcquisition_live_sec());
+                //endregion
+
+
+                /*
+                 *    SAMPLE
+                 * */
+                //region #SAMPLE Old CALIBRATION
+                List<Calibration> samplOldCalibrations = new ArrayList<>();
+                Calibration samplOldCalibrationCH = new Calibration();
+                Calibration samplOldCalibrationE = new Calibration();
+                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
+                    samplOldCalibrationCH.setBeta(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
+                } else {
+                    samplOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
+                    samplOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
+                } else {
+                    samplOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
+                    samplOldCalibrationE.setBeta(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(2))));
+                } else {
+                    samplOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
+                    samplOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(2))));
+                } else {
+                    samplOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
+                }
+                samplOldCalibrations.add(samplOldCalibrationCH);
+                samplOldCalibrations.add(samplOldCalibrationE);
+                result.put("samplOldCalibrations", samplOldCalibrations);
+                //endregion
+
+                //region #SAMPLE New CALIBRATION
+                List<Calibration> samplNewCalibrations = new ArrayList<>();
+                Calibration samplNewCalibrationCH = new Calibration();
+                Calibration samplNewCalibrationE = new Calibration();
+                samplNewCalibrationCH.setBeta("CH(x) =  (" +
+                        (Objects.isNull(betaCalibrationParamES.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(betaCalibrationParamES.getCoeff1())))
+                        + ")+(" + (Objects.isNull(betaCalibrationParamES.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamES.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(betaCalibrationParamES.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamES.getCoeff3())))
+                        + ")x*x");
+                samplNewCalibrationCH.setGamma("CH(x) =  (" +
+                        (Objects.isNull(gammaCalibrationParamES.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(gammaCalibrationParamES.getCoeff1())))
+                        + ")+(" + (Objects.isNull(gammaCalibrationParamES.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamES.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamES.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamES.getCoeff3())))
+                        + ")x*x");
+                samplNewCalibrationE.setBeta("E(x) = (" +
+                        (Objects.isNull(betaCalibrationParamS.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(betaCalibrationParamS.getCoeff1())))
+                        + ")+(" + (Objects.isNull(betaCalibrationParamS.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamS.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(betaCalibrationParamS.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamS.getCoeff3())))
+                        + ")x*x");
+                samplNewCalibrationE.setGamma("E(x) = (" +
+                        (Objects.isNull(gammaCalibrationParamS.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(gammaCalibrationParamS.getCoeff1())))
+                        + ")+(" + (Objects.isNull(gammaCalibrationParamS.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamS.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamS.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamS.getCoeff3())))
+                        + ")x*x");
+                samplNewCalibrations.add(samplNewCalibrationCH);
+                samplNewCalibrations.add(samplNewCalibrationE);
+                result.put("samplNewCalibrations", samplNewCalibrations);
+                //endregion
+
+                // #SAMPLE: LIMITS PER ROI
+                List<ROIChannelsDto> roiChannelsDtosS = new LinkedList<>();
+                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsSample) {
+                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
+                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
+                    roiChannelsDto.shift();
+                    roiChannelsDtosS.add(roiChannelsDto);
+                }
+                result.put("roiChannelsS", roiChannelsDtosS);
+
+                /*
+                 *     DET
+                 * */
+                //region #DET Old CALIBRATION
+                List<Calibration> detOldCalibrations = new ArrayList<>();
+                Calibration detOldCalibrationCH = new Calibration();
+                Calibration detOldCalibrationE = new Calibration();
+                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
+                    detOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
+                } else {
+                    detOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
+                    detOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
+                } else {
+                    detOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
+                    detOldCalibrationE.setBeta(rowFormat(" E(x) =  (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(2))));
+                } else {
+                    detOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
+                    detOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(2))));
+                } else {
+                    detOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
+                }
+                detOldCalibrations.add(detOldCalibrationCH);
+                detOldCalibrations.add(detOldCalibrationE);
+                result.put("detOldCalibrations", detOldCalibrations);
+                //endregion
+
+                //region DET New CALIBRATION
+                List<Calibration> detNewCalibrations = new ArrayList<>();
+                Calibration detNewCalibrationCH = new Calibration();
+                Calibration detNewCalibrationE = new Calibration();
+                detNewCalibrationCH.setBeta("CH(x) =  (" +
+                        (Objects.isNull(betaCalibrationParamED.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(betaCalibrationParamED.getCoeff1())))
+                        + ")+(" + (Objects.isNull(betaCalibrationParamED.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamED.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(betaCalibrationParamED.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamED.getCoeff3())))
+                        + ")x*x");
+                detNewCalibrationCH.setGamma("CH(x) =  (" +
+                        (Objects.isNull(gammaCalibrationParamED.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(gammaCalibrationParamED.getCoeff1())))
+                        + ")+(" + (Objects.isNull(gammaCalibrationParamED.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamED.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamED.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamED.getCoeff3())))
+                        + ")x*x");
+                detNewCalibrationE.setBeta("E(x) = (" +
+                        (Objects.isNull(betaCalibrationParamD.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(betaCalibrationParamD.getCoeff1())))
+                        + ")+(" + (Objects.isNull(betaCalibrationParamD.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamD.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(betaCalibrationParamD.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamD.getCoeff3())))
+                        + ")x*x");
+                detNewCalibrationE.setGamma("E(x) = (" +
+                        (Objects.isNull(gammaCalibrationParamD.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(gammaCalibrationParamD.getCoeff1())))
+                        + ")+(" + (Objects.isNull(gammaCalibrationParamD.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamD.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamD.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamD.getCoeff3())))
+                        + ")x*x");
+                detNewCalibrations.add(detNewCalibrationCH);
+                detNewCalibrations.add(detNewCalibrationE);
+                result.put("detNewCalibrations", detNewCalibrations);
+                //endregion
+
+                // DET: LIMITS PER ROI
+                List<ROIChannelsDto> roiChannelsDtosD = new LinkedList<>();
+                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsDet) {
+                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
+                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
+                    roiChannelsDto.shift();
+                    roiChannelsDtosD.add(roiChannelsDto);
+                }
+                result.put("roiChannelsD", roiChannelsDtosD);
+
+                /*
+                 *    GAS
+                 * */
+                //region #GAS Old CALIBRATION
+                List<Calibration> gasOldCalibrations = new ArrayList<>();
+                Calibration gasOldCalibrationCH = new Calibration();
+                Calibration gasOldCalibrationE = new Calibration();
+                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
+                    gasOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
+                } else {
+                    gasOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
+                    gasOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
+                } else {
+                    gasOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
+                    gasOldCalibrationE.setBeta(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getBetaFittingParaOld().get(2))));
+                } else {
+                    gasOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
+                }
+                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
+                    gasOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(0)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(1)),
+                            NumberFormatUtil.numberSixLen(
+                                    betaDataFile.getGammaFittingParaOld().get(2))));
+                } else {
+                    gasOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
+                }
+                gasOldCalibrations.add(gasOldCalibrationCH);
+                gasOldCalibrations.add(gasOldCalibrationE);
+                result.put("gasOldCalibrations", gasOldCalibrations);
+                //endregion
+
+                //region #GAS New CALIBRATION
+                List<Calibration> gasNewCalibrations = new ArrayList<>();
+                Calibration gasNewCalibrationCH = new Calibration();
+                Calibration gasNewCalibrationE = new Calibration();
+                gasNewCalibrationCH.setBeta("CH(x) =  (" +
+                        (Objects.isNull(betaCalibrationParamEG.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(betaCalibrationParamEG.getCoeff1())))
+                        + ")+(" + (Objects.isNull(betaCalibrationParamEG.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamEG.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(betaCalibrationParamEG.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamEG.getCoeff3())))
+                        + ")x*x");
+                gasNewCalibrationCH.setGamma("CH(x) =  (" +
+                        (Objects.isNull(gammaCalibrationParamEG.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(gammaCalibrationParamEG.getCoeff1())))
+                        + ")+(" + (Objects.isNull(gammaCalibrationParamEG.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamEG.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamEG.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamEG.getCoeff3())))
+                        + ")x*x");
+                gasNewCalibrationE.setBeta("E(x) = (" +
+                        (Objects.isNull(betaCalibrationParamG.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(betaCalibrationParamG.getCoeff1())))
+                        + ")+(" + (Objects.isNull(betaCalibrationParamG.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamG.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(betaCalibrationParamG.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(betaCalibrationParamG.getCoeff3())))
+                        + ")x*x");
+                gasNewCalibrationE.setGamma("E(x) = (" +
+                        (Objects.isNull(gammaCalibrationParamG.getCoeff1()) ? "?1" :
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(gammaCalibrationParamG.getCoeff1())))
+                        + ")+(" + (Objects.isNull(gammaCalibrationParamG.getCoeff2()) ? "?2" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamG.getCoeff2())))
+                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamG.getCoeff3()) ? "?3" :
+                        NumberFormatUtil.numberSixLen(
+                                String.valueOf(gammaCalibrationParamG.getCoeff3())))
+                        + ")x*x");
+                gasNewCalibrations.add(gasNewCalibrationCH);
+                gasNewCalibrations.add(gasNewCalibrationE);
+                result.put("gasNewCalibrations", gasNewCalibrations);
+                //endregion
+
+                // #GAS: LIMITS PER ROI
+                List<ROIChannelsDto> roiChannelsDtosG = new LinkedList<>();
+                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsGas) {
+                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
+                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
+                    roiChannelsDto.shift();
+                    roiChannelsDtosG.add(roiChannelsDto);
+                }
+                result.put("roiChannelsG", roiChannelsDtosG);
+                //region GardsROIResultsSpectrum
+                /*
+                 *    GardsROIResultsSpectrum
+                 * */
+                // #GROSS COUNTS PER ROI
+                // #NET COUNTS AND LC PER ROI
+                // #CONCENTRATION AND LC PER ROI
+                List<ROIResultsStrDto> roiResults = new ArrayList<>();
+                for (GardsROIResultsSpectrum resultsSpectrum : resultsSpectrums) {
+                    ROIResultsStrDto roiResultsStrDto = new ROIResultsStrDto();
+                    roiResultsStrDto.setRoi(resultsSpectrum.getRoi());
+                    roiResultsStrDto.setSGross(resultsSpectrum.getSGross());
+                    roiResultsStrDto.setGGross(resultsSpectrum.getGGross());
+                    roiResultsStrDto.setBGross(resultsSpectrum.getBGross());
+                    roiResultsStrDto.setLc(
+                            NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc())));
+                    roiResultsStrDto.setMdc(NumberFormatUtil.numberSixLen(
+                            String.valueOf(resultsSpectrum.getMdc())));
+                    if (betaDataFile.isBProcessed()) {
+                        roiResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
+                                String.valueOf(resultsSpectrum.getConc())) + " +/- " +
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(resultsSpectrum.getConcErr())));
+                        roiResultsStrDto.setNetCount(NumberFormatUtil.numberSixLen(
+                                String.valueOf(resultsSpectrum.getNet())) + " +/- " +
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(resultsSpectrum.getNetErr())));
+                        if (ObjectUtil.isNotNull(resultsSpectrums.get(0).getLcCts())) {
+                            roiResultsStrDto.setLcCts(NumberFormatUtil.numberSixLen(
+                                    String.valueOf(resultsSpectrum.getLcCts())));
+                        }
+                    } else {
+                        roiResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
+                                String.valueOf(resultsSpectrum.getConcErr())) + " +/- " +
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(resultsSpectrum.getConcErr())));
+                        roiResultsStrDto.setNetCount(NumberFormatUtil.numberSixLen(
+                                String.valueOf(resultsSpectrum.getNet())) + " +/- " +
+                                NumberFormatUtil.numberSixLen(
+                                        String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))));
+                        if (ObjectUtil.isNotNull(resultsSpectrums.get(0).getLcCts())) {
+                            roiResultsStrDto.setLcCts(NumberFormatUtil.numberSixLen(
+                                    String.valueOf(resultsSpectrum.getLcCts())));
+                        }
+                    }
+                    roiResults.add(roiResultsStrDto);
+                }
+                result.put("roiResults", roiResults);
+                //endregion
+                /*
+                 *   GardsXeResultsSpectrum
+                 * */
+                //region #RESULT SUMMARY
+                List<XeResultsStrDto> xeResults = new ArrayList<>();
+                for (GardsXeResultsSpectrum xeResultsSpectrum : xeResultsSpectrums) {
+                    XeResultsStrDto xeResultsStrDto = new XeResultsStrDto();
+                    xeResultsStrDto.setNuclideName(xeResultsSpectrum.getNuclideName());
+                    xeResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
+                            String.valueOf(xeResultsSpectrum.getConc())) + " +/- " +
+                            NumberFormatUtil.numberSixLen(
+                                    String.valueOf(xeResultsSpectrum.getConcErr())));
+                    xeResultsStrDto.setLc(NumberFormatUtil.numberSixLen(
+                            String.valueOf(xeResultsSpectrum.getLc())));
+                    xeResultsStrDto.setMdc(NumberFormatUtil.numberSixLen(
+                            String.valueOf(xeResultsSpectrum.getMdc())));
+                    xeResultsStrDto.setNidFlag(xeResultsSpectrum.getNidFlag());
+                    xeResults.add(xeResultsStrDto);
+                }
+
+                result.put("xeResults", xeResults);
+                //endregion
+                String schemaName = "rnman";
+                List<MeasurementCategorization> categorizations = new ArrayList<>();
+
+                List<Map<String, Object>> thresholdValues =
+                        spectrumAnalysisMapper.selectThresholdDataBySampleId(schemaName, sampleId);
+                //获取阈值历史信息
+                Date startTime = Date.from(
+                        LocalDateTime.now().minusYears(1).atZone(ZoneId.systemDefault())
+                                .toInstant());
+                Date endTime =
+                        Date.from(LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant());
+
+                List<ThresholdResultHistory> thresholdHistoryValues =
+                        spectrumAnalysisMapper.selectThresholdHistoryBySampleId(schemaName,
+                                sampleId, startTime);
+                List<NuclideAnalysisInfo> xeHistoryAllData =
+                        spectrumAnalysisMapper.selectXeDataPastYear(schemaName, sampleId, userName,
+                                startTime, endTime);
+
+
+                //region 获取当前样品的核素分级
+                for (String xe : validNuclides) {
+                    MeasurementCategorization item = new MeasurementCategorization();
+                    //获取xe结果信息
+                    Optional<GardsXeResultsSpectrum> xeResultDto = xeResultsSpectrums.stream()
+                            .filter(dto -> xe.equals(dto.getNuclideName()))
+                            .findFirst();
+                    //获取阈值信息
+                    Optional<Map<String, Object>> thresholdValue = thresholdValues.stream()
+                            .filter(map -> xe.equals(map.get("NUCLIDENAME")))
+                            .findFirst();
+                    Double value = 0.0;
+                    if (thresholdValue.isPresent()) {
+                        Map<String, Object> thresholdMap = thresholdValue.get();
+                        value = Double.parseDouble(thresholdMap.get("THRESHOLD_VALUE").toString());
+                    }
+
+                    //如果找到核素 获取阈值信息
+
+                    if (xeResultDto.isPresent()) {
+                        GardsXeResultsSpectrum foundDto = xeResultDto.get();
+                        item.setIsotope(xe);
+                        item.setDetected("YES");
+                        item.setAbnormalLimit(value);
+                        double safeConcentration =
+                                Optional.ofNullable(foundDto.getConc()).orElse(0.0);
+                        if (safeConcentration > value) {
+                            item.setCategory("C");
+                        } else if (safeConcentration < value) {
+                            item.setCategory("B");
+                        } else {
+                            item.setCategory("A");
+                        }
+
+                    } else {
+                        // 未找到的核素,表示在样品中没有发现核素，等级则为A
+                        item.setIsotope(xe);
+                        item.setDetected("NO");
+                        item.setAbnormalLimit(value);
+                        item.setCategory("A");
+                    }
+                    categorizations.add(item);
+                }
+                //endregion
+                result.put("measurementCategorization", categorizations);
+
+
+                //region
+
+                Map<String, List<NuclideAnalysisInfo>> analysisDataMap =
+                        Optional.ofNullable(xeHistoryAllData)
+                                .orElse(Collections.emptyList())
+                                .stream()
+                                .collect(Collectors.groupingBy(
+                                        na -> normalizeNuclideName(na.getNuclideName())));
+
+                Map<String, List<ThresholdResultHistory>> thresholdDataMap =
+                        Optional.ofNullable(thresholdHistoryValues)
+                                .orElse(Collections.emptyList())
+                                .stream()
+                                .collect(Collectors.groupingBy(
+                                        th -> normalizeNuclideName(th.getNuclideName())));
+
+
+                for (String xe : validNuclides) {
+                    String normalizedKey = normalizeNuclideName(xe);
+                    // 1. 过滤出目标核素的分析数据
+                    List<NuclideAnalysisInfo> singleNuclideData =
+                            analysisDataMap.getOrDefault(normalizedKey, Collections.emptyList());
+                    // 2. 过滤出目标核素的阈值历史
+                    List<ThresholdResultHistory> singleThresholdData =
+                            thresholdDataMap.getOrDefault(normalizedKey, Collections.emptyList());
+                    //获取分类历史
+                    XeCategoryHistory xeHistoryData =
+                            convertToRequest(singleNuclideData, singleThresholdData);
+                    //region 历史分类数据
+                    result.put(xe + "HistoryData",
+                            xeHistoryData != null ? xeHistoryData : new HashMap<>());
+                    //endregion
+                    //region 频率分布数据
+                    result.put(xe + "HistogramData",
+                            calculateFrequencyDistribution(singleNuclideData));
+                    //endregion
+
+                }
+                //endregion
+                // --- 第二部分：比率 (Ratio) 处理 ---
+                // 定义需要计算的比率配置
+                // 结构：[标识后缀, 分子, 分母]
+                String[][] ratioConfigs = {
+                        {"1", "Xe133", "Xe131m"},
+                        {"2", "Xe133m", "Xe131m"},
+                        {"3", "Xe133m", "Xe133"},
+                        {"4", "Xe135", "Xe133"}
+                };
+                for (String[] config : ratioConfigs) {
+                    String index = config[0];
+                    String numerator = config[1];
+                    String denominator = config[2];
+                    List<NuclideAnalysisInfo> ratioResults =
+                            calculateXeRatio(xeHistoryAllData, numerator, denominator);
+                    result.put("ratioResults" + index, convertToRequest(ratioResults, null));
+                    result.put("ratioIntvlResults" + index,
+                            calculateFrequencyDistribution(ratioResults));
+                }
+
+            } catch (ParseException e) {
+                log.error("", e.getMessage());
+            }
+            //endregion
+        }
+        return result;
+
+    }
+    /**
+     * 将项目 resources 目录下的 echarts.js 拷贝到目标文件夹
+     *
+     * @param targetDir 目标存放 HTML 的目录路径
+     */
+    public static void copyEchartsLib(String targetDir) {
+        try {
+            Path destinationDir = Paths.get(targetDir);
+            if (!Files.exists(destinationDir)) {
+                Files.createDirectories(destinationDir);
+            }
+
+            Path targetFile = destinationDir.resolve("echarts.min.js");
+
+            try (InputStream is = SpectrumAnalysisServiceImpl.class.getResourceAsStream(
+                    "/static/js/echarts.min.js")) {
+                if (is == null) {
+                    log.error("未在 resources/static/js/ 目录下找到 echarts.min.js");
+                    return;
+                }
+                Files.copy(is, targetFile, StandardCopyOption.REPLACE_EXISTING);
+                log.info("ECharts 库文件已就绪: " + targetFile.toAbsolutePath());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String normalizeNuclideName(String name) {
+        if (name == null) {
+            return null;
+        }
+        return name.toUpperCase()
+                .replaceAll("[^A-Z0-9]", "")   // 移除 -、空格、下划线等
+                .replace("XE", "XE");
+
+    }
+    private static final DateTimeFormatter DATE_FORMATTER =
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
+
+
+    public XeCategoryHistory convertToRequest(List<NuclideAnalysisInfo> list,
+                                              List<ThresholdResultHistory> thresholdResultHis) {
+        XeCategoryHistory req = new XeCategoryHistory();
+        //req.title = "Xe-133 categorization history";
+
+        if (list != null) {
+            for (NuclideAnalysisInfo na : list) {
+                if (na.getCollectStop() == null || na.getConc() == null) {
+                    continue;
+                }
+                String dateStr = DATE_FORMATTER.format(na.getCollectStop().toInstant());
+                String category = na.getCategory() == null ? "" : na.getCategory();
+                switch (category) {
+                    case "A": // Level A
+                        req.levelA.add(createPoint(dateStr, na.getConc()));
+                        break;
+                    case "B": // Level B
+                        req.levelB.add(createErrorPoint(dateStr, na.getConc(), na.getConcErr()));
+                        break;
+                    case "C": // Level C
+                        req.levelC.add(createErrorPoint(dateStr, na.getConc(), na.getConcErr()));
+                        break;
+                    default:
+                        // 处理未知分类
+                        break;
+                }
+
+                // MDC 和 LC 是每个点都有的
+                if (na.getMdc() != null) {
+                    req.mdc.add(createPoint(dateStr, na.getMdc()));
+                }
+                if (na.getLc() != null) {
+                    req.lc.add(createPoint(dateStr, na.getLc()));
+                }
+            }
+        }
+        if (thresholdResultHis != null) {
+            for (ThresholdResultHistory threshold : thresholdResultHis) {
+                if (threshold.getCollectStop() == null || threshold.getThresholdValue() == null) {
+                    continue;
+                }
+                String dateStr = DATE_FORMATTER.format(threshold.getCollectStop().toInstant());
+                req.thresholds.add(createPoint(dateStr, threshold.getThresholdValue()));
+            }
+        }
+        return req;
+    }
+    /**
+     * 计算浓度区间的分类频数分布（堆叠直方图专用）
+     *
+     * @param analyses 核素分析列表
+     * @return Map<区间字符串, Map<分类, 次数>>，例如：
+     * "[0.00~10.00)" -> {"A": 5, "B": 12, "C": 3}
+     * "[10.00~20.00)" -> {"A": 0, "B": 8, "C": 7}
+     */
+    public static Map<String, Map<String, Integer>> calculateFrequencyDistribution(
+            List<NuclideAnalysisInfo> analyses) {
+
+        if (analyses == null || analyses.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        int numBins = calculateOptimalBins(analyses);
+        // 1. 一次性统计 min/max/count，过滤无效值
+        DoubleSummaryStatistics stats = analyses.stream()
+                .map(NuclideAnalysisInfo::getConc)
+                .filter(Objects::nonNull)
+                .filter(d -> !d.isNaN() && !d.isInfinite())
+                .mapToDouble(Double::doubleValue)
+                .summaryStatistics();
+
+        if (stats.getCount() == 0) {
+            return Collections.emptyMap();
+        }
+
+        double min = stats.getMin();
+        double max = stats.getMax();
+
+        //2. 处理所有值相同或极小范围（关键！避免 binWidth = 0）
+        if (max - min < 1e-8) {
+            // 取值向下取整为起点，向上扩展一个单位
+            min = Math.floor(min);
+            max = min + Math.max(1.0, Math.abs(min) * 0.1); // 避免 min=-1000 时扩展太小
+        }
+
+        double binWidth = (max - min) / numBins;
+        if (binWidth <= 0) {
+            binWidth = 1.0; // 极端防御
+        }
+
+        //3. 初始化累加器
+        List<Map<String, Integer>> bins = new ArrayList<>(numBins);
+        Set<String> levels = new HashSet<>(Arrays.asList("A", "B", "C"));
+
+        for (int i = 0; i < numBins; i++) {
+            Map<String, Integer> map = new HashMap<>();
+            levels.forEach(l -> map.put(l, 0));
+            bins.add(map);
+        }
+
+        //4. 统计原始列表
+        for (NuclideAnalysisInfo a : analyses) {
+            Double conc = a.getConc();
+            if (conc == null || conc.isNaN() || conc.isInfinite()) {
+                continue;
+            }
+
+            String level = Optional.ofNullable(a.getCategory()).orElse("unknown");
+
+            // 计算当前对象属于哪个区间索引
+            int index = (int) ((conc - min) / binWidth);
+            if (index < 0) {
+                index = 0;
+            }
+            if (index >= numBins) {
+                index = numBins - 1;
+            }
+
+            bins.get(index).merge(level, 1, Integer::sum);
+        }
+
+        //5. 组装结果（格式化区间，保持顺序）
+        Map<String, Map<String, Integer>> result = new LinkedHashMap<>();
+        for (int i = 0; i < numBins; i++) {
+            double start = min + i * binWidth;
+            double end = min + (i + 1) * binWidth;
+
+            // 最后一个区间使用闭区间，语义更清晰
+            String key = i == numBins - 1
+                    ? String.format("[%.4f ~ %.4f]", start, max)
+                    : String.format("[%.4f ~ %.4f)", start, end);
+
+            result.put(key, bins.get(i));
+        }
+
+        return result;
+    }
+
+    /**
+     * 计算同一样本中Xe-133与Xe-131m的活性浓度比值
+     *
+     * @param analysisList 从 getCategorizatlonHist() 获取的列表
+     * @return 包含样本ID、比值、停止时间和状态的结果列表
+     */
+    public List<NuclideAnalysisInfo> calculateXeRatio(List<NuclideAnalysisInfo> analysisList,
+                                                      String isotopeA, String isotopeB) {
+
+        // 1. 按样本ID分组，关键步骤，将同一样本的不同核素数据归组
+        Map<String, List<NuclideAnalysisInfo>> groupedBySample = analysisList.stream()
+                .collect(Collectors.groupingBy(NuclideAnalysisInfo::getSampleId));
+
+        List<NuclideAnalysisInfo> results = new ArrayList<>();
+
+        // 2. 遍历每个样本分组
+        for (Map.Entry<String, List<NuclideAnalysisInfo>> entry : groupedBySample.entrySet()) {
+            String sampleId = entry.getKey();
+            List<NuclideAnalysisInfo> sampleData = entry.getValue();
+
+            // 3. 从同一样本的数据中查找两种核素
+            Optional<NuclideAnalysisInfo> isotopeAOpt = sampleData.stream()
+                    .filter(n -> isotopeA.equals(n.getNuclideName()))
+                    .findFirst();
+            Optional<NuclideAnalysisInfo> isotopeBOpt = sampleData.stream()
+                    .filter(n -> isotopeB.equals(n.getNuclideName()))
+                    .findFirst();
+
+            NuclideAnalysisInfo result;
+            // 4. 检查核素数据是否存在且有效
+            if (!isotopeAOpt.isPresent() || !isotopeBOpt.isPresent()) {
+                // result = new NuclideAnalysisInfo(sampleId, null, null, "MISSING_DATA");
+                result = new NuclideAnalysisInfo();
+                result.setSampleId(sampleId);
+                result.setRoiPeakfit("MISSING_DATA");
+                results.add(result);
+                continue;
+            }
+
+            NuclideAnalysisInfo isotopeAconc = isotopeAOpt.get();
+            NuclideAnalysisInfo isotopeBconc = isotopeBOpt.get();
+            Double concA = isotopeAconc.getConc();
+            Double concB = isotopeBconc.getConc();
+
+            // 5. 检查浓度值是否有效，避免除零错误
+            if (concA == null || concB == null) {
+                result = new NuclideAnalysisInfo();
+                result.setSampleId(sampleId);
+                result.setRoiPeakfit("NULL_CONCENTRATION");
+            } else if (concB == 0.0) {
+                result = new NuclideAnalysisInfo();
+                result.setSampleId(sampleId);
+                result.setRoiPeakfit("ZERO_DENOMINATOR");
+                // result = new NuclideRatioResult(sampleId, null, null, "ZERO_DENOMINATOR");
+            } else {
+                // 6. 核心计算：计算比值
+                double ratio = concA / concB;
+                // 通常使用Xe-133的记录时间作为该样本的停止采集时间
+                //result = new NuclideRatioResult(sampleId, ratio, stopTime, "SUCCESS");
+                result = new NuclideAnalysisInfo();
+                result.setSampleId(sampleId);
+                result.setConc(ratio);
+                result.setCategory("ratio");
+                result.setCollectStop(isotopeAconc.getCollectStop());
+                result.setRoiPeakfit("ZERO_DENOMINATOR");
+            }
+            results.add(result);
+        }
+        return results;
+    }
+
+    public static int calculateOptimalBins(List<NuclideAnalysisInfo> analyses) {
+        if (analyses == null || analyses.size() < 2) {
+            return 5; // 太少数据用 5 根柱子
+        }
+
+        // 提取有效浓度并过滤无效值
+        List<Double> values = analyses.stream()
+                .map(NuclideAnalysisInfo::getConc)
+                .filter(Objects::nonNull)
+                .filter(d -> !d.isNaN() && !d.isInfinite())
+                .sorted()
+                .collect(Collectors.toList());
+
+        int n = values.size();
+        if (n < 2) {
+            return 5;
+        }
+
+        // 计算四分位距 IQR（抗异常值）
+        double q1 = values.get(n / 4);
+        double q3 = values.get((3 * n) / 4);
+        double iqr = q3 - q1;
+
+        if (iqr <= 0) {
+            // IQR=0，说明大部分数据相同，用平方根
+            return (int) Math.max(3, Math.ceil(Math.sqrt(n)));
+        }
+
+        // FD 公式：binWidth = 2 * IQR * n^(-1/3)
+        double binWidth = 2 * iqr * Math.pow(n, -1.0 / 3.0);
+        double dataRange = values.get(n - 1) - values.get(0);
+
+        int bins = (int) Math.ceil(dataRange / binWidth);
+
+        // 限制合理范围：3 ~ 40 根柱子
+        bins = Math.max(3, Math.min(40, bins));
+
+        return bins;
+    }
+    private XeCategoryHistory.Point createPoint(String date, Double y) {
+        XeCategoryHistory.Point p = new XeCategoryHistory.Point();
+        p.date = date;
+        p.y = y;
+        return p;
+    }
+
+    private XeCategoryHistory.ErrorPoint createErrorPoint(String date, Double y, String errStr) {
+        XeCategoryHistory.ErrorPoint ep = new XeCategoryHistory.ErrorPoint();
+        ep.date = date;
+        ep.y = y;
+        ep.yError = parseError(errStr);
+        return ep;
+    }
+    // 将 concErr 字符串解析为 double
+    private double parseError(String errStr) {
+        try {
+            return Double.parseDouble(errStr);
+        } catch (Exception e) {
+            return 0.0;
+        }
+    }
 
 }
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 992d22fb..10875938 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
@@ -50,6 +50,7 @@ import org.jeecg.modules.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StopWatch;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring5.SpringTemplateEngine;
@@ -2226,9 +2227,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
         return result;
     }
 
-    //@Override
-    public Result viewRRR2(RRRLogInfo rrrLogInfo, HttpServletRequest request) {
-        //声明结果
+    @Override
+    public Result viewRRRHtml(RRRLogInfo rrrLogInfo, HttpServletRequest request) {
         Result result = new Result();
         //获取用户名称
         String userName = JwtUtil.getUserNameByToken(request);
@@ -2236,798 +2236,21 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
         Cache<String, BetaDataFile> cache = betaCache.getBetaCache();
         BetaDataFile betaDataFile =
                 cache.getIfPresent(rrrLogInfo.getSampleFileName() + "-" + userName);
-        OutPutRrrHtml(betaDataFile, userName);
-        return new Result();
-    }
-
-    //@Override
-    public Result viewRRR1(RRRLogInfo rrrLogInfo, HttpServletRequest request) {
-        Result result = new Result();
-        //获取用户名称
-        String userName = JwtUtil.getUserNameByToken(request);
-        //获取本地缓存
-        BetaDataFile betaDataFile = betaCache.getBetaCache()
-                .getIfPresent(rrrLogInfo.getSampleFileName() + "-" + userName);
-        if (Objects.isNull(betaDataFile)) {
-            result.error500("Load basic file information first!");
-            return result;
-        }
-        Map<String, Object> rrrMap = ViewRRR(rrrLogInfo, betaDataFile, userName);
-        reportByThymeleaf.generateHtmlReportToFile(rrrMap,
-                "C:\\Users\\cnndc\\Desktop\\模板图表数据\\Index.html");
+        StopWatch sw = new StopWatch();
+        sw.start("数据库查询");
+        Map<String, Object> data = OutPutRrrHtml(betaDataFile, userName);
+        sw.stop();
+        sw.start("HTML模板渲染");
+        String html = reportByThymeleaf.generateBasicHtmlReport(data);
+        sw.stop();
+        log.info("\n{}", sw.prettyPrint());
         result.setSuccess(true);
-        result.setResult(rrrMap);
+        result.setResult(html);
         return result;
     }
 
     List<String> validNuclides = Arrays.asList("Xe131m", "Xe133", "Xe133m", "Xe135");
 
-    private Map<String, Object> ViewRRR(RRRLogInfo rrrLogInfo, BetaDataFile betaDataFile,
-                                        String userName) {
-        //region 设置局部变量
-
-
-        Map<String, Object> result = new HashMap<>();
-
-        GardsCalibrationSpectrum gammaCalibrationParamS = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamD = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamES = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamEG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamED = new GardsCalibrationSpectrum();
-
-        GardsCalibrationSpectrum betaCalibrationParamS = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamD = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamES = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamEG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamED = new GardsCalibrationSpectrum();
-
-        StringBuffer strBuffer = new StringBuffer();
-        //endregion
-        //判断
-        if (betaDataFile.isSaveAnalysisResult()) {
-            //region 对分析后的内容进行数据获取
-            List<GardsROIChannelsSpectrum> channelsSpectrums =
-                    betaDataFile.getRoiChannelsSpectrumList();
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream()
-                    .filter(item -> item.getDataType()
-                            .equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType()))
-                    .collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream()
-                    .filter(item -> item.getDataType()
-                            .equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType()))
-                    .collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream()
-                    .filter(item -> item.getDataType()
-                            .equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType()))
-                    .collect(Collectors.toList());
-            List<GardsROIResultsSpectrum> resultsSpectrums =
-                    betaDataFile.getRoiResultsSpectrumList();
-            List<GardsXeResultsSpectrum> xeResultsSpectrums =
-                    betaDataFile.getXeResultsSpectrumList();
-            for (int i = 0; i < xeResultsSpectrums.size(); i++) {
-                for (int j = 0; j < rrrLogInfo.getXeResultsSpectrumList().size(); j++) {
-                    if (xeResultsSpectrums.get(i).getNuclideName().equalsIgnoreCase(
-                            rrrLogInfo.getXeResultsSpectrumList().get(j).getNuclideName())) {
-                        xeResultsSpectrums.get(i).setNidFlag(
-                                rrrLogInfo.getXeResultsSpectrumList().get(j).getNidFlag());
-                    }
-                }
-            }
-            //endregion
-
-            //region #SAMPLE: LIMITS PER ROI GAMMA
-            List<GardsCalibrationSpectrum> gammaCalibrationParamList =
-                    betaDataFile.getGammaCalibrationSpectrumList();
-            List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList =
-                    betaDataFile.getGammaCalibrationSpectrumEList();
-            for (int i = 0; i < gammaCalibrationParamList.size(); i++) {
-                if (gammaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    gammaCalibrationParamS = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    gammaCalibrationParamG = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    gammaCalibrationParamD = gammaCalibrationParamList.get(i);
-                }
-            }
-            for (int i = 0; i < gammaCalibrationSpectrumEList.size(); i++) {
-                if (gammaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i);
-                }
-            }
-            //endregion
-
-            //region #SAMPLE: LIMITS PER ROI BETA
-            List<GardsCalibrationSpectrum> betaCalibrationParamList =
-                    betaDataFile.getBetaCalibrationSpectrumList();
-            List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList =
-                    betaDataFile.getBetaCalibrationSpectrumEList();
-            for (int i = 0; i < betaCalibrationParamList.size(); i++) {
-                if (betaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    betaCalibrationParamS = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    betaCalibrationParamG = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    betaCalibrationParamD = betaCalibrationParamList.get(i);
-                }
-            }
-            for (int i = 0; i < betaCalibrationSpectrumEList.size(); i++) {
-                if (betaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    betaCalibrationParamES = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    betaCalibrationParamED = betaCalibrationSpectrumEList.get(i);
-                }
-            }
-            //endregion
-
-            //region sampleFile  相关数据
-            try {
-                Information information = new Information();
-                //region 获取Information数据
-                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_real_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);
-                }
-                //endregion
-                /* 开始装配数据 */
-                //region 设置标题中的时间
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateConstant.DATE_TIME_S);
-                result.put("now", LocalDateTime.now().format(formatter));
-                result.put("measurement_id", information.getMeasurementID());
-                result.put("gas_bk_measurement_id", information.getGasBkgdMeasurementID());
-                result.put("sample_ref_id", information.getSampleRefId());
-                result.put("site_code", information.getSit_det_code());
-                result.put("detector_code", information.getDetect_code());
-                result.put("collection_start", DateUtils.formatDate(information.getCollect_start(),
-                        "yyyy/MM/dd HH:mm:ss"));
-                result.put("collection_stop",
-                        DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss"));
-                result.put("collection_time", (information.getCollect_stop().getTime() / 1000 -
-                        information.getCollect_start().getTime() / 1000) / 3600);
-                result.put("air_volume", information.getS_xe_stable_volume());
-                result.put("sample_volume_of_Xe", information.getS_volume_of_Xe());
-                result.put("acquisition_start",
-                        DateUtils.formatDate(information.getAcquisition_start(),
-                                "yyyy/MM/dd HH:mm:ss"));
-                result.put("acquisition_real_time", information.getAcquisition_real_sec());
-                result.put("acquisition_live_time", information.getAcquisition_live_sec());
-                //endregion
-
-
-                /*
-                 *    SAMPLE
-                 * */
-                //region #SAMPLE Old CALIBRATION
-                List<Calibration> samplOldCalibrations = new ArrayList<>();
-                Calibration samplOldCalibrationCH = new Calibration();
-                Calibration samplOldCalibrationE = new Calibration();
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
-                    samplOldCalibrationCH.setBeta(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
-                } else {
-                    samplOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
-                    samplOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
-                } else {
-                    samplOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
-                    samplOldCalibrationE.setBeta(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(2))));
-                } else {
-                    samplOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
-                    samplOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(2))));
-                } else {
-                    samplOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                samplOldCalibrations.add(samplOldCalibrationCH);
-                samplOldCalibrations.add(samplOldCalibrationE);
-                result.put("samplOldCalibrations", samplOldCalibrations);
-                //endregion
-
-                //region #SAMPLE New CALIBRATION
-                List<Calibration> samplNewCalibrations = new ArrayList<>();
-                Calibration samplNewCalibrationCH = new Calibration();
-                Calibration samplNewCalibrationE = new Calibration();
-                samplNewCalibrationCH.setBeta("CH(x) =  (" +
-                        (Objects.isNull(betaCalibrationParamES.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamES.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamES.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamES.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamES.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamES.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrationCH.setGamma("CH(x) =  (" +
-                        (Objects.isNull(gammaCalibrationParamES.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamES.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamES.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamES.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamES.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamES.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrationE.setBeta("E(x) = (" +
-                        (Objects.isNull(betaCalibrationParamS.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamS.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamS.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamS.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamS.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamS.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrationE.setGamma("E(x) = (" +
-                        (Objects.isNull(gammaCalibrationParamS.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamS.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamS.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamS.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamS.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamS.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrations.add(samplNewCalibrationCH);
-                samplNewCalibrations.add(samplNewCalibrationE);
-                result.put("samplNewCalibrations", samplNewCalibrations);
-                //endregion
-
-                // #SAMPLE: LIMITS PER ROI
-                List<ROIChannelsDto> roiChannelsDtosS = new LinkedList<>();
-                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsSample) {
-                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
-                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
-                    roiChannelsDto.shift();
-                    roiChannelsDtosS.add(roiChannelsDto);
-                }
-                result.put("roiChannelsS", roiChannelsDtosS);
-
-                /*
-                 *     DET
-                 * */
-                //region #DET Old CALIBRATION
-                List<Calibration> detOldCalibrations = new ArrayList<>();
-                Calibration detOldCalibrationCH = new Calibration();
-                Calibration detOldCalibrationE = new Calibration();
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
-                    detOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
-                } else {
-                    detOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
-                    detOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
-                } else {
-                    detOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
-                    detOldCalibrationE.setBeta(rowFormat(" E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(2))));
-                } else {
-                    detOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
-                    detOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(2))));
-                } else {
-                    detOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                detOldCalibrations.add(detOldCalibrationCH);
-                detOldCalibrations.add(detOldCalibrationE);
-                result.put("detOldCalibrations", detOldCalibrations);
-                //endregion
-
-                //region DET New CALIBRATION
-                List<Calibration> detNewCalibrations = new ArrayList<>();
-                Calibration detNewCalibrationCH = new Calibration();
-                Calibration detNewCalibrationE = new Calibration();
-                detNewCalibrationCH.setBeta("CH(x) =  (" +
-                        (Objects.isNull(betaCalibrationParamED.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamED.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamED.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamED.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamED.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamED.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrationCH.setGamma("CH(x) =  (" +
-                        (Objects.isNull(gammaCalibrationParamED.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamED.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamED.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamED.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamED.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamED.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrationE.setBeta("E(x) = (" +
-                        (Objects.isNull(betaCalibrationParamD.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamD.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamD.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamD.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamD.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamD.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrationE.setGamma("E(x) = (" +
-                        (Objects.isNull(gammaCalibrationParamD.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamD.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamD.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamD.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamD.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamD.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrations.add(detNewCalibrationCH);
-                detNewCalibrations.add(detNewCalibrationE);
-                result.put("detNewCalibrations", detNewCalibrations);
-                //endregion
-
-                // DET: LIMITS PER ROI
-                List<ROIChannelsDto> roiChannelsDtosD = new LinkedList<>();
-                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsDet) {
-                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
-                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
-                    roiChannelsDto.shift();
-                    roiChannelsDtosD.add(roiChannelsDto);
-                }
-                result.put("roiChannelsD", roiChannelsDtosD);
-
-                /*
-                 *    GAS
-                 * */
-                //region #GAS Old CALIBRATION
-                List<Calibration> gasOldCalibrations = new ArrayList<>();
-                Calibration gasOldCalibrationCH = new Calibration();
-                Calibration gasOldCalibrationE = new Calibration();
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
-                    gasOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
-                } else {
-                    gasOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
-                    gasOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
-                } else {
-                    gasOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
-                    gasOldCalibrationE.setBeta(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(2))));
-                } else {
-                    gasOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
-                    gasOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(2))));
-                } else {
-                    gasOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                gasOldCalibrations.add(gasOldCalibrationCH);
-                gasOldCalibrations.add(gasOldCalibrationE);
-                result.put("gasOldCalibrations", gasOldCalibrations);
-                //endregion
-
-                //region #GAS New CALIBRATION
-                List<Calibration> gasNewCalibrations = new ArrayList<>();
-                Calibration gasNewCalibrationCH = new Calibration();
-                Calibration gasNewCalibrationE = new Calibration();
-                gasNewCalibrationCH.setBeta("CH(x) =  (" +
-                        (Objects.isNull(betaCalibrationParamEG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamEG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamEG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamEG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamEG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamEG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrationCH.setGamma("CH(x) =  (" +
-                        (Objects.isNull(gammaCalibrationParamEG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamEG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamEG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamEG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamEG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamEG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrationE.setBeta("E(x) = (" +
-                        (Objects.isNull(betaCalibrationParamG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrationE.setGamma("E(x) = (" +
-                        (Objects.isNull(gammaCalibrationParamG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrations.add(gasNewCalibrationCH);
-                gasNewCalibrations.add(gasNewCalibrationE);
-                result.put("gasNewCalibrations", gasNewCalibrations);
-                //endregion
-
-                // #GAS: LIMITS PER ROI
-                List<ROIChannelsDto> roiChannelsDtosG = new LinkedList<>();
-                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsGas) {
-                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
-                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
-                    roiChannelsDto.shift();
-                    roiChannelsDtosG.add(roiChannelsDto);
-                }
-                result.put("roiChannelsG", roiChannelsDtosG);
-                //region GardsROIResultsSpectrum
-                /*
-                 *    GardsROIResultsSpectrum
-                 * */
-                // #GROSS COUNTS PER ROI
-                // #NET COUNTS AND LC PER ROI
-                // #CONCENTRATION AND LC PER ROI
-                List<ROIResultsStrDto> roiResults = new ArrayList<>();
-                for (GardsROIResultsSpectrum resultsSpectrum : resultsSpectrums) {
-                    ROIResultsStrDto roiResultsStrDto = new ROIResultsStrDto();
-                    roiResultsStrDto.setRoi(resultsSpectrum.getRoi());
-                    roiResultsStrDto.setSGross(resultsSpectrum.getSGross());
-                    roiResultsStrDto.setGGross(resultsSpectrum.getGGross());
-                    roiResultsStrDto.setBGross(resultsSpectrum.getBGross());
-                    roiResultsStrDto.setLc(
-                            NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc())));
-                    roiResultsStrDto.setMdc(NumberFormatUtil.numberSixLen(
-                            String.valueOf(resultsSpectrum.getMdc())));
-                    if (betaDataFile.isBProcessed()) {
-                        roiResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getConc())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(resultsSpectrum.getConcErr())));
-                        roiResultsStrDto.setNetCount(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getNet())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(resultsSpectrum.getNetErr())));
-                        if (ObjectUtil.isNotNull(resultsSpectrums.get(0).getLcCts())) {
-                            roiResultsStrDto.setLcCts(NumberFormatUtil.numberSixLen(
-                                    String.valueOf(resultsSpectrum.getLcCts())));
-                        }
-                    } else {
-                        roiResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getConcErr())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(resultsSpectrum.getConcErr())));
-                        roiResultsStrDto.setNetCount(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getNet())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))));
-                        if (ObjectUtil.isNotNull(resultsSpectrums.get(0).getLcCts())) {
-                            roiResultsStrDto.setLcCts(NumberFormatUtil.numberSixLen(
-                                    String.valueOf(resultsSpectrum.getLcCts())));
-                        }
-                    }
-                    roiResults.add(roiResultsStrDto);
-                }
-                result.put("roiResults", roiResults);
-                //endregion
-                /*
-                 *   GardsXeResultsSpectrum
-                 * */
-                //region #RESULT SUMMARY
-                List<XeResultsStrDto> xeResults = new ArrayList<>();
-                for (GardsXeResultsSpectrum xeResultsSpectrum : xeResultsSpectrums) {
-                    XeResultsStrDto xeResultsStrDto = new XeResultsStrDto();
-                    xeResultsStrDto.setNuclideName(xeResultsSpectrum.getNuclideName());
-                    xeResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
-                            String.valueOf(xeResultsSpectrum.getConc())) + " +/- " +
-                            NumberFormatUtil.numberSixLen(
-                                    String.valueOf(xeResultsSpectrum.getConcErr())));
-                    xeResultsStrDto.setLc(NumberFormatUtil.numberSixLen(
-                            String.valueOf(xeResultsSpectrum.getLc())));
-                    xeResultsStrDto.setMdc(NumberFormatUtil.numberSixLen(
-                            String.valueOf(xeResultsSpectrum.getMdc())));
-                    xeResultsStrDto.setNidFlag(xeResultsSpectrum.getNidFlag());
-                    xeResults.add(xeResultsStrDto);
-                }
-
-                result.put("xeResults", xeResults);
-                //endregion
-                String schemaName = rrrLogInfo.getDbName().equals("auto") ? "rnauto" : "rnman";
-                List<MeasurementCategorization> categorizations = new ArrayList<>();
-
-                List<Map<String, Object>> thresholdValues =
-                        spectrumAnalysisMapper.selectThresholdDataBySampleId(schemaName,
-                                rrrLogInfo.getSampleId().toString());
-                //获取阈值历史信息
-                Date startTime = Date.from(
-                        LocalDateTime.now().minusYears(1).atZone(ZoneId.systemDefault())
-                                .toInstant());
-                Date endTime =
-                        Date.from(LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant());
-
-                List<ThresholdResultHistory> thresholdHistoryValues =
-                        spectrumAnalysisMapper.selectThresholdHistoryBySampleId(schemaName,
-                                rrrLogInfo.getSampleId().toString(), startTime);
-                List<NuclideAnalysisInfo> xeHistoryAllData =
-                        spectrumAnalysisMapper.selectXeDataPastYear(schemaName,
-                                rrrLogInfo.getSampleId().toString(), userName, startTime, endTime);
-
-
-                //region 获取当前样品的核素分级
-                for (String xe : validNuclides) {
-                    MeasurementCategorization item = new MeasurementCategorization();
-                    //获取xe结果信息
-                    Optional<GardsXeResultsSpectrum> xeResultDto = xeResultsSpectrums.stream()
-                            .filter(dto -> xe.equals(dto.getNuclideName()))
-                            .findFirst();
-                    //获取阈值信息
-                    Optional<Map<String, Object>> thresholdValue = thresholdValues.stream()
-                            .filter(map -> xe.equals(map.get("NUCLIDENAME")))
-                            .findFirst();
-                    Double value = 0.0;
-                    if (thresholdValue.isPresent()) {
-                        Map<String, Object> thresholdMap = thresholdValue.get();
-                        value = Double.parseDouble(thresholdMap.get("THRESHOLD_VALUE").toString());
-                    }
-
-                    //如果找到核素 获取阈值信息
-
-                    if (xeResultDto.isPresent()) {
-                        GardsXeResultsSpectrum foundDto = xeResultDto.get();
-                        item.setIsotope(xe);
-                        item.setDetected("YES");
-                        item.setAbnormalLimit(value);
-                        double safeConcentration =
-                                Optional.ofNullable(foundDto.getConc()).orElse(0.0);
-                        if (safeConcentration > value) {
-                            item.setCategory("C");
-                        } else if (safeConcentration < value) {
-                            item.setCategory("B");
-                        } else {
-                            item.setCategory("A");
-                        }
-
-                    } else {
-                        // 未找到的核素,表示在样品中没有发现核素，等级则为A
-                        item.setIsotope(xe);
-                        item.setDetected("NO");
-                        item.setAbnormalLimit(value);
-                        item.setCategory("A");
-                    }
-                    categorizations.add(item);
-                }
-                //endregion
-                result.put("measurementCategorization", categorizations);
-
-
-                //region
-
-                Map<String, List<NuclideAnalysisInfo>> analysisDataMap =
-                        Optional.ofNullable(xeHistoryAllData)
-                                .orElse(Collections.emptyList())
-                                .stream()
-                                .collect(Collectors.groupingBy(
-                                        na -> normalizeNuclideName(na.getNuclideName())));
-
-                Map<String, List<ThresholdResultHistory>> thresholdDataMap =
-                        Optional.ofNullable(thresholdHistoryValues)
-                                .orElse(Collections.emptyList())
-                                .stream()
-                                .collect(Collectors.groupingBy(
-                                        th -> normalizeNuclideName(th.getNuclideName())));
-
-
-                for (String xe : validNuclides) {
-                    String normalizedKey = normalizeNuclideName(xe);
-                    // 1. 过滤出目标核素的分析数据
-                    List<NuclideAnalysisInfo> singleNuclideData =
-                            analysisDataMap.getOrDefault(normalizedKey, Collections.emptyList());
-                    // 2. 过滤出目标核素的阈值历史
-                    List<ThresholdResultHistory> singleThresholdData =
-                            thresholdDataMap.getOrDefault(normalizedKey, Collections.emptyList());
-                    //获取分类历史
-                    XeCategoryHistory xeHistoryData =
-                            convertToRequest(singleNuclideData, singleThresholdData);
-                    //region 历史分类数据
-                    result.put(xe + "History", xeHistoryData);
-                    //endregion
-                    //region 频率分布数据
-                    result.put(xe + "HistogramData",
-                            calculateFrequencyDistribution(singleNuclideData));
-                    //endregion
-
-                }
-                //endregion
-                // --- 第二部分：比率 (Ratio) 处理 ---
-                // 定义需要计算的比率配置
-                // 结构：[标识后缀, 分子, 分母]
-                String[][] ratioConfigs = {
-                        {"1", "Xe133", "Xe131m"},
-                        {"2", "Xe133m", "Xe131m"},
-                        {"3", "Xe133m", "Xe133"},
-                        {"4", "Xe135", "Xe133"}
-                };
-                for (String[] config : ratioConfigs) {
-                    String index = config[0];
-                    String numerator = config[1];
-                    String denominator = config[2];
-                    List<NuclideAnalysisInfo> ratioResults =
-                            calculateXeRatio(xeHistoryAllData, numerator, denominator);
-                    result.put("ratioResults" + index, convertToRequest(ratioResults, null));
-                    result.put("ratioIntvlResults" + index,
-                            calculateFrequencyDistribution(ratioResults));
-                }
-
-            } catch (ParseException e) {
-                log.error("", e.getMessage());
-            }
-            //endregion
-        }
-        return result;
-
-    }
-
-
     @Override
     public Result viewSpectrum(Integer sampleId, String dbName, String sampleFileName,
                                String gasFileName, String detFileName, String qcFileName,
@@ -6273,9 +5496,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
         gardsAnalyses.setLogPath(qsLogPath);
         gardsAnalyses.setReportPath(qsReportPath);
         if (Objects.nonNull(isExist)) {
-            spectrumAnalysisMapper.updateGardsAnalyses(gardsAnalyses,dbType.getText());
+            spectrumAnalysisMapper.updateGardsAnalyses(gardsAnalyses, dbType.getText());
         } else {//如果没有分析过就新增--GARDS_ANALYSES
-            spectrumAnalysisMapper.insertGardsAnalyses(gardsAnalyses,dbType.getText());
+            spectrumAnalysisMapper.insertGardsAnalyses(gardsAnalyses, dbType.getText());
         }
         //查询analysisId根据sampleId 分析员名称--GARDS_ANALYSES
         GardsAnalysesSpectrum analysis =
@@ -6438,10 +5661,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
                         }
                         // 完整文件路径
                         Path htmlFile =
-                                destinationDir.resolve(analyses_absolute_ReportPath + ".html");
+                                destinationDir.resolve(destinationDir.getFileName() + ".html");
                         reportByThymeleaf.generateHtmlReportToFile(rrrMap, htmlFile.toString());
                         copyEchartsLib(targetDir);
-
                     } catch (IOException e) {
                         System.err.println("目录创建失败: " + e.getMessage());
                         e.printStackTrace();
@@ -8354,20 +7576,18 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
      */
     public static void copyEchartsLib(String targetDir) {
         try {
-            // 1. 确保目标目录存在
             Path destinationDir = Paths.get(targetDir);
             if (!Files.exists(destinationDir)) {
                 Files.createDirectories(destinationDir);
             }
 
-            // 2. 获取目标文件路径 (echarts.min.js)
             Path targetFile = destinationDir.resolve("echarts.min.js");
 
-            // 3. 从资源路径读取并拷贝 ( resources/static/js 下)
             try (InputStream is = SpectrumAnalysisServiceImpl.class.getResourceAsStream(
-                    "/templates/echarts.min.js")) {
+                    "/static/js/echarts.min.js")) {
                 if (is == null) {
-                    log.error("未在 resources/templates/ 目录下找到 echarts.min.js");
+                    log.error("未在 resources/static/js/ 目录下找到 echarts.min.js");
+                    return;
                 }
                 Files.copy(is, targetFile, StandardCopyOption.REPLACE_EXISTING);
                 log.info("ECharts 库文件已就绪: " + targetFile.toAbsolutePath());
@@ -8379,1255 +7599,376 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
 
 
     private Map<String, Object> OutPutRrrHtml(BetaDataFile betaDataFile, String userName) {
-        //region 设置局部变量
 
+        //region 定义变量
         Map<String, Object> result = new HashMap<>();
-        GardsCalibrationSpectrum gammaCalibrationParamS = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamD = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamES = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamEG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum gammaCalibrationParamED = new GardsCalibrationSpectrum();
-
-        GardsCalibrationSpectrum betaCalibrationParamS = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamD = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamES = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamEG = new GardsCalibrationSpectrum();
-        GardsCalibrationSpectrum betaCalibrationParamED = new GardsCalibrationSpectrum();
-
-        StringBuffer strBuffer = new StringBuffer();
         String sampleId = betaDataFile.getSampleId();
+        String stationId = betaDataFile.getStationId();
         //endregion
-        //判断
-        if (betaDataFile.isSaveAnalysisResult()) {
-            //region 对分析后的内容进行数据获取
-            List<GardsROIChannelsSpectrum> channelsSpectrums =
-                    betaDataFile.getRoiChannelsSpectrumList();
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream()
-                    .filter(item -> item.getDataType()
-                            .equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType()))
-                    .collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream()
-                    .filter(item -> item.getDataType()
-                            .equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType()))
-                    .collect(Collectors.toList());
-            List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream()
-                    .filter(item -> item.getDataType()
-                            .equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType()))
-                    .collect(Collectors.toList());
-            List<GardsROIResultsSpectrum> resultsSpectrums =
-                    betaDataFile.getRoiResultsSpectrumList();
-            List<GardsXeResultsSpectrum> xeResultsSpectrums =
-                    betaDataFile.getXeResultsSpectrumList();
 
-            //endregion
-
-            //region #SAMPLE: LIMITS PER ROI GAMMA
-            List<GardsCalibrationSpectrum> gammaCalibrationParamList =
-                    betaDataFile.getGammaCalibrationSpectrumList();
-            List<GardsCalibrationSpectrum> gammaCalibrationSpectrumEList =
-                    betaDataFile.getGammaCalibrationSpectrumEList();
-            for (int i = 0; i < gammaCalibrationParamList.size(); i++) {
-                if (gammaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    gammaCalibrationParamS = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    gammaCalibrationParamG = gammaCalibrationParamList.get(i);
-                } else if (gammaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    gammaCalibrationParamD = gammaCalibrationParamList.get(i);
-                }
-            }
-            for (int i = 0; i < gammaCalibrationSpectrumEList.size(); i++) {
-                if (gammaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    gammaCalibrationParamES = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    gammaCalibrationParamEG = gammaCalibrationSpectrumEList.get(i);
-                } else if (gammaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    gammaCalibrationParamED = gammaCalibrationSpectrumEList.get(i);
-                }
-            }
-            //endregion
-
-            //region #SAMPLE: LIMITS PER ROI BETA
-            List<GardsCalibrationSpectrum> betaCalibrationParamList =
-                    betaDataFile.getBetaCalibrationSpectrumList();
-            List<GardsCalibrationSpectrum> betaCalibrationSpectrumEList =
-                    betaDataFile.getBetaCalibrationSpectrumEList();
-            for (int i = 0; i < betaCalibrationParamList.size(); i++) {
-                if (betaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    betaCalibrationParamS = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    betaCalibrationParamG = betaCalibrationParamList.get(i);
-                } else if (betaCalibrationParamList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    betaCalibrationParamD = betaCalibrationParamList.get(i);
-                }
-            }
-            for (int i = 0; i < betaCalibrationSpectrumEList.size(); i++) {
-                if (betaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.SAMPLEPHD.getType())) {
-                    betaCalibrationParamES = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.GASBKPHD.getType())) {
-                    betaCalibrationParamEG = betaCalibrationSpectrumEList.get(i);
-                } else if (betaCalibrationSpectrumEList.get(i).getDataType()
-                        .equals(DataTypeAbbr.DETBKPHD.getType())) {
-                    betaCalibrationParamED = betaCalibrationSpectrumEList.get(i);
-                }
-            }
-            //endregion
-
-            //region sampleFile  相关数据
-            try {
-                Information information = new Information();
-                //region 获取Information数据
-                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_real_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);
-                }
-                //endregion
-                /* 开始装配数据 */
-                //region 设置标题中的时间
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateConstant.DATE_TIME_S);
-                result.put("now", LocalDateTime.now().format(formatter));
-                result.put("measurement_id", information.getMeasurementID());
-                result.put("gas_bk_measurement_id", information.getGasBkgdMeasurementID());
-                result.put("sample_ref_id", information.getSampleRefId());
-                result.put("site_code", information.getSit_det_code());
-                result.put("detector_code", information.getDetect_code());
-                result.put("collection_start", DateUtils.formatDate(information.getCollect_start(),
-                        "yyyy/MM/dd HH:mm:ss"));
-                result.put("collection_stop",
-                        DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss"));
-                result.put("collection_time", (information.getCollect_stop().getTime() / 1000 -
-                        information.getCollect_start().getTime() / 1000) / 3600);
-                result.put("air_volume", information.getS_xe_stable_volume());
-                result.put("sample_volume_of_Xe", information.getS_volume_of_Xe());
-                result.put("acquisition_start",
-                        DateUtils.formatDate(information.getAcquisition_start(),
-                                "yyyy/MM/dd HH:mm:ss"));
-                result.put("acquisition_real_time", information.getAcquisition_real_sec());
-                result.put("acquisition_live_time", information.getAcquisition_live_sec());
-                //endregion
-
-
-                /*
-                 *    SAMPLE
-                 * */
-                //region #SAMPLE Old CALIBRATION
-                List<Calibration> samplOldCalibrations = new ArrayList<>();
-                Calibration samplOldCalibrationCH = new Calibration();
-                Calibration samplOldCalibrationE = new Calibration();
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
-                    samplOldCalibrationCH.setBeta(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
-                } else {
-                    samplOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
-                    samplOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
-                } else {
-                    samplOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
-                    samplOldCalibrationE.setBeta(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(2))));
-                } else {
-                    samplOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
-                    samplOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(2))));
-                } else {
-                    samplOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                samplOldCalibrations.add(samplOldCalibrationCH);
-                samplOldCalibrations.add(samplOldCalibrationE);
-                result.put("samplOldCalibrations", samplOldCalibrations);
-                //endregion
-
-                //region #SAMPLE New CALIBRATION
-                List<Calibration> samplNewCalibrations = new ArrayList<>();
-                Calibration samplNewCalibrationCH = new Calibration();
-                Calibration samplNewCalibrationE = new Calibration();
-                samplNewCalibrationCH.setBeta("CH(x) =  (" +
-                        (Objects.isNull(betaCalibrationParamES.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamES.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamES.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamES.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamES.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamES.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrationCH.setGamma("CH(x) =  (" +
-                        (Objects.isNull(gammaCalibrationParamES.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamES.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamES.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamES.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamES.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamES.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrationE.setBeta("E(x) = (" +
-                        (Objects.isNull(betaCalibrationParamS.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamS.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamS.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamS.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamS.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamS.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrationE.setGamma("E(x) = (" +
-                        (Objects.isNull(gammaCalibrationParamS.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamS.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamS.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamS.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamS.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamS.getCoeff3())))
-                        + ")x*x");
-                samplNewCalibrations.add(samplNewCalibrationCH);
-                samplNewCalibrations.add(samplNewCalibrationE);
-                result.put("samplNewCalibrations", samplNewCalibrations);
-                //endregion
-
-                // #SAMPLE: LIMITS PER ROI
-                List<ROIChannelsDto> roiChannelsDtosS = new LinkedList<>();
-                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsSample) {
-                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
-                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
-                    roiChannelsDto.shift();
-                    roiChannelsDtosS.add(roiChannelsDto);
-                }
-                result.put("roiChannelsS", roiChannelsDtosS);
-
-                /*
-                 *     DET
-                 * */
-                //region #DET Old CALIBRATION
-                List<Calibration> detOldCalibrations = new ArrayList<>();
-                Calibration detOldCalibrationCH = new Calibration();
-                Calibration detOldCalibrationE = new Calibration();
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
-                    detOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
-                } else {
-                    detOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
-                    detOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
-                } else {
-                    detOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
-                    detOldCalibrationE.setBeta(rowFormat(" E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(2))));
-                } else {
-                    detOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
-                    detOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(2))));
-                } else {
-                    detOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                detOldCalibrations.add(detOldCalibrationCH);
-                detOldCalibrations.add(detOldCalibrationE);
-                result.put("detOldCalibrations", detOldCalibrations);
-                //endregion
-
-                //region DET New CALIBRATION
-                List<Calibration> detNewCalibrations = new ArrayList<>();
-                Calibration detNewCalibrationCH = new Calibration();
-                Calibration detNewCalibrationE = new Calibration();
-                detNewCalibrationCH.setBeta("CH(x) =  (" +
-                        (Objects.isNull(betaCalibrationParamED.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamED.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamED.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamED.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamED.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamED.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrationCH.setGamma("CH(x) =  (" +
-                        (Objects.isNull(gammaCalibrationParamED.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamED.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamED.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamED.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamED.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamED.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrationE.setBeta("E(x) = (" +
-                        (Objects.isNull(betaCalibrationParamD.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamD.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamD.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamD.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamD.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamD.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrationE.setGamma("E(x) = (" +
-                        (Objects.isNull(gammaCalibrationParamD.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamD.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamD.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamD.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamD.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamD.getCoeff3())))
-                        + ")x*x");
-                detNewCalibrations.add(detNewCalibrationCH);
-                detNewCalibrations.add(detNewCalibrationE);
-                result.put("detNewCalibrations", detNewCalibrations);
-                //endregion
-
-                // DET: LIMITS PER ROI
-                List<ROIChannelsDto> roiChannelsDtosD = new LinkedList<>();
-                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsDet) {
-                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
-                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
-                    roiChannelsDto.shift();
-                    roiChannelsDtosD.add(roiChannelsDto);
-                }
-                result.put("roiChannelsD", roiChannelsDtosD);
-
-                /*
-                 *    GAS
-                 * */
-                //region #GAS Old CALIBRATION
-                List<Calibration> gasOldCalibrations = new ArrayList<>();
-                Calibration gasOldCalibrationCH = new Calibration();
-                Calibration gasOldCalibrationE = new Calibration();
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) {
-                    gasOldCalibrationCH.setBeta(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaToUiOld().get(2))));
-                } else {
-                    gasOldCalibrationCH.setBeta("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) {
-                    gasOldCalibrationCH.setGamma(rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaToUiOld().get(2))));
-                } else {
-                    gasOldCalibrationCH.setGamma("CH(x) = (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) {
-                    gasOldCalibrationE.setBeta(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getBetaFittingParaOld().get(2))));
-                } else {
-                    gasOldCalibrationE.setBeta("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) {
-                    gasOldCalibrationE.setGamma(rowFormat("E(x) =  (%s)+(%s)*x+(%s)x*x ",
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(0)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(1)),
-                            NumberFormatUtil.numberSixLen(
-                                    betaDataFile.getGammaFittingParaOld().get(2))));
-                } else {
-                    gasOldCalibrationE.setGamma("E(x) =  (?1)+(?2)*x+(?3)x*x");
-                }
-                gasOldCalibrations.add(gasOldCalibrationCH);
-                gasOldCalibrations.add(gasOldCalibrationE);
-                result.put("gasOldCalibrations", gasOldCalibrations);
-                //endregion
-
-                //region #GAS New CALIBRATION
-                List<Calibration> gasNewCalibrations = new ArrayList<>();
-                Calibration gasNewCalibrationCH = new Calibration();
-                Calibration gasNewCalibrationE = new Calibration();
-                gasNewCalibrationCH.setBeta("CH(x) =  (" +
-                        (Objects.isNull(betaCalibrationParamEG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamEG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamEG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamEG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamEG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamEG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrationCH.setGamma("CH(x) =  (" +
-                        (Objects.isNull(gammaCalibrationParamEG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamEG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamEG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamEG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamEG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamEG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrationE.setBeta("E(x) = (" +
-                        (Objects.isNull(betaCalibrationParamG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(betaCalibrationParamG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(betaCalibrationParamG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(betaCalibrationParamG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(betaCalibrationParamG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrationE.setGamma("E(x) = (" +
-                        (Objects.isNull(gammaCalibrationParamG.getCoeff1()) ? "?1" :
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(gammaCalibrationParamG.getCoeff1())))
-                        + ")+(" + (Objects.isNull(gammaCalibrationParamG.getCoeff2()) ? "?2" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamG.getCoeff2())))
-                        + ")*x+(" + (Objects.isNull(gammaCalibrationParamG.getCoeff3()) ? "?3" :
-                        NumberFormatUtil.numberSixLen(
-                                String.valueOf(gammaCalibrationParamG.getCoeff3())))
-                        + ")x*x");
-                gasNewCalibrations.add(gasNewCalibrationCH);
-                gasNewCalibrations.add(gasNewCalibrationE);
-                result.put("gasNewCalibrations", gasNewCalibrations);
-                //endregion
-
-                // #GAS: LIMITS PER ROI
-                List<ROIChannelsDto> roiChannelsDtosG = new LinkedList<>();
-                for (GardsROIChannelsSpectrum roiChannels : roiChannelsSpectrumsGas) {
-                    ROIChannelsDto roiChannelsDto = new ROIChannelsDto();
-                    BeanUtil.copyProperties(roiChannels, roiChannelsDto);
-                    roiChannelsDto.shift();
-                    roiChannelsDtosG.add(roiChannelsDto);
-                }
-                result.put("roiChannelsG", roiChannelsDtosG);
-                //region GardsROIResultsSpectrum
-                /*
-                 *    GardsROIResultsSpectrum
-                 * */
-                // #GROSS COUNTS PER ROI
-                // #NET COUNTS AND LC PER ROI
-                // #CONCENTRATION AND LC PER ROI
-                List<ROIResultsStrDto> roiResults = new ArrayList<>();
-                for (GardsROIResultsSpectrum resultsSpectrum : resultsSpectrums) {
-                    ROIResultsStrDto roiResultsStrDto = new ROIResultsStrDto();
-                    roiResultsStrDto.setRoi(resultsSpectrum.getRoi());
-                    roiResultsStrDto.setSGross(resultsSpectrum.getSGross());
-                    roiResultsStrDto.setGGross(resultsSpectrum.getGGross());
-                    roiResultsStrDto.setBGross(resultsSpectrum.getBGross());
-                    roiResultsStrDto.setLc(
-                            NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc())));
-                    roiResultsStrDto.setMdc(NumberFormatUtil.numberSixLen(
-                            String.valueOf(resultsSpectrum.getMdc())));
-                    if (betaDataFile.isBProcessed()) {
-                        roiResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getConc())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(resultsSpectrum.getConcErr())));
-                        roiResultsStrDto.setNetCount(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getNet())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(resultsSpectrum.getNetErr())));
-                        if (ObjectUtil.isNotNull(resultsSpectrums.get(0).getLcCts())) {
-                            roiResultsStrDto.setLcCts(NumberFormatUtil.numberSixLen(
-                                    String.valueOf(resultsSpectrum.getLcCts())));
-                        }
-                    } else {
-                        roiResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getConcErr())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(resultsSpectrum.getConcErr())));
-                        roiResultsStrDto.setNetCount(NumberFormatUtil.numberSixLen(
-                                String.valueOf(resultsSpectrum.getNet())) + " +/- " +
-                                NumberFormatUtil.numberSixLen(
-                                        String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))));
-                        if (ObjectUtil.isNotNull(resultsSpectrums.get(0).getLcCts())) {
-                            roiResultsStrDto.setLcCts(NumberFormatUtil.numberSixLen(
-                                    String.valueOf(resultsSpectrum.getLcCts())));
-                        }
-                    }
-                    roiResults.add(roiResultsStrDto);
-                }
-                result.put("roiResults", roiResults);
-                //endregion
-                /*
-                 *   GardsXeResultsSpectrum
-                 * */
-                //region #RESULT SUMMARY
-                List<XeResultsStrDto> xeResults = new ArrayList<>();
-                for (GardsXeResultsSpectrum xeResultsSpectrum : xeResultsSpectrums) {
-                    XeResultsStrDto xeResultsStrDto = new XeResultsStrDto();
-                    xeResultsStrDto.setNuclideName(xeResultsSpectrum.getNuclideName());
-                    xeResultsStrDto.setConcStr(NumberFormatUtil.numberSixLen(
-                            String.valueOf(xeResultsSpectrum.getConc())) + " +/- " +
-                            NumberFormatUtil.numberSixLen(
-                                    String.valueOf(xeResultsSpectrum.getConcErr())));
-                    xeResultsStrDto.setLc(NumberFormatUtil.numberSixLen(
-                            String.valueOf(xeResultsSpectrum.getLc())));
-                    xeResultsStrDto.setMdc(NumberFormatUtil.numberSixLen(
-                            String.valueOf(xeResultsSpectrum.getMdc())));
-                    xeResultsStrDto.setNidFlag(xeResultsSpectrum.getNidFlag());
-                    xeResults.add(xeResultsStrDto);
-                }
-
-                result.put("xeResults", xeResults);
-                //endregion
-                String schemaName = "rnman";
-                List<MeasurementCategorization> categorizations = new ArrayList<>();
-
-                List<Map<String, Object>> thresholdValues =
-                        spectrumAnalysisMapper.selectThresholdDataBySampleId(schemaName, sampleId);
-                //获取阈值历史信息
-                Date startTime = Date.from(
-                        LocalDateTime.now().minusYears(1).atZone(ZoneId.systemDefault())
-                                .toInstant());
-                Date endTime =
-                        Date.from(LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant());
-
-                List<ThresholdResultHistory> thresholdHistoryValues =
-                        spectrumAnalysisMapper.selectThresholdHistoryBySampleId(schemaName,
-                                sampleId, startTime);
-                List<NuclideAnalysisInfo> xeHistoryAllData =
-                        spectrumAnalysisMapper.selectXeDataPastYear(schemaName, sampleId, userName,
-                                startTime, endTime);
-
-
-                //region 获取当前样品的核素分级
-                for (String xe : validNuclides) {
-                    MeasurementCategorization item = new MeasurementCategorization();
-                    //获取xe结果信息
-                    Optional<GardsXeResultsSpectrum> xeResultDto = xeResultsSpectrums.stream()
-                            .filter(dto -> xe.equals(dto.getNuclideName()))
-                            .findFirst();
-                    //获取阈值信息
-                    Optional<Map<String, Object>> thresholdValue = thresholdValues.stream()
-                            .filter(map -> xe.equals(map.get("NUCLIDENAME")))
-                            .findFirst();
-                    Double value = 0.0;
-                    if (thresholdValue.isPresent()) {
-                        Map<String, Object> thresholdMap = thresholdValue.get();
-                        value = Double.parseDouble(thresholdMap.get("THRESHOLD_VALUE").toString());
-                    }
-
-                    //如果找到核素 获取阈值信息
-
-                    if (xeResultDto.isPresent()) {
-                        GardsXeResultsSpectrum foundDto = xeResultDto.get();
-                        item.setIsotope(xe);
-                        item.setDetected("YES");
-                        item.setAbnormalLimit(value);
-                        double safeConcentration =
-                                Optional.ofNullable(foundDto.getConc()).orElse(0.0);
-                        if (safeConcentration > value) {
-                            item.setCategory("C");
-                        } else if (safeConcentration < value) {
-                            item.setCategory("B");
-                        } else {
-                            item.setCategory("A");
-                        }
-
-                    } else {
-                        // 未找到的核素,表示在样品中没有发现核素，等级则为A
-                        item.setIsotope(xe);
-                        item.setDetected("NO");
-                        item.setAbnormalLimit(value);
-                        item.setCategory("A");
-                    }
-                    categorizations.add(item);
-                }
-                //endregion
-                result.put("measurementCategorization", categorizations);
-
-
-                //region
-
-                Map<String, List<NuclideAnalysisInfo>> analysisDataMap =
-                        Optional.ofNullable(xeHistoryAllData)
-                                .orElse(Collections.emptyList())
-                                .stream()
-                                .collect(Collectors.groupingBy(
-                                        na -> normalizeNuclideName(na.getNuclideName())));
-
-                Map<String, List<ThresholdResultHistory>> thresholdDataMap =
-                        Optional.ofNullable(thresholdHistoryValues)
-                                .orElse(Collections.emptyList())
-                                .stream()
-                                .collect(Collectors.groupingBy(
-                                        th -> normalizeNuclideName(th.getNuclideName())));
-
-
-                for (String xe : validNuclides) {
-                    String normalizedKey = normalizeNuclideName(xe);
-                    // 1. 过滤出目标核素的分析数据
-                    List<NuclideAnalysisInfo> singleNuclideData =
-                            analysisDataMap.getOrDefault(normalizedKey, Collections.emptyList());
-                    // 2. 过滤出目标核素的阈值历史
-                    List<ThresholdResultHistory> singleThresholdData =
-                            thresholdDataMap.getOrDefault(normalizedKey, Collections.emptyList());
-                    //获取分类历史
-                    XeCategoryHistory xeHistoryData =
-                            convertToRequest(singleNuclideData, singleThresholdData);
-                    //region 历史分类数据
-                    result.put(xe + "History", xeHistoryData);
-                    //endregion
-                    //region 频率分布数据
-                    result.put(xe + "HistogramData",
-                            calculateFrequencyDistribution(singleNuclideData));
-                    //endregion
-
-                }
-                //endregion
-                // --- 第二部分：比率 (Ratio) 处理 ---
-                // 定义需要计算的比率配置
-                // 结构：[标识后缀, 分子, 分母]
-                String[][] ratioConfigs = {
-                        {"1", "Xe133", "Xe131m"},
-                        {"2", "Xe133m", "Xe131m"},
-                        {"3", "Xe133m", "Xe133"},
-                        {"4", "Xe135", "Xe133"}
-                };
-                for (String[] config : ratioConfigs) {
-                    String index = config[0];
-                    String numerator = config[1];
-                    String denominator = config[2];
-                    List<NuclideAnalysisInfo> ratioResults =
-                            calculateXeRatio(xeHistoryAllData, numerator, denominator);
-                    result.put("ratioResults" + index, convertToRequest(ratioResults, null));
-                    result.put("ratioIntvlResults" + index,
-                            calculateFrequencyDistribution(ratioResults));
-                }
-
-            } catch (ParseException e) {
-                log.error("", e.getMessage());
-            }
-            //endregion
+        if (!betaDataFile.isSaveAnalysisResult()) {
+            return result;
         }
-        return result;
+        //region 获取数据
+        List<GardsROIChannelsSpectrum> channelsSpectrums =
+                betaDataFile.getRoiChannelsSpectrumList();
 
-    }
-
-    private void syncNidFlgs(List<GardsXeResultsSpectrum> targetList,
-                             List<GardsXeResultsSpectrum> sourceList) {
-        if (CollectionUtils.isEmpty(targetList) || CollectionUtils.isEmpty(sourceList)) {
-            return;
-        }
-        Map<String, Integer> sourceMap = sourceList.stream()
-                .collect(Collectors.toMap(k -> k.getNuclideName().toUpperCase(),
-                        GardsXeResultsSpectrum::getNidFlag, (Integer v1, Integer v2) -> v1));
-        for (GardsXeResultsSpectrum target : targetList) {
-            Integer flag = sourceMap.get(target.getNuclideName().toUpperCase());
-            if (flag != null) {
-                target.setNidFlag(flag);
-            }
-        }
-    }
-
-
-    public Map<String, Object> getSampleActConcIntvlAnalysis(
-            List<NuclideAnalysisInfo> nuclideActConcIntvls) {
-        //声明返回用的结果map
-        Map<String, Object> resultMap = new HashMap<>();
-
-        //获取浓度出现的次数
-        //获取浓度值集合
-        List<Double> data =
-                DistributionAnalysisToolkit.convertConcToDoubleList(nuclideActConcIntvls);
-        // 设置区间参数
-        double start = -3000;          // 区间起始值
-        double step = 100;          // 区间步长（宽度）
-
-
-        // 1. 区间统计
-        List<DistributionAnalysisToolkit.IntervalStat> stats =
-                DistributionAnalysisToolkit.calculateIntervalStats(nuclideActConcIntvls, start,
-                        step);
-        // 3. 累积分布函数
-        List<DistributionAnalysisToolkit.CDFPoint> cdfPoints =
-                DistributionAnalysisToolkit.calculateCDF(data);
-        // 4. 核密度估计
-        List<DistributionAnalysisToolkit.KDEPoint> kdePoints =
-                DistributionAnalysisToolkit.autoKDE(data,
-                        DistributionAnalysisToolkit.GAUSSIAN_KERNEL);
-        //获取所有浓度的累积
-        //List<Double> cumulative = DistributionAnalysisToolkit.cumulativeSum(data);
-        //获取95%累积线
-        double percentile95 = DistributionAnalysisToolkit.calculate95thPercentile(data);
-
-        resultMap.put("stats", stats);
-        resultMap.put("cdfPoints", cdfPoints);
-        resultMap.put("kdePoints", kdePoints);
-        //resultMap.put("cumulative", cumulative);
-        resultMap.put("percentile95", percentile95);
-        return resultMap;
-    }
-
-    public Map<String, Object> getSampleRatioIntvlAnalysis(
-            List<NuclideRatioResult> calculateXeRatio) {
-        //声明返回用的结果map
-        Map<String, Object> resultMap = new HashMap<>();
-
-        //region 局部变量
-
-
-        //获取浓度出现的次数
-        //获取浓度值集合
-        List<Double> data = DistributionAnalysisToolkit.convertRatioToDoubleList(calculateXeRatio);
-        // 设置区间参数
-        double start = -3000;          // 区间起始值
-        double step = 100;          // 区间步长（宽度）
-
-
-        // 1. 区间统计
-        List<DistributionAnalysisToolkit.IntervalStat> stats =
-                DistributionAnalysisToolkit.calculateIntervalStats(data, start, step, "ratio");
-        // 3. 累积分布函数
-        List<DistributionAnalysisToolkit.CDFPoint> cdfPoints =
-                DistributionAnalysisToolkit.calculateCDF(data);
-        // 4. 核密度估计
-        List<DistributionAnalysisToolkit.KDEPoint> kdePoints =
-                DistributionAnalysisToolkit.autoKDE(data,
-                        DistributionAnalysisToolkit.GAUSSIAN_KERNEL);
-        //获取所有浓度的累积
-        //List<Double> cumulative = DistributionAnalysisToolkit.cumulativeSum(data);
-        //获取95%累积线
-        double percentile95 = DistributionAnalysisToolkit.calculate95thPercentile(data);
-
-        resultMap.put("stats", stats);
-        resultMap.put("cdfPoints", cdfPoints);
-        resultMap.put("kdePoints", kdePoints);
-        //resultMap.put("cumulative", cumulative);
-        resultMap.put("percentile95", percentile95);
-        return resultMap;
-    }
-
-
-    /**
-     * 计算同一样本中Xe-133与Xe-131m的活性浓度比值
-     *
-     * @param analysisList 从 getCategorizatlonHist() 获取的列表
-     * @return 包含样本ID、比值、停止时间和状态的结果列表
-     */
-    public List<NuclideAnalysisInfo> calculateXeRatio(List<NuclideAnalysisInfo> analysisList,
-                                                      String isotopeA, String isotopeB) {
-
-        // 1. 按样本ID分组，关键步骤，将同一样本的不同核素数据归组
-        Map<String, List<NuclideAnalysisInfo>> groupedBySample = analysisList.stream()
-                .collect(Collectors.groupingBy(NuclideAnalysisInfo::getSampleId));
-
-        List<NuclideAnalysisInfo> results = new ArrayList<>();
-
-        // 2. 遍历每个样本分组
-        for (Map.Entry<String, List<NuclideAnalysisInfo>> entry : groupedBySample.entrySet()) {
-            String sampleId = entry.getKey();
-            List<NuclideAnalysisInfo> sampleData = entry.getValue();
-
-            // 3. 从同一样本的数据中查找两种核素
-            Optional<NuclideAnalysisInfo> isotopeAOpt = sampleData.stream()
-                    .filter(n -> isotopeA.equals(n.getNuclideName()))
-                    .findFirst();
-            Optional<NuclideAnalysisInfo> isotopeBOpt = sampleData.stream()
-                    .filter(n -> isotopeB.equals(n.getNuclideName()))
-                    .findFirst();
-
-            NuclideAnalysisInfo result;
-            // 4. 检查核素数据是否存在且有效
-            if (!isotopeAOpt.isPresent() || !isotopeBOpt.isPresent()) {
-                // result = new NuclideAnalysisInfo(sampleId, null, null, "MISSING_DATA");
-                result = new NuclideAnalysisInfo();
-                result.setSampleId(sampleId);
-                result.setRoiPeakfit("MISSING_DATA");
-                results.add(result);
-                continue;
-            }
-
-            NuclideAnalysisInfo isotopeAconc = isotopeAOpt.get();
-            NuclideAnalysisInfo isotopeBconc = isotopeBOpt.get();
-            Double concA = isotopeAconc.getConc();
-            Double concB = isotopeBconc.getConc();
-
-            // 5. 检查浓度值是否有效，避免除零错误
-            if (concA == null || concB == null) {
-                result = new NuclideAnalysisInfo();
-                result.setSampleId(sampleId);
-                result.setRoiPeakfit("NULL_CONCENTRATION");
-            } else if (concB == 0.0) {
-                result = new NuclideAnalysisInfo();
-                result.setSampleId(sampleId);
-                result.setRoiPeakfit("ZERO_DENOMINATOR");
-                // result = new NuclideRatioResult(sampleId, null, null, "ZERO_DENOMINATOR");
-            } else {
-                // 6. 核心计算：计算比值
-                double ratio = concA / concB;
-                // 通常使用Xe-133的记录时间作为该样本的停止采集时间
-                //result = new NuclideRatioResult(sampleId, ratio, stopTime, "SUCCESS");
-                result = new NuclideAnalysisInfo();
-                result.setSampleId(sampleId);
-                result.setConc(ratio);
-                result.setCategory("ratio");
-                result.setCollectStop(isotopeAconc.getCollectStop());
-                result.setRoiPeakfit("ZERO_DENOMINATOR");
-            }
-            results.add(result);
-        }
-        return results;
-    }
-
-
-    /**
-     * 计算浓度区间的分类频数分布（堆叠直方图专用）
-     *
-     * @param analyses 核素分析列表
-     * @param numBins  期望划分的区间数（建议 5~15）
-     * @return Map<区间字符串, Map<分类, 次数>>，例如：
-     * "[0.00~10.00)" -> {"A": 5, "B": 12, "C": 3}
-     * "[10.00~20.00)" -> {"A": 0, "B": 8, "C": 7}
-     */
-    public static Map<String, Map<String, Integer>> calculateFrequencyDistribution1(
-            List<NuclideAnalysisInfo> analyses, int numBins) {
-
-        // 1. 直接过滤有效的NuclideAnalysis对象，而不是只提取浓度值
-        List<NuclideAnalysisInfo> validAnalyses = analyses.stream()
-                .filter(analysis -> analysis.getConc() != null) // 过滤掉浓度为null的对象
-                .filter(analysis -> !analysis.getConc().isNaN() &&
-                        !analysis.getConc().isInfinite()) // 过滤掉非法数值
+        Map<String, List<GardsROIChannelsSpectrum>> channelsByType =
+                CalculateChartResultUtil.nullSafe(channelsSpectrums)
+                        .stream().collect(Collectors.groupingBy(
+                                item -> item.getDataType() != null ? item.getDataType().toUpperCase() :
+                                        ""));
+        List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream()
+                .filter(item -> item.getDataType()
+                        .equalsIgnoreCase(DataTypeAbbr.SAMPLEPHD.getType()))
                 .collect(Collectors.toList());
-
-        if (validAnalyses.isEmpty()) {
-            return Collections.emptyMap();
-        }
-
-        // 2. 找到浓度最小值和最大值，确定数据范围[1](@ref)
-        DoubleSummaryStatistics stats = validAnalyses.stream()
-                .mapToDouble(NuclideAnalysisInfo::getConc)
-                .summaryStatistics();
-        double min = stats.getMin();
-        double max = stats.getMax();
-
-        // 处理最小值等于最大值的情况（例如所有浓度都相同）
-        if (min == max) {
-            // 人为扩大范围，确保至少有一个区间
-            min = min - 1.0;
-            max = max + 1.0;
-        }
-
-        // 3. 计算区间宽度[5](@ref)
-        double binWidth = (max - min) / numBins;
-
-        // 4. 初始化频率分布Map，使用TreeMap让键（区间范围）按顺序排列
-        Map<String, Map<String, Integer>> resultMap = new TreeMap<>();
-        List<String> allPossibleLevels = Arrays.asList("A", "B", "C");
-        // 5. 初始化所有区间，确保即使频数为0的区间也出现在结果中[8](@ref)
-        for (int i = 0; i < numBins; i++) {
-            double binStart = min + i * binWidth;
-            double binEnd = binStart + binWidth;
-            // 格式化区间字符串，保留4位小数以便阅读
-            String binKey = String.format("[%.4f - %.4f)", binStart, binEnd);
-
-            // 初始化每个区间对应的级别计数Map，所有级别默认计数为0
-            Map<String, Integer> levelCountMap = new HashMap<>();
-            for (String level : allPossibleLevels) {
-                levelCountMap.put(level, 0);
-            }
-            resultMap.put(binKey, levelCountMap);
-        }
-
-        // 6. 遍历数据，统计每个数据点所属的区间[6](@ref)
-        for (NuclideAnalysisInfo analysis : validAnalyses) {
-            Double conc = analysis.getConc();
-
-            String levelKey = analysis.getCategory();
-            if (levelKey == null) {
-                levelKey = "unkwon"; // 或者根据您的业务逻辑处理空类别
-            }
-            // 计算当前对象属于哪个区间索引
-            int binIndex = (int) ((conc - min) / binWidth);
-            if (binIndex == numBins) {
-                binIndex--;
-            }
-
-            double binStart = min + binIndex * binWidth;
-            double binEnd = binStart + binWidth;
-            String binKey = String.format("[%.4f - %.4f)", binStart, binEnd);
-
-            Map<String, Integer> levelMap = resultMap.get(binKey);
-            Integer currentCount = levelMap.getOrDefault(levelKey, 0);
-            levelMap.put(levelKey, currentCount + 1);
-
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * 计算浓度区间的分类频数分布（堆叠直方图专用）
-     *
-     * @param analyses 核素分析列表
-     * @return Map<区间字符串, Map<分类, 次数>>，例如：
-     * "[0.00~10.00)" -> {"A": 5, "B": 12, "C": 3}
-     * "[10.00~20.00)" -> {"A": 0, "B": 8, "C": 7}
-     */
-    public static Map<String, Map<String, Integer>> calculateFrequencyDistribution(
-            List<NuclideAnalysisInfo> analyses) {
-
-        if (analyses == null || analyses.isEmpty()) {
-            return Collections.emptyMap();
-        }
-        int numBins = calculateOptimalBins(analyses);
-        // 1. 一次性统计 min/max/count，过滤无效值
-        DoubleSummaryStatistics stats = analyses.stream()
-                .map(NuclideAnalysisInfo::getConc)
-                .filter(Objects::nonNull)
-                .filter(d -> !d.isNaN() && !d.isInfinite())
-                .mapToDouble(Double::doubleValue)
-                .summaryStatistics();
-
-        if (stats.getCount() == 0) {
-            return Collections.emptyMap();
-        }
-
-        double min = stats.getMin();
-        double max = stats.getMax();
-
-        //2. 处理所有值相同或极小范围（关键！避免 binWidth = 0）
-        if (max - min < 1e-8) {
-            // 取值向下取整为起点，向上扩展一个单位
-            min = Math.floor(min);
-            max = min + Math.max(1.0, Math.abs(min) * 0.1); // 避免 min=-1000 时扩展太小
-        }
-
-        double binWidth = (max - min) / numBins;
-        if (binWidth <= 0) {
-            binWidth = 1.0; // 极端防御
-        }
-
-        //3. 初始化累加器
-        List<Map<String, Integer>> bins = new ArrayList<>(numBins);
-        Set<String> levels = new HashSet<>(Arrays.asList("A", "B", "C"));
-
-        for (int i = 0; i < numBins; i++) {
-            Map<String, Integer> map = new HashMap<>();
-            levels.forEach(l -> map.put(l, 0));
-            bins.add(map);
-        }
-
-        //4. 统计原始列表
-        for (NuclideAnalysisInfo a : analyses) {
-            Double conc = a.getConc();
-            if (conc == null || conc.isNaN() || conc.isInfinite()) {
-                continue;
-            }
-
-            String level = Optional.ofNullable(a.getCategory()).orElse("unknown");
-
-            // 计算当前对象属于哪个区间索引
-            int index = (int) ((conc - min) / binWidth);
-            if (index < 0) {
-                index = 0;
-            }
-            if (index >= numBins) {
-                index = numBins - 1;
-            }
-
-            bins.get(index).merge(level, 1, Integer::sum);
-        }
-
-        //5. 组装结果（格式化区间，保持顺序）
-        Map<String, Map<String, Integer>> result = new LinkedHashMap<>();
-        for (int i = 0; i < numBins; i++) {
-            double start = min + i * binWidth;
-            double end = min + (i + 1) * binWidth;
-
-            // 最后一个区间使用闭区间，语义更清晰
-            String key = i == numBins - 1
-                    ? String.format("[%.4f ~ %.4f]", start, max)
-                    : String.format("[%.4f ~ %.4f)", start, end);
-
-            result.put(key, bins.get(i));
-        }
-
-        return result;
-    }
-
-    public static int calculateOptimalBins(List<NuclideAnalysisInfo> analyses) {
-        if (analyses == null || analyses.size() < 2) {
-            return 5; // 太少数据用 5 根柱子
-        }
-
-        // 提取有效浓度并过滤无效值
-        List<Double> values = analyses.stream()
-                .map(NuclideAnalysisInfo::getConc)
-                .filter(Objects::nonNull)
-                .filter(d -> !d.isNaN() && !d.isInfinite())
-                .sorted()
+        List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream()
+                .filter(item -> item.getDataType()
+                        .equalsIgnoreCase(DataTypeAbbr.GASBKPHD.getType()))
                 .collect(Collectors.toList());
-
-        int n = values.size();
-        if (n < 2) {
-            return 5;
-        }
-
-        // 计算四分位距 IQR（抗异常值）
-        double q1 = values.get(n / 4);
-        double q3 = values.get((3 * n) / 4);
-        double iqr = q3 - q1;
-
-        if (iqr <= 0) {
-            // IQR=0，说明大部分数据相同，用平方根
-            return (int) Math.max(3, Math.ceil(Math.sqrt(n)));
-        }
-
-        // FD 公式：binWidth = 2 * IQR * n^(-1/3)
-        double binWidth = 2 * iqr * Math.pow(n, -1.0 / 3.0);
-        double dataRange = values.get(n - 1) - values.get(0);
-
-        int bins = (int) Math.ceil(dataRange / binWidth);
-
-        // 限制合理范围：3 ~ 40 根柱子
-        bins = Math.max(3, Math.min(40, bins));
-
-        return bins;
-    }
-
-
-    private static final DateTimeFormatter DATE_FORMATTER =
-            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
-
-    /**
-     * 对外提供的方法：按指定核素获取分类历史图数据
-     *
-     * @param xeHistoryAllData       所有氙核素的历史分析数据（含多个核素）
-     * @param thresholdHistoryValues 所有氙核素的阈值历史（含多个核素）
-     * @param targetNuclideName      目标核素，例如 "Xe133" 或 "Xe-133"
-     * @return 只包含该核素的图表数据
-     */
-    public XeCategoryHistory getXeCategoryHistoryByNuclide(
-            List<NuclideAnalysisInfo> xeHistoryAllData,
-            List<ThresholdResultHistory> thresholdHistoryValues,
-            String targetNuclideName) {
-
-        if (xeHistoryAllData == null && thresholdHistoryValues == null) {
-            return new XeCategoryHistory();
-        }
-
-        // 1. 过滤出目标核素的分析数据
-        List<NuclideAnalysisInfo> singleNuclideData = Optional.ofNullable(xeHistoryAllData)
-                .orElse(Collections.emptyList())
-                .stream()
-                .filter(na -> Objects.equals(normalizeNuclideName(na.getNuclideName()),
-                        normalizeNuclideName(targetNuclideName)))
+        List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream()
+                .filter(item -> item.getDataType()
+                        .equalsIgnoreCase(DataTypeAbbr.DETBKPHD.getType()))
                 .collect(Collectors.toList());
+        List<GardsROIResultsSpectrum> resultsSpectrums = betaDataFile.getRoiResultsSpectrumList();
+        List<GardsXeResultsSpectrum> xeResultsSpectrums = betaDataFile.getXeResultsSpectrumList();
 
-        // 2. 过滤出目标核素的阈值历史
-        List<ThresholdResultHistory> singleThresholdData =
-                Optional.ofNullable(thresholdHistoryValues)
-                        .orElse(Collections.emptyList())
-                        .stream()
-                        .filter(th -> Objects.equals(normalizeNuclideName(th.getNuclideName()),
-                                normalizeNuclideName(targetNuclideName)))
-                        .collect(Collectors.toList());
+        //endregion
 
-        // 3. 调用你原来的转换方法（现在传入的都是纯净的单个核素数据）
-        return convertToRequest(singleNuclideData, singleThresholdData);
-    }
+        // region 将校准参数列表按 dataType 建索引
+        Map<String, GardsCalibrationSpectrum> gammaOld = CalculateChartResultUtil.indexByDataType(
+                betaDataFile.getGammaCalibrationSpectrumList());
+        Map<String, GardsCalibrationSpectrum> gammaNew = CalculateChartResultUtil.indexByDataType(
+                betaDataFile.getGammaCalibrationSpectrumEList());
+        Map<String, GardsCalibrationSpectrum> betaOld = CalculateChartResultUtil.indexByDataType(
+                betaDataFile.getBetaCalibrationSpectrumList());
+        Map<String, GardsCalibrationSpectrum> betaNew = CalculateChartResultUtil.indexByDataType(
+                betaDataFile.getBetaCalibrationSpectrumEList());
 
-
-    public XeCategoryHistory convertToRequest(List<NuclideAnalysisInfo> list,
-                                              List<ThresholdResultHistory> thresholdResultHis) {
-        XeCategoryHistory req = new XeCategoryHistory();
-        //req.title = "Xe-133 categorization history";
-
-        if (list != null) {
-            for (NuclideAnalysisInfo na : list) {
-                if (na.getCollectStop() == null || na.getConc() == null) {
-                    continue;
-                }
-                String dateStr = DATE_FORMATTER.format(na.getCollectStop().toInstant());
-                String category = na.getCategory() == null ? "" : na.getCategory();
-                switch (category) {
-                    case "A": // Level A
-                        req.levelA.add(createPoint(dateStr, na.getConc()));
-                        break;
-                    case "B": // Level B
-                        req.levelB.add(createErrorPoint(dateStr, na.getConc(), na.getConcErr()));
-                        break;
-                    case "C": // Level C
-                        req.levelC.add(createErrorPoint(dateStr, na.getConc(), na.getConcErr()));
-                        break;
-                    default:
-                        // 处理未知分类
-                        break;
-                }
-
-                // MDC 和 LC 是每个点都有的
-                if (na.getMdc() != null) {
-                    req.mdc.add(createPoint(dateStr, na.getMdc()));
-                }
-                if (na.getLc() != null) {
-                    req.lc.add(createPoint(dateStr, na.getLc()));
-                }
-            }
-        }
-        if (thresholdResultHis != null) {
-            for (ThresholdResultHistory threshold : thresholdResultHis) {
-                if (threshold.getCollectStop() == null || threshold.getThresholdValue() == null) {
-                    continue;
-                }
-                String dateStr = DATE_FORMATTER.format(threshold.getCollectStop().toInstant());
-                req.thresholds.add(createPoint(dateStr, threshold.getThresholdValue()));
-            }
-        }
-        return req;
-    }
-
-    private XeCategoryHistory.Point createPoint(String date, Double y) {
-        XeCategoryHistory.Point p = new XeCategoryHistory.Point();
-        p.date = date;
-        p.y = y;
-        return p;
-    }
-
-    private XeCategoryHistory.ErrorPoint createErrorPoint(String date, Double y, String errStr) {
-        XeCategoryHistory.ErrorPoint ep = new XeCategoryHistory.ErrorPoint();
-        ep.date = date;
-        ep.y = y;
-        ep.yError = parseError(errStr);
-        return ep;
-    }
-
-    // 将 concErr 字符串解析为 double
-    private double parseError(String errStr) {
+        String S = DataTypeAbbr.SAMPLEPHD.getType();
+        String G = DataTypeAbbr.GASBKPHD.getType();
+        String D = DataTypeAbbr.DETBKPHD.getType();
+        //endregion
+        //region Information 装配
         try {
-            return Double.parseDouble(errStr);
-        } catch (Exception e) {
-            return 0.0;
+            Information information = new Information();
+            //region 获取Information数据
+            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_real_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);
+            }
+            //endregion
+
+            //region 基本信息写入 result
+            result.put("reportTitle", betaDataFile.getSampleSpectrumData().getStationCode());
+            result.put("now", LocalDateTime.now().format(
+                    DateTimeFormatter.ofPattern(DateConstant.DATE_TIME_S)));
+            result.put("measurement_id", information.getMeasurementID());
+            result.put("gas_bk_measurement_id", information.getGasBkgdMeasurementID());
+            result.put("sample_ref_id", information.getSampleRefId());
+            result.put("site_code", information.getSit_det_code());
+            result.put("detector_code", information.getDetect_code());
+            result.put("collection_start", DateUtils.formatDate(
+                    information.getCollect_start(), "yyyy/MM/dd HH:mm:ss"));
+            result.put("collection_stop", DateUtils.formatDate(
+                    information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss"));
+            result.put("collection_time",
+                    (information.getCollect_stop().getTime() / 1000
+                            - information.getCollect_start().getTime() / 1000) / 3600);
+            result.put("air_volume", information.getS_xe_stable_volume());
+            result.put("sample_volume_of_Xe", information.getS_volume_of_Xe());
+            result.put("acquisition_start", DateUtils.formatDate(
+                    information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss"));
+            result.put("acquisition_real_time", information.getAcquisition_real_sec());
+            result.put("acquisition_live_time", information.getAcquisition_live_sec());
+            //endregion
+
+            //region 校准数据
+            // Old Calibration: SAMPLE / DET / GAS
+            List<Calibration> oldCalibrations =
+                    CalculateChartResultUtil.buildOldCalibrations(betaDataFile);
+            result.put("samplOldCalibrations", oldCalibrations);
+            result.put("detOldCalibrations", oldCalibrations);
+            result.put("gasOldCalibrations", oldCalibrations);
+            // New Calibration: 三段仅校准参数不同
+            result.put("samplNewCalibrations", CalculateChartResultUtil.buildNewCalibrations(
+                    betaNew.get(S), gammaNew.get(S), betaOld.get(S), gammaOld.get(S)));
+            result.put("detNewCalibrations", CalculateChartResultUtil.buildNewCalibrations(
+                    betaNew.get(D), gammaNew.get(D), betaOld.get(D), gammaOld.get(D)));
+            result.put("gasNewCalibrations", CalculateChartResultUtil.buildNewCalibrations(
+                    betaNew.get(G), gammaNew.get(G), betaOld.get(G), gammaOld.get(G)));
+
+            // ROI Channels
+            result.put("roiChannelsS",
+                    CalculateChartResultUtil.buildROIChannels(roiChannelsSpectrumsSample));
+            result.put("roiChannelsD",
+                    CalculateChartResultUtil.buildROIChannels(roiChannelsSpectrumsDet));
+            result.put("roiChannelsG",
+                    CalculateChartResultUtil.buildROIChannels(roiChannelsSpectrumsGas));
+
+
+            // ROI Results
+            List<ROIResultsStrDto> roiResults = new ArrayList<>();
+            boolean lcCtsAvailable = CollectionUtils.isNotEmpty(resultsSpectrums)
+                    && resultsSpectrums.get(0).getLcCts() != null;
+
+            for (GardsROIResultsSpectrum rs : resultsSpectrums) {
+                ROIResultsStrDto dto = new ROIResultsStrDto();
+                dto.setRoi(rs.getRoi());
+                dto.setSGross(rs.getSGross());
+                dto.setGGross(rs.getGGross());
+                dto.setBGross(rs.getBGross());
+                dto.setLc(NumberFormatUtil.numberSixLen(String.valueOf(rs.getLc())));
+                dto.setMdc(NumberFormatUtil.numberSixLen(String.valueOf(rs.getMdc())));
+
+                if (betaDataFile.isBProcessed()) {
+                    dto.setConcStr(NumberFormatUtil.numberSixLen(String.valueOf(rs.getConc()))
+                            + " +/- " +
+                            NumberFormatUtil.numberSixLen(String.valueOf(rs.getConcErr())));
+                    dto.setNetCount(NumberFormatUtil.numberSixLen(String.valueOf(rs.getNet()))
+                            + " +/- " +
+                            NumberFormatUtil.numberSixLen(String.valueOf(rs.getNetErr())));
+                } else {
+                    dto.setConcStr(NumberFormatUtil.numberSixLen(String.valueOf(rs.getConcErr()))
+                            + " +/- " +
+                            NumberFormatUtil.numberSixLen(String.valueOf(rs.getConcErr())));
+                    dto.setNetCount(NumberFormatUtil.numberSixLen(String.valueOf(rs.getNet()))
+                            + " +/- " + NumberFormatUtil.numberSixLen(
+                            String.valueOf(Math.sqrt(rs.getNetErr()))));
+                }
+                if (lcCtsAvailable) {
+                    dto.setLcCts(NumberFormatUtil.numberSixLen(String.valueOf(rs.getLcCts())));
+                }
+                roiResults.add(dto);
+            }
+            result.put("roiResults", roiResults);
+
+            // Xe Results
+            List<XeResultsStrDto> xeResults = new ArrayList<>();
+            for (GardsXeResultsSpectrum xrs : xeResultsSpectrums) {
+                XeResultsStrDto dto = new XeResultsStrDto();
+                dto.setNuclideName(xrs.getNuclideName());
+                dto.setConcStr(NumberFormatUtil.numberSixLen(String.valueOf(xrs.getConc()))
+                        + " +/- " +
+                        NumberFormatUtil.numberSixLen(String.valueOf(xrs.getConcErr())));
+                dto.setLc(NumberFormatUtil.numberSixLen(String.valueOf(xrs.getLc())));
+                dto.setMdc(NumberFormatUtil.numberSixLen(String.valueOf(xrs.getMdc())));
+                dto.setNidFlag(xrs.getNidFlag());
+                xeResults.add(dto);
+            }
+            result.put("xeResults", xeResults);
+            // 核素分级与图表 ========================
+            buildCategorizationAndCharts(result, xeResultsSpectrums, sampleId, stationId, userName);
+            //endregion
+        } catch (Exception ex) {
+            log.error("生成报告内容错误：", ex);
         }
+        //endregion
+
+
+        return result;
+
+    }
+
+    /**
+     * 核素分级、历史数据、比率图表（从主方法中拆出）
+     */
+    private void buildCategorizationAndCharts(Map<String, Object> result,
+                                              List<GardsXeResultsSpectrum> xeResultsSpectrums,
+                                              String sampleId, String stationId, String userName) {
+
+        String schemaName = CalculateChartResultUtil.SCHEMA_NAME;
+        List<MeasurementCategorization> categorizations = new ArrayList<>();
+
+        List<Map<String, Object>> thresholdValues =
+                spectrumAnalysisMapper.selectThresholdDataBySampleId(schemaName, sampleId);
+        //获取阈值历史信息
+        LocalDateTime now = LocalDateTime.now();
+        Date startTime =
+                Date.from(now.minusYears(1).atZone(ZoneId.systemDefault()).toInstant());
+        Date endTime = Date.from(now.atZone(ZoneId.systemDefault()).toInstant());
+
+        List<ThresholdResultHistory> thresholdHistoryValues =
+                spectrumAnalysisMapper.selectThresholdHistoryBySampleId(schemaName,
+                        sampleId, startTime);
+        List<NuclideAnalysisInfo> xeHistoryAllData =
+                spectrumAnalysisMapper.selectXeDataPastYear(schemaName, stationId, userName,
+                        startTime, endTime);
+        List<NuclideAnalysisInfo> xeCurrentDataList =
+                spectrumAnalysisMapper.selectXeData(schemaName, sampleId, userName);
+
+        // 预先转换为 Map，避免在循环中反复 stream filter
+        Map<String, GardsXeResultsSpectrum> xeResultMap =
+                CalculateChartResultUtil.nullSafe(xeResultsSpectrums).stream()
+                        .collect(Collectors.toMap(GardsXeResultsSpectrum::getNuclideName,
+                                dto -> dto, (a, b) -> b));
+
+        Map<String, Double> thresholdMap =
+                CalculateChartResultUtil.nullSafe(thresholdValues).stream()
+                        .collect(Collectors.toMap(
+                                m -> String.valueOf(m.get("NUCLIDENAME")),
+                                m -> Double.parseDouble(
+                                        String.valueOf(m.get("THRESHOLD_VALUE"))),
+                                (a, b) -> b));
+        Map<String, Double> currentConcMap =
+                CalculateChartResultUtil.nullSafe(xeCurrentDataList).stream()
+                        .collect(Collectors.toMap(NuclideAnalysisInfo::getNuclideName,
+                                NuclideAnalysisInfo::getConc, (a, b) -> b));
+        //region 获取当前样品的核素分级
+        // ===================== 当前样品的核素分级 =====================
+        for (String xe : validNuclides) {
+            MeasurementCategorization item = new MeasurementCategorization();
+            item.setIsotope(xe);
+
+            double value = thresholdMap.getOrDefault(xe, 0.0);
+            item.setAbnormalLimit(value);
+
+            GardsXeResultsSpectrum foundDto = xeResultMap.get(xe);
+            if (foundDto != null) {
+                item.setDetected(CalculateChartResultUtil.DETECTED_YES);
+                double safeConcentration =
+                        Optional.ofNullable(foundDto.getConc()).orElse(0.0);
+                // 三元表达式
+                item.setCategory(
+                        safeConcentration > value ? CalculateChartResultUtil.CAT_C :
+                                safeConcentration < value ? CalculateChartResultUtil.CAT_B :
+                                        CalculateChartResultUtil.CAT_A);
+            } else {
+                item.setDetected(CalculateChartResultUtil.DETECTED_NO);
+                item.setCategory(CalculateChartResultUtil.CAT_A);
+            }
+            categorizations.add(item);
+        }
+        result.put("measurementCategorization", categorizations);
+
+        //endregion
+        //region
+        // 提前分组，避免循环内 stream
+        Map<String, List<NuclideAnalysisInfo>> analysisDataMap =
+                CalculateChartResultUtil.nullSafe(xeHistoryAllData).stream()
+                        .collect(Collectors.groupingBy(
+                                na -> normalizeNuclideName(na.getNuclideName())));
+
+        Map<String, List<ThresholdResultHistory>> thresholdDataMap =
+                CalculateChartResultUtil.nullSafe(thresholdHistoryValues).stream()
+                        .collect(Collectors.groupingBy(
+                                th -> normalizeNuclideName(th.getNuclideName())));
+        for (String xe : validNuclides) {
+            String normalizedKey = normalizeNuclideName(xe);
+            // 1. 过滤出目标核素的分析数据
+            List<NuclideAnalysisInfo> singleNuclideData =
+                    analysisDataMap.getOrDefault(normalizedKey, Collections.emptyList());
+            // 2. 过滤出目标核素的阈值历史
+            List<ThresholdResultHistory> singleThresholdData =
+                    thresholdDataMap.getOrDefault(normalizedKey, Collections.emptyList());
+            //获取分类历史
+            XeCategoryHistory xeHistoryData =
+                    CalculateChartResultUtil.convertToRequest(singleNuclideData,
+                            singleThresholdData);
+            //region 历史分类数据
+            result.put(xe + "HistoryData",
+                    xeHistoryData != null ? xeHistoryData : new HashMap<>());
+            //endregion
+            //region 频率分布数据
+            Map<String, Object> map = new HashMap<>();
+            map.put("frequencyData", CalculateChartResultUtil.buildConcFrequencyByCategory(
+                    singleNuclideData));
+            //获取当前样品的
+            double sampleValue = currentConcMap.getOrDefault(xe, 0.0);
+            map.put("sampleValue", sampleValue);
+            result.put(xe + "HistogramData", map);
+            //endregion
+        }
+        //endregion
+        // =====================比率 处理 =====================
+        List<NuclideRatioResult> allResults = new ArrayList<>();
+        List<NuclideRatioResult> allRatioCurrents = new ArrayList<>();
+        for (CalculateChartResultUtil.RatioConfig cfg : CalculateChartResultUtil.RATIO_CONFIGS) {
+            allResults.addAll(CalculateChartResultUtil.calculateXeRatio(
+                    xeHistoryAllData, cfg.getType(), cfg.getNumerator(),
+                    cfg.getDenominator()));
+            allRatioCurrents.addAll(CalculateChartResultUtil.calculateXeRatio(
+                    xeCurrentDataList, cfg.getType(), cfg.getNumerator(),
+                    cfg.getDenominator()));
+        }
+
+        // ====== 按比值类型分组 ======
+        Map<RatioType, List<NuclideRatioResult>> grouped = allResults.stream()
+                .collect(Collectors.groupingBy(NuclideRatioResult::getRatioType));
+        List<IsotopeChart> charts = new ArrayList<>();
+        for (RatioType type : RatioType.values()) {
+            charts.add(CalculateChartResultUtil.buildSingleChart(
+                    type, grouped.getOrDefault(type, Collections.emptyList())));
+        }
+        ChartConfig chartConfig = CalculateChartResultUtil.buildConfig(allResults);
+        result.put("chartConfig", chartConfig);
+        result.put("chartDataList", charts);
+        // 提取当前样品的比值
+        Map<String, Double> sampleRatios = allRatioCurrents.stream()
+                .filter(r -> "SUCCESS".equals(r.getStatus()))
+                .filter(r -> r.getRatio() != null)
+                .collect(Collectors.toMap(
+                        r -> r.getRatioType().getLabel(),
+                        NuclideRatioResult::getRatio,
+                        (a, b) -> b
+                ));
+        Map<String, Object> distributionsMap = new HashMap<>();
+        distributionsMap.put("frequencyData",
+                CalculateChartResultUtil.buildStackedHistogramFrequencyData(allResults));
+        distributionsMap.put("sampleRatios", sampleRatios);
+        result.put("distributions", distributionsMap);
     }
 
     private String normalizeNuclideName(String name) {
diff --git a/jeecg-module-spectrum-analysis/src/main/resources/templates/report.html b/jeecg-module-spectrum-analysis/src/main/resources/templates/report.html
index 7c1f098d..8fd02468 100644
--- a/jeecg-module-spectrum-analysis/src/main/resources/templates/report.html
+++ b/jeecg-module-spectrum-analysis/src/main/resources/templates/report.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <title>CNL06 GENERATED REPORT - REVIEWED RADIONUCLIDE REPORT</title>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width,initial-scale=1"/>
+    <title th:text="${reportTitle} + ' GENERATED REPORT - AUTO RADIONUCLIDE REPORT'">CNL06 GENERATED REPORT</title>
     <style>
         :root {
             --muted: #555;
@@ -62,7 +63,7 @@
             color: var(--muted);
         }
 
-        .meta-row, .meta {
+        .meta-row {
             text-align: center;
             font-family: var(--mono);
             margin-top: 6px;
@@ -70,15 +71,6 @@
             font-size: 12px;
         }
 
-        .meta {
-            display: grid;
-            grid-template-columns: repeat(3, 1fr);
-            gap: 12px;
-            margin-top: 8px;
-            color: var(--muted);
-            font-size: 14px;
-        }
-
         section {
             margin: 18px 0;
             page-break-inside: avoid;
@@ -94,13 +86,6 @@
             border: 1px solid var(--table-border);
         }
 
-        .section-title {
-            display: flex;
-            align-items: baseline;
-            justify-content: space-between;
-            gap: 8px;
-        }
-
         .grid {
             display: grid;
             grid-template-columns: 1fr 1fr;
@@ -165,7 +150,6 @@
         .wide-table th {
             background: #fafafa;
             font-weight: 600;
-            text-transform: none;
             color: var(--muted);
             font-size: 12px;
         }
@@ -189,11 +173,6 @@
             font-weight: 600;
         }
 
-        .subtle {
-            color: var(--muted);
-            font-size: 13px;
-        }
-
         .two-col {
             display: flex;
             justify-content: space-between;
@@ -223,103 +202,76 @@
             padding: 8px;
         }
 
-        .legend {
-            display: flex;
-            gap: 10px;
-            flex-wrap: wrap;
-            margin-top: 6px;
+        .level-A {
+            color: var(--ok);
         }
 
-        .legend-item {
-            display: inline-flex;
-            align-items: center;
-            gap: 6px;
-            color: var(--muted);
-            font-size: 12px;
-            border: 1px solid var(--line);
-            border-radius: 16px;
-            padding: 2px 8px;
-            background: #ffffff;
+        .level-B {
+            color: var(--warn);
         }
 
-        .dot {
-            width: 10px;
-            height: 10px;
-            border-radius: 50%;
+        .level-C {
+            color: var(--bad);
         }
 
-        .footer-note {
-            color: var(--muted);
-            font-size: 12px;
-            margin-top: 6px;
-        }
-
-        @media (max-width:1024px) {
+        @media (max-width: 1024px) {
             .grid-2 {
                 grid-template-columns: 1fr;
             }
+
             .canvas-wrap {
                 height: 280px;
             }
-            .meta {
-                grid-template-columns: 1fr;
-            }
         }
 
         @media print {
             body {
                 padding: 10mm;
             }
+
             header h1 {
                 font-size: 16px;
             }
+
             .report, .card {
                 box-shadow: none;
             }
-            .grid {
+
+            .grid, .section {
                 page-break-inside: avoid;
             }
-            section {
-                page-break-inside: avoid;
-            }
-            .canvas-wrap {
-                border: 1px solid #d1d5db;
-            }
         }
-
-        .level-A { color: var(--ok); }
-        .level-B { color: var(--warn); }
-        .level-C { color: var(--bad); }
     </style>
-    <script src="echarts.min.js"></script>
+    <script src="https://cdn.bootcdn.net/ajax/libs/echarts/5.4.3/echarts.min.js"></script>
 </head>
 
 <body>
 <div class="report">
+    <!-- ===================== HEADER ===================== -->
     <header>
-        <h1>CNL06 GENERATED REPORT</h1>
+        <h1 th:text="${reportTitle} + ' GENERATED REPORT'">CNL06 GENERATED REPORT</h1>
         <h2>REVIEWED RADIONUCLIDE REPORT</h2>
         <h2>(Noble Gas Version)</h2>
         <div class="meta-row">
-            Creation Date <span th:text="${now}">2025/10/27-21:00:35</span>
+            Creation Date <span th:text="${now}">2025/11/18-14:44:23</span>
         </div>
     </header>
 
-    <!-- FILE INFORMATION -->
+    <!-- ===================== FILE INFORMATION ===================== -->
     <section>
         <h3>FILE INFORMATION</h3>
         <div class="grid">
             <div class="field">
                 <div class="label">SampleMeasID:</div>
-                <div class="value" th:text="${measurement_id}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${measurement_id}"></div>
             </div>
             <div class="field">
                 <div class="label">GASBKMeasID:</div>
-                <div class="value" th:text="${gas_bk_measurement_id}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${gas_bk_measurement_id}"></div>
             </div>
             <div class="field">
                 <div class="label">SRID:</div>
-                <div class="value" th:text="${sample_ref_id}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${sample_ref_id}"></div>
             </div>
             <div class="field">
                 <div class="label">Detector Type:</div>
@@ -328,61 +280,61 @@
         </div>
     </section>
 
-    <!-- COLLECTION INFORMATION -->
+    <!-- ===================== COLLECTION INFORMATION ===================== -->
     <section>
         <h3>COLLECTION INFORMATION</h3>
         <div class="grid">
             <div class="field">
                 <div class="label">Station CODE:</div>
-                <div class="value" th:text="${site_code}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${site_code}"></div>
             </div>
             <div class="field">
                 <div class="label">Detector CODE:</div>
-                <div class="value" th:text="${detector_code}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${detector_code}"></div>
             </div>
             <div class="field">
                 <div class="label">Collection Start:</div>
-                <div class="value" th:text="${collection_start}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${collection_start}"></div>
             </div>
             <div class="field">
                 <div class="label">Collection Stop:</div>
-                <div class="value" th:text="${collection_stop}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${collection_stop}"></div>
             </div>
             <div class="field">
                 <div class="label">Collection TIME(h):</div>
-                <div class="value" th:text="${collection_time}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${collection_time}"></div>
             </div>
             <div class="field">
                 <div class="label">Air Volume[cm3]:</div>
-                <div class="value" th:text="${air_volume}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${air_volume}"></div>
             </div>
             <div class="field">
                 <div class="label">Xe Volume[cm3]:</div>
-                <div class="value" th:text="${sample_volume_of_Xe}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${sample_volume_of_Xe}"></div>
             </div>
         </div>
     </section>
 
-    <!-- ACQUISITION INFORMATION -->
+    <!-- ===================== ACQUISITION INFORMATION ===================== -->
     <section>
         <h3>ACQUISITION INFORMATION</h3>
         <div class="grid">
             <div class="field">
                 <div class="label">Acquisition Start:</div>
-                <div class="value" th:text="${acquisition_start}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${acquisition_start}"></div>
             </div>
             <div class="field">
                 <div class="label">Acq Real Time(s):</div>
-                <div class="value" th:text="${acquisition_real_time}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${acquisition_real_time}"></div>
             </div>
             <div class="field">
                 <div class="label">Acq Live Time(s):</div>
-                <div class="value" th:text="${acquisition_live_time}">xxxxxxxxxxxxx</div>
+                <div class="value" th:text="${acquisition_live_time}"></div>
             </div>
         </div>
     </section>
 
-    <!-- SOFTWARE -->
+    <!-- ===================== SOFTWARE ===================== -->
     <section>
         <h3>SOFTWARE</h3>
         <div class="two-col">
@@ -390,10 +342,10 @@
             <div class="right">1.0.1</div>
         </div>
     </section>
+
+    <!-- ===================== MEASUREMENT CATEGORIZATION ===================== -->
     <section>
         <h3>MEASUREMENT CATEGORIZATION</h3>
-
-        <!-- Legend -->
         <div style="padding:10px;border:1px solid #e8e8e8;background:#fafafa;margin-bottom:6px;">
             <div style="font-weight:700;margin-bottom:8px;color:#333;">Categorization Legend</div>
             <div style="font-size:13px;color:#555;line-height:1.45;">
@@ -402,8 +354,6 @@
                 <div><strong>Level C</strong> = Anomalous Xenon detection.</div>
             </div>
         </div>
-
-        <!-- Data table placed immediately under the legend -->
         <div>
             <table class="wide-table" style="width:100%;margin:0 0 12px 0;">
                 <thead>
@@ -415,359 +365,295 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr th:each="row : ${measurementCategorization}">
-                    <td class="center" th:text="${row.isotope}">Xe-131m</td>
-                    <td class="center" th:text="${row.detected}">NO</td>
-                    <td class="right" th:text="${row.abnormalLimit}">1.74E-01</td>
-                    <td class="center" th:text="${row.category}">A</td>
-                </tr>
-                <tr th:if="${measurementCategorization == null or #lists.isEmpty(measurementCategorization)}">
-                    <td class="center">Xe-131m</td>
-                    <td class="center">NO</td>
-                    <td class="right">1.74E-01</td>
-                    <td class="center">A</td>
+                <tr th:each="cat : ${measurementCategorization}">
+                    <td class="center" th:text="${cat.isotope}"></td>
+                    <td class="center" th:text="${cat.detected}"></td>
+                    <td class="right" th:text="${cat.abnormalLimit}"></td>
+                    <td class="center" th:text="${cat.category}"
+                        th:classappend="${cat.category == 'A' ? 'level-A' : (cat.category == 'B' ? 'level-B' : 'level-C')}">
+                    </td>
                 </tr>
                 </tbody>
             </table>
         </div>
-
-
     </section>
-    <!-- SAMPLE OLD CALIBRATION -->
+
+    <!-- ===================== SAMPLE OLD CALIBRATION ===================== -->
     <section>
         <h3>SAMPLE OLD CALIBRATION</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Old Beta</th>
-                    <th>Old Gamma</th>
-                </tr>
+            <tr>
+                <th>Old Beta</th>
+                <th>Old Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="samplOldCalibration : ${samplOldCalibrations}">
-                    <td class="right" th:text="${samplOldCalibration.beta}"></td>
-                    <td class="right" th:text="${samplOldCalibration.gamma}"></td>
-                </tr>
-                <tr th:if="${samplOldCalibrations == null or #lists.isEmpty(samplOldCalibrations)}">
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="cal : ${samplOldCalibrations}">
+                <td class="right" th:text="${cal.beta}"></td>
+                <td class="right" th:text="${cal.gamma}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- SAMPLE NEW CALIBRATION -->
+    <!-- ===================== SAMPLE NEW CALIBRATION ===================== -->
     <section>
         <h3>SAMPLE NEW CALIBRATION</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>New Beta</th>
-                    <th>New Gamma</th>
-                </tr>
+            <tr>
+                <th>New Beta</th>
+                <th>New Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="samplNewCalibration : ${samplNewCalibrations}">
-                    <td class="right" th:text="${samplNewCalibration.beta}"></td>
-                    <td class="right" th:text="${samplNewCalibration.gamma}"></td>
-                </tr>
-                <tr th:if="${samplNewCalibrations == null or #lists.isEmpty(samplNewCalibrations)}">
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="cal : ${samplNewCalibrations}">
+                <td class="right" th:text="${cal.beta}"></td>
+                <td class="right" th:text="${cal.gamma}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- SAMPLE: LIMITS PER ROI -->
+    <!-- ===================== SAMPLE: LIMITS PER ROI ===================== -->
     <section>
         <h3>SAMPLE: LIMITS PER ROI</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Roi</th>
-                    <th>Beta</th>
-                    <th>Gamma</th>
-                </tr>
+            <tr>
+                <th>Roi</th>
+                <th>Beta</th>
+                <th>Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="roiChannel : ${roiChannelsS}">
-                    <td class="center" th:text="${roiChannel.roi}"></td>
-                    <td class="right" th:text="${roiChannel.bChanStr}"></td>
-                    <td class="right" th:text="${roiChannel.gChanStr}"></td>
-                </tr>
-                <tr th:if="${roiChannelsS == null or #lists.isEmpty(roiChannelsS)}">
-                    <td class="center">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <!-- SAMPLE: LIMITS PER ROI -->
+            <tr th:each="roi : ${roiChannelsS}">
+                <td class="center" th:text="${roi.roi}"></td>
+                <td class="right" th:text="${roi.bChanStr}"></td>
+                <td class="right" th:text="${roi.gChanStr}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- DET OLD CALIBRATION -->
+    <!-- ===================== DET OLD CALIBRATION ===================== -->
     <section>
         <h3>DET OLD CALIBRATION</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Old Beta</th>
-                    <th>Old Gamma</th>
-                </tr>
+            <tr>
+                <th>Old Beta</th>
+                <th>Old Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="detOldCalibration : ${detOldCalibrations}">
-                    <td class="right" th:text="${detOldCalibration.beta}"></td>
-                    <td class="right" th:text="${detOldCalibration.gamma}"></td>
-                </tr>
-                <tr th:if="${detOldCalibrations == null or #lists.isEmpty(detOldCalibrations)}">
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="cal : ${detOldCalibrations}">
+                <td class="right" th:text="${cal.beta}"></td>
+                <td class="right" th:text="${cal.gamma}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- DET NEW CALIBRATION -->
+    <!-- ===================== DET NEW CALIBRATION ===================== -->
     <section>
         <h3>DET NEW CALIBRATION</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>New Beta</th>
-                    <th>New Gamma</th>
-                </tr>
+            <tr>
+                <th>New Beta</th>
+                <th>New Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="detNewCalibration : ${detNewCalibrations}">
-                    <td class="right" th:text="${detNewCalibration.beta}"></td>
-                    <td class="right" th:text="${detNewCalibration.gamma}"></td>
-                </tr>
-                <tr th:if="${detNewCalibrations == null or #lists.isEmpty(detNewCalibrations)}">
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="cal : ${detNewCalibrations}">
+                <td class="right" th:text="${cal.beta}"></td>
+                <td class="right" th:text="${cal.gamma}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- DET: LIMITS PER ROI -->
+    <!-- ===================== DET: LIMITS PER ROI ===================== -->
     <section>
         <h3>DET: LIMITS PER ROI</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Roi</th>
-                    <th>Beta</th>
-                    <th>Gamma</th>
-                </tr>
+            <tr>
+                <th>Roi</th>
+                <th>Beta</th>
+                <th>Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="roiChannel : ${roiChannelsD}">
-                    <td class="center" th:text="${roiChannel.roi}"></td>
-                    <td class="right" th:text="${roiChannel.bChanStr}"></td>
-                    <td class="right" th:text="${roiChannel.gChanStr}"></td>
-                </tr>
-                <tr th:if="${roiChannelsD == null or #lists.isEmpty(roiChannelsD)}">
-                    <td class="center">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <!-- DET: LIMITS PER ROI -->
+            <tr th:each="roi : ${roiChannelsD}">
+                <td class="center" th:text="${roi.roi}"></td>
+                <td class="right" th:text="${roi.bChanStr}"></td>
+                <td class="right" th:text="${roi.gChanStr}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- GAS OLD CALIBRATION -->
+    <!-- ===================== GAS OLD CALIBRATION ===================== -->
     <section>
         <h3>GAS OLD CALIBRATION</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Old Beta</th>
-                    <th>Old Gamma</th>
-                </tr>
+            <tr>
+                <th>Old Beta</th>
+                <th>Old Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="gasOldCalibration : ${gasOldCalibrations}">
-                    <td class="right" th:text="${gasOldCalibration.beta}"></td>
-                    <td class="right" th:text="${gasOldCalibration.gamma}"></td>
-                </tr>
-                <tr th:if="${gasOldCalibrations == null or #lists.isEmpty(gasOldCalibrations)}">
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="cal : ${gasOldCalibrations}">
+                <td class="right" th:text="${cal.beta}"></td>
+                <td class="right" th:text="${cal.gamma}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- GAS NEW CALIBRATION -->
+    <!-- ===================== GAS NEW CALIBRATION ===================== -->
     <section>
         <h3>GAS NEW CALIBRATION</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>New Beta</th>
-                    <th>New Gamma</th>
-                </tr>
+            <tr>
+                <th>New Beta</th>
+                <th>New Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="gasNewCalibration : ${gasNewCalibrations}">
-                    <td class="right" th:text="${gasNewCalibration.beta}"></td>
-                    <td class="right" th:text="${gasNewCalibration.gamma}"></td>
-                </tr>
-                <tr th:if="${gasNewCalibrations == null or #lists.isEmpty(gasNewCalibrations)}">
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="cal : ${gasNewCalibrations}">
+                <td class="right" th:text="${cal.beta}"></td>
+                <td class="right" th:text="${cal.gamma}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- GAS: LIMITS PER ROI -->
+    <!-- ===================== GAS: LIMITS PER ROI ===================== -->
     <section>
         <h3>GAS: LIMITS PER ROI</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Roi</th>
-                    <th>Beta</th>
-                    <th>Gamma</th>
-                </tr>
+            <tr>
+                <th>Roi</th>
+                <th>Beta</th>
+                <th>Gamma</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="roiChannel : ${roiChannelsG}">
-                    <td class="center" th:text="${roiChannel.roi}"></td>
-                    <td class="right" th:text="${roiChannel.bChanStr}"></td>
-                    <td class="right" th:text="${roiChannel.gChanStr}"></td>
-                </tr>
-                <tr th:if="${roiChannelsG == null or #lists.isEmpty(roiChannelsG)}">
-                    <td class="center">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <!-- GAS: LIMITS PER ROI -->
+            <tr th:each="roi : ${roiChannelsG}">
+                <td class="center" th:text="${roi.roi}"></td>
+                <td class="right" th:text="${roi.bChanStr}"></td>
+                <td class="right" th:text="${roi.gChanStr}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- GROSS COUNTS PER ROI -->
+    <!-- ===================== GROSS COUNTS PER ROI ===================== -->
     <section>
         <h3>GROSS COUNTS PER ROI</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Roi</th>
-                    <th>Sample</th>
-                    <th>GasBkgnd</th>
-                    <th>DetBkgnd</th>
-                </tr>
+            <tr>
+                <th>Roi</th>
+                <th>Sample</th>
+                <th>GasBkgnd</th>
+                <th>DetBkgnd</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="roiResult : ${roiResults}">
-                    <td class="center" th:text="${roiResult.roi}"></td>
-                    <td class="right" th:text="${roiResult.sGross}"></td>
-                    <td class="right" th:text="${roiResult.gGross}"></td>
-                    <td class="right" th:text="${roiResult.bGross}"></td>
-                </tr>
-                <tr th:if="${roiResults == null or #lists.isEmpty(roiResults)}">
-                    <td class="center">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="r : ${roiResults}">
+                <td class="center" th:text="${r.roi}"></td>
+                <td class="right" th:text="${r.SGross}"></td>
+                <td class="right" th:text="${r.GGross}"></td>
+                <td class="right" th:text="${r.BGross}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- NET COUNTS AND LC PER ROI -->
+    <!-- ===================== NET COUNTS AND LC PER ROI ===================== -->
     <section>
         <h3>NET COUNTS AND LC PER ROI</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Roi</th>
-                    <th>Net count</th>
-                    <th>Lc</th>
-                </tr>
+            <tr>
+                <th>Roi</th>
+                <th>Net count</th>
+                <th>Lc</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="roiResult : ${roiResults}">
-                    <td class="center" th:text="${roiResult.roi}"></td>
-                    <td class="right" th:text="${roiResult.netCount}"></td>
-                    <td class="right" th:text="${roiResult.lcCts}"></td>
-                </tr>
-                <tr th:if="${roiResults == null or #lists.isEmpty(roiResults)}">
-                    <td class="center">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="r : ${roiResults}">
+                <td class="center" th:text="${r.roi}"></td>
+                <td class="right" th:text="${r.netCount}"></td>
+                <td class="right" th:text="${r.lcCts}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- CONCENTRATION AND LC PER ROI -->
+    <!-- ===================== CONCENTRATION AND LC PER ROI ===================== -->
     <section>
         <h3>CONCENTRATION AND LC PER ROI</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Roi</th>
-                    <th>Conc(mBq/m3)</th>
-                    <th>LC(mBq/m3)</th>
-                    <th>MDC(mBq/m3)</th>
-                </tr>
+            <tr>
+                <th>Roi</th>
+                <th>Conc(mBq/m3)</th>
+                <th>LC(mBq/m3)</th>
+                <th>MDC(mBq/m3)</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="roiResult : ${roiResults}">
-                    <td class="center" th:text="${roiResult.roi}"></td>
-                    <td class="right" th:text="${roiResult.concStr}"></td>
-                    <td class="right" th:text="${roiResult.lc}"></td>
-                    <td class="right" th:text="${roiResult.mdc}"></td>
-                </tr>
-                <tr th:if="${roiResults == null or #lists.isEmpty(roiResults)}">
-                    <td class="center">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="r : ${roiResults}">
+                <td class="center" th:text="${r.roi}"></td>
+                <td class="right" th:text="${r.concStr}"></td>
+                <td class="right" th:text="${r.lc}"></td>
+                <td class="right" th:text="${r.mdc}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- RESULT SUMMARY -->
+    <!-- ===================== RESULT SUMMARY ===================== -->
     <section>
         <h3>RESULT SUMMARY</h3>
         <table class="wide-table">
             <thead>
-                <tr>
-                    <th>Nuclide Name</th>
-                    <th>Conc(mBq/m3)</th>
-                    <th>LC(mBq/m3)</th>
-                    <th>MDC(mBq/m3)</th>
-                    <th>NID Flag</th>
-                </tr>
+            <tr>
+                <th>Nuclide Name</th>
+                <th>Conc(mBq/m3)</th>
+                <th>LC(mBq/m3)</th>
+                <th>MDC(mBq/m3)</th>
+                <th>NID Flag</th>
+            </tr>
             </thead>
             <tbody>
-                <tr th:each="xeResult : ${xeResults}">
-                    <td class="center" th:text="${xeResult.nuclideName}"></td>
-                    <td class="right" th:text="${xeResult.concStr}"></td>
-                    <td class="right" th:text="${xeResult.lc}"></td>
-                    <td class="right" th:text="${xeResult.mdc}"></td>
-                    <td class="right" th:text="${xeResult.nidFlag}"></td>
-                </tr>
-                <tr th:if="${xeResults == null or #lists.isEmpty(xeResults)}">
-                    <td class="center">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                    <td class="right">-</td>
-                </tr>
+            <tr th:each="xe : ${xeResults}">
+                <td class="center" th:text="${xe.nuclideName}"></td>
+                <td class="right" th:text="${xe.concStr}"></td>
+                <td class="right" th:text="${xe.lc}"></td>
+                <td class="right" th:text="${xe.mdc}"></td>
+                <td class="right" th:text="${xe.nidFlag}"></td>
+            </tr>
             </tbody>
         </table>
     </section>
 
-    <!-- CHARTS SECTION -->
+    <!-- ===================== CHARTS SECTION ===================== -->
     <section class="card">
         <div class="grid-2">
+            <!-- 单核素历史 & 频率分布 -->
             <div>
                 <h4>Xe-131m Categorization history</h4>
                 <div class="canvas-wrap" id="xe131mHistory"></div>
@@ -798,3584 +684,1046 @@
             </div>
             <div>
                 <h4>Xe-135 frequency distribution</h4>
-                <div class="canvas-wrap" id="xe135mHistogram"></div>
+                <div class="canvas-wrap" id="xe135Histogram"></div>
             </div>
+            <!-- 比率历史 & 频率分布 -->
             <div>
                 <h4>Xe-133/Xe-131m history</h4>
-                <div class="canvas-wrap" id="xe131mHistory5"></div>
+                <div class="canvas-wrap" id="ratio1History"></div>
             </div>
             <div>
                 <h4>Xe-133/Xe-131m frequency distribution</h4>
-                <div class="canvas-wrap" id="xe131mHistogram5"></div>
+                <div class="canvas-wrap" id="ratio1Histogram"></div>
             </div>
             <div>
                 <h4>Xe-133m/Xe-131m history</h4>
-                <div class="canvas-wrap" id="xe131mHistory6"></div>
+                <div class="canvas-wrap" id="ratio2History"></div>
             </div>
             <div>
                 <h4>Xe-133m/Xe-131m frequency distribution</h4>
-                <div class="canvas-wrap" id="xe131mHistogram6"></div>
+                <div class="canvas-wrap" id="ratio2Histogram"></div>
             </div>
             <div>
                 <h4>Xe-133m/Xe-133 history</h4>
-                <div class="canvas-wrap" id="xe131mHistory7"></div>
+                <div class="canvas-wrap" id="ratio3History"></div>
             </div>
             <div>
                 <h4>Xe-133m/Xe-133 frequency distribution</h4>
-                <div class="canvas-wrap" id="xe131mHistogram7"></div>
+                <div class="canvas-wrap" id="ratio3Histogram"></div>
             </div>
             <div>
                 <h4>Xe-135/Xe-133 history</h4>
-                <div class="canvas-wrap" id="xe131mHistory8"></div>
+                <div class="canvas-wrap" id="ratio4History"></div>
             </div>
             <div>
                 <h4>Xe-135/Xe-133 frequency distribution</h4>
-                <div class="canvas-wrap" id="xe131mHistogram8"></div>
+                <div class="canvas-wrap" id="ratio4Histogram"></div>
             </div>
         </div>
     </section>
 </div>
-<!-- 数据绑定与图表渲染 -->
+
+<!-- ===================== ECharts 渲染脚本 ===================== -->
 <script th:inline="javascript">
-    /*<![CDATA[*/
-    /* Xe-131m    1 */
-    //#region  Xe-131m
-    //#region Xe-131m Categorization history
-    const xe131mHistoryData =JSON.parse(JSON.stringify( /*[[${Xe131mHistory1Data}]]*/ []));
-    let xe131mthresholHis = xe131mHistoryData?.xe131mthresholHis;
-    let xe131mData = xe131mHistoryData?.history.sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop));
-    // console.log('xe131mData', xe131mData);
-    let xe131myData = {
-        mdc: [],
-        lc: [],
-        conc: [],//活度浓度
+    // =================================================================
+    // Thymeleaf 注入后端数据
+    // =================================================================
+
+    // 单核素历史数据
+    const xe131mHistoryData = /*[[${Xe131mHistoryData}]]*/ {};
+    const xe133mHistoryData = /*[[${Xe133mHistoryData}]]*/ {};
+    const xe133HistoryData = /*[[${Xe133HistoryData}]]*/ {};
+    const xe135HistoryData = /*[[${Xe135HistoryData}]]*/ {};
+
+    // 单核素频率分布数据
+    const xe131mHistogramData = /*[[${Xe131mHistogramData}]]*/ {};
+    const xe133mHistogramData = /*[[${Xe133mHistogramData}]]*/ {};
+    const xe133HistogramData = /*[[${Xe133HistogramData}]]*/ {};
+    const xe135HistogramData = /*[[${Xe135HistogramData}]]*/ {};
+
+    // 比率历史数据
+
+    // 全局配置（x轴时间范围、y轴范围等）
+    const chartConfig = /*[[${chartConfig}]]*/ {};
+
+    // 四种比值的图表数据
+    const chartDataList = /*[[${chartDataList}]]*/ [];
+
+    // 组装成 renderMultipleIsotopeCharts 需要的格式
+    const backendData = {
+        config: chartConfig,
+        charts: chartDataList
+    };
+
+    // 容器ID
+    const containerIds = [
+        'ratio1History',
+        'ratio2History',
+        'ratio3History',
+        'ratio4History'
+    ];
+    const frequencyIds = [
+        'ratio1Histogram',
+        'ratio2Histogram',
+        'ratio3Histogram',
+        'ratio4Histogram'
+    ];
+
+
+    // 比率频率分布数据
+    const ratio1HistogramData = /*[[${ratioIntvlResults1}]]*/ {};
+    const ratio2HistogramData = /*[[${ratioIntvlResults2}]]*/ {};
+    const ratio3HistogramData = /*[[${ratioIntvlResults3}]]*/ {};
+    const ratio4HistogramData = /*[[${ratioIntvlResults4}]]*/ {};
+
+    // =================================================================
+    // 通用渲染函数 — 历史分类图
+    // =================================================================
+    /**
+     * 渲染历史图
+     */
+    function renderHistoryChart(domId, title, name, data) {
+        // ===== 1. Bulletproof Argument Handling =====
+        // If the 4th argument is omitted and the 3rd is an object, swap them!
+        if (data === undefined && typeof name === 'object') {
+            data = name;
+            name = '';
+        }
+
+        // Ensure data is at least an empty object to prevent runtime errors
+        data = data || {};
+
+        // ===== 2. Safe Data Conversion =====
+        // Using fallbacks (|| []) to safely iterate even if properties are missing
+        const labels = [...new Set([
+            ...(data.levelA || []).map(p => p.date),
+            ...(data.levelB || []).map(p => p.date),
+            ...(data.levelC || []).map(p => p.date),
+            ...(data.mdc || []).map(p => p.date),
+            ...(data.lc || []).map(p => p.date),
+            ...(data.thresholds || []).map(p => p.date)
+        ])].sort();
+
+        const scatterA = (data.levelA || []).map(p => [p.date, p.y]);
+        const scatterB = (data.levelB || []).map(p => [p.date, p.y]);
+        const scatterC = (data.levelC || []).map(p => [p.date, p.y]);
+
+        const errorB = (data.levelB || []).map(p => ({
+            date: p.date, low: p.y - (p.yError || 0), high: p.y + (p.yError || 0), center: p.y
+        }));
+        const errorC = (data.levelC || []).map(p => ({
+            date: p.date, low: p.y - (p.yError || 0), high: p.y + (p.yError || 0), center: p.y
+        }));
+
+        const mdcLine = (data.mdc || []).map(p => [p.date, p.y]);
+        const lcLine = (data.lc || []).map(p => [p.date, p.y]);
+        const thresholdLine = (data.thresholds || []).map(p => [p.date, p.y]);
+
+        // ===== 3. Build ECharts Option =====
+        const option = {
+            tooltip: {trigger: 'item'},
+            legend: {
+                top: 15,
+                data: ['Level A', 'Level B', 'Level C', 'MDC', 'LC', 'Threshold']
+            },
+            grid: {left: '8%', right: '6%', bottom: '5%', containLabel: true},
+            xAxis: {type: 'category', data: labels},
+            yAxis: {
+                type: 'value',
+                name: `${name || ''},(mBq/m³)`,
+                nameLocation: 'middle',
+                nameGap: 30,
+                nameTextStyle: {fontSize: 10},
+                position: 'left',
+                axisLabel: {inside: false},
+                min: 0,
+                max: computeMaxY(data)
+            },
+            series: [
+                {
+                    name: 'Level A',
+                    type: 'scatter',
+                    data: scatterA,
+                    symbol: 'circle',
+                    itemStyle: {color: 'green'}
+                },
+                {
+                    name: 'Level B',
+                    type: 'scatter',
+                    data: scatterB,
+                    symbol: 'rect',
+                    itemStyle: {color: 'gold'}
+                },
+                {
+                    name: 'Level C',
+                    type: 'scatter',
+                    data: scatterC,
+                    symbol: 'triangle',
+                    itemStyle: {color: 'red'}
+                },
+                // Error bars for B
+                {
+                    name: 'Error B',
+                    type: 'custom',
+                    renderItem: function (params, api) {
+                        const pt = errorB[params.dataIndex];
+                        if (!pt) return;
+                        const x = api.coord([pt.date, pt.center])[0];
+                        const yLow = api.coord([pt.date, pt.low])[1];
+                        const yHigh = api.coord([pt.date, pt.high])[1];
+                        return {
+                            type: 'group',
+                            children: [
+                                {type: 'line', shape: {x1: x, y1: yLow, x2: x, y2: yHigh}, style: {stroke: 'gold'}},
+                                {
+                                    type: 'line',
+                                    shape: {x1: x - 4, y1: yHigh, x2: x + 4, y2: yHigh},
+                                    style: {stroke: 'gold'}
+                                },
+                                {
+                                    type: 'line',
+                                    shape: {x1: x - 4, y1: yLow, x2: x + 4, y2: yLow},
+                                    style: {stroke: 'gold'}
+                                }
+                            ]
+                        };
+                    },
+                    data: errorB
+                },
+                // Error bars for C
+                {
+                    name: 'Error C',
+                    type: 'custom',
+                    renderItem: function (params, api) {
+                        const pt = errorC[params.dataIndex];
+                        if (!pt) return;
+                        const x = api.coord([pt.date, pt.center])[0];
+                        const yLow = api.coord([pt.date, pt.low])[1];
+                        const yHigh = api.coord([pt.date, pt.high])[1];
+                        return {
+                            type: 'group',
+                            children: [
+                                {type: 'line', shape: {x1: x, y1: yLow, x2: x, y2: yHigh}, style: {stroke: 'red'}},
+                                {
+                                    type: 'line',
+                                    shape: {x1: x - 4, y1: yHigh, x2: x + 4, y2: yHigh},
+                                    style: {stroke: 'red'}
+                                },
+                                {
+                                    type: 'line',
+                                    shape: {x1: x - 4, y1: yLow, x2: x + 4, y2: yLow},
+                                    style: {stroke: 'red'}
+                                }
+                            ]
+                        };
+                    },
+                    data: errorC
+                },
+                {
+                    name: 'MDC',
+                    type: 'line',
+                    data: mdcLine,
+                    lineStyle: {color: 'blue', type: 'dotted'}
+                },
+                {
+                    name: 'LC',
+                    type: 'line',
+                    data: lcLine,
+                    lineStyle: {color: 'black'}
+                },
+                {
+                    name: 'Threshold',
+                    type: 'line',
+                    data: thresholdLine,
+                    lineStyle: {color: 'red', type: 'dashed'}
+                }
+            ]
+        };
+
+        const chartDom = document.getElementById(domId);
+        if (!chartDom) return; // Prevent crashes if the DOM element is not found
+
+        const myChart = echarts.init(chartDom);
+        myChart.setOption(option);
+        window.addEventListener('resize', () => myChart.resize());
     }
-    let xe131mY = []
-    let xe131mXData = [];//采集停止时间 x轴
-    xe131mData.forEach(item => {
-        xe131myData.mdc.push([item.collectStop.substr(0, 19), item.mdc]);
-        xe131myData.lc.push([item.collectStop.substr(0, 19), item.lc]);
-        xe131myData.conc.push([item.collectStop.substr(0, 19), item.conc, item.concErr, item.category]);
-        // xe131myData.conc.push(item.conc);
-        // xe131myData.concErr.push(item.concErr);
-        xe131mXData.push(item.collectStop.substr(0, 19));
-        xe131mY.push(item.mdc);
-        xe131mY.push(item.lc);
-    });
-    // console.log(xe131myData, 'xe131myData');
-    // console.log(xe131mY, 'xe131mY');
 
-    const xe131mYMax = Math.max(...xe131mY)
-    const xe131mYMin = Math.min(...xe131mY)
-    // console.log('xe131mYMax:', xe131mYMax, 'xe131mYMin:', xe131mYMin)
-    const option = {
-        legend: { type: 'plain', data: xe131mData.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            // data: xe131mXData,
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280',
-                // rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
+    function computeMaxY(req) {
+        if (!req) return 1; // Safely return fallback value if req is undefined
+        const vals = [];
+
+        // Level A
+        (req.levelA || []).forEach(p => vals.push(p.y));
+
+        // Level B/C with upper error bound
+        (req.levelB || []).forEach(p => vals.push(p.y + (p.yError || 0)));
+        (req.levelC || []).forEach(p => vals.push(p.y + (p.yError || 0)));
+
+        // Dynamic Thresholds
+        (req.mdc || []).forEach(p => vals.push(p.y));
+        (req.lc || []).forEach(p => vals.push(p.y));
+        (req.thresholds || []).forEach(p => vals.push(p.y));
+
+        const maxVal = vals.length ? Math.max(...vals) : 1;
+        return Math.ceil(maxVal * 1.2); // 20% Headroom padding
+    }
+
+    /**
+     * 渲染频率图
+     */
+    function renderFrequencyChart(domId, title, inputData) {
+        // --------------------------------------------------------
+        // 1. 初始化校验
+        // --------------------------------------------------------
+        const chartDom = document.getElementById(domId);
+        if (!chartDom) {
+            console.error(`DOM 元素 #${domId} 未找到`);
+            return;
+        }
+
+        // --------------------------------------------------------
+        // 2. 数据处理与解析
+        // --------------------------------------------------------
+        let parsedData = [];
+        const dataMap = inputData.frequencyData || {};
+        const regex = /\[(.*?)\s[~-]\s(.*?)\)/;
+
+        for (let key in dataMap) {
+            const match = key.match(regex);
+            if (match) {
+                const start = parseFloat(match[1]);
+                const end = parseFloat(match[2]);
+                const center = (start + end) / 2;
+                const counts = dataMap[key];
+                parsedData.push({
+                    start: start,
+                    end: end,
+                    center: center,
+                    A: counts.A || 0,
+                    B: counts.B || 0,
+                    C: counts.C || 0,
+                    total: (counts.A || 0) + (counts.B || 0) + (counts.C || 0)
+                });
             }
-        },
-        yAxis: {
-            type: 'value',
-            name: 'Xe-131m,(mBq/m3)',
-            nameLocation: 'middle',
-            nameGap: 20,
-            scale: true,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                lineStyle: {
-                    color: '#e5e7eb'
-                }
-            },
-            // min: xe131mYMin > 0 ? 0 : Math.floor(xe131mYMin)
-            min: -2,
-            max: Math.ceil(xe131mYMax),
-            interval: 1, // 刻度间隔
-        },
-        series: [
-            {
-                name: 'level',
-                type: 'custom',
-                renderItem: function (params, api) {
-                    var xValue = api.value(0);
-                    var yValue = api.value(1);
-                    var error = api.value(2);
-                    var level = api.value(3); // 获取等级值
-                    // 根据等级设置颜色和形状
-                    var color, symbolType;
-                    switch (level) {
-                        case 1:
-                            color = '#52c41a'; // 绿色
-                            symbolType = 'circle';
-                            break;
-                        case 2:
-                            color = '#faad14'; // 黄色
-                            symbolType = 'rect';
-                            break;
-                        case 3:
-                            color = '#f5222d'; // 红色
-                            symbolType = 'triangle';
-                            break;
-                        default:
-                            color = '#5470c6'; // 默认蓝色
-                            symbolType = 'circle';
-                    }
-                    var point = api.coord([xValue, yValue]);
-                    var top = api.coord([xValue, yValue + error]);
-                    var bottom = api.coord([xValue, yValue - error]);
+        }
 
-                    // 创建图形组
-                    var children = [
-                        // 误差棒垂直线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0],
-                                y1: top[1],
-                                x2: point[0],
-                                y2: bottom[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒顶部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: top[1],
-                                x2: point[0] + 5,
-                                y2: top[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒底部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: bottom[1],
-                                x2: point[0] + 5,
-                                y2: bottom[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
+        // 按区间起点升序排序
+        parsedData.sort((a, b) => a.start - b.start);
+
+        // 计算总样本数
+        const grandTotal = parsedData.reduce((sum, item) => sum + item.total, 0);
+        if (grandTotal === 0) {
+            console.warn("样本总数为 0，无法计算累计密度");
+            return;
+        }
+
+        // --------------------------------------------------------
+        // 3. 前台计算：累计密度 & 精确 95% 分位数（线性插值法）
+        // --------------------------------------------------------
+        const target95Count = grandTotal * 0.95; // 95% 对应的目标频数
+        let accumulatedCountBefore = 0;         // 跨入 95% 区间之前的累计频数
+        let percentile95Value = 0;              // 精确的 95% 物理 X 值
+        let percentile95Index = -1;             // 95% 所在的区间索引
+
+        // 寻找 95% 临界区间并进行线性插值计算
+        for (let i = 0; i < parsedData.length; i++) {
+            const item = parsedData[i];
+            const currentSumWithItem = accumulatedCountBefore + item.total;
+
+            if (currentSumWithItem >= target95Count) {
+                percentile95Index = i;
+                const neededInBin = target95Count - accumulatedCountBefore; // 组内还需要多少频数达到95%
+                const binWidth = item.end - item.start;                     // 组距
+
+                // 线性插值公式
+                percentile95Value = item.start + (neededInBin / (item.total || 1)) * binWidth;
+                break;
+            }
+            accumulatedCountBefore = currentSumWithItem;
+        }
+
+        // 兜底处理
+        if (percentile95Index === -1) {
+            percentile95Index = parsedData.length - 1;
+            percentile95Value = parsedData[parsedData.length - 1].end;
+        }
+
+        // 填充 ECharts 绘图数据
+        const axisData = [];
+        const seriesA = [];
+        const seriesB = [];
+        const seriesC = [];
+        const seriesCumulative = [];
+        let currentSum = 0;
+
+        const sampleValue = 0.04;
+        let sampleIndex = -1;
+
+        parsedData.forEach((item, index) => {
+            axisData.push(item.center.toFixed(4));
+            seriesA.push(item.A);
+            seriesB.push(item.B);
+            seriesC.push(item.C);
+
+            // 前台计算当前的累计密度比例 (0 ~ 1)
+            currentSum += item.total;
+            seriesCumulative.push(currentSum / grandTotal);
+
+            // 匹配当前样本的区间索引
+            if (sampleValue >= item.start && sampleValue < item.end) {
+                sampleIndex = index;
+            }
+        });
+
+        if (sampleIndex === -1) sampleIndex = 0;
+        const percentile95ActualValue = seriesCumulative[percentile95Index];
+
+        // --------------------------------------------------------
+        // 4. ECharts 图表配置
+        // --------------------------------------------------------
+        const myChart = echarts.init(chartDom);
+        const customArrowPath = 'path://M0,0 L-5,8 L-2,8 L-2,22 L2,22 L2,8 L5,8 Z';
+
+        const option = {
+            backgroundColor: '#fff',
+            tooltip: {
+                trigger: 'axis',
+                axisPointer: {type: 'shadow'},
+                formatter: function (params) {
+                    let html = `<div>X: ${params[0].axisValue}</div>`;
+                    params.forEach(item => {
+                        if (item.value > 0 || item.seriesName === 'cumulative') {
+                            let val = item.value;
+                            // 累计密度转换为百分比显示
+                            if (item.seriesName === 'cumulative') {
+                                val = (val * 100).toFixed(2) + '%';
                             }
+                            html += `<div>${item.marker} ${item.seriesName}: ${val}</div>`;
                         }
-                    ];
-
-                    // 根据等级添加不同的散点形状
-                    switch (symbolType) {
-                        case 'circle':
-                            children.push({
-                                type: 'circle',
-                                shape: {
-                                    cx: point[0],
-                                    cy: point[1],
-                                    r: 4
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'rect':
-                            children.push({
-                                type: 'rect',
-                                shape: {
-                                    x: point[0] - 4,
-                                    y: point[1] - 4,
-                                    width: 8,
-                                    height: 8
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'triangle':
-                            children.push({
-                                type: 'polygon',
-                                shape: {
-                                    points: [
-                                        [point[0], point[1] - 5], // 上顶点
-                                        [point[0] - 4, point[1] + 3], // 左下角
-                                        [point[0] + 4, point[1] + 3] // 右下角
-                                    ]
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                    }
-
-                    return {
-                        type: 'group',
-                        children: children
-                    };
-                },
-                data: xe131myData.conc,
-                z: 10
-            },
-            // {
-            //     name: 'level',
-            //     type: 'scatter',
-            //     symbolSize: 4,
-            //     data: xe131myData.category.map(item => {
-            //         return [item[0], item[1]];
-            //     }),
-            //     // data: [...new Set(xe131myData.category.map(item => JSON.stringify(item)))].map(str => JSON.parse(str)),
-            //     itemStyle: {
-            //         color: 'rgba(255, 99, 132, 0.8)',
-            //         borderColor: 'rgba(255, 99, 132, 1)',
-            //         borderWidth: 1
-            //     }
-            // },
-            {
-                name: 'mdc',
-                type: 'line',
-                data: xe131myData.mdc,
-                // stack: 'x',
-                symbolSize: 0,
-                // smooth: 0.3 // 轻微平滑
-            },
-            {
-                name: 'lc',
-                type: 'line',
-                data: xe131myData.lc,
-                // stack: 'x',
-                // step: 'start',
-                symbolSize: 0,
-                // itemStyle: {
-                //     color: '#939393',
-                //     borderWidth: 1,
-                // },
-                // barWidth: '10%',
-                // yAxisIndex: 1,
-            },
-            // 添加专门的阈值线系列
-            {
-                name: '阈值',
-                type: 'line',
-                markLine: {
-                    data: [
-                        { yAxis: 3.0 }
-                    ],
-                    // data:xe131mthresholHis[0].thresholValue,
-                    lineStyle: {
-                        color: '#ff0000',
-                        width: 2,
-                        type: 'dashed'
-                    },
-                    label: {
-                        show: true,
-                        position: 'end',
-                        formatter: '阈值: 3.0'
-                    },
-                    symbol: 'none'
-                },
-                data: [], // 空数据，只显示标线
-                lineStyle: {
-                    opacity: 0 // 隐藏实际连线
-                }
-            }
-        ],
-    };
-    const myChart = echarts.init(document.getElementById('xe131mHistory'));
-    myChart.setOption(option);
-    //#endregion
-
-    //#region Xe-131m frequency distribution
-    const xe131mHistogramData = JSON.parse(JSON.stringify(/*[[${Xe131mHistogramData}]]*/ []));
-
-    const xe131mCdfPoints = xe131mHistogramData?.cdfPoints; // 累积分布函数
-    const xe131mPercentile95 = xe131mHistogramData?.percentile95; // 95%累积线
-    const xe131mKdePoints = xe131mHistogramData?.kdePoints; // 核密度估计
-    // const xe131mCumulative = xe131mHistogramData?.cumulative;// 所有浓度累积
-    const xe131mStats = xe131mHistogramData?.stats; // 区间统计
-    // const xe131mxDate = [];
-    // const xe131myData = [];
-    const xe131mBarData = {
-        kdePoints: []
-    }
-    xe131mKdePoints.map((item) => {
-        xe131mBarData.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData.kdePoints);
-    const xe131mCdfP = xe131mCdfPoints.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    xe131mStats.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = xe131mStats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    // const xe131mAllLevels = [...new Set(
-    //     xe131mStats.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    // )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // // 为每个等级生成系列数据
-    // const xe131mSeries = xe131mAllLevels.map((level) => {
-    //     // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-    //     return xe131mStats.map(item => [
-    //         item.x, // x轴坐标（interval值）
-    //         item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
-
-    //     ]);
-    // });
-    // // console.log('seriesData11', xe131mSeries);
-    // // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    // const series1 = xe131mAllLevels.map((level, index) => ({
-    //     name: `级别(${level})`,
-    //     type: 'bar',
-    //     stack: 'total', // 共用stack实现堆积
-    //     data: xe131mSeries[index], // 该等级的[x, value]数据
-    //     barGap: '-100%', // 负值使柱子重叠
-    //     barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    // }));
-    // console.log('xe131mSeries', JSON.stringify(series[0]), JSON.stringify(series[1]));
-    xe131mBarData.percentile95 = xe131mPercentile95;
-    xe131mBarData.cdfPoints = xe131mCdfP;
-    // xe131mBarData.cumulative = cumulative;
-    xe131mBarData.stats = xe131mStats;
-    // xe131mBarData.xAxisData = xDate;
-    // xe131mBarData.yAxisData = yData;
-    console.log(xe131mBarData, 'xe131mBarData1111')
-    const xe131mAllSeries = [
-        // ...series,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: xe131mBarData.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [xe131mBarData.percentile95, 0.95]
-            ],
-            /*]]>*/
-
-
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: xe131mBarData.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: xe131mBarData.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
-                }
-            }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let xe131mAllXValues = [];
-    xe131mAllSeries.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            xe131mAllXValues.push(item[0]);
-        });
-    });
-    // console.log(xe131mAllXValues, 'allXValues33333333');
-
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const xe131mMaxX = xe131mAllXValues.length > 0 ? Math.max(...xe131mAllXValues) : 0;
-    const xe131mMinX = xe131mAllXValues.length > 0 ? Math.min(...xe131mAllXValues) : 0;
-    console.log('xe131mMaxX', xe131mMaxX);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const xe131mMaxXDivisibleBy200 = Math.ceil(xe131mMaxX / 200) * 200;
-    const xe131mMinXDivisibleBy200 = Math.ceil(xe131mMinX / 200) * 200;
-    // console.log(xe131mMaxXDivisibleBy200, 'xe131mMaxXDivisibleBy200');
-    const barOption = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: xe131mBarData.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: xe131mMaxXDivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: xe131mMinXDivisibleBy200,
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
+                    });
+                    return html;
                 }
             },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
+            legend: {
+                data: ['level A', 'level B', 'level C', 'cumulative'],
+                top: 10
             },
-        ],
-        markLine: {
-            data: [
+            grid: {
+                left: '3%',
+                right: '5%',
+                bottom: '15%',
+                containLabel: true
+            },
+            yAxis: [
                 {
-                    name: '95%累积线',
-                    xAxis: xe131mBarData.percentile95,
-                    label: { show: true, formatter: '95%' },
+                    type: 'value',
+                    name: 'occurrences',
+                    nameTextStyle: {fontWeight: 'bold', fontSize: 14},
+                    splitLine: {show: true, lineStyle: {type: 'dotted'}}
                 },
-            ],
-        },
-        series: xe131mAllSeries,
-    };
-    const barChart1 = echarts.init(document.getElementById('xe131mHistogram'));
-    barChart1.setOption(barOption);
-    // #endregion
-    //#endregion  Xe-131m
-
-    /*Xe-133m    2 */
-    //#region  Xe-133m
-    //#region Xe-133m Categorization history
-    const xe133mHistoryData = JSON.parse(JSON.stringify( /*[[${Xe133mHistory1Data}]]*/ []));
-    let xe133mthresholHis = xe133mHistoryData?.xe131mthresholHis;
-    let xe133mData = xe133mHistoryData?.history.sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop));
-    // console.log('xe133mData', xe133mData);
-    let xe133myData = {
-        mdc: [],
-        lc: [],
-        conc: [],//活度浓度
-    }
-    let xe133mXData = [];//采集停止时间 x轴
-    let xe133mY = []
-    xe133mData.forEach(item => {
-        xe133myData.mdc.push([item.collectStop.substr(0, 19), item.mdc]);
-        xe133myData.lc.push([item.collectStop.substr(0, 19), item.lc]);
-        xe133myData.conc.push([item.collectStop.substr(0, 19), item.conc, item.concErr, item.category]);
-        // xe131myData.conc.push(item.conc);
-        // xe131myData.concErr.push(item.concErr);
-        xe133mXData.push(item.collectStop.substr(0, 19));
-        xe133mY.push(item.mdc);
-        xe133mY.push(item.lc);
-    });
-    console.log(xe131myData, 'xe131myData');
-    // console.log(xe131mY, 'xe131mY');
-
-    const xe133mYMax = Math.max(...xe133mY)
-    const xe133mYMin = Math.min(...xe133mY)
-    const xe133mOption = {
-        legend: { type: 'plain', data: xe133mData.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            // data: xe131mXData,
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280',
-                // rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            }
-        },
-        yAxis: {
-            type: 'value',
-            name: 'Xe-131m,(mBq/m3)',
-            nameLocation: 'middle',
-            nameGap: 20,
-            scale: true,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                lineStyle: {
-                    color: '#e5e7eb'
-                }
-            },
-            // min: xe131mYMin > 0 ? 0 : Math.floor(xe131mYMin)
-            min: -2,
-            max: Math.ceil(xe133mYMax),
-            interval: 1, // 刻度间隔
-        },
-        series: [
-            {
-                name: 'level',
-                type: 'custom',
-                renderItem: function (params, api) {
-                    var xValue = api.value(0);
-                    var yValue = api.value(1);
-                    var error = api.value(2);
-                    var level = api.value(3); // 获取等级值
-                    // 根据等级设置颜色和形状
-                    var color, symbolType;
-                    switch (level) {
-                        case 1:
-                            color = '#52c41a'; // 绿色
-                            symbolType = 'circle';
-                            break;
-                        case 2:
-                            color = '#faad14'; // 黄色
-                            symbolType = 'rect';
-                            break;
-                        case 3:
-                            color = '#f5222d'; // 红色
-                            symbolType = 'triangle';
-                            break;
-                        default:
-                            color = '#5470c6'; // 默认蓝色
-                            symbolType = 'circle';
-                    }
-                    var point = api.coord([xValue, yValue]);
-                    var top = api.coord([xValue, yValue + error]);
-                    var bottom = api.coord([xValue, yValue - error]);
-
-                    // 创建图形组
-                    var children = [
-                        // 误差棒垂直线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0],
-                                y1: top[1],
-                                x2: point[0],
-                                y2: bottom[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒顶部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: top[1],
-                                x2: point[0] + 5,
-                                y2: top[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒底部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: bottom[1],
-                                x2: point[0] + 5,
-                                y2: bottom[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
+                {
+                    type: 'value',
+                    name: 'cumulative',
+                    nameTextStyle: {fontWeight: 'bold', fontSize: 14},
+                    min: 0,
+                    max: 1,
+                    axisLabel: {
+                        formatter: function (value) {
+                            return value;
                         }
-                    ];
-
-                    // 根据等级添加不同的散点形状
-                    switch (symbolType) {
-                        case 'circle':
-                            children.push({
-                                type: 'circle',
-                                shape: {
-                                    cx: point[0],
-                                    cy: point[1],
-                                    r: 4
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'rect':
-                            children.push({
-                                type: 'rect',
-                                shape: {
-                                    x: point[0] - 4,
-                                    y: point[1] - 4,
-                                    width: 8,
-                                    height: 8
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'triangle':
-                            children.push({
-                                type: 'polygon',
-                                shape: {
-                                    points: [
-                                        [point[0], point[1] - 5], // 上顶点
-                                        [point[0] - 4, point[1] + 3], // 左下角
-                                        [point[0] + 4, point[1] + 3] // 右下角
-                                    ]
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                    }
-
-                    return {
-                        type: 'group',
-                        children: children
-                    };
-                },
-                data: xe133myData.conc,
-                z: 10
-            },
-            // {
-            //     name: 'level',
-            //     type: 'scatter',
-            //     symbolSize: 4,
-            //     data: xe133mData.category.map(item => {
-            //         return [item[0], item[1]];
-            //     }),
-            //     // data: [...new Set(xe133mData.category.map(item => JSON.stringify(item)))].map(str => JSON.parse(str)),
-            //     itemStyle: {
-            //         color: 'rgba(255, 99, 132, 0.8)',
-            //         borderColor: 'rgba(255, 99, 132, 1)',
-            //         borderWidth: 1
-            //     }
-            // },
-            {
-                name: 'mdc',
-                type: 'line',
-                data: xe133myData.mdc,
-                // stack: 'x',
-                symbolSize: 0,
-                // smooth: 0.3 // 轻微平滑
-            },
-            {
-                name: 'lc',
-                type: 'line',
-                data: xe133myData.lc,
-                // stack: 'x',
-                // step: 'start',
-                symbolSize: 0,
-                // itemStyle: {
-                //     color: '#939393',
-                //     borderWidth: 1,
-                // },
-                // barWidth: '10%',
-                // yAxisIndex: 1,
-            },
-            // 添加专门的阈值线系列
-            {
-                name: '阈值',
-                type: 'line',
-                markLine: {
-                    data: [
-                        { yAxis: 3.0 }
-                    ],
-                    // data:xe131mthresholHis[0].thresholValue,
-                    lineStyle: {
-                        color: '#ff0000',
-                        width: 2,
-                        type: 'dashed'
                     },
-                    label: {
-                        show: true,
-                        position: 'end',
-                        formatter: '阈值: 3.0'
-                    },
-                    symbol: 'none'
-                },
-                data: [], // 空数据，只显示标线
-                lineStyle: {
-                    opacity: 0 // 隐藏实际连线
+                    splitLine: {show: false}
                 }
-            }
-        ],
-    };
-    const myChart2 = echarts.init(document.getElementById('xe133mHistory'));
-    myChart2.setOption(xe133mOption);
-    //#endregion
-
-    //#region Xe-133m frequency distribution
-    const xe133mHistogramData =  /*[[${Xe133mHistogramData}]]*/ [];
-    const xe133mCdfPoints = xe133mHistogramData?.cdfPoints; // 累积分布函数
-    const xe133mPercentile95 = xe133mHistogramData?.percentile95; // 95%累积线
-    const xe133mKdePoints = xe133mHistogramData?.kdePoints; // 核密度估计
-    // const xe131mCumulative = xe133mHistogramData?.cumulative;// 所有浓度累积
-    const xe133mStats = xe133mHistogramData?.stats; // 区间统计
-    // const xe131mxDate = [];
-    // const xe131myData = [];
-    const xe133mBarData = {
-        kdePoints: []
-    }
-    xe133mKdePoints.map((item) => {
-        xe133mBarData.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData.kdePoints);
-    const xe133mCdfP = xe133mCdfPoints.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    xe133mStats.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = xe133mStats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    // const xe133mAllLevels = [...new Set(
-    //     xe133mStats.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    // )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // // 为每个等级生成系列数据
-    // const xe133mSeries = xe133mAllLevels.map((level) => {
-    //     // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-    //     return xe133mStats.map(item => [
-    //         item.x, // x轴坐标（interval值）
-    //         item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
-
-    //     ]);
-    // });
-    // // console.log('seriesData11', xe133mSeries);
-    // // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    // const series1 = xe133mAllLevels.map((level, index) => ({
-    //     name: `级别(${level})`,
-    //     type: 'bar',
-    //     stack: 'total', // 共用stack实现堆积
-    //     data: xe133mSeries[index], // 该等级的[x, value]数据
-    //     barGap: '-100%', // 负值使柱子重叠
-    //     barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    // }));
-    // console.log('xe133mSeries', JSON.stringify(series[0]), JSON.stringify(series[1]));
-    xe133mBarData.percentile95 = xe133mPercentile95;
-    xe133mBarData.cdfPoints = xe133mCdfP;
-    // xe133mBarData.cumulative = cumulative;
-    xe133mBarData.stats = xe133mStats;
-    // xe133mBarData.xAxisData = xDate;
-    // xe133mBarData.yAxisData = yData;
-    const xe133mAllSeries = [
-        // ...series,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: xe133mBarData.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [xe133mBarData.percentile95, 0.95]
             ],
-            /*]]>*/
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
+            xAxis: {
+                type: 'category',
+                data: axisData,
+                name: 'Activity concentration, mBq/m3',
+                nameLocation: 'middle',
+                nameGap: 50,
+                nameTextStyle: {fontWeight: 'bold', fontSize: 14},
+                axisTick: {alignWithLabel: true}
             },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: xe133mBarData.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: xe133mBarData.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
-                }
-            }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let xe133mAllXValues = [];
-    xe133mAllSeries.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            xe133mAllXValues.push(item[0]);
-        });
-    });
-    // console.log(xe133mAllXValues, 'allXValues33333333');
-
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const xe133mMaxX = xe133mAllXValues.length > 0 ? Math.max(...xe133mAllXValues) : 0;
-    const xe133mMinX = xe133mAllXValues.length > 0 ? Math.min(...xe133mAllXValues) : 0;
-    // console.log('maxX', maxX);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const xe133mMaxXDivisibleBy200 = Math.ceil(xe133mMaxX / 200) * 200;
-    const xe133mMinXDivisibleBy200 = Math.ceil(xe133mMinX / 200) * 200;
-    // console.log(maxXDivisibleBy200, 'maxXDivisibleBy200');
-    const barOption2 = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: xe133mBarData.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: xe133mMaxXDivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: xe133mMinXDivisibleBy200,
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                }
-            },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
-            },
-        ],
-        markLine: {
-            data: [
+            series: [
                 {
-                    name: '95%累积线',
-                    xAxis: xe133mBarData.percentile95,
-                    label: { show: true, formatter: '95%' },
+                    name: 'level A',
+                    type: 'bar',
+                    stack: 'total',
+                    color: 'green',
+                    data: seriesA,
+                    itemStyle: {borderColor: '#333', borderWidth: 0.5}
                 },
-            ],
-        },
-        series: xe133mAllSeries,
-    };
-    const barChart2 = echarts.init(document.getElementById('xe133mHistogram'));
-    barChart2.setOption(barOption2);
-    //#endregion
-    //#endregion Xe-133m
+                {
+                    name: 'level B',
+                    type: 'bar',
+                    stack: 'total',
+                    color: 'yellow',
+                    data: seriesB,
+                    itemStyle: {borderColor: '#333', borderWidth: 0.5}
+                },
+                {
+                    name: 'level C',
+                    type: 'bar',
+                    stack: 'total',
+                    color: 'red',
+                    data: seriesC,
+                    itemStyle: {borderColor: '#333', borderWidth: 0.5}
+                },
+                {
+                    name: 'cumulative',
+                    type: 'line',
+                    yAxisIndex: 1,
+                    step: 'end',
+                    symbol: 'none',
+                    color: 'gray',
+                    data: seriesCumulative,
 
-    /* Xe-133 history.    3 */
-    //#region  Xe-133
-    //#region Xe-133 Categorization history
-    const xe133HistoryData = JSON.parse(JSON.stringify( /*[[${Xe133History1Data}]]*/ []));
-    let xe133thresholHis = xe133mHistoryData?.xe131mthresholHis;
-    let xe133Data = xe133mHistoryData?.history.sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop));
-    // console.log('xe133HistoryData', xe133HistoryData);
-    let xe133yData = {
-        mdc: [],
-        lc: [],
-        conc: [],//活度浓度
-    }
-    let xe133XData = [];//采集停止时间 x轴
-    let xe133Y = []
-    xe133Data.forEach(item => {
-        xe133yData.mdc.push([item.collectStop.substr(0, 19), item.mdc]);
-        xe133yData.lc.push([item.collectStop.substr(0, 19), item.lc]);
-        xe133yData.conc.push([item.collectStop.substr(0, 19), item.conc, item.concErr, item.category]);
-        // xe131myData.conc.push(item.conc);
-        // xe131myData.concErr.push(item.concErr);
-        xe133XData.push(item.collectStop.substr(0, 19));
-        xe133Y.push(item.mdc);
-        xe133Y.push(item.lc);
-    });
-    // console.log(xe133yData, 'xe133yData');
-    // console.log(xe131mY, 'xe131mY');
-
-    const xe133YMax = Math.max(...xe133Y)
-    const xe133YMin = Math.min(...xe133Y)
-
-    const xe133Option = {
-        legend: { type: 'plain', data: xe133Data.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            // data: xe131mXData,
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280',
-                // rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            }
-        },
-        yAxis: {
-            type: 'value',
-            name: 'Xe-131m,(mBq/m3)',
-            nameLocation: 'middle',
-            nameGap: 20,
-            scale: true,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                lineStyle: {
-                    color: '#e5e7eb'
-                }
-            },
-            // min: xe131mYMin > 0 ? 0 : Math.floor(xe131mYMin)
-            min: -2,
-            max: Math.ceil(xe133YMax),
-            interval: 1, // 刻度间隔
-        },
-        series: [
-            {
-                name: 'level',
-                type: 'custom',
-                renderItem: function (params, api) {
-                    var xValue = api.value(0);
-                    var yValue = api.value(1);
-                    var error = api.value(2);
-                    var level = api.value(3); // 获取等级值
-                    // 根据等级设置颜色和形状
-                    var color, symbolType;
-                    switch (level) {
-                        case 1:
-                            color = '#52c41a'; // 绿色
-                            symbolType = 'circle';
-                            break;
-                        case 2:
-                            color = '#faad14'; // 黄色
-                            symbolType = 'rect';
-                            break;
-                        case 3:
-                            color = '#f5222d'; // 红色
-                            symbolType = 'triangle';
-                            break;
-                        default:
-                            color = '#5470c6'; // 默认蓝色
-                            symbolType = 'circle';
+                    // 精准绘制 95% 虚线
+                    markLine: {
+                        symbol: 'none',
+                        data: [
+                            [
+                                {
+                                    xAxis: percentile95Index,
+                                    yAxis: 0,
+                                    lineStyle: {color: 'red', width: 1.5, type: 'dashed'}
+                                },
+                                {
+                                    xAxis: percentile95Index,
+                                    yAxis: percentile95ActualValue,
+                                    label: {
+                                        show: true,
+                                        // 标签上同时显示 95% 阈值和前台精确计算出的 X 轴物理值
+                                        formatter: `95% Line (${percentile95Value.toFixed(4)})`,
+                                        position: 'end',
+                                        distance: 8,
+                                        color: 'black',
+                                        fontWeight: 'bold'
+                                    }
+                                }
+                            ]
+                        ]
+                    },
+                    markPoint: {
+                        symbolKeepAspect: true,
+                        data: [
+                            // 95% 红色倒三角标记
+                            {
+                                coord: [percentile95Index, percentile95ActualValue],
+                                symbol: 'triangle',
+                                symbolSize: 12,
+                                symbolRotate: 180, // 倒三角指向曲线交点
+                                itemStyle: {color: 'red'},
+                                label: {show: false}
+                            },
+                            // Current Sample 蓝色箭头 (保持原样)
+                            {
+                                coord: [sampleIndex, 0],
+                                symbol: customArrowPath,
+                                symbolSize: [15, 30],
+                                symbolOffset: [0, 15],
+                                itemStyle: {
+                                    color: 'blue',
+                                    borderColor: 'black',
+                                    borderWidth: 1
+                                },
+                                label: {
+                                    show: true,
+                                    position: 'bottom',
+                                    formatter: `current sample = ${inputData.sampleValue}`,
+                                    color: 'black',
+                                    fontSize: 12,
+                                    distance: 5
+                                }
+                            }
+                        ]
                     }
-                    var point = api.coord([xValue, yValue]);
-                    var top = api.coord([xValue, yValue + error]);
-                    var bottom = api.coord([xValue, yValue - error]);
+                }
+            ]
+        };
 
-                    // 创建图形组
-                    var children = [
-                        // 误差棒垂直线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0],
-                                y1: top[1],
-                                x2: point[0],
-                                y2: bottom[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒顶部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: top[1],
-                                x2: point[0] + 5,
-                                y2: top[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒底部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: bottom[1],
-                                x2: point[0] + 5,
-                                y2: bottom[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
+        myChart.setOption(option);
+        window.addEventListener('resize', () => myChart.resize());
+    }
+
+    /**
+     * 循环渲染多个同位素比值散点图
+     * @param {string[]} containerIds    DOM容器ID数组
+     * @param {object}   backendData     后端返回的 data 对象（含 config + charts）
+     * @returns {echarts.Instance[]}     渲染完成的图表实例数组
+     */
+    function renderMultipleIsotopeCharts(containerIds, backendData) {
+
+        // ---------- 从后端数据中提取配置 ----------
+        const cfg = backendData.config;
+        const chartDataList = backendData.charts;
+        const xMinNum = cfg.xMin ? Number(cfg.xMin) : undefined;
+        const xMaxNum = cfg.xMax ? Number(cfg.xMax) : undefined;
+        // 强制将 xMin 和 xMax 转换为数值型 (Number)，防止后端传入字符串导致解析为 0
+        const defaultConfig = {
+            xMin: xMinNum,
+            xMax: xMaxNum,
+            yMin: cfg.yMin,
+            yMax: cfg.yMax,
+            yInterval: cfg.yInterval,
+            discriminationLineY: cfg.discriminationLineY
+        };
+
+        const instances = [];
+
+        containerIds.forEach((containerId, index) => {
+            const container = document.getElementById(containerId);
+            if (!container) {
+                console.error(`DOM容器 ${containerId} 不存在，跳过渲染`);
+                return;
+            }
+
+            const currentChart = chartDataList[index] || {
+                title: `Isotope Ratio Chart ${index + 1}`,
+                data: []
+            };
+
+            const scatterData = (currentChart.data || []).map(item => [
+                Number(item[0]),
+                Number(item[1])
+            ]);
+            // 2. 🎯 动态检测当前图表的最大 Y 值
+            const yValues = scatterData.map(item => item[1]);
+            const maxDataY = yValues.length > 0 ? Math.max(...yValues) : 0;
+            const thresholdY = Number(currentChart.discriminationLineY) || 0;
+            const maxY = Math.max(maxDataY, thresholdY); // 获取数据和判别线中的最大值
+            // 3. 🎯 如果最大 Y 值超过 10，则启用对数轴
+            const useLogScale = maxY > 10;
+            // 4. 🎯 根据是否启用对数轴，动态定制 Y 轴配置
+            const yAxisConfig = {
+                name: 'Isotopic Ratio',
+                nameLocation: 'middle',
+                nameRotate: 90,
+                nameGap: 30,
+                nameTextStyle: {fontSize: 10, fontWeight: 'bold'},
+                axisLabel: {fontSize: 10},
+                splitLine: {show: true, lineStyle: {opacity: 0.3}}
+            };
+            if (useLogScale) {
+                yAxisConfig.type = 'log'; // 启用对数轴
+                yAxisConfig.logBase = 10; // 以 10 为底数
+
+                // ⚠️ 对数轴避坑：不能从 0 开始。如果 yMin 是 0 或未定义，让 ECharts 自动计算或设为极小值
+                yAxisConfig.min = (defaultConfig.yMin && defaultConfig.yMin > 0) ? defaultConfig.yMin : 'dataMin';
+                yAxisConfig.max = defaultConfig.yMax || undefined;
+
+                // ⚠️ 对数轴避坑：绝对不能设置 interval 属性
+                delete yAxisConfig.interval;
+            } else {
+                yAxisConfig.type = 'value'; // 普通线性轴
+                yAxisConfig.min = defaultConfig.yMin;
+                yAxisConfig.max = defaultConfig.yMax;
+                yAxisConfig.interval = defaultConfig.yInterval; // 线性轴保留间隔设置
+            }
+
+
+            const chartInstance = echarts.init(container);
+
+            const option = {
+                tooltip: {
+                    trigger: 'item',
+                    formatter: (params) => {
+                        if (params.seriesName === 'Discrimination line') return '';
+
+                        // 确保 tooltip 里的时间戳也是数值
+                        let timeVal = Number(params.value[0]);
+                        const timestamp = timeVal > 1e12 ? timeVal : timeVal * 1000;
+                        const date = new Date(timestamp);
+                        const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                            'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+                        const dateStr = `${months[date.getMonth()]} ${date.getDate()}, ${date.getFullYear()}`;
+                        return `Sample collection stop: ${dateStr}<br/>Isotopic Ratio: ${params.value[1]}`;
+                    }
+                },
+                legend: {
+                    left: 'left',
+                    top: 30,
+                    textStyle: {fontSize: 10},
+                    data: ['Discrimination line', 'Observations']
+                },
+                grid: {left: '8%', right: 40, top: 80, bottom: 60},
+                xAxis: {
+                    // 将 type 从 'value' 改为 'time'
+                    type: 'time',
+                    name: 'Sample collection stop',
+                    nameLocation: 'middle',
+                    nameGap: 35,
+                    nameTextStyle: {fontSize: 10, fontWeight: 'bold'},
+                    min: defaultConfig.xMin,
+                    max: defaultConfig.xMax,
+                    splitNumber: 5,
+                    axisLabel: {
+                        hideOverlap: true,
+                        fontSize: 10,
+                        formatter: (value) => {
+                            if (!value) return '';
+                            // type 为 'time' 时，传入的 value 直接是毫秒时间戳
+
+                            const date = new Date(value);
+                            if (isNaN(date.getTime())) return '';
+                            const month = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                                'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][date.getMonth()];
+                            return `${month} ${date.getFullYear()}`;
                         }
-                    ];
-
-                    // 根据等级添加不同的散点形状
-                    switch (symbolType) {
-                        case 'circle':
-                            children.push({
-                                type: 'circle',
-                                shape: {
-                                    cx: point[0],
-                                    cy: point[1],
-                                    r: 4
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'rect':
-                            children.push({
-                                type: 'rect',
-                                shape: {
-                                    x: point[0] - 4,
-                                    y: point[1] - 4,
-                                    width: 8,
-                                    height: 8
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'triangle':
-                            children.push({
-                                type: 'polygon',
-                                shape: {
-                                    points: [
-                                        [point[0], point[1] - 5], // 上顶点
-                                        [point[0] - 4, point[1] + 3], // 左下角
-                                        [point[0] + 4, point[1] + 3] // 右下角
-                                    ]
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                    }
-
-                    return {
-                        type: 'group',
-                        children: children
-                    };
-                },
-                data: xe133yData.conc,
-                z: 10
-            },
-            // {
-            //     name: 'level',
-            //     type: 'scatter',
-            //     symbolSize: 4,
-            //     data: xe133yData.category.map(item => {
-            //         return [item[0], item[1]];
-            //     }),
-            //     // data: [...new Set(xe133yData.category.map(item => JSON.stringify(item)))].map(str => JSON.parse(str)),
-            //     itemStyle: {
-            //         color: 'rgba(255, 99, 132, 0.8)',
-            //         borderColor: 'rgba(255, 99, 132, 1)',
-            //         borderWidth: 1
-            //     }
-            // },
-            {
-                name: 'mdc',
-                type: 'line',
-                data: xe133yData.mdc,
-                // stack: 'x',
-                symbolSize: 0,
-                // smooth: 0.3 // 轻微平滑
-            },
-            {
-                name: 'lc',
-                type: 'line',
-                data: xe133yData.lc,
-                // stack: 'x',
-                // step: 'start',
-                symbolSize: 0,
-                // itemStyle: {
-                //     color: '#939393',
-                //     borderWidth: 1,
-                // },
-                // barWidth: '10%',
-                // yAxisIndex: 1,
-            },
-            // 添加专门的阈值线系列
-            {
-                name: '阈值',
-                type: 'line',
-                markLine: {
-                    data: [
-                        { yAxis: 3.0 }
-                    ],
-                    // data:xe131mthresholHis[0].thresholValue,
-                    lineStyle: {
-                        color: '#ff0000',
-                        width: 2,
-                        type: 'dashed'
                     },
-                    label: {
-                        show: true,
-                        position: 'end',
-                        formatter: '阈值: 3.0'
-                    },
-                    symbol: 'none'
+                    splitLine: {show: true, lineStyle: {opacity: 0.3}}
                 },
-                data: [], // 空数据，只显示标线
-                lineStyle: {
-                    opacity: 0 // 隐藏实际连线
-                }
-            }
-        ],
-    };
-    const myChart3 = echarts.init(document.getElementById('xe133History'));
-    myChart3.setOption(xe133Option);
-    //#endregion
-
-    //#region Xe-133 frequency distribution
-    const xe133HistogramData = JSON.parse(JSON.stringify(/*[[${Xe133HistogramData}]]*/[]));
-    const xe133CdfPoints = xe133HistogramData?.cdfPoints; // 累积分布函数
-    const xe133Percentile95 = xe133HistogramData?.percentile95; // 95%累积线
-    const xe133KdePoints = xe133HistogramData?.kdePoints; // 核密度估计
-    // const xe131mCumulative = xe133HistogramData?.cumulative;// 所有浓度累积
-    const xe133Stats = xe133HistogramData?.stats; // 区间统计
-    // const xe131mxDate = [];
-    // const xe131myData = [];
-    const xe133BarData = {
-        kdePoints: []
-    }
-    xe133KdePoints.map((item) => {
-        xe133BarData.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData.kdePoints);
-    const xe133CdfP = xe133CdfPoints.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    xe133Stats.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = xe133Stats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    // const xe133AllLevels = [...new Set(
-    //     xe133Stats.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    // )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // // 为每个等级生成系列数据
-    // const xe133Series = xe133AllLevels.map((level) => {
-    //     // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-    //     return xe133Stats.map(item => [
-    //         item.x, // x轴坐标（interval值）
-    //         item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
-
-    //     ]);
-    // });
-    // // console.log('seriesData11', xe133Series);
-    // // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    // const series1 = xe133AllLevels.map((level, index) => ({
-    //     name: `级别(${level})`,
-    //     type: 'bar',
-    //     stack: 'total', // 共用stack实现堆积
-    //     data: xe133Series[index], // 该等级的[x, value]数据
-    //     barGap: '-100%', // 负值使柱子重叠
-    //     barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    // }));
-    // console.log('xe133Series', JSON.stringify(series[0]), JSON.stringify(series[1]));
-    xe133BarData.percentile95 = xe133Percentile95;
-    xe133BarData.cdfPoints = xe133CdfP;
-    // xe133BarData.cumulative = cumulative;
-    xe133BarData.stats = xe133Stats;
-    // xe133BarData.xAxisData = xDate;
-    // xe133BarData.yAxisData = yData;
-    const xe133AllSeries = [
-        // ...series,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: xe133BarData.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [xe133BarData.percentile95, 0.95]
-            ],
-            /*]]>*/
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: xe133BarData.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: xe133BarData.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
-                }
-            }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let xe133AllXValues = [];
-    xe133AllSeries.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            xe133AllXValues.push(item[0]);
-        });
-    });
-    // console.log(xe133AllXValues, 'allXValues33333333');
-
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const xe133MaxX = xe133AllXValues.length > 0 ? Math.max(...xe133AllXValues) : 0;
-    const xe133MinX = xe133AllXValues.length > 0 ? Math.min(...xe133AllXValues) : 0;
-    // console.log('maxX', maxX);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const xe133MaxXDivisibleBy200 = Math.ceil(xe133MaxX / 200) * 200;
-    const xe133MinXDivisibleBy200 = Math.ceil(xe133MinX / 200) * 200;
-    // console.log(maxXDivisibleBy200, 'maxXDivisibleBy200');
-    const barOption3 = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: xe133BarData.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: xe133MaxXDivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: xe133MinXDivisibleBy200,
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
+                yAxis: {
+                    type: 'value',
+                    name: 'Isotopic Ratio',
+                    nameLocation: 'middle',
+                    nameRotate: 90,
+                    nameGap: 30,
+                    nameTextStyle: {fontSize: 10, fontWeight: 'bold'},
+                    min: defaultConfig.yMin,
+                    max: defaultConfig.yMax,
+                    interval: defaultConfig.yInterval,
+                    axisLabel: yAxisConfig,
+                    splitLine: {show: true, lineStyle: {opacity: 0.3}}
                 },
-            },
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                }
-            },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
-            },
-        ],
-        markLine: {
-            data: [
-                {
-                    name: '95%累积线',
-                    xAxis: xe133BarData.percentile95,
-                    label: { show: true, formatter: '95%' },
-                },
-            ],
-        },
-        series: xe133AllSeries,
-    };
-    const barChart3 = echarts.init(document.getElementById('xe133Histogram'));
-    barChart3.setOption(barOption3);
-    //#endregion
-    //#endregion Xe-133
-
-    /* Xe-135  4 */
-    //#region  Xe-135
-    //#region Xe-135 Categorization history
-    const xe135HistoryData =  JSON.parse(JSON.stringify(/*[[${Xe135History1Data}]]*/ []));
-    let xe135thresholHis = xe135HistoryData?.xe131mthresholHis;
-    let xe135Data = xe135HistoryData?.history.sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop));
-    // console.log('xe133mData', xe133mData);
-    let xe135yData = {
-        mdc: [],
-        lc: [],
-        conc: [],//活度浓度
-    }
-    let xe135XData = [];//采集停止时间 x轴
-    let xe135Y = []
-    xe135Data.forEach(item => {
-        xe135yData.mdc.push([item.collectStop.substr(0, 19), item.mdc]);
-        xe135yData.lc.push([item.collectStop.substr(0, 19), item.lc]);
-        xe135yData.conc.push([item.collectStop.substr(0, 19), item.conc, item.concErr, item.category]);
-        // xe131myData.conc.push(item.conc);
-        // xe131myData.concErr.push(item.concErr);
-        xe135XData.push(item.collectStop.substr(0, 19));
-        xe135Y.push(item.mdc);
-        xe135Y.push(item.lc);
-    });
-    // console.log(xe131myData, 'xe131myData');
-    // console.log(xe131mY, 'xe131mY');
-
-    const xe135YMax = Math.max(...xe135Y)
-    const xe135YMin = Math.min(...xe135Y)
-    const xe135Option = {
-        legend: { type: 'plain', data: xe135Data.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            // data: xe131mXData,
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280',
-                // rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            }
-        },
-        yAxis: {
-            type: 'value',
-            name: 'Xe-131m,(mBq/m3)',
-            nameLocation: 'middle',
-            nameGap: 20,
-            scale: true,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                lineStyle: {
-                    color: '#e5e7eb'
-                }
-            },
-            // min: xe131mYMin > 0 ? 0 : Math.floor(xe131mYMin)
-            min: -2,
-            // max: Math.ceil(xe135YMax),
-            // interval: 1, // 刻度间隔
-        },
-        series: [
-            {
-                name: 'level',
-                type: 'custom',
-                renderItem: function (params, api) {
-                    var xValue = api.value(0);
-                    var yValue = api.value(1);
-                    var error = api.value(2);
-                    var level = api.value(3); // 获取等级值
-                    // 根据等级设置颜色和形状
-                    var color, symbolType;
-                    switch (level) {
-                        case 1:
-                            color = '#52c41a'; // 绿色
-                            symbolType = 'circle';
-                            break;
-                        case 2:
-                            color = '#faad14'; // 黄色
-                            symbolType = 'rect';
-                            break;
-                        case 3:
-                            color = '#f5222d'; // 红色
-                            symbolType = 'triangle';
-                            break;
-                        default:
-                            color = '#5470c6'; // 默认蓝色
-                            symbolType = 'circle';
-                    }
-                    var point = api.coord([xValue, yValue]);
-                    var top = api.coord([xValue, yValue + error]);
-                    var bottom = api.coord([xValue, yValue - error]);
-
-                    // 创建图形组
-                    var children = [
-                        // 误差棒垂直线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0],
-                                y1: top[1],
-                                x2: point[0],
-                                y2: bottom[1]
+                series: [
+                    {
+                        //  给它一个名字和类型
+                        name: 'Discrimination line',
+                        type: 'line',
+                        data: [], // 保持数据为空，只用 markLine
+                        lineStyle: {color: 'red', width: 1},
+                        itemStyle: {color: 'red'},
+                        //  配置辅助线
+                        markLine: {
+                            silent: true,
+                            symbol: ['none', 'none'],
+                            label: {
+                                show: true,
+                                position: 'end',
+                                formatter: 'Discrimination'
                             },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒顶部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: top[1],
-                                x2: point[0] + 5,
-                                y2: top[1]
+                            lineStyle: {
+                                color: 'red',
+                                width: 2,
+                                type: 'solid'
                             },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
-                        },
-                        // 误差棒底部横线
-                        {
-                            type: 'line',
-                            shape: {
-                                x1: point[0] - 5,
-                                y1: bottom[1],
-                                x2: point[0] + 5,
-                                y2: bottom[1]
-                            },
-                            style: {
-                                stroke: color,
-                                lineWidth: 2
-                            }
+                            data: [
+                                // 动态获取当前图表的判别线高度
+                                {yAxis: currentChart.discriminationLineY}
+                            ]
                         }
-                    ];
-
-                    // 根据等级添加不同的散点形状
-                    switch (symbolType) {
-                        case 'circle':
-                            children.push({
-                                type: 'circle',
-                                shape: {
-                                    cx: point[0],
-                                    cy: point[1],
-                                    r: 4
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'rect':
-                            children.push({
-                                type: 'rect',
-                                shape: {
-                                    x: point[0] - 4,
-                                    y: point[1] - 4,
-                                    width: 8,
-                                    height: 8
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
-                        case 'triangle':
-                            children.push({
-                                type: 'polygon',
-                                shape: {
-                                    points: [
-                                        [point[0], point[1] - 5], // 上顶点
-                                        [point[0] - 4, point[1] + 3], // 左下角
-                                        [point[0] + 4, point[1] + 3] // 右下角
-                                    ]
-                                },
-                                style: {
-                                    fill: color,
-                                    stroke: '#fff',
-                                    lineWidth: 1
-                                }
-                            });
-                            break;
+                    },
+                    {
+                        name: 'Observations',
+                        type: 'scatter',
+                        // 如果后端传来的 scatter 数据中 x 值也是字符串，可以在这里做一次 map 映射
+                        // data: currentChart.data.map(item => [Number(item[0]), item[1]]),
+                        data: currentChart.data,
+                        symbolSize: 9,
+                        itemStyle: {color: 'blue', opacity: 0.8}
                     }
+                ]
+            };
 
-                    return {
-                        type: 'group',
-                        children: children
-                    };
-                },
-                data: xe135yData.conc,
-                z: 10
-            },
-            // {
-            //     name: 'level',
-            //     type: 'scatter',
-            //     symbolSize: 4,
-            //     data: xe133mData.category.map(item => {
-            //         return [item[0], item[1]];
-            //     }),
-            //     // data: [...new Set(xe133mData.category.map(item => JSON.stringify(item)))].map(str => JSON.parse(str)),
-            //     itemStyle: {
-            //         color: 'rgba(255, 99, 132, 0.8)',
-            //         borderColor: 'rgba(255, 99, 132, 1)',
-            //         borderWidth: 1
-            //     }
-            // },
-            {
-                name: 'mdc',
-                type: 'line',
-                data: xe135yData.mdc,
-                // stack: 'x',
-                symbolSize: 0,
-                // smooth: 0.3 // 轻微平滑
-            },
-            {
-                name: 'lc',
-                type: 'line',
-                data: xe135yData.lc,
-                // stack: 'x',
-                // step: 'start',
-                symbolSize: 0,
-                // itemStyle: {
-                //     color: '#939393',
-                //     borderWidth: 1,
-                // },
-                // barWidth: '10%',
-                // yAxisIndex: 1,
-            },
-            // 添加专门的阈值线系列
-            {
-                name: '阈值',
-                type: 'line',
-                markLine: {
-                    data: [
-                        { yAxis: 3.0 }
-                    ],
-                    // data:xe131mthresholHis[0].thresholValue,
-                    lineStyle: {
-                        color: '#ff0000',
-                        width: 2,
-                        type: 'dashed'
-                    },
-                    label: {
-                        show: true,
-                        position: 'end',
-                        formatter: '阈值: 3.0'
-                    },
-                    symbol: 'none'
-                },
-                data: [], // 空数据，只显示标线
-                lineStyle: {
-                    opacity: 0 // 隐藏实际连线
-                }
-            }
-        ],
-    };
-    const myChart4 = echarts.init(document.getElementById('xe135History'));
-    myChart4.setOption(xe135Option);
-    //#endregion
+            chartInstance.setOption(option);
+            instances.push(chartInstance);
+        });
 
-    //#region Xe-135 frequency distribution
-    const xe135HistogramData = JSON.parse(JSON.stringify(/*[[${Xe135HistogramData}]]*/[]));
-    const xe135CdfPoints = xe135HistogramData?.cdfPoints; // 累积分布函数
-    const xe135Percentile95 = xe135HistogramData?.percentile95; // 95%累积线
-    const xe135KdePoints = xe135HistogramData?.kdePoints; // 核密度估计
-    // const xe131mCumulative = xe135HistogramData?.cumulative;// 所有浓度累积
-    const xe135Stats = xe135HistogramData?.stats; // 区间统计
-    // const xe131mxDate = [];
-    // const xe131myData = [];
-    const xe135BarData = {
-        kdePoints: []
+        window.addEventListener('resize', () => {
+            instances.forEach(instance => instance.resize());
+        });
+
+        return instances;
     }
-    xe135KdePoints.map((item) => {
-        xe135BarData.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData.kdePoints);
-    const xe135CdfP = xe135CdfPoints.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    xe135Stats.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = xe135Stats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    // const xe135AllLevels = [...new Set(
-    //     xe135Stats.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    // )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // // 为每个等级生成系列数据
-    // const xe135Series = xe135AllLevels.map((level) => {
-    //     // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-    //     return xe135Stats.map(item => [
-    //         item.x, // x轴坐标（interval值）
-    //         item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
 
-    //     ]);
-    // });
-    // // console.log('seriesData11', xe135Series);
-    // // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    // const series1 = xe135AllLevels.map((level, index) => ({
-    //     name: `级别(${level})`,
-    //     type: 'bar',
-    //     stack: 'total', // 共用stack实现堆积
-    //     data: xe135Series[index], // 该等级的[x, value]数据
-    //     barGap: '-100%', // 负值使柱子重叠
-    //     barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    // }));
-    // console.log('xe135Series', JSON.stringify(series[0]), JSON.stringify(series[1]));
-    xe135BarData.percentile95 = xe135Percentile95;
-    xe135BarData.cdfPoints = xe135CdfP;
-    // xe135BarData.cumulative = cumulative;
-    xe135BarData.stats = xe135Stats;
-    // xe135BarData.xAxisData = xDate;
-    // xe135BarData.yAxisData = yData;
-    const xe135AllSeries = [
-        // ...series,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: xe135BarData.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [xe135BarData.percentile95, 0.95]
-            ],
-            /*]]>*/
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: xe135BarData.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: xe135BarData.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
+
+    /**
+     *
+     * 循环渲染多个同位素比值频率分布图
+     * @param {string[]} containerIds    DOM容器ID数组
+     * @param {object}   backendData     后端返回的 distributions 对象（含 frequencyData + sampleRatios）
+     * @returns {echarts.Instance[]}     渲染完成的图表实例数组
+     */
+    function renderMultipleFrequencyCharts(containerIds, backendData) {
+
+        var frequencyData = backendData.frequencyData || {};
+        var sampleRatios = backendData.sampleRatios || {};
+        var labels = Object.keys(frequencyData);
+
+        var instances = [];
+
+        containerIds.forEach(function (containerId, index) {
+            var chartDom = document.getElementById(containerId);
+            if (!chartDom) {
+                console.error('DOM容器 ' + containerId + ' 不存在，跳过渲染');
+                return;
+            }
+
+            var title = labels[index] || ('Ratio ' + (index + 1));
+            var sampleValue = sampleRatios[title] || 0;
+            var dataMap = frequencyData[title] || {};
+
+            // --------------------------------------------------------
+            // 1. 数据处理与解析
+            // --------------------------------------------------------
+            var parsedData = [];
+            var regex = /\[(.*?)\s[~-]\s(.*?)\)/;
+
+            for (var key in dataMap) {
+                var match = key.match(regex);
+                if (match) {
+                    var start = parseFloat(match[1]);
+                    var end = parseFloat(match[2]);
+                    parsedData.push({
+                        start: start,
+                        end: end,
+                        center: (start + end) / 2,
+                        count: typeof dataMap[key] === 'number' ? dataMap[key] : 0
+                    });
                 }
             }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let xe135AllXValues = [];
-    xe135AllSeries.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            xe135AllXValues.push(item[0]);
-        });
-    });
-    // console.log(xe135AllXValues, 'allXValues33333333');
 
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const xe135MaxX = xe135AllXValues.length > 0 ? Math.max(...xe135AllXValues) : 0;
-    const xe135MinX = xe135AllXValues.length > 0 ? Math.min(...xe135AllXValues) : 0;
-    // console.log('maxX', maxX);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const xe135MaxXDivisibleBy200 = Math.ceil(xe135MaxX / 200) * 200;
-    const xe135MinXDivisibleBy200 = Math.ceil(xe135MinX / 200) * 200;
-    // console.log(maxXDivisibleBy200, 'maxXDivisibleBy200');
-    const barOption4 = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: xe135BarData.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: xe135MaxXDivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: xe135MinXDivisibleBy200,
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
+            parsedData.sort(function (a, b) {
+                return a.start - b.start;
+            });
+
+            var grandTotal = parsedData.reduce(function (sum, item) {
+                return sum + item.count;
+            }, 0);
+            if (grandTotal === 0) {
+                console.warn('[' + title + '] 样本总数为 0，跳过渲染');
+                return;
+            }
+
+            // --------------------------------------------------------
+            // 2. 累计密度 & 精确 95% 分位数（线性插值法）
+            // --------------------------------------------------------
+            var target95Count = grandTotal * 0.95;
+            var accumulatedCountBefore = 0;
+            var percentile95Value = 0;
+            var percentile95Index = -1;
+
+            for (var i = 0; i < parsedData.length; i++) {
+                var item = parsedData[i];
+                var currentSumWithItem = accumulatedCountBefore + item.count;
+
+                if (currentSumWithItem >= target95Count) {
+                    percentile95Index = i;
+                    var neededInBin = target95Count - accumulatedCountBefore;
+                    var binWidth = item.end - item.start;
+                    percentile95Value = item.start + (neededInBin / (item.count || 1)) * binWidth;
+                    break;
                 }
-            },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
-            },
-        ],
-        markLine: {
-            data: [
-                {
-                    name: '95%累积线',
-                    xAxis: xe135BarData.percentile95,
-                    label: { show: true, formatter: '95%' },
-                },
-            ],
-        },
-        series: xe135AllSeries,
-    };
-    const barChart4 = echarts.init(document.getElementById('xe135mHistogram'));
-    barChart4.setOption(barOption4);
-    //#endregion
-    //#endregion Xe-135
+                accumulatedCountBefore = currentSumWithItem;
+            }
 
-    /* Xe-133/Xe-131m history   5. */
-    //#region  Xe-133/Xe-131m
-    const xe131mHistory5Data =  JSON.parse(JSON.stringify(/*[[${ratioResults1}]]*/ []));
-    const xe131mHistogram5Ynums = [];
-    const xe131mHistogram5List = xe131mHistory5Data.history
-        .sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop))
-        .map((item) => {
-            xe131mHistogram5Ynums.push(item.ratio.toFixed(2));
-            return [item.collectStop.slice(0, -2), item.ratio.toFixed(2)];
+            if (percentile95Index === -1) {
+                percentile95Index = parsedData.length - 1;
+                percentile95Value = parsedData[parsedData.length - 1].end;
+            }
+
+            // --------------------------------------------------------
+            // 3. 填充 ECharts 绘图数据
+            // --------------------------------------------------------
+            var axisData = [];
+            var seriesFreq = [];
+            var seriesCumulative = [];
+            var currentSum = 0;
+            var sampleIndex = -1;
+
+            parsedData.forEach(function (item, idx) {
+                axisData.push(item.center.toFixed(4));
+                seriesFreq.push(item.count);
+                currentSum += item.count;
+                seriesCumulative.push(currentSum / grandTotal);
+
+                if (sampleValue >= item.start && sampleValue < item.end) {
+                    sampleIndex = idx;
+                }
+            });
+
+            if (sampleIndex === -1) sampleIndex = 0;
+            var percentile95ActualValue = seriesCumulative[percentile95Index];
+
+            // --------------------------------------------------------
+            // 4. ECharts 初始化 & 配置
+            // --------------------------------------------------------
+            var chartInstance = echarts.init(chartDom);
+            var customArrowPath = 'path://M0,0 L-5,8 L-2,8 L-2,22 L2,22 L2,8 L5,8 Z';
+
+            var option = {
+                backgroundColor: '#fff',
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {type: 'shadow'},
+                    formatter: function (params) {
+                        var html = '<div>X: ' + params[0].axisValue + '</div>';
+                        params.forEach(function (item) {
+                            if (item.value > 0 || item.seriesName === 'cumulative') {
+                                var val = item.value;
+                                if (item.seriesName === 'cumulative') {
+                                    val = (val * 100).toFixed(2) + '%';
+                                }
+                                html += '<div>' + item.marker + ' ' + item.seriesName + ': ' + val + '</div>';
+                            }
+                        });
+                        return html;
+                    }
+                },
+                legend: {
+                    data: ['frequency', 'cumulative'],
+                    top: 10
+                },
+                grid: {
+                    left: '3%',
+                    right: '5%',
+                    bottom: '15%',
+                    containLabel: true
+                },
+                yAxis: [
+                    {
+                        type: 'value',
+                        name: 'occurrences',
+                        nameTextStyle: {fontWeight: 'bold', fontSize: 14},
+                        splitLine: {show: true, lineStyle: {type: 'dotted'}}
+                    },
+                    {
+                        type: 'value',
+                        name: 'cumulative',
+                        nameTextStyle: {fontWeight: 'bold', fontSize: 14},
+                        min: 0,
+                        max: 1,
+                        axisLabel: {
+                            formatter: function (value) {
+                                return value;
+                            }
+                        },
+                        splitLine: {show: false}
+                    }
+                ],
+                xAxis: {
+                    type: 'category',
+                    data: axisData,
+                    name: title + ' Activity Concentration, mBq/m\u00B3',
+                    nameLocation: 'middle',
+                    nameGap: 50,
+                    nameTextStyle: {fontWeight: 'bold', fontSize: 14},
+                    axisTick: {alignWithLabel: true}
+                },
+                series: [
+                    {
+                        name: 'frequency',
+                        type: 'bar',
+                        data: seriesFreq,
+                        itemStyle: {color: 'blue', borderColor: '#333', borderWidth: 0.5}
+                    },
+                    {
+                        name: 'cumulative',
+                        type: 'line',
+                        yAxisIndex: 1,
+                        step: 'end',
+                        symbol: 'none',
+                        color: 'gray',
+                        data: seriesCumulative,
+                        markLine: {
+                            symbol: 'none',
+                            data: [
+                                [
+                                    {
+                                        xAxis: percentile95Index,
+                                        yAxis: 0,
+                                        lineStyle: {color: 'red', width: 1.5, type: 'dashed'}
+                                    },
+                                    {
+                                        xAxis: percentile95Index,
+                                        yAxis: percentile95ActualValue,
+                                        label: {
+                                            show: true,
+                                            formatter: '95% Line (' + percentile95Value.toFixed(4) + ')',
+                                            position: 'end',
+                                            distance: 8,
+                                            color: 'black',
+                                            fontWeight: 'bold'
+                                        }
+                                    }
+                                ]
+                            ]
+                        },
+                        markPoint: {
+                            symbolKeepAspect: true,
+                            data: [
+                                {
+                                    coord: [percentile95Index, percentile95ActualValue],
+                                    symbol: 'triangle',
+                                    symbolSize: 12,
+                                    symbolRotate: 180,
+                                    itemStyle: {color: 'red'},
+                                    label: {show: false}
+                                },
+                                {
+                                    coord: [sampleIndex, 0],
+                                    symbol: customArrowPath,
+                                    symbolSize: [15, 30],
+                                    symbolOffset: [0, 15],
+                                    itemStyle: {
+                                        color: 'blue',
+                                        borderColor: 'black',
+                                        borderWidth: 1
+                                    },
+                                    label: {
+                                        show: true,
+                                        position: 'bottom',
+                                        formatter: 'current sample = ' + sampleValue,
+                                        color: 'black',
+                                        fontSize: 12,
+                                        distance: 5
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                ]
+            };
+
+            chartInstance.setOption(option);
+            instances.push(chartInstance);
         });
 
-    // console.log(xe131mHistogram5List, 'xe131mHistogram5List');
-    // console.log(Math.min(...xe131mHistogram5Ynums),
-    //     Math.max(...xe131mHistogram5Ynums),);
-    const myChart5 = echarts.init(document.getElementById('xe131mHistory5'));
-    const option5 = {
-        legend: { type: 'plain', data: xe131mHistogram5List.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            data: xe131mHistory5Data.history.map(item => item.collectStop),
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // onZero: false
-        },
-        yAxis: {
-            type: 'value',//log
-            name: '同位素比值',
-            nameLocation: 'middle',
-            nameGap: 40,
-            // scale: true,
-            // min: Math.min(...xe131mHistogram5Ynums),
-            // max: Math.max(...xe131mHistogram5Ynums),
-            splitLine: { show: false },
-            axisLabel: { color: '#6b7280' },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // logBase: 10,
-            min: -1000,
-            max: 1000,
-            // interval: 1000,
-            // axisLabel: {
-            //     color: '#6b7280',
-            //     formatter: function (value) {
-            //         // 预定义的标签映射
-            //         const labels = {
-            //             0.01: '10⁻²',
-            //             0.1: '10⁻¹',
-            //             1: '10⁰',
-            //             10: '10¹',
-            //             100: '10²',
-            //             1000: '10³',
-            //             10000: '10⁴',
-            //             100000: '10⁵',
-            //             1000000: '10⁶'
-            //         };
-            //         // 检查是否为0
-            //         if (value === 0) return '0';
-            //         // 查找最接近的标签值
-            //         const absValue = Math.abs(value);
-            //         let closestKey = Object.keys(labels).find(key => {
-            //             const numKey = Math.abs(parseFloat(key));
-            //             return Math.abs(absValue - numKey) / numKey < 0.1; // 10% 容差
-            //         });
-            //         return closestKey ? labels[closestKey] : value.toExponential();
-            //     }
-            // },
-        },
-        series: [{
-            name: '观察结果',
-            type: 'scatter',
-            symbolSize: 8,
-            data: [...new Set(xe131mHistogram5List.map(item => JSON.stringify(item)))]
-                .map(str => JSON.parse(str)),
+        window.addEventListener('resize', function () {
+            instances.forEach(function (instance) {
+                instance.resize();
+            });
+        });
 
-            itemStyle: {
-                color: 'blue',
-                // borderColor: 'rgba(255, 99, 132, 1)',
-            },
-        }, {
-            name: '区分线',
-            type: 'line',
-            data: [
-                // 示例：绘制一条水平中位线，x轴覆盖全范围，y值固定为中位值
-                [new Date(xe131mHistogram5List[0][0]), 2],
-                [new Date(xe131mHistogram5List[xe131mHistogram5List.length - 1][0]), 2]
-            ],
-            itemStyle: {
-                color: 'red' // 中位线颜色
-            },
-            lineStyle: {
-                width: 3,
-                type: 'solid'
-            },
-            symbol: 'none', // 若不需要折线的标记点，可隐藏
-        }]
-    };
-    myChart5.setOption(option5);
-
-    /* Xe-133/Xe-131m frequency distribution   5. */
-    const xe131mHistogram5Data =  /*[[${ratioIntvlResults1}]]*/[];
-
-    const cdfPoints = xe131mHistogram5Data?.cdfPoints; // 累积分布函数
-    const percentile95 = xe131mHistogram5Data?.percentile95; // 95%累积线
-    const kdePoints = xe131mHistogram5Data?.kdePoints; // 核密度估计
-    const cumulative = xe131mHistogram5Data?.cumulative;// 所有浓度累积
-    const stats = xe131mHistogram5Data?.stats; // 区间统计
-    const xDate = [];
-    const yData = [];
-    const barData = {
-        kdePoints: []
+        return instances;
     }
-    kdePoints.map((item) => {
-        barData.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData.kdePoints);
-    const cdfP = cdfPoints.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    stats.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = stats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    const allLevels = [...new Set(
-        stats.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // 为每个等级生成系列数据
-    const seriesData = allLevels.map((level) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return stats.map(item => [
-            item.x, // x轴坐标（interval值）
-            item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
 
-        ]);
-    });
-    // console.log('seriesData11', seriesData);
-    // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    const series = allLevels.map((level, index) => ({
-        name: `级别(${level})`,
-        type: 'bar',
-        stack: 'total', // 共用stack实现堆积
-        data: seriesData[index], // 该等级的[x, value]数据
-        barGap: '-100%', // 负值使柱子重叠
-        barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    }));
-    // console.log('seriesData', JSON.stringify(series[0]), JSON.stringify(series[1]));
-    barData.percentile95 = percentile95;
-    barData.cdfPoints = cdfP;
-    barData.cumulative = cumulative;
-    barData.stats = stats;
-    barData.xAxisData = xDate;
-    barData.yAxisData = yData;
-    const allSeries = [
-        ...series,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: barData.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [barData.percentile95, 0.95]
-            ],
-            /*]]>*/
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: barData.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: barData.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
-                }
-            }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let allXValues = [];
-    allSeries.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            allXValues.push(item[0]);
-        });
-    });
-    // console.log(allXValues, 'allXValues33333333');
+    // =================================================================
+    // 初始化所有图表
+    // =================================================================
 
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const maxX = allXValues.length > 0 ? Math.max(...allXValues) : 0;
-    const minX = allXValues.length > 0 ? Math.min(...allXValues) : 0;
-    // console.log('maxX', maxX);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const maxXDivisibleBy200 = Math.ceil(maxX / 200) * 200;
-    const minXDivisibleBy200 = Math.ceil(minX / 200) * 200;
-    // console.log(maxXDivisibleBy200, 'maxXDivisibleBy200');
-    const barOption5 = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: barData.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: maxXDivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: minXDivisibleBy200,
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                }
-            },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
-            },
-        ],
-        markLine: {
-            data: [
-                {
-                    name: '95%累积线',
-                    xAxis: barData.percentile95,
-                    label: { show: true, formatter: '95%' },
-                },
-            ],
-        },
-        series: allSeries,
-    };
-    const barChart5 = echarts.init(document.getElementById('xe131mHistogram5'));
-    barChart5.setOption(barOption5);
-    //#endregion. Xe-133/Xe-131m
+    // 单核素
+    renderHistoryChart('xe131mHistory', 'Xe-131m', xe131mHistoryData);
+    renderFrequencyChart('xe131mHistogram', 'Xe-131m', xe131mHistogramData);
 
-    /* Xe-133m/Xe-131m history   6.  */
-    //#region  Xe-133m/Xe-131m
-    const xe131mHistory6Data = JSON.parse(JSON.stringify(/*[[${ratioResults2}]]*/ []));
-    const xe131mHistogram6Ynums = [];
-    const xe131mHistogram6List = xe131mHistory6Data.history
-        .sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop))
-        .map((item) => {
-            xe131mHistogram6Ynums.push(item.ratio.toFixed(2));
-            return [item.collectStop.slice(0, -2), item.ratio.toFixed(2)];
-        });
-    const myChart6 = echarts.init(document.getElementById('xe131mHistory6'));
-    const option6 = {
-        legend: { type: 'plain', data: xe131mHistogram6List.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            data: xe131mHistory6Data.history.map(item => item.collectStop),
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // onZero: false
-        },
-        yAxis: {
-            type: 'value',//log
-            name: '同位素比值',
-            nameLocation: 'middle',
-            nameGap: 40,
-            // scale: true,
-            // min: Math.min(...xe131mHistogram5Ynums),
-            // max: Math.max(...xe131mHistogram5Ynums),
-            splitLine: { show: false },
-            axisLabel: { color: '#6b7280' },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // logBase: 10,
-            // min: -1000,
-            // max: 1000,
-            // interval: 1000,
-            // axisLabel: {
-            //     color: '#6b7280',
-            //     formatter: function (value) {
-            //         // 预定义的标签映射
-            //         const labels = {
-            //             0.01: '10⁻²',
-            //             0.1: '10⁻¹',
-            //             1: '10⁰',
-            //             10: '10¹',
-            //             100: '10²',
-            //             1000: '10³',
-            //             10000: '10⁴',
-            //             100000: '10⁵',
-            //             1000000: '10⁶'
-            //         };
-            //         // 检查是否为0
-            //         if (value === 0) return '0';
-            //         // 查找最接近的标签值
-            //         const absValue = Math.abs(value);
-            //         let closestKey = Object.keys(labels).find(key => {
-            //             const numKey = Math.abs(parseFloat(key));
-            //             return Math.abs(absValue - numKey) / numKey < 0.1; // 10% 容差
-            //         });
-            //         return closestKey ? labels[closestKey] : value.toExponential();
-            //     }
-            // },
-        },
-        series: [{
-            name: '观察结果',
-            type: 'scatter',
-            symbolSize: 8,
-            data: [...new Set(xe131mHistogram6List.map(item => JSON.stringify(item)))]
-                .map(str => JSON.parse(str)),
+    renderHistoryChart('xe133mHistory', 'Xe-133m', xe133mHistoryData);
+    renderFrequencyChart('xe133mHistogram', 'Xe-133m', xe133mHistogramData);
 
-            itemStyle: {
-                color: 'blue',
-                // borderColor: 'rgba(255, 99, 132, 1)',
-            },
-        }, {
-            name: '区分线',
-            type: 'line',
-            data: [
-                // 示例：绘制一条水平中位线，x轴覆盖全范围，y值固定为中位值
-                [new Date(xe131mHistogram6List[0][0]), 2],
-                [new Date(xe131mHistogram6List[xe131mHistogram6List.length - 1][0]), 2]
-            ],
-            itemStyle: {
-                color: 'red' // 中位线颜色
-            },
-            lineStyle: {
-                width: 3,
-                type: 'solid'
-            },
-            symbol: 'none', // 若不需要折线的标记点，可隐藏
-        }]
-    };
-    myChart6.setOption(option6);
+    renderHistoryChart('xe133History', 'Xe-133', xe133HistoryData);
+    renderFrequencyChart('xe133Histogram', 'Xe-133', xe133HistogramData);
 
-    //Xe-133m/Xe-131m frequency distribution
-    const xe133mAnd131mDistributeData =  /*[[${ratioIntvlResults2}]]*/[];
-    const cdfPoints6 = xe133mAnd131mDistributeData?.cdfPoints; // 累积分布函数
-    const percentile956 = xe133mAnd131mDistributeData?.percentile95; // 95%累积线
-    const kdePoints6 = xe133mAnd131mDistributeData?.kdePoints; // 核密度估计
-    const cumulative6 = xe133mAnd131mDistributeData?.cumulative;// 所有浓度累积
-    const stats6 = xe133mAnd131mDistributeData?.stats; // 区间统计
-    const xDate6 = [];
-    const yData6 = [];
-    const barData6 = {
-        kdePoints: []
-    }
-    kdePoints6.map((item) => {
-        barData6.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData6.kdePoints);
-    const cdfP6 = cdfPoints6.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    stats6.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = stats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    const allLevels6 = [...new Set(
-        stats6.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // 为每个等级生成系列数据
-    const seriesData6 = allLevels6.map((level) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return stats6.map(item => [
-            item.x, // x轴坐标（interval值）
-            item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
+    renderHistoryChart('xe135History', 'Xe-135', xe135HistoryData);
+    renderFrequencyChart('xe135Histogram', 'Xe-135', xe135HistogramData);
 
-        ]);
-    });
-    // console.log('seriesData11', seriesData);
-    // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    const series6 = allLevels6.map((level, index) => ({
-        name: `级别(${level})`,
-        type: 'bar',
-        stack: 'total', // 共用stack实现堆积
-        data: seriesData6[index], // 该等级的[x, value]数据
-        barGap: '-100%', // 负值使柱子重叠
-        barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    }));
-    // console.log('seriesData6', JSON.stringify(series6[0]), JSON.stringify(series6[1]));
-    barData6.percentile95 = percentile956;
-    barData6.cdfPoints = cdfP6;
-    barData6.cumulative = cumulative6;
-    barData6.stats = stats6;
-    barData6.xAxisData = xDate6;
-    barData6.yAxisData = yData6;
-    const allSeries6 = [
-        ...series6,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: barData6.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [barData6.percentile95, 0.95]
-            ],
-            /*]]>*/
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: barData6.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: barData6.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
-                }
-            }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let allXValues6 = [];
-    allSeries.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            allXValues6.push(item[0]);
-        });
-    });
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const maxX6 = allXValues6.length > 0 ? Math.max(...allXValues6) : 0;
-    const minX6 = allXValues6.length > 0 ? Math.min(...allXValues6) : 0;
-    console.log('maxX6', maxX6);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const maxX6DivisibleBy200 = Math.ceil(maxX6 / 200) * 200;
-    const minX6DivisibleBy200 = Math.ceil(minX6 / 200) * 200;
-    // console.log(maxX6DivisibleBy200, 'minX6DivisibleBy200');
-    const barOption6 = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: barData6.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: maxX6DivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: minX6DivisibleBy200,
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                }
-            },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
-            },
-        ],
-        markLine: {
-            data: [
-                {
-                    name: '95%累积线',
-                    xAxis: barData6.percentile95,
-                    label: { show: true, formatter: '95%' },
-                },
-            ],
-        },
-        series: allSeries6,
-    };
-    const barChart6 = echarts.init(document.getElementById('xe131mHistogram6'));
-    barChart6.setOption(barOption6);
-    //#endregion Xe-133m/Xe-131m
+    // 比率
+    // 一次性批量渲染所有图表
+    const chartInstances = renderMultipleIsotopeCharts(containerIds, backendData);
 
-    /* Xe-133m/Xe-133 history.    7 */
-    //#region  Xe-133m/Xe-133
-    const xe133mAnd133Data =JSON.parse(JSON.stringify( /*[[${ratioResults3}]]*/ []));
-    const xe133mAnd133HistogY = [];
-    const xe131mHistogram7List = xe133mAnd133Data.history
-        .sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop))
-        .map((item) => {
-            xe133mAnd133HistogY.push(item.ratio.toFixed(2));
-            return [item.collectStop.slice(0, -2), item.ratio.toFixed(2)];
-        });
-    const myChart7 = echarts.init(document.getElementById('xe131mHistory7'));
-    const option7 = {
-        legend: { type: 'plain', data: xe131mHistogram7List.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            data: xe131mHistogram7List.map(item => item.collectStop),
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // onZero: false
-        },
-        yAxis: {
-            type: 'value',//log
-            name: '同位素比值',
-            nameLocation: 'middle',
-            nameGap: 40,
-            // scale: true,
-            // min: Math.min(...xe131mHistogram5Ynums),
-            // max: Math.max(...xe131mHistogram5Ynums),
-            splitLine: { show: false },
-            axisLabel: { color: '#6b7280' },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // logBase: 10,
-            // min: -1000,
-            // max: 1000,
-            // interval: 1000,
-            // axisLabel: {
-            //     color: '#6b7280',
-            //     formatter: function (value) {
-            //         // 预定义的标签映射
-            //         const labels = {
-            //             0.01: '10⁻²',
-            //             0.1: '10⁻¹',
-            //             1: '10⁰',
-            //             10: '10¹',
-            //             100: '10²',
-            //             1000: '10³',
-            //             10000: '10⁴',
-            //             100000: '10⁵',
-            //             1000000: '10⁶'
-            //         };
-            //         // 检查是否为0
-            //         if (value === 0) return '0';
-            //         // 查找最接近的标签值
-            //         const absValue = Math.abs(value);
-            //         let closestKey = Object.keys(labels).find(key => {
-            //             const numKey = Math.abs(parseFloat(key));
-            //             return Math.abs(absValue - numKey) / numKey < 0.1; // 10% 容差
-            //         });
-            //         return closestKey ? labels[closestKey] : value.toExponential();
-            //     }
-            // },
-        },
-        series: [{
-            name: '观察结果',
-            type: 'scatter',
-            symbolSize: 8,
-            data: [...new Set(xe131mHistogram7List.map(item => JSON.stringify(item)))]
-                .map(str => JSON.parse(str)),
-
-            itemStyle: {
-                color: 'blue',
-                // borderColor: 'rgba(255, 99, 132, 1)',
-            },
-        }, {
-            name: '区分线',
-            type: 'line',
-            data: [
-                // 示例：绘制一条水平中位线，x轴覆盖全范围，y值固定为中位值
-                [new Date(xe131mHistogram7List[0][0]), 2],
-                [new Date(xe131mHistogram7List[xe131mHistogram7List.length - 1][0]), 2]
-            ],
-            itemStyle: {
-                color: 'red' // 中位线颜色
-            },
-            lineStyle: {
-                width: 3,
-                type: 'solid'
-            },
-            symbol: 'none', // 若不需要折线的标记点，可隐藏
-        }]
-    };
-    myChart7.setOption(option7);
-
-    // Xe-133m/Xe-133 frequency distribution
-    const xe133mAnd133DistributeData =  /*[[${ratioIntvlResults3}]]*/[];
-    const cdfPoints7 = xe133mAnd133DistributeData?.cdfPoints; // 累积分布函数
-    const percentile957 = xe133mAnd133DistributeData?.percentile95; // 95%累积线
-    const kdePoints7 = xe133mAnd133DistributeData?.kdePoints; // 核密度估计
-    const cumulative7 = xe133mAnd133DistributeData?.cumulative;// 所有浓度累积
-    const stats7 = xe133mAnd133DistributeData?.stats; // 区间统计
-    const xDate7 = [];
-    const yData7 = [];
-    const barData7 = {
-        kdePoints: []
-    }
-    kdePoints7.map((item) => {
-        barData7.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData7.kdePoints);
-    const cdfP7 = cdfPoints7.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    stats7.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = stats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    const allLevels7 = [...new Set(
-        stats7.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // 为每个等级生成系列数据
-    const seriesData7 = allLevels7.map((level) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return stats.map(item => [
-            item.x, // x轴坐标（interval值）
-            item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
-
-        ]);
-    });
-    // console.log('seriesData11', seriesData);
-    // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    const series7 = allLevels7.map((level, index) => ({
-        name: `级别(${level})`,
-        type: 'bar',
-        stack: 'total', // 共用stack实现堆积
-        data: seriesData7[index], // 该等级的[x, value]数据
-        barGap: '-100%', // 负值使柱子重叠
-        barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    }));
-    // console.log('seriesData7', JSON.stringify(series7[0]), JSON.stringify(series7[1]));
-    barData7.cdfPoints = cdfP7;
-    barData7.percentile95 = percentile957;
-    barData7.cumulative = cumulative7;
-    barData7.stats = stats7;
-    barData7.xAxisData = xDate7;
-    barData7.yAxisData = yData7;
-    const allSeries7 = [
-        ...series7,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: barData7.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [barData7.percentile95, 0.95]
-            ],
-            /*]]>*/
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: barData7.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: barData7.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
-                }
-            }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let allXValues7 = [];
-    allSeries7.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            allXValues7.push(item[0]);
-        });
-    });
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const maxX7 = allXValues7.length > 0 ? Math.max(...allXValues7) : 0;
-    const minX7 = allXValues7.length > 0 ? Math.min(...allXValues7) : 0;
-    console.log('maxX7:', maxX7, 'minX7:', minX7);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const maxX7DivisibleBy200 = Math.ceil(maxX7 / 200) * 200;
-    const minX7DivisibleBy200 = Math.ceil(minX7 / 200) * 200;
-    // console.log(maxX7DivisibleBy200, 'minX7DivisibleBy200');
-    const barOption7 = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: barData7.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: maxX7DivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: minX7DivisibleBy200,
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                }
-            },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
-            },
-        ],
-        markLine: {
-            data: [
-                {
-                    name: '95%累积线',
-                    xAxis: barData7.percentile95,
-                    label: { show: true, formatter: '95%' },
-                },
-            ],
-        },
-        series: allSeries7,
-    };
-    const barChart7 = echarts.init(document.getElementById('xe131mHistogram7'));
-    barChart7.setOption(barOption7);
-    //#endregion
-
-    /* Xe-135/Xe-133 history.    8 */
-    //#region  Xe-135/Xe-133
-    const xe135And133Data = JSON.parse(JSON.stringify(/*[[${ratioResults4}]]*/ []));
-    const xe135And133HistogY = [];
-    const xe135Histogram8List = xe135And133Data.history
-        .sort((a, b) => new Date(a.collectStop) - new Date(b.collectStop))
-        .map((item) => {
-            xe135And133HistogY.push(item.ratio.toFixed(2));
-            return [item.collectStop.slice(0, -2), item.ratio.toFixed(2)];
-        });
-    const myChart8 = echarts.init(document.getElementById('xe131mHistory8'));
-    const option8 = {
-        legend: { type: 'plain', data: xe135Histogram8List.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '3%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            type: 'time',
-            data: xe135Histogram8List.map(item => item.collectStop),
-            name: '采样停止时间',
-            nameLocation: 'middle',
-            nameGap: 20,
-            axisLabel: {
-                color: '#6b7280'
-            },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // onZero: false
-        },
-        yAxis: {
-            type: 'value',//log
-            name: '同位素比值',
-            nameLocation: 'middle',
-            nameGap: 40,
-            // scale: true,
-            // min: Math.min(...xe131mHistogram5Ynums),
-            // max: Math.max(...xe131mHistogram5Ynums),
-            splitLine: { show: false },
-            axisLabel: { color: '#6b7280' },
-            axisLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280'
-                }
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#406979', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            // logBase: 10,
-            // min: -1000,
-            // max: 1000,
-            // interval: 1000,
-            // axisLabel: {
-            //     color: '#6b7280',
-            //     formatter: function (value) {
-            //         // 预定义的标签映射
-            //         const labels = {
-            //             0.01: '10⁻²',
-            //             0.1: '10⁻¹',
-            //             1: '10⁰',
-            //             10: '10¹',
-            //             100: '10²',
-            //             1000: '10³',
-            //             10000: '10⁴',
-            //             100000: '10⁵',
-            //             1000000: '10⁶'
-            //         };
-            //         // 检查是否为0
-            //         if (value === 0) return '0';
-            //         // 查找最接近的标签值
-            //         const absValue = Math.abs(value);
-            //         let closestKey = Object.keys(labels).find(key => {
-            //             const numKey = Math.abs(parseFloat(key));
-            //             return Math.abs(absValue - numKey) / numKey < 0.1; // 10% 容差
-            //         });
-            //         return closestKey ? labels[closestKey] : value.toExponential();
-            //     }
-            // },
-        },
-        series: [{
-            name: '观察结果',
-            type: 'scatter',
-            symbolSize: 8,
-            data: [...new Set(xe135Histogram8List.map(item => JSON.stringify(item)))]
-                .map(str => JSON.parse(str)),
-
-            itemStyle: {
-                color: 'blue',
-                // borderColor: 'rgba(255, 99, 132, 1)',
-            },
-        }, {
-            name: '区分线',
-            type: 'line',
-            data: [
-                // 示例：绘制一条水平中位线，x轴覆盖全范围，y值固定为中位值
-                [new Date(xe135Histogram8List[0][0]), 2],
-                [new Date(xe135Histogram8List[xe135Histogram8List.length - 1][0]), 2]
-            ],
-            itemStyle: {
-                color: 'red' // 中位线颜色
-            },
-            lineStyle: {
-                width: 3,
-                type: 'solid'
-            },
-            symbol: 'none', // 若不需要折线的标记点，可隐藏
-        }]
-    };
-    myChart8.setOption(option8);
-
-    // Xe-135/Xe-133 frequency distribution
-    const xe135And133DistributeData =   /*[[${ratioIntvlResults4}]]*/[];
-    const cdfPoints8 = xe135And133DistributeData?.cdfPoints; // 累积分布函数
-    const percentile958 = xe135And133DistributeData?.percentile95; // 95%累积线
-    const kdePoints8 = xe135And133DistributeData?.kdePoints; // 核密度估计
-    const cumulative8 = xe135And133DistributeData?.cumulative;// 所有浓度累积
-    const stats8 = xe135And133DistributeData?.stats; // 区间统计
-    const xDate8 = [];
-    const yData8 = [];
-    const barData8 = {
-        kdePoints: []
-    }
-    kdePoints8.map((item) => {
-        barData8.kdePoints.push({
-            x: item.x,
-            y: item.density,
-        });
-    });
-    // console.log('111', barData8.kdePoints);
-    const cdfP8 = cdfPoints8.map((item) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return [item.value, item.cumulativeProb];
-    });
-    stats8.map((item) => {
-        item.x = Number.parseFloat(item.interval?.split(',')[0].replace('[', ''));
-        delete item.value;
-    });
-    // const section = stats.filter(item => item.count > 0)
-    // 提取所有等级（去重并排序）
-    const allLevels8 = [...new Set(
-        stats8.flatMap(item => Object.keys(item.levelDistribution).map(Number)),
-    )].sort((a, b) => a - b); // 结果：[1,2,3,4]
-    // 为每个等级生成系列数据
-    const seriesData8 = allLevels8.map((level) => {
-        // 遍历每个数据项，提取该等级的数值（缺失则为0），并关联interval作为x坐标
-        return stats.map(item => [
-            item.x, // x轴坐标（interval值）
-            item.levelDistribution[level] || 0, // 该等级的数值（缺失填0）
-
-        ]);
-    });
-    // console.log('seriesData11', seriesData);
-    // 步骤3：生成series配置（每个等级一个系列，共享同一个stack）
-    const series8 = allLevels8.map((level, index) => ({
-        name: `级别(${level})`,
-        type: 'bar',
-        stack: 'total', // 共用stack实现堆积
-        data: seriesData8[index], // 该等级的[x, value]数据
-        barGap: '-100%', // 负值使柱子重叠
-        barWidth: '212%', // 柱状图宽度（可根据x轴密度调整）
-    }));
-    // console.log('seriesData8', JSON.stringify(series8[0]), JSON.stringify(series8[1]));
-    barData8.cdfPoints = cdfP8;
-    barData8.percentile95 = percentile958;
-    barData8.cumulative = cumulative8;
-    barData8.stats = stats8;
-    barData8.xAxisData = xDate8;
-    barData8.yAxisData = yData8;
-    const allSeries8 = [
-        ...series8,
-        {
-            name: '累积分布',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#939393',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            data: barData8.cdfPoints,
-            yAxisIndex: 1,
-        },
-        {
-            name: '95%累积线',
-            type: 'bar',
-            itemStyle: {
-                color: '#00ffd2',
-            },
-            barWidth: '1px',
-            // barWidth: '10%',
-            // barGap: '20%',
-            // barCategoryGap: '20%',
-            /*<![CDATA[*/
-            data: [
-                [barData8.percentile95, 0.95]
-            ],
-            /*]]>*/
-            yAxisIndex: 1,
-            lineStyle: { color: 'green', type: 'dashed' },
-        },
-        {
-            name: 'KDE',
-            type: 'line',
-            step: 'start',
-            symbolSize: 0,
-            itemStyle: {
-                color: '#ffd13e',
-                borderWidth: 1,
-            },
-            barWidth: '10%',
-            barGap: '90%',
-            barCategoryGap: '20%',
-            data: barData8.kdePoints.map(item => [item.x, item.y]),
-            yAxisIndex: 1,
-        },
-        {
-            name: '频数',
-            type: 'bar',
-            barWidth: '20',
-            data: barData8.stats.map(item => [item.x, item.count]),
-            itemStyle: {
-                color: function (params) {
-                    // 根据数值大小设置不同颜色
-                    const colors = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de'];
-                    return colors[params.dataIndex % colors.length];
-                }
-            }
-        }
-    ];
-    // 步骤1：收集所有系列的x坐标
-    let allXValues8 = [];
-    // console.log(allSeries8, 'allSeries8');
-    allSeries8.forEach((serie) => {
-        // 遍历每个系列的数据，提取x值（data中每个元素的第一个值）
-        serie.data.forEach((item) => {
-            allXValues8.push(item[0]);
-        });
-    });
-    // 步骤2：计算最大x值（如果没有数据，可设一个默认值如0）
-    const maxX8 = allXValues8.length > 0 ? Math.max(...allXValues8) : 0;
-    const minX8 = allXValues8.length > 0 ? Math.min(...allXValues8) : 0;
-    console.log('maxX8:', maxX8, 'minX8:', minX8);
-    // 计算能被200整除的最小整数（不小于maxX）
-    const maxX8DivisibleBy200 = Math.ceil(maxX8 / 200) * 200;
-    const minX8DivisibleBy200 = Math.ceil(minX8 / 200) * 200;
-    // console.log(maxX8DivisibleBy200, 'minX8DivisibleBy200');
-    const barOption8 = {
-        tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-        legend: { type: 'plain', data: barData8.legendData, top: 0, textStyle: { color: '#9ab1bc' }, icon: 'circle' },
-        grid: {
-            left: '5%', right: '5%', bottom: '5%', top: '10%', containLabel: true,
-        },
-        xAxis: {
-            nameTextStyle: { padding: 25, color: '#9ab1bc', fontSize: 15 },
-            name: '活性浓度（uBq/m3）',
-            nameLocation: 'center',
-            nameTextStyle: { color: '#6b7280' },
-            nameGap: 40,
-            axisLabel: {
-                color: '#6b7280',
-                rotate: 45, // 关键配置：标签顺时针旋转45度
-                interval: 0, // 强制显示所有标签（默认可能省略部分标签）
-                marginTop: 25, // 标签与轴线的距离（避免旋转后重叠）
-                fontSize: 12, // 可配合调整字体大小
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    color: '#6b7280', // 网格线颜色
-                    width: 1, // 网格线宽度
-                    type: 'dashed', // 线条类型: solid, dashed, dotted
-                },
-            },
-            type: 'value',
-            scale: true,
-            // splitNumber:50,
-            max: maxX8DivisibleBy200,
-            interval: 500, // 刻度间隔
-            min: minX8DivisibleBy200,
-        },
-        yAxis: [
-            {
-                type: 'value', name: '发生次数', nameLocation: 'center',
-                // min: 0,           // 最小值
-                // max: 18,         // 最大值
-                // interval: 2,     // 刻度间隔
-                nameTextStyle: { color: '#6b7280', padding: 20 },
-                axisLabel: { color: '#6b7280' },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 0, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                }
-            },
-            {
-                type: 'value',
-                name: '累积/密度',
-                // position: 'right', // 关键属性：设置在右侧
-                nameLocation: 'center',
-                min: 0, // 最小值
-                max: 1, // 最大值
-                interval: 0.1, // 刻度间隔
-                nameTextStyle: {
-                    padding: 20, // 调整名称位置
-                    color: '#6b7280',
-                },
-                axisLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280',
-                    },
-                },
-                axisLabel: {
-                    formatter: '{value}',
-                    color: '#6b7280',
-                },
-                splitLine: {
-                    show: true,
-                    lineStyle: {
-                        color: '#6b7280', // 网格线颜色
-                        width: 1, // 网格线宽度
-                        type: 'dashed', // 线条类型: solid, dashed, dotted
-                    },
-                },
-            },
-        ],
-        markLine: {
-            data: [
-                {
-                    name: '95%累积线',
-                    xAxis: barData8.percentile95,
-                    label: { show: true, formatter: '95%' },
-                },
-            ],
-        },
-        series: allSeries8,
-    };
-    const barChart8 = echarts.init(document.getElementById('xe131mHistogram8'));
-    barChart8.setOption(barOption8);
-    //#endregion
-    /*]]>*/
+    var distributions = /*[[${distributions}]]*/{};
+    // 直接传入 distributions
+    renderMultipleFrequencyCharts(frequencyIds, distributions);
 </script>
+
 </body>
 </html>
\ No newline at end of file