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

自动处理Gamma部分QC相关数据没有存储数据库问题修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-12-25 13:42:54 +08:00
parent 78384d5f12
commit 9a26e787c8
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
View File

@ -883,20 +883,22 @@ public class Sample_G_Analysis {
List<GardsMDC> mdcList = new LinkedList<>();
if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
for (CalMDCInfo mdcInfo :mdcInfoMap.values()) {
GardsMDC mdc = new GardsMDC();
mdc.setIdAnalysis(IdAnalysis);
mdc.setSampleId(sampleId);
mdc.setNuclideName(mdcInfo.getNuclideName());
mdc.setEnergy(mdcInfo.getEnergy());
mdc.setYield(mdcInfo.getYield());
mdc.setEfficiency(mdcInfo.getEfficiency());
if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) {
mdc.setMdc(mdcInfo.getMdc());
} else {
mdc.setMdc(null);
if (Objects.nonNull(mdcInfo.getEnergy()) && Objects.nonNull(mdcInfo.getYield()) && Objects.nonNull(mdcInfo.getEfficiency())) {
GardsMDC mdc = new GardsMDC();
mdc.setIdAnalysis(IdAnalysis);
mdc.setSampleId(sampleId);
mdc.setNuclideName(mdcInfo.getNuclideName());
mdc.setEnergy(mdcInfo.getEnergy());
mdc.setYield(mdcInfo.getYield());
mdc.setEfficiency(mdcInfo.getEfficiency());
if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) {
mdc.setMdc(mdcInfo.getMdc());
} else {
mdc.setMdc(null);
}
mdc.setMdcErr(null);
mdcList.add(mdc);
}
mdc.setMdcErr(null);
mdcList.add(mdc);
}
}
if (CollectionUtils.isNotEmpty(mdcList)) {

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

@ -3116,6 +3116,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
String anylseEnd;
anylseBegin = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss");
bRet = AnalyseSpectrum(fileAnlyse,nucline);
RunQC(fileAnlyse);
fileAnlyse.setEfficiencyParam(fileAnlyse.getUsedEffiPara().getP());
fileAnlyse.setEfficiencyEnergy(fileAnlyse.getUsedEffiKD().getG_energy());
fileAnlyse.setEfficiencyCurRow(0);
@ -4593,13 +4594,15 @@ public class GammaFileUtil extends AbstractLogOrReport {
CalMDCInfo mdcInfo = mdcInfoMap.get(nuclideName);
if (Objects.nonNull(mdcInfo)) {
calCulEfficiencyValue(phd, mdcInfo, nuclideLines);
//计算MDC数据
List<Double> vMdcInfo = new LinkedList<>();
vMdcInfo.add(mdcInfo.getEnergy());
vMdcInfo.add(mdcInfo.getYield());
vMdcInfo.add(mdcInfo.getHalflife());
Double mdc = CalculateMDC(phd, vMdcInfo, 1.0);
mdcInfo.setMdc(mdc);
if (Objects.nonNull(mdcInfo.getEnergy()) && Objects.nonNull(mdcInfo.getYield()) && Objects.nonNull(mdcInfo.getHalflife())) {
//计算MDC数据
List<Double> vMdcInfo = new LinkedList<>();
vMdcInfo.add(mdcInfo.getEnergy());
vMdcInfo.add(mdcInfo.getYield());
vMdcInfo.add(mdcInfo.getHalflife());
Double mdc = CalculateMDC(phd, vMdcInfo, 1.0);
mdcInfo.setMdc(mdc);
}
}
}
@ -4607,6 +4610,9 @@ public class GammaFileUtil extends AbstractLogOrReport {
public void calCulEfficiencyValue(PHDFile phd, CalMDCInfo mdcInfo, NuclideLines nuclideLines) {
List<Double> efficiencies = new LinkedList<>();
if (CollectionUtils.isEmpty(phd.getEfficiencyParam()) || CollectionUtils.isEmpty(phd.getEfficiencyEnergy())) {
return;
}
int funId = phd.getEfficiencyParam().get(0).intValue();
int p_size = phd.getEfficiencyParam().size() - 1;
int e_size = phd.getEfficiencyEnergy().size();