From dd071d063dafb8c4520b887f762e6f84800ec243 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 26 Oct 2023 14:29:40 +0800 Subject: [PATCH] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BD=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=90=8E=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9?= =?UTF-8?q?vPeak=E6=95=B0=E6=8D=AE=20=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=88=9D=E5=A7=8B=E5=8C=96halfLife=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B2=A1=E6=9C=89=E5=AF=B9=E5=BA=94=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/GardsNuclLinesLibServiceImpl.java | 7 ++++--- .../org/jeecg/modules/service/impl/GammaServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesLibServiceImpl.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesLibServiceImpl.java index 71f3a5aa..c8d33bbf 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesLibServiceImpl.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesLibServiceImpl.java @@ -83,14 +83,15 @@ public class GardsNuclLinesLibServiceImpl extends ServiceImpl 0){ - nuclideLines.setKey_flag(i); - nuclideLines.setMaxYeildIdx(i); + int index = nuclideNames.indexOf(lib.getName()); + nuclideLines.setKey_flag(index); + nuclideLines.setMaxYeildIdx(index); } String name = lib.getName(); Double day = halfLife.get(name); if (ObjectUtil.isNotNull(day)) - lib.setHalflife(day * 86400); + nuclideLines.setHalflife(day * 86400); result.put(lib.getName(), nuclideLines); } 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 0a65408a..69d0faa1 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 @@ -1005,6 +1005,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi List qcstate = gammaFileUtil.Qcstate(phd); map.put("QCFlag", qcstate); map.put("bAnalyed", phd.isBAnalyed()); + map.put("peak", phd.getVPeak()); result.setSuccess(true); result.setResult(map); }