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

beta自动处理生成报告文件部分模块小数约分内容修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-11-24 10:17:43 +08:00
parent dbff5a719b
commit fb2517ccbc
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.StringConstant;
import org.jeecg.common.properties.SpectrumPathProperties;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.NumberFormatUtil;
import org.jeecg.modules.base.dto.Info;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.rnauto.GardsAnalyses;
@ -459,7 +460,7 @@ public class Sample_B_Analysis implements BlockConstant {
reportContent.append(System.lineSeparator());
reportContent.append(super.rowFormat(collectionStop,StringConstant.SPACE,sampleStruct.collection_stop_date+StringConstant.SPACE+sampleStruct.collection_stop_time));
reportContent.append(System.lineSeparator());
reportContent.append(super.rowFormat(collectionTime,StringConstant.SPACE,String.valueOf((sampleData.getCollectStart().getTime()-sampleData.getCollectStop().getTime())/1000)));
reportContent.append(super.rowFormat(collectionTime,StringConstant.SPACE,String.valueOf((sampleData.getCollectStop().getTime()-sampleData.getCollectStart().getTime())/1000)));
reportContent.append(System.lineSeparator());
reportContent.append(super.rowFormat(airVolume,StringConstant.SPACE,String.valueOf(sampleStruct.air_volume)));
reportContent.append(System.lineSeparator());
@ -662,9 +663,9 @@ public class Sample_B_Analysis implements BlockConstant {
String rowValue = " %-50s %-51s %-21s %s";
List<String> roi = analyseResult.ROI.stream().map(Object::toString).collect(Collectors.toList());
List<String> s_roi_cts = analyseResult.s_roi_cts.stream().map(v->super.formatToStr5(v)).collect(Collectors.toList());
List<String> g_roi_cts = analyseResult.g_roi_cts.stream().map(v->super.formatToStr5(v)).collect(Collectors.toList());
List<String> d_roi_cts = analyseResult.d_roi_cts.stream().map(v->super.formatToStr5(v)).collect(Collectors.toList());
List<String> s_roi_cts = analyseResult.s_roi_cts.stream().map(v->NumberFormatUtil.numberFormat(String.valueOf(v))).collect(Collectors.toList());
List<String> g_roi_cts = analyseResult.g_roi_cts.stream().map(v->NumberFormatUtil.numberFormat(String.valueOf(v))).collect(Collectors.toList());
List<String> d_roi_cts = analyseResult.d_roi_cts.stream().map(v->NumberFormatUtil.numberFormat(String.valueOf(v))).collect(Collectors.toList());
reportContent.append(grossCountsBlock);
reportContent.append(System.lineSeparator());
@ -693,14 +694,14 @@ public class Sample_B_Analysis implements BlockConstant {
List<Double> roi_net_count_err = analyseResult.ROI_net_coutns_err;
//此参数需第一位补0
analyseResult.LC_CTS.add(0,0D);
List<String> lc = analyseResult.LC_CTS.stream().map(v->super.formatToStr5(v)).collect(Collectors.toList());
List<String> lc = analyseResult.LC_CTS.stream().map(v->NumberFormatUtil.numberFormat(String.valueOf(v))).collect(Collectors.toList());
reportContent.append(netCountsBlock);
reportContent.append(System.lineSeparator());
reportContent.append(super.rowFormat(rowTitle,StringConstant.SPACE,StringConstant.SPACE));
reportContent.append(System.lineSeparator());
for (int i=0;i<roi.size();i++){
String netCount = super.formatToStr5(roi_net_count.get(i))+arithmetic_flag+super.formatToStr5(roi_net_count_err.get(i));
String netCount = NumberFormatUtil.numberFormat(String.valueOf(roi_net_count.get(i)))+arithmetic_flag+NumberFormatUtil.numberFormat(String.valueOf(roi_net_count_err.get(i)));
reportContent.append(super.rowFormat(rowValue,String.valueOf(roi.get(i)),netCount,lc.get(i)));
if(i==roi.size()-1){
reportContent.append(System.lineSeparator()).append(System.lineSeparator());
@ -723,15 +724,15 @@ public class Sample_B_Analysis implements BlockConstant {
List<Double> conErr = analyseResult.ROI_con_uncer_err;
analyseResult.LC.add(0,0.0D);
analyseResult.MDC.add(0,0.0D);
List<String> lc = analyseResult.LC.stream().map(v->super.formatToStr5(v)).collect(Collectors.toList());
List<String> mdc = analyseResult.MDC.stream().map(v->super.formatToStr5(v)).collect(Collectors.toList());
List<String> lc = analyseResult.LC.stream().map(v->NumberFormatUtil.numberFormat(String.valueOf(v))).collect(Collectors.toList());
List<String> mdc = analyseResult.MDC.stream().map(v->NumberFormatUtil.numberFormat(String.valueOf(v))).collect(Collectors.toList());
reportContent.append(grossCountsBlock);
reportContent.append(System.lineSeparator());
reportContent.append(super.rowFormat(rowTitle,StringConstant.SPACE,StringConstant.SPACE,StringConstant.SPACE));
reportContent.append(System.lineSeparator());
for (int i=0;i<roi.size();i++){
String conc = super.formatToStr5(con.get(i))+arithmetic_flag+super.formatToStr5(conErr.get(i));
String conc = NumberFormatUtil.numberFormat(String.valueOf(con.get(i)))+arithmetic_flag+NumberFormatUtil.numberFormat(String.valueOf(conErr.get(i)));
reportContent.append(super.rowFormat(rowValue,roi.get(i),conc,lc.get(i),mdc.get(i)));
if(i==roi.size()-1){
reportContent.append(System.lineSeparator()).append(System.lineSeparator());
@ -751,20 +752,20 @@ public class Sample_B_Analysis implements BlockConstant {
String[] nuclideName = {XE_135,XE_131m,XE_133m,XE_133};
String xe_135_conc = super.formatToStr5(analyseResult.Xe135_con) + arithmetic_flag + super.formatToStr5(analyseResult.Xe135_uncer);
String xe_131m_conc = super.formatToStr5(analyseResult.Xe131m_con) + arithmetic_flag + super.formatToStr5(analyseResult.Xe131m_uncer);
String xe_133m_conc = super.formatToStr5(analyseResult.Xe133m_con) + arithmetic_flag + super.formatToStr5(analyseResult.Xe133m_uncer);
String xe_133_conc = super.formatToStr5(analyseResult.Xe133_con) + arithmetic_flag + super.formatToStr5(analyseResult.Xe133_uncer);
String xe_135_conc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe135_con)) + arithmetic_flag + NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe135_uncer));
String xe_131m_conc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe131m_con)) + arithmetic_flag + NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe131m_uncer));
String xe_133m_conc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133m_con)) + arithmetic_flag + NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133m_uncer));
String xe_133_conc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133_con)) + arithmetic_flag + NumberFormatUtil.numberFormat(String.valueOf(analyseResult.Xe133_uncer));
String xe_135_uncertainty = super.formatToStr5(analyseResult.LC_Xe135);
String xe_131m_uncertainty = super.formatToStr5(analyseResult.LC_Xe131m);
String xe_133m_uncertainty = super.formatToStr5(analyseResult.LC_Xe133m);
String xe_133_uncertainty = super.formatToStr5(analyseResult.LC_Xe133);
String xe_135_uncertainty = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe135));
String xe_131m_uncertainty = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe131m));
String xe_133m_uncertainty = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe133m));
String xe_133_uncertainty = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.LC_Xe133));
String xe_135_mdc = super.formatToStr5(analyseResult.MDC_Xe135);
String xe_131m_mdc = super.formatToStr5(analyseResult.MDC_Xe131m);
String xe_133m_mdc = super.formatToStr5(analyseResult.MDC_Xe133m);
String xe_133_mdc = super.formatToStr5(analyseResult.MDC_Xe133);
String xe_135_mdc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe135));
String xe_131m_mdc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe131m));
String xe_133m_mdc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe133m));
String xe_133_mdc = NumberFormatUtil.numberFormat(String.valueOf(analyseResult.MDC_Xe133));
String xe_135_nid_flag = analyseResult.Xe135_con>analyseResult.MDC_Xe135?"1":"0";
String xe_131m_nid_flag = analyseResult.Xe131m_con>analyseResult.MDC_Xe131m?"1":"0";