diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLibMapper.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLibMapper.java
index 1ef29b1f..a6d8f512 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLibMapper.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/GardsNuclLibMapper.java
@@ -18,10 +18,8 @@ public interface GardsNuclLibMapper extends BaseMapper<GardsNuclLib> {
 
     List<GardsNuclLib> getNucliLib();
 
-    List<String> findNuclidesAnalysis();
+    List<HalfData> findNuclidesAnalysis();
 
-    List<NuclideLine> getNuclideLines(@Param("name") String name);
-
-    HalfData getOneHalf(@Param("name") String name);
+    List<NuclideLine> getNuclideLines();
 
 }
diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclLibMapper.xml b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclLibMapper.xml
index 72513b3f..e5369528 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclLibMapper.xml
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclLibMapper.xml
@@ -26,27 +26,19 @@
         select a.NAME, a.num_lines, a.halflife, a.halflife_err from CONFIGURATION.GARDS_NUCL_LIB a
     </select>
 
-    <select id="findNuclidesAnalysis" resultType="java.lang.String">
-        select NAME from CONFIGURATION.GARDS_NUCL_LIB
+    <select id="findNuclidesAnalysis" resultType="org.jeecg.modules.entity.vo.HalfData">
+        select NAME as name, HALFLIFE as half from CONFIGURATION.GARDS_NUCL_LIB
     </select>
 
     <select id="getNuclideLines" resultType="org.jeecg.modules.entity.vo.NuclideLine">
-        SELECT FULLNAME as fullName,
+        SELECT NAME as name,
+               FULLNAME as fullName,
                ENERGY as energy,
                ENERGY_UNCERT as energyUncert,
                YIELD as yield,
                YIELD_UNCERT as yieldUncert,
                KEY_FLAG as keyFlag
-        from CONFIGURATION.GARDS_NUCL_LINES_LIB WHERE NAME = #{name} ORDER BY ENERGY
-    </select>
-
-    <select id="getOneHalf" resultType="org.jeecg.modules.entity.vo.HalfData">
-        SELECT
-            NAME as name,
-            HALFLIFE as half
-        FROM
-            CONFIGURATION.GARDS_NUCL_LIB
-        WHERE NAME = #{name}
+        from CONFIGURATION.GARDS_NUCL_LINES_LIB ORDER BY NAME,ENERGY
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLibServiceImpl.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLibServiceImpl.java
index 2acbff31..e3beec7c 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLibServiceImpl.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLibServiceImpl.java
@@ -60,38 +60,41 @@ public class GardsNuclLibServiceImpl extends ServiceImpl<GardsNuclLibMapper, Gar
 
     @Override
     public void getNuclideMap() {
-        List<String> nuclideLibs = this.baseMapper.findNuclidesAnalysis();
-        Map<String, NuclideLines> nuclideMap = GetNuclideLines(nuclideLibs);
+        Map<String, NuclideLines> nuclideMap = GetNuclideLines();
         redisUtil.set("AllNuclideMap", nuclideMap);
     }
 
-    public Map<String, NuclideLines> GetNuclideLines(List<String> nuclideList) {
+    public Map<String, NuclideLines> GetNuclideLines() {
+        List<HalfData> nuclideList = this.baseMapper.findNuclidesAnalysis();
         Map<String, NuclideLines> mapLines = new HashMap<>();
         if (nuclideList.size() < 1) {
             return mapLines;
         }
-        for (String name : nuclideList) {
-            NuclideLines nlines = new NuclideLines();
-            List<NuclideLine> nuclideLineList = this.baseMapper.getNuclideLines(name);
-            for (int j = 0; j < nuclideLineList.size(); j++) {
-                nlines.getFullNames().add(nuclideLineList.get(j).getFullName());
-                nlines.getVenergy().add(nuclideLineList.get(j).getEnergy());
-                nlines.getVuncertE().add(nuclideLineList.get(j).getEnergyUncert());
-                nlines.getVyield().add(nuclideLineList.get(j).getYield() / 100);
-                nlines.getVuncertY().add(nuclideLineList.get(j).getYieldUncert());
-                if (Objects.nonNull(nuclideLineList.get(j).getKeyFlag()) && nuclideLineList.get(j).getKeyFlag().intValue() > 0) {
+        List<NuclideLine> nuclideLineList = this.baseMapper.getNuclideLines();
+        for (HalfData half : nuclideList) {
+            String name = half.getName();
+            NuclideLines nlines = null;
+            //判断map里是否存在当前名称的核素信息
+            if (Objects.isNull(mapLines.get(name))) {
+                nlines = new NuclideLines();
+                nlines.setHalflife(half.getHalf() == null ? 0 : half.getHalf() * 86400);// 将天转换成秒
+            } else {
+                nlines = mapLines.get(name);
+            }
+            List<NuclideLine> filterList = nuclideLineList.stream().filter(item -> item.getName().equals(name)).collect(Collectors.toList());
+            for (int j = 0; j < filterList.size(); j++) {
+                nlines.getFullNames().add(filterList.get(j).getFullName());
+                nlines.getVenergy().add(filterList.get(j).getEnergy());
+                nlines.getVuncertE().add(filterList.get(j).getEnergyUncert());
+                nlines.getVyield().add(filterList.get(j).getYield() / 100);
+                nlines.getVuncertY().add(filterList.get(j).getYieldUncert());
+                if (Objects.nonNull(filterList.get(j).getKeyFlag()) && filterList.get(j).getKeyFlag().intValue() > 0) {
                     nlines.key_flag = j;
                     nlines.maxYeildIdx = j;
                 }
             }
             mapLines.put(name, nlines);
         }
-        for (String name:nuclideList) {
-            HalfData half = this.baseMapper.getOneHalf(name);
-            NuclideLines nuclideLines = mapLines.get(half.getName());
-            nuclideLines.setHalflife(half.getHalf() == null ? 0 : half.getHalf() * 86400);// 将天转换成秒
-            mapLines.put(half.getName(), nuclideLines);
-        }
         return mapLines;
     }