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

GammaFileUtil查询数据库方法修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-09-18 19:26:48 +08:00
parent a794d8f357
commit 0d33209b60
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -531,7 +531,7 @@ public class GammaFileUtil {
phd.getBaseCtrls().setRg_low(analysis.getSearchStartChannel());
phd.getBaseCtrls().setRg_high(analysis.getSearchEndChannel());
phd.getUsedSetting().setEnergyTolerance(analysis.getSearchThreshold());
}else {
} else {
result.error500("There are 0 records when sample_id is "+sampleId+"!");
return false;
}
@ -711,7 +711,7 @@ public class GammaFileUtil {
if (CollectionUtils.isNotEmpty(nuclIdeds)){
for (GardsNuclIdedSpectrum nuclIdedSpectrum:nuclIdeds) {
String str_key = nuclIdedSpectrum.getNuclideName();
if(Objects.isNull(phd.getMapNucActMda().get(str_key))) {
if(Objects.nonNull(phd.getMapNucActMda().get(str_key))) {
phd.getMapNucActMda().get(str_key).setHalflife(Double.valueOf(nuclIdedSpectrum.getHalflife()));
List<Double> vEner = phd.getMapNucActMda().get(str_key).getVEnergy();
Double key_ener = Double.valueOf(nuclIdedSpectrum.getKeyEnergy());
@ -2634,7 +2634,7 @@ public class GammaFileUtil {
strBuffer.append(StringPool.SPACE+middleData.peaks_idPeak.get(i)+" "+String.format("%.3f", Double.valueOf(middleData.peaks_Energy.get(i)))+" "+String.format("%.3f", Double.valueOf(middleData.peaks_peakCentroid.get(i)))+
" "+String.format("%.3f", Double.valueOf(middleData.peaks_Fwhm.get(i)))+" "+String.format("%.3f", Double.valueOf(middleData.peaks_Area.get(i)))+
" "+String.format("%.3f", (Double.valueOf(middleData.peaks_areaErr.get(i))/Double.valueOf(middleData.peaks_Area.get(i))*100))+
" "+String.format("%.3f", Double.valueOf(middleData.peaks_Significance.get(i)))+" "+String.format("%.3f", Double.valueOf(middleData.peaks_Sensitivity.get(i)))+" "+middleData.peaks_Nuclide_name+"\n");
" "+String.format("%.3f", Double.valueOf(middleData.peaks_Significance.get(i)))+" "+String.format("%.3f", Double.valueOf(middleData.peaks_Sensitivity.get(i)))+" "+middleData.peaks_Nuclide_name.get(i)+"\n");
}
strBuffer.append(" \n");
strBuffer.append("#PROCESSING PARAMETERS\n");
@ -3177,7 +3177,6 @@ public class GammaFileUtil {
}
dvctComments.add(t_comment);
dvctNuclide_name.add(StringUtils.join(fileAnlyse.getVPeak().get(m).nuclides, ";"));
}
middleData.peaks_idPeak =DoubleLimit_I(dvctIDPEAK);
middleData.peaks_peakCentroid =DoubleLimit_G(dvctCENTROIDCHANNEL);