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

自动处理Beta部分报告内容ROI从1开始计数，报告内容的模块名称DET LIMITS PER ROI写成了GAS LIMITS PER ROI内容修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-12-25 15:22:45 +08:00
parent 9a26e787c8
commit b7c55cf274
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java
View File

@ -541,7 +541,7 @@ public class Sample_B_Analysis implements BlockConstant {
for(int i=0;i<roi.size();i++){ for(int i=0;i<roi.size();i++){
String beta = b_chan_start.get(i)+to_flag+b_chan_stop.get(i); String beta = b_chan_start.get(i)+to_flag+b_chan_stop.get(i);
String gamma = g_chan_start.get(i)+to_flag+g_chan_stop.get(i); String gamma = g_chan_start.get(i)+to_flag+g_chan_stop.get(i);
reportContent.append(super.rowFormat(rowValue,String.valueOf(i),beta,gamma)); reportContent.append(super.rowFormat(rowValue,String.valueOf(i+1),beta,gamma));
if(i==roi.size()-1){ if(i==roi.size()-1){
reportContent.append(System.lineSeparator()).append(System.lineSeparator()); reportContent.append(System.lineSeparator()).append(System.lineSeparator());
}else{ }else{
@ -593,7 +593,7 @@ public class Sample_B_Analysis implements BlockConstant {
for(int i=0;i<roi.size();i++){ for(int i=0;i<roi.size();i++){
String beta = b_chan_start.get(i)+to_flag+b_chan_stop.get(i); String beta = b_chan_start.get(i)+to_flag+b_chan_stop.get(i);
String gamma = g_chan_start.get(i)+to_flag+g_chan_stop.get(i); String gamma = g_chan_start.get(i)+to_flag+g_chan_stop.get(i);
reportContent.append(super.rowFormat(rowValue,String.valueOf(i),beta,gamma)); reportContent.append(super.rowFormat(rowValue,String.valueOf(i+1),beta,gamma));
if(i==roi.size()-1){ if(i==roi.size()-1){
reportContent.append(System.lineSeparator()).append(System.lineSeparator()); reportContent.append(System.lineSeparator()).append(System.lineSeparator());
}else{ }else{
@ -629,7 +629,7 @@ public class Sample_B_Analysis implements BlockConstant {
* 处理#GAS LIMITS PER ROI 模块 * 处理#GAS LIMITS PER ROI 模块
*/ */
private void handleGasLimits() throws IOException { private void handleGasLimits() throws IOException {
String gasLimitsBlock = "#DET LIMITS PER ROI (SAMPLEID:%s)"; String gasLimitsBlock = "#GAS LIMITS PER ROI (SAMPLEID:%s)";
String rowTitle = " Roi %-46s Beta %-46s Gamma"; String rowTitle = " Roi %-46s Beta %-46s Gamma";
String rowValue = " %-50s %-51s %s"; String rowValue = " %-50s %-51s %s";
List<Integer> roi = analyseResult.G_ROI; List<Integer> roi = analyseResult.G_ROI;
@ -645,7 +645,7 @@ public class Sample_B_Analysis implements BlockConstant {
for(int i=0;i<roi.size();i++){ for(int i=0;i<roi.size();i++){
String beta = b_chan_start.get(i)+to_flag+b_chan_stop.get(i); String beta = b_chan_start.get(i)+to_flag+b_chan_stop.get(i);
String gamma = g_chan_start.get(i)+to_flag+g_chan_stop.get(i); String gamma = g_chan_start.get(i)+to_flag+g_chan_stop.get(i);
reportContent.append(super.rowFormat(rowValue,String.valueOf(i),beta,gamma)); reportContent.append(super.rowFormat(rowValue,String.valueOf(i+1),beta,gamma));
if(i==roi.size()-1){ if(i==roi.size()-1){
reportContent.append(System.lineSeparator()).append(System.lineSeparator()); reportContent.append(System.lineSeparator()).append(System.lineSeparator());
}else{ }else{