From be6572109757e5aa3099081543ac5a17309b27b2 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Tue, 19 Dec 2023 16:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97mdc=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E5=85=AC=E5=BC=8F=E5=8F=82=E6=95=B0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E6=94=B9effici?=
 =?UTF-8?q?ency=E9=A1=B5=E9=9D=A2=E5=85=AC=E5=BC=8F=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=8F=82=E6=95=B0=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=A7=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jeecg/common/util/GammaFileUtil.java  | 12 ++------
 .../service/impl/GammaServiceImpl.java        | 28 ++++---------------
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
index 65765ffb..09a4a1d9 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
@@ -3116,15 +3116,9 @@ public class GammaFileUtil extends AbstractLogOrReport {
             String anylseEnd;
             anylseBegin = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss");
             bRet = AnalyseSpectrum(fileAnlyse,nucline);
-            if (CollectionUtils.isEmpty(fileAnlyse.getEfficiencyParam())) {
-                fileAnlyse.setEfficiencyParam(fileAnlyse.getUsedEffiPara().getP());
-            }
-            if (CollectionUtils.isEmpty(fileAnlyse.getEfficiencyEnergy())) {
-                fileAnlyse.setEfficiencyEnergy(fileAnlyse.getUsedEffiKD().getG_energy());
-            }
-            if (Objects.isNull(fileAnlyse.getEfficiencyCurRow())) {
-                fileAnlyse.setEfficiencyCurRow(0);
-            }
+            fileAnlyse.setEfficiencyParam(fileAnlyse.getUsedEffiPara().getP());
+            fileAnlyse.setEfficiencyEnergy(fileAnlyse.getUsedEffiKD().getG_energy());
+            fileAnlyse.setEfficiencyCurRow(0);
             getNuclideMDCValue(fileAnlyse, fileAnlyse.getMdcInfoMap(), nucline);
             anylseEnd = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss");
             middleData.analyses_analysisBegin = anylseBegin;
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
index f93e3e2d..0cfd7f92 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
@@ -1278,15 +1278,9 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type());
             gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
             gammaFileUtil.RunQC(phd);
-            if (CollectionUtils.isEmpty(phd.getEfficiencyParam())) {
-                phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
-            }
-            if (CollectionUtils.isEmpty(phd.getEfficiencyEnergy())) {
-                phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
-            }
-            if (Objects.isNull(phd.getEfficiencyCurRow())) {
-                phd.setEfficiencyCurRow(0);
-            }
+            phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
+            phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
+            phd.setEfficiencyCurRow(0);
             // 重新计算峰值
             gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMap);
             String warning = "Finish three tasks:\n" +
@@ -1299,15 +1293,9 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
             // 重新分析各峰值对应的核素信息
 //            gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
-            if (CollectionUtils.isEmpty(phd.getEfficiencyParam())) {
-                phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
-            }
-            if (CollectionUtils.isEmpty(phd.getEfficiencyEnergy())) {
-                phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
-            }
-            if (Objects.isNull(phd.getEfficiencyCurRow())) {
-                phd.setEfficiencyCurRow(0);
-            }
+            phd.setEfficiencyParam(phd.getUsedEffiPara().getP());
+            phd.setEfficiencyEnergy(phd.getUsedEffiKD().getG_energy());
+            phd.setEfficiencyCurRow(0);
             // 重新计算峰值
             gammaFileUtil.getNuclideMDCValue(phd, phd.getMdcInfoMap(), nuclideLinesMap);
             Map<String, Object> map = new HashMap<>();
@@ -3565,10 +3553,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
         //redis获取缓存的峰核素信息
         Map<String, NuclideLines> nuclideLinesMap = (Map<String, NuclideLines>) redisUtil.get(userName+StringPool.DASH+phd.getHeader().getSystem_type());
         DataChangeEfficiency(m_vCurEffi, m_vCurEnergy, m_vCurUncert, m_curParam, funcId, phd, width, curRow, map);
-        //将本次计算公式的信息赋值给各对应参数用于计算MDC
-        phd.setEfficiencyParam(m_curParam.getP());
-        phd.setEfficiencyCurRow(curRow);
-        phd.setEfficiencyEnergy(m_vCurEnergy);
         result.setSuccess(true);
         result.setResult(map);
         return result;