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<GardsNuclLinesLibM int keyFlag = lib.getKeyFlag(); if (keyFlag > 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<String> qcstate = gammaFileUtil.Qcstate(phd); map.put("QCFlag", qcstate); map.put("bAnalyed", phd.isBAnalyed()); + map.put("peak", phd.getVPeak()); result.setSuccess(true); result.setResult(map); }