From 4f29d3235c22f4c02a687b8df54e8df916cfef50 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Mon, 13 Nov 2023 18:09:31 +0800
Subject: [PATCH] =?UTF-8?q?gamma=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
=?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/jeecg/common/util/GammaFileUtil.java | 24 +++++++++++--------
.../service/impl/GammaServiceImpl.java | 2 +-
2 files changed, 15 insertions(+), 11 deletions(-)
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 5bf3ae61..1d9d2d33 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
@@ -3508,8 +3508,8 @@ public class GammaFileUtil extends AbstractLogOrReport {
dvctACTIV_KEY.add(itor_v.getValue().getActivity());
dvctACTIV_KEY_ERR.add(itor_v.getValue().getAct_err());
dvctMDA.add(String.format("%e", itor_v.getValue().getMda()));
- dvctMDC.add(itor_v.getValue().getMdc().isInfinite()?"inf":(itor_v.getValue().getMdc()>0?String.format("%e", itor_v.getValue().getMdc()):"0.0"));
- dvctCONCENTRATION.add(itor_v.getValue().getConcentration().isInfinite()?"inf":String.format("%e", itor_v.getValue().getConcentration()));
+ dvctMDC.add(Objects.isNull(itor_v.getValue().getMdc())?null:(itor_v.getValue().getMdc().isInfinite()?"inf":(itor_v.getValue().getMdc()>0?String.format("%e", itor_v.getValue().getMdc()):"0.0")));
+ dvctCONCENTRATION.add(Objects.isNull(itor_v.getValue().getConcentration())?null:itor_v.getValue().getConcentration().isInfinite()?"inf":String.format("%e", itor_v.getValue().getConcentration()));
dvctCSC_RATIO.add(1.0);
dvctCSC_RATIO_ERR.add(0.0);
if(itor_v.getValue().getCalculateIdx() >= 0 && itor_v.getValue().getCalculateIdx()<itor_v.getValue().getVEnergy().size()) {
@@ -3633,17 +3633,21 @@ public class GammaFileUtil extends AbstractLogOrReport {
String str_mda = (nuc.getMda() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMda())));
tableNuclideActivity.setMda(str_mda);
- if (Double.isFinite(nuc.getConcentration())) {
- DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
- nuc.setConcentration(Double.valueOf(decimalFormat.format(nuc.getConcentration())));
+ if (Objects.nonNull(nuc.getConcentration())) {
+ if (Double.isFinite(nuc.getConcentration())) {
+ DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
+ nuc.setConcentration(Double.valueOf(decimalFormat.format(nuc.getConcentration())));
+ }
}
- String str_con = (Double.isFinite(nuc.getConcentration())? nuc.getConcentration() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getConcentration())) : "inf");
+ String str_con = (Objects.nonNull(nuc.getConcentration())?(Double.isFinite(nuc.getConcentration())? nuc.getConcentration() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getConcentration())) : "inf"):"null");
tableNuclideActivity.setConc(str_con);
- if (Double.isFinite(nuc.getMdc())) {
- DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
- nuc.setMdc(Double.valueOf(decimalFormat.format(nuc.getMdc())));
+ if (Objects.nonNull(nuc.getMdc())) {
+ if (Double.isFinite(nuc.getMdc())) {
+ DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
+ nuc.setMdc(Double.valueOf(decimalFormat.format(nuc.getMdc())));
+ }
}
- String str_mdc = (Double.isFinite(nuc.getMdc())? nuc.getMdc() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMdc())) : "inf");
+ String str_mdc = (Objects.nonNull(nuc.getMdc())?(Double.isFinite(nuc.getMdc())?nuc.getMdc() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMdc())) : "inf"):"null");
tableNuclideActivity.setMdc(str_mdc);
nuclideActivityList.add(tableNuclideActivity);
}
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 ef303f75..5fd36fd0 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
@@ -4169,7 +4169,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
tableResult.setActErr(act_err);
tableResult.setFactor1(coverage_factor);
tableResult.setConfidence1(level_confidence);
- tableResult.setConc(NumUtil.keep4ScienceStr(nuc.getConcentration() / 1000));
+ tableResult.setConc(Objects.isNull(nuc.getConcentration())?null:NumUtil.keep4ScienceStr(nuc.getConcentration() / 1000));
tableResult.setConcErr(act_err);
tableResult.setFactor2(coverage_factor);
tableResult.setConfidence2(level_confidence);