From 0d33209b60a01f97908a7cd194f854011d7dfcdb Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng>
Date: Mon, 18 Sep 2023 19:26:48 +0800
Subject: [PATCH] =?UTF-8?q?GammaFileUtil=E6=9F=A5=E8=AF=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/GammaFileUtil.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
index dff6063e..b65a5efb 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
@@ -531,7 +531,7 @@ public class GammaFileUtil {
             phd.getBaseCtrls().setRg_low(analysis.getSearchStartChannel());
             phd.getBaseCtrls().setRg_high(analysis.getSearchEndChannel());
             phd.getUsedSetting().setEnergyTolerance(analysis.getSearchThreshold());
-        }else {
+        } else {
             result.error500("There are 0 records when sample_id is "+sampleId+"!");
             return false;
         }
@@ -711,7 +711,7 @@ public class GammaFileUtil {
         if (CollectionUtils.isNotEmpty(nuclIdeds)){
             for (GardsNuclIdedSpectrum nuclIdedSpectrum:nuclIdeds) {
                 String str_key = nuclIdedSpectrum.getNuclideName();
-                if(Objects.isNull(phd.getMapNucActMda().get(str_key))) {
+                if(Objects.nonNull(phd.getMapNucActMda().get(str_key))) {
                     phd.getMapNucActMda().get(str_key).setHalflife(Double.valueOf(nuclIdedSpectrum.getHalflife()));
                     List<Double> vEner = phd.getMapNucActMda().get(str_key).getVEnergy();
                     Double key_ener = Double.valueOf(nuclIdedSpectrum.getKeyEnergy());
@@ -2634,7 +2634,7 @@ public class GammaFileUtil {
             strBuffer.append(StringPool.SPACE+middleData.peaks_idPeak.get(i)+"     "+String.format("%.3f", Double.valueOf(middleData.peaks_Energy.get(i)))+"     "+String.format("%.3f", Double.valueOf(middleData.peaks_peakCentroid.get(i)))+
                     "     "+String.format("%.3f", Double.valueOf(middleData.peaks_Fwhm.get(i)))+"     "+String.format("%.3f", Double.valueOf(middleData.peaks_Area.get(i)))+
                     "     "+String.format("%.3f", (Double.valueOf(middleData.peaks_areaErr.get(i))/Double.valueOf(middleData.peaks_Area.get(i))*100))+
-                    "     "+String.format("%.3f", Double.valueOf(middleData.peaks_Significance.get(i)))+"     "+String.format("%.3f", Double.valueOf(middleData.peaks_Sensitivity.get(i)))+"     "+middleData.peaks_Nuclide_name+"\n");
+                    "     "+String.format("%.3f", Double.valueOf(middleData.peaks_Significance.get(i)))+"     "+String.format("%.3f", Double.valueOf(middleData.peaks_Sensitivity.get(i)))+"     "+middleData.peaks_Nuclide_name.get(i)+"\n");
         }
         strBuffer.append(" \n");
         strBuffer.append("#PROCESSING PARAMETERS\n");
@@ -3177,7 +3177,6 @@ public class GammaFileUtil {
                 }
                 dvctComments.add(t_comment);
                 dvctNuclide_name.add(StringUtils.join(fileAnlyse.getVPeak().get(m).nuclides, ";"));
-
             }
             middleData.peaks_idPeak =DoubleLimit_I(dvctIDPEAK);
             middleData.peaks_peakCentroid =DoubleLimit_G(dvctCENTROIDCHANNEL);