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

beta功能RRR报告分析状态分析结果区分返回内容

Browse Source 
gamma查看MDC报错问题修改
This commit is contained in:
qiaoqinzheng 2023-11-09 20:10:56 +08:00
parent 8f27aef511
commit bf96e9f446
3 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3635,17 +3635,17 @@ public class GammaFileUtil extends AbstractLogOrReport {
String str_mda = (nuc.getMda() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMda()))); String str_mda = (nuc.getMda() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMda())));
tableNuclideActivity.setMda(str_mda); tableNuclideActivity.setMda(str_mda);
if (nuc.getConcentration() > 1000000) { if (Double.isFinite(nuc.getConcentration())) {
DecimalFormat decimalFormat = new DecimalFormat("0.###E0"); DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
nuc.setConcentration(Double.valueOf(decimalFormat.format(nuc.getConcentration()))); nuc.setConcentration(Double.valueOf(decimalFormat.format(nuc.getConcentration())));
} }
String str_con = (nuc.getConcentration() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getConcentration()))); String str_con = (Double.isFinite(nuc.getConcentration())? nuc.getConcentration() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getConcentration())) : "inf");
tableNuclideActivity.setConc(str_con); tableNuclideActivity.setConc(str_con);
if (nuc.getMdc() > 1000000) { if (Double.isFinite(nuc.getMdc())) {
DecimalFormat decimalFormat = new DecimalFormat("0.###E0"); DecimalFormat decimalFormat = new DecimalFormat("0.###E0");
nuc.setConcentration(Double.valueOf(decimalFormat.format(nuc.getMdc()))); nuc.setMdc(Double.valueOf(decimalFormat.format(nuc.getMdc())));
} }
String str_mdc = (nuc.getMdc() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMdc()))); String str_mdc = (Double.isFinite(nuc.getMdc())? nuc.getMdc() <= 0 ? "null" : NumberFormatUtil.numberFormat(String.valueOf(nuc.getMdc())) : "inf");
tableNuclideActivity.setMdc(str_mdc); tableNuclideActivity.setMdc(str_mdc);
nuclideActivityList.add(tableNuclideActivity); nuclideActivityList.add(tableNuclideActivity);
} }

1
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
View File

@ -580,7 +580,6 @@
WHERE WHERE
ROI_CHANNELS.SAMPLE_ID = SAMPLE_DATA.SAMPLE_ID ROI_CHANNELS.SAMPLE_ID = SAMPLE_DATA.SAMPLE_ID
AND ROI_CHANNELS.IDANALYSIS = #{idAnalysis} AND ROI_CHANNELS.IDANALYSIS = #{idAnalysis}
AND ROI_CHANNELS.SAMPLE_ID = #{sampleId}
ORDER BY ROI_CHANNELS.ROI ASC ORDER BY ROI_CHANNELS.ROI ASC
</select> </select>

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

