From 51a5981faaf267f66d058c72ea9bef34ea58c805 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 16 Nov 2023 18:23:49 +0800 Subject: [PATCH] =?UTF-8?q?beta=E9=87=8D=E6=96=B0=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=87=8D=E6=96=B0=E5=88=86=E6=9E=90=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E5=8F=82=E6=95=B0=E8=B5=8B=E5=80=BC=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SpectrumAnalysisServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 1358a0a7..6ef9ad0e 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 @@ -2926,7 +2926,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements spectrum_group.BgCalPara.bApplyNewCalicDetBg = analyseData.isDetBgData(); //判断是否勾选了qc spectrum_group.BgCalPara.bApplyNewCalicQc = analyseData.isQcData(); - betaDataFile.setBgPara(spectrum_group.BgCalPara); File sampleTmp = null; File gasTmp = null; File detTmp = null; @@ -2989,6 +2988,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements betaDataFile.setXeResultsSpectrumList(xeResultsSpectrumList); betaDataFile.setBProcessed(true); betaDataFile.setSaveAnalysisResult(true); + betaDataFile.setBgPara(spectrum_group.BgCalPara); } } else { xeMap.put("XeData", Collections.EMPTY_LIST); @@ -3120,7 +3120,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements spectrum_group.BgCalPara.bApplyNewCalicGasBg = analyseData.isGasBgData(); spectrum_group.BgCalPara.bApplyNewCalicDetBg = analyseData.isDetBgData(); spectrum_group.BgCalPara.bApplyNewCalicQc = analyseData.isQcData(); - sampleBetaData.setBgPara(spectrum_group.BgCalPara); File sampleTmp = null; File gasTmp = null; File detTmp = null; @@ -3136,15 +3135,15 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements if (Objects.nonNull(sampleTmp) && Objects.nonNull(gasTmp) && Objects.nonNull(detTmp)) { //调用分析方法进行分析操作 boolean bRet = phdFileUtil.analyzeSpectrum(sampleTmp, gasTmp, detTmp, spectrum_group.BgCalPara, xeMap, sampleBetaData); - if (bRet) { - if (analyseData.isQcData()) { - if (StringUtils.isNotBlank(sampleBetaData.getQcFilePathName())) { - EnergySpectrumStruct struct = sampleBetaData.getQcStruct(); - if (Objects.nonNull(struct)) { - phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap, sampleBetaData); - } + if (analyseData.isQcData()) { + if (StringUtils.isNotBlank(sampleBetaData.getQcFilePathName())) { + EnergySpectrumStruct struct = sampleBetaData.getQcStruct(); + if (Objects.nonNull(struct)) { + phdFileUtil.CalQCBoundary(betaList, gammaList, betaFittingParaToUi, gammaFittingParaToUi, struct, xeMap, sampleBetaData); } } + } + if (bRet) { List sampleBoundary = (List) xeMap.get("SampleBoundary"); if(CollectionUtils.isNotEmpty(sampleBoundary)) { betaDataFile.setSampleBoundary(sampleBoundary); @@ -3183,6 +3182,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements sampleBetaData.setXeResultsSpectrumList(xeResultsSpectrumList); sampleBetaData.setBProcessed(true); sampleBetaData.setSaveAnalysisResult(true); + sampleBetaData.setBgPara(spectrum_group.BgCalPara); } analyseResultMap.put(sampleFileName, xeMap); } else {