From 3ea54ffec49a830eaa554e4c2646446beaa20a3c Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Tue, 3 Dec 2024 09:11:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=96=B0beta=20=E7=9A=84?=
 =?UTF-8?q?beta=E5=88=86=E6=9E=90=E5=8F=82=E6=95=B0=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/SelfStationUtil.java | 4 ++--
 .../jeecg/modules/service/impl/SelfStationServiceImpl.java   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
index 3b345886..783f2f6d 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
@@ -1288,7 +1288,7 @@ public class SelfStationUtil extends SelfBaseUtil {
      * @param gStop RoiLimit Gamma Stop
      * @param nuclideLinesMap 所有核素信息
      */
-    public HashMap<String, Object> getBetaAnalyseNuclideParam(SelfStationVueData sampleData, HashMap<String, NuclideLine> nuclideMap,
+    /**public HashMap<String, Object> getBetaAnalyseNuclideParam(SelfStationVueData sampleData, HashMap<String, NuclideLine> nuclideMap,
                                                                List<Double> gStart, List<Double> gStop, Map<String,
             NuclideLines> nuclideLinesMap) {
         HashMap<String, Object> param = Maps.newHashMap();
@@ -1385,7 +1385,7 @@ public class SelfStationUtil extends SelfBaseUtil {
             param.put(mapKey, nuclideParam);
         }
         return param;
-    }
+    }*/
 
     /**
      * 得到 baseline计数
diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
index c96d5e35..134c4669 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
@@ -2704,7 +2704,10 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
         HashMap<String, NuclideLine> nuclideMap = selfParameter.getNuclideMap();
 
         // 获取峰面积、半衰期、发射几率
-        HashMap<String, Object> nuclideParam = selfStationUtil.getBetaAnalyseNuclideParam(sampleData, nuclideMap, struct.POI_G_y1, struct.POI_G_y2, nuclideLinesMap);
+        HashMap<String, Object> nuclideParam = selfStationUtil.getBetaAnalyseNuclideParam(nuclideMap, struct.POI_G_y1,
+                struct.POI_G_y2, sampleData.getROIOnePHDFile(), sampleData.getROITwoPHDFile(),
+                sampleData.getROIThreePHDFile(), sampleData.getROIFourPHDFile());
+
         Console.log(JSON.toJSONString(nuclideParam));
         // 调用beta分析算法
         String resultStr = EnergySpectrumHandler.selfBgAnalyse(phdPath, JSON.toJSONString(nuclideParam));