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

web统计beta部分查询核素名称时，特殊核素修改

Browse Source
This commit is contained in:
qiaoqinzheng 2024-03-04 15:43:39 +08:00
parent 28baa48257
commit ae62849591
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
View File

@ -25,6 +25,7 @@ import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSampleDescription; import org.jeecg.modules.base.entity.original.GardsSampleDescription;
import org.jeecg.modules.base.entity.postgre.SysDefaultNuclide; import org.jeecg.modules.base.entity.postgre.SysDefaultNuclide;
import org.jeecg.modules.base.enums.SystemType; import org.jeecg.modules.base.enums.SystemType;
import org.jeecg.modules.base.enums.XeNuclideName;
import org.jeecg.modules.entity.GardsSampleDataWeb; import org.jeecg.modules.entity.GardsSampleDataWeb;
import org.jeecg.modules.entity.data.*; import org.jeecg.modules.entity.data.*;
import org.jeecg.modules.entity.dto.SampleDataDto; import org.jeecg.modules.entity.dto.SampleDataDto;
@ -992,6 +993,13 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
nuclideSql = betaNuclideSql(dbName, nuclideNameList); nuclideSql = betaNuclideSql(dbName, nuclideNameList);
for (int i=0; i< nuclideNameList.size(); i++) { for (int i=0; i< nuclideNameList.size(); i++) {
String nuclideName = nuclideNameList.get(i); String nuclideName = nuclideNameList.get(i);
String upperNuclideName = nuclideName.toUpperCase();
if (upperNuclideName.equals(XeNuclideName.XE_131m.getType().toUpperCase())) {
nuclideName = XeNuclideName.XE_131m.getType();
} else if (upperNuclideName.equals(XeNuclideName.XE_133m.getType().toUpperCase())) {
nuclideName = XeNuclideName.XE_133m.getType();
}
nuclideNameList.set(i, nuclideName);
if (StringUtils.isNotBlank(nuclideName)) { if (StringUtils.isNotBlank(nuclideName)) {
columnNameList.add(StringUtils.upperCase(nuclideName)); columnNameList.add(StringUtils.upperCase(nuclideName));
columnNameList.add(StringUtils.upperCase(nuclideName+"MDC")); columnNameList.add(StringUtils.upperCase(nuclideName+"MDC"));