xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gamma分析判断时缺少部分校验内容修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-11-10 10:22:02 +08:00
parent bf96e9f446
commit 03e093268c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -1483,7 +1483,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
}
List<Double> old_ener = phd.getUsedEnerPara().getP();
List<Double> new_ener = CollectionUtils.isNotEmpty(phd.getMapEnerPara())?phd.getMapEnerPara().get(phd.getNewEner()).getP():new LinkedList<>();
List<Double> new_ener = Objects.nonNull(phd.getMapEnerPara().get(phd.getNewEner()))?(CollectionUtils.isNotEmpty(phd.getMapEnerPara().get(phd.getNewEner()).getP())?phd.getMapEnerPara().get(phd.getNewEner()).getP():new LinkedList<>()):new LinkedList<>();
if(old_ener.size() != new_ener.size()) {
return 1;
}
@ -1494,7 +1494,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
}
List<Double> old_reso = phd.getUsedResoPara().getP();
List<Double> new_reso = CollectionUtils.isNotEmpty(phd.getMapResoPara())?phd.getMapResoPara().get(phd.getNewReso()).getP():new LinkedList<>();
List<Double> new_reso = Objects.nonNull(phd.getMapResoPara().get(phd.getNewReso()))?(CollectionUtils.isNotEmpty(phd.getMapResoPara().get(phd.getNewReso()).getP())?phd.getMapResoPara().get(phd.getNewReso()).getP():new LinkedList<>()):new LinkedList<>();
if(old_reso.size() != new_reso.size()) {
return 1;
}
@ -1505,7 +1505,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
}
List<Double> old_effi = phd.getUsedEffiPara().getP();
List<Double> new_effi = CollectionUtils.isNotEmpty(phd.getMapEffiPara())?phd.getMapEffiPara().get(phd.getNewEffi()).getP():new LinkedList<>();
List<Double> new_effi = Objects.nonNull(phd.getMapEffiPara().get(phd.getNewEffi()))?(CollectionUtils.isNotEmpty(phd.getMapEffiPara().get(phd.getNewEffi()).getP())?phd.getMapEffiPara().get(phd.getNewEffi()).getP():new LinkedList<>()):new LinkedList<>();
if(old_effi.size() != new_effi.size()) {
return -1;
}