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 2371dc12..6d854878 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
@@ -1483,7 +1483,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
         }
 
         List<Double> old_ener = phd.getUsedEnerPara().getP();
-        List<Double> new_ener = CollectionUtils.isNotEmpty(phd.getMapEnerPara())?phd.getMapEnerPara().get(phd.getNewEner()).getP():new LinkedList<>();
+        List<Double> new_ener = Objects.nonNull(phd.getMapEnerPara().get(phd.getNewEner()))?(CollectionUtils.isNotEmpty(phd.getMapEnerPara().get(phd.getNewEner()).getP())?phd.getMapEnerPara().get(phd.getNewEner()).getP():new LinkedList<>()):new LinkedList<>();
         if(old_ener.size() != new_ener.size()) {
             return 1;
         }
@@ -1494,7 +1494,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
         }
 
         List<Double> old_reso = phd.getUsedResoPara().getP();
-        List<Double> new_reso = CollectionUtils.isNotEmpty(phd.getMapResoPara())?phd.getMapResoPara().get(phd.getNewReso()).getP():new LinkedList<>();
+        List<Double> new_reso = Objects.nonNull(phd.getMapResoPara().get(phd.getNewReso()))?(CollectionUtils.isNotEmpty(phd.getMapResoPara().get(phd.getNewReso()).getP())?phd.getMapResoPara().get(phd.getNewReso()).getP():new LinkedList<>()):new LinkedList<>();
         if(old_reso.size() != new_reso.size()) {
             return 1;
         }
@@ -1505,7 +1505,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
         }
 
         List<Double> old_effi = phd.getUsedEffiPara().getP();
-        List<Double> new_effi = CollectionUtils.isNotEmpty(phd.getMapEffiPara())?phd.getMapEffiPara().get(phd.getNewEffi()).getP():new LinkedList<>();
+        List<Double> new_effi = Objects.nonNull(phd.getMapEffiPara().get(phd.getNewEffi()))?(CollectionUtils.isNotEmpty(phd.getMapEffiPara().get(phd.getNewEffi()).getP())?phd.getMapEffiPara().get(phd.getNewEffi()).getP():new LinkedList<>()):new LinkedList<>();
         if(old_effi.size() != new_effi.size()) {
             return -1;
         }
@@ -3027,8 +3027,6 @@ public class GammaFileUtil extends AbstractLogOrReport {
                 }
             } catch (FileNotFoundException e) {
                 throw new RuntimeException(e);
-            } finally {
-                sampleTmp.delete();
             }
         }
 
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java
index a89e1c81..ffa833b1 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.base.entity.rnman.GardsNuclLinesIded;
 import org.jeecg.modules.entity.vo.GStoreMiddleProcessData;
@@ -34,18 +35,18 @@ public class GardsNuclLinesIdedSpectrumServiceImpl extends ServiceImpl<GardsNucl
                 nuclLinesIded.setNuclidefullname(map.get(key).nuclideFullname.get(i));
                 nuclLinesIded.setIdPeak(Integer.valueOf(map.get(key).idPeak.get(i)));
                 nuclLinesIded.setEnergy(Double.valueOf(map.get(key).Energy.get(i)));
-                nuclLinesIded.setUncEnergy(Double.valueOf(map.get(key).uncEnergy.get(i)));
-                nuclLinesIded.setAbundance(Double.valueOf(map.get(key).Abundance.get(i)));
-                nuclLinesIded.setUncAbundance(Double.valueOf(map.get(key).uncAbundance.get(i)));
+                nuclLinesIded.setUncEnergy(StringUtils.isBlank(map.get(key).uncEnergy.get(i))?null:Double.valueOf(map.get(key).uncEnergy.get(i)));
+                nuclLinesIded.setAbundance(StringUtils.isBlank(map.get(key).Abundance.get(i))?null:Double.valueOf(map.get(key).Abundance.get(i)));
+                nuclLinesIded.setUncAbundance(StringUtils.isBlank(map.get(key).uncAbundance.get(i))?null:Double.valueOf(map.get(key).uncAbundance.get(i)));
                 nuclLinesIded.setActivity(map.get(key).Activity.get(i));
-                nuclLinesIded.setUncActivity(Double.valueOf(map.get(key).uncActivity.get(i)));
-                nuclLinesIded.setEffic(Double.valueOf(map.get(key).Effic.get(i)));
-                nuclLinesIded.setUnEffic(Double.valueOf(map.get(key).uncEffic.get(i)));
-                nuclLinesIded.setMda(Double.valueOf(map.get(key).Mda.get(i)));
-                nuclLinesIded.setKeyFlag(Double.valueOf(map.get(key).key_flag.get(i)));
-                nuclLinesIded.setCscRatio(Double.valueOf(map.get(key).csc_ratio.get(i)));
-                nuclLinesIded.setCscRatioErr(Double.valueOf(map.get(key).csc_ratio_err.get(i)));
-                nuclLinesIded.setCscModFlag(Double.valueOf(map.get(key).csc_mod_flag.get(i)));
+                nuclLinesIded.setUncActivity(StringUtils.isBlank(map.get(key).uncActivity.get(i))?null:Double.valueOf(map.get(key).uncActivity.get(i)));
+                nuclLinesIded.setEffic(StringUtils.isBlank(map.get(key).Effic.get(i))?null:Double.valueOf(map.get(key).Effic.get(i)));
+                nuclLinesIded.setUnEffic(StringUtils.isBlank(map.get(key).uncEffic.get(i))?null:Double.valueOf(map.get(key).uncEffic.get(i)));
+                nuclLinesIded.setMda(StringUtils.isBlank(map.get(key).Mda.get(i))?null:Double.valueOf(map.get(key).Mda.get(i)));
+                nuclLinesIded.setKeyFlag(StringUtils.isBlank(map.get(key).key_flag.get(i))?null:Double.valueOf(map.get(key).key_flag.get(i)));
+                nuclLinesIded.setCscRatio(StringUtils.isBlank(map.get(key).csc_ratio.get(i))?null:Double.valueOf(map.get(key).csc_ratio.get(i)));
+                nuclLinesIded.setCscRatioErr(StringUtils.isBlank(map.get(key).csc_ratio_err.get(i))?null:Double.valueOf(map.get(key).csc_ratio_err.get(i)));
+                nuclLinesIded.setCscModFlag(StringUtils.isBlank(map.get(key).csc_mod_flag.get(i))?null:Double.valueOf(map.get(key).csc_mod_flag.get(i)));
                 nuclLinesIded.setMdc(map.get(key).MDC.get(i));
                 nuclLinesIded.setConcentration(map.get(key).Concentration.get(i));
                 nuclLinesIdedList.add(nuclLinesIded);