From aaa2a149bef8c1888c6acfb2ce53fa62bc17ed0c Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Thu, 26 Oct 2023 10:05:23 +0800
Subject: [PATCH] =?UTF-8?q?gamma=E5=88=86=E6=9E=90=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9mapNucAct?=
 =?UTF-8?q?Map=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jeecg/common/util/GammaFileUtil.java | 10 ++++++++++
 .../jeecg/modules/service/impl/GammaServiceImpl.java   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

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 ef6357c1..f038acc5 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
@@ -1540,6 +1540,16 @@ public class GammaFileUtil extends AbstractLogOrReport {
                     ParameterInfo value = JSON.parseObject(JSON.toJSONString(entry.getValue()), ParameterInfo.class);
                     phd.setUsedTotEPara(value);
                 }
+                if (entry.getKey().equalsIgnoreCase("mapNucActMda")) {
+                    HashMap<String, Object> jsonMap = JSON.parseObject(JSON.toJSONString(entry.getValue()), HashMap.class);
+                    Map<String, NuclideActMda> value = new HashMap<>();
+                    for (Map.Entry<String, Object> objectEntry:jsonMap.entrySet()) {
+                        String key = objectEntry.getKey();
+                        NuclideActMda entryValue = JSON.parseObject(JSON.toJSONString(objectEntry.getValue()), NuclideActMda.class);
+                        value.put(key, entryValue);
+                    }
+                    phd.setMapNucActMda(value);
+                }
             }
             BeanUtils.copyProperties(phd.getSetting(), phd.getUsedSetting());
 
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 4d93ad02..1e6caccf 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
@@ -996,7 +996,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
             Map<String, NuclideLines> nuclideLinesMap = GetNuclideLines(nuclides);
             gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap);
             //重新分析各峰值对应的核素信息
-            gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
+//            gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap);
             Map<String, Object> map = new HashMap<>();
             gammaFileUtil.UpdateChart(phd, map, colorMap);
             // 更新 ‘QC Flags’ 状态