@ -823,6 +823,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
if (betaDataFile.isSaveAnalysisResult()) { if (betaDataFile.isSaveAnalysisResult()) {
//对分析后的内容进行数据获取 //对分析后的内容进行数据获取
List<GardsROIChannelsSpectrum> channelsSpectrums = betaDataFile.getRoiChannelsSpectrumList(); List<GardsROIChannelsSpectrum> channelsSpectrums = betaDataFile.getRoiChannelsSpectrumList();
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsSample = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("S")).collect(Collectors.toList());
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsGas = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("G")).collect(Collectors.toList());
List<GardsROIChannelsSpectrum> roiChannelsSpectrumsDet = channelsSpectrums.stream().filter(item -> item.getDataType().equalsIgnoreCase("D")).collect(Collectors.toList());
List<GardsROIResultsSpectrum> resultsSpectrums = betaDataFile.getRoiResultsSpectrumList(); List<GardsROIResultsSpectrum> resultsSpectrums = betaDataFile.getRoiResultsSpectrumList();
List<GardsXeResultsSpectrum> xeResultsSpectrums = betaDataFile.getXeResultsSpectrumList(); List<GardsXeResultsSpectrum> xeResultsSpectrums = betaDataFile.getXeResultsSpectrumList();
for (int i=0; i<xeResultsSpectrums.size(); i++) { for (int i=0; i<xeResultsSpectrums.size(); i++) {
@ -1001,8 +1004,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append("\n"); strBuffer.append("\n");
strBuffer.append("#SAMPLE: LIMITS PER ROI").append("\n"); strBuffer.append("#SAMPLE: LIMITS PER ROI").append("\n");
strBuffer.append(" Roi Beta Gamma ").append("\n"); strBuffer.append(" Roi Beta Gamma ").append("\n");
if (CollectionUtils.isNotEmpty(channelsSpectrums)) { if (CollectionUtils.isNotEmpty(roiChannelsSpectrumsSample)) {
for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) { for (GardsROIChannelsSpectrum channelsSpectrum:roiChannelsSpectrumsSample) {
strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n"); strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n");
} }
} }
@ -1060,8 +1063,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append("\n"); strBuffer.append("\n");
strBuffer.append("#DET: LIMITS PER ROI").append("\n"); strBuffer.append("#DET: LIMITS PER ROI").append("\n");
strBuffer.append(" Roi Beta Gamma ").append("\n"); strBuffer.append(" Roi Beta Gamma ").append("\n");
if (CollectionUtils.isNotEmpty(channelsSpectrums)) { if (CollectionUtils.isNotEmpty(roiChannelsSpectrumsDet)) {
for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) { for (GardsROIChannelsSpectrum channelsSpectrum:roiChannelsSpectrumsDet) {
strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n"); strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n");
} }
} }
@ -1119,8 +1122,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append("\n"); strBuffer.append("\n");
strBuffer.append("#GAS: LIMITS PER ROI").append("\n"); strBuffer.append("#GAS: LIMITS PER ROI").append("\n");
strBuffer.append(" Roi Beta Gamma ").append("\n"); strBuffer.append(" Roi Beta Gamma ").append("\n");
if (CollectionUtils.isNotEmpty(channelsSpectrums)) { if (CollectionUtils.isNotEmpty(roiChannelsSpectrumsGas)) {
for (GardsROIChannelsSpectrum channelsSpectrum:channelsSpectrums) { for (GardsROIChannelsSpectrum channelsSpectrum:roiChannelsSpectrumsGas) {
strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n"); strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n");
} }
} }
@ -1134,29 +1137,56 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
} }
strBuffer.append("\n"); strBuffer.append("\n");
strBuffer.append("#NET COUNTS AND LC PER ROI").append("\n"); strBuffer.append("#NET COUNTS AND LC PER ROI").append("\n");
if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) { if (betaDataFile.isBProcessed()) {
strBuffer.append(" Roi Net count ").append("\n"); if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) {
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { strBuffer.append(" Roi Net count ").append("\n");
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr())))).append("\n"); for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr()))).append("\n");
}
}
} else {
strBuffer.append(" Roi Net count LC ").append("\n");
if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr()))+ " " + NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts()))).append("\n");
}
} }
} }
} else { } else {
strBuffer.append(" Roi Net count LC ").append("\n"); if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) {
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { strBuffer.append(" Roi Net count ").append("\n");
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr())))+ " " + NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts()))).append("\n"); for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr())))).append("\n");
}
}
} else {
strBuffer.append(" Roi Net count LC ").append("\n");
if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr())))+ " " + NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts()))).append("\n");
}
} }
} }
} }
strBuffer.append("\n"); strBuffer.append("\n");
strBuffer.append("#CONCENTRATION AND LC PER ROI").append("\n"); strBuffer.append("#CONCENTRATION AND LC PER ROI").append("\n");
strBuffer.append(" Roi Conc(mBq/m3) LC(mBq/m3) MDC(mBq/m3): ").append("\n"); strBuffer.append(" Roi Conc(mBq/m3) LC(mBq/m3) MDC(mBq/m3): ").append("\n");
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { if (betaDataFile.isBProcessed()) {
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getMdc()))).append("\n"); for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConc()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getMdc()))).append("\n");
}
}
} else {
if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getMdc()))).append("\n");
}
} }
} }
strBuffer.append("\n"); strBuffer.append("\n");
strBuffer.append("#RESULT SUMMARY").append("\n"); strBuffer.append("#RESULT SUMMARY").append("\n");
strBuffer.append(" Nuclide Name Conc LC MDC NID Flag ").append("\n"); strBuffer.append(" Nuclide Name Conc LC MDC NID Flag ").append("\n");