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

gamma功能分析后增加返回内容vPeak数据

Browse Source 
自动处理程序初始化halfLife数据没有对应数据问题修改
This commit is contained in:
qiaoqinzheng 2023-10-26 14:29:40 +08:00
parent f6f540cef6
commit dd071d063d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesLibServiceImpl.java
View File

@ -83,14 +83,15 @@ public class GardsNuclLinesLibServiceImpl extends ServiceImpl<GardsNuclLinesLibM
int keyFlag = lib.getKeyFlag(); int keyFlag = lib.getKeyFlag();
if (keyFlag > 0){ if (keyFlag > 0){
nuclideLines.setKey_flag(i); int index = nuclideNames.indexOf(lib.getName());
nuclideLines.setMaxYeildIdx(i); nuclideLines.setKey_flag(index);
nuclideLines.setMaxYeildIdx(index);
} }
String name = lib.getName(); String name = lib.getName();
Double day = halfLife.get(name); Double day = halfLife.get(name);
if (ObjectUtil.isNotNull(day)) if (ObjectUtil.isNotNull(day))
lib.setHalflife(day * 86400); nuclideLines.setHalflife(day * 86400);
result.put(lib.getName(), nuclideLines); result.put(lib.getName(), nuclideLines);
} }

1
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
View File

@ -1005,6 +1005,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
List<String> qcstate = gammaFileUtil.Qcstate(phd); List<String> qcstate = gammaFileUtil.Qcstate(phd);
map.put("QCFlag", qcstate); map.put("QCFlag", qcstate);
map.put("bAnalyed", phd.isBAnalyed()); map.put("bAnalyed", phd.isBAnalyed());
map.put("peak", phd.getVPeak());
result.setSuccess(true); result.setSuccess(true);
result.setResult(map); result.setResult(map);
} }