diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordReagentController.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordReagentController.java index 2e564d9..d82b546 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordReagentController.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordReagentController.java @@ -44,11 +44,15 @@ public class TestRecordReagentController { @PutMapping("/updateReagent") @ApiOperation(value = "修改实验使用试剂耗材、标准物质", notes = "") public R updateReagent(@RequestBody TestRecordReagent testRecordReagent) { - TestRecordReagent ret = testRecordReagentService.updateTestRecordReagent(testRecordReagent); - if (ret != null) { - return R.ok(ret, "添加成功"); - } else { - return R.failed("false", "添加失败"); + try { + TestRecordReagent ret = testRecordReagentService.updateTestRecordReagent(testRecordReagent); + if (ret != null) { + return R.ok(ret, "添加成功"); + } else { + return R.failed("false", "添加失败"); + } + } catch (Exception e) { + return R.failed(e.getMessage()); } } diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleDataExpand.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleDataExpand.java index 6a63bb9..a8367ab 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleDataExpand.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleDataExpand.java @@ -55,4 +55,13 @@ public class TestRecordSampleDataExpand extends BaseEntity { */ private BigDecimal fragmentRetTime; + /** + * 质荷比(m/z), nps案件 + */ + private BigDecimal massToChargeRatio; + + /** + * 定性离子对,生物案件使用 + */ + private String qualitativeIonPair; } diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordReagentServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordReagentServiceImpl.java index 95e1c2d..e08cab9 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordReagentServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordReagentServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import digital.laboratory.platform.common.aop.annotation.DlpResultProc; +import digital.laboratory.platform.common.core.exception.CheckedException; import digital.laboratory.platform.inspection.convert.TestRecordReagentConvert; import digital.laboratory.platform.inspection.dto.TestRecordArgumentDto; import digital.laboratory.platform.inspection.entity.TestRecordReagent; @@ -76,10 +77,10 @@ public class TestRecordReagentServiceImpl extends ServiceImpl getTestRecordReagentPageList(Page page, String testId, String keywords, String category, Integer opCode) { List categoryList = getCategoryList(category); TestRecordVo testRecordVo = testRecordMapper.getTestRecordMapById(testId); return testRecordReagentPage(page, keywords, opCode, categoryList, testRecordVo.getReagentConsumablesList()); @@ -140,7 +142,8 @@ public class TestRecordReagentServiceImpl extends ServiceImpl getTestTemplateReagentPageList(Page page, String templateId, String keywords, String category, Integer opCode) { List categoryList = getCategoryList(category); TestTemplateVo templateVo = testTemplateMapper.getTestTemplateMapById(templateId); return testRecordReagentPage(page, keywords, opCode, categoryList, templateVo.getReagentConsumables()); @@ -156,7 +159,6 @@ public class TestRecordReagentServiceImpl extends ServiceImpl testRecordReagentPage(Page page, String keywords, Integer opCode, List categoryList, List reagentConsumablesList) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.and(StringUtils.isNotBlank(keywords), qw -> qw diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java index 4ce8682..c57888e 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java @@ -1861,9 +1861,7 @@ public class TestRecordSampleDataServiceImpl extends ServiceImpl + + @@ -28,6 +30,8 @@ exp.ion_abundance_ratio_error, exp.fragment_ret_time exp.ion_abundance_ratio_within_error, + exp.mass_to_charge_ratio, + exp.qualitative_ion_pair, exp.create_by, exp.create_time, exp.update_by,