20250319 更新

1.补充检验数据扩展信息
2.对实验中用到的试剂耗材进行重构，并关联毒品清单

dlp-drugtesting-biz/src/main/resources/mapper/TestRecordSampleDataExpandMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="digital.laboratory.platform.inspection.mapper.TestRecordSampledataExpandMapper">
+<mapper namespace="digital.laboratory.platform.inspection.mapper.TestRecordSampleDataExpandMapper">
 
     <resultMap id="BaseResultMap" type="digital.laboratory.platform.inspection.entity.TestRecordSampleDataExpand">
             <id property="id" column="exp_id" jdbcType="VARCHAR"/>
@@ -12,6 +12,7 @@
             <result property="ionAbundanceRatio" column="ion_abundance_ratio" jdbcType="DECIMAL"/>
             <result property="ionAbundanceRatioError" column="ion_abundance_ratio_error" jdbcType="DECIMAL"/>
             <result property="ionAbundanceRatioWithinError" column="ion_abundance_ratio_within_error" jdbcType="VARCHAR"/>
+            <result property="fragmentRetTime" column="fragment_ret_time" jdbcType="DECIMAL"/>
             <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
@@ -19,9 +20,25 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        exp_id,test_data_id,peak_area,
-        base_peak,ion_abundance_ratio,ion_abundance_ratio_error,
-        ion_abundance_ratio_within_error,create_by,create_time,
-        update_by,update_time
+            exp.exp_id,
+            exp.test_data_id,
+            exp.peak_area,
+            exp.base_peak,
+            exp.ion_abundance_ratio,
+            exp.ion_abundance_ratio_error,
+            exp.fragment_ret_time
+            exp.ion_abundance_ratio_within_error,
+            exp.create_by,
+            exp.create_time,
+            exp.update_by,
+            exp.update_time
     </sql>
+<!--    连表查询，主表b_test_record_sampledata    -->
+    <sql id="joinMasterTable">
+        SELECT
+            <include refid="Base_Column_List"/>
+            FROM b_test_record_sampledata_expand exp
+                LEFT JOIN b_test_record_sampledata test ON exp.test_data_id = test.id
+    </sql>
+
 </mapper>

dlp-drugtesting-biz/src/main/resources/mapper/TestRecordSampleDataMapper.xml

@@ -28,13 +28,27 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,name,sample_no,
-        test_id,std_concentration,sample_concentration,
-        compound_name,rt_time_within_error,rt_time_error,
-        target_rt_time,std_rt_time,is_detected,
-        sample_type,data_json,data_result_json,
-        status,create_time,create_by,
-        update_time,update_by,compound_cn_name
+            id,
+            name,
+            sample_no,
+            test_id,
+            std_concentration,
+            sample_concentration,
+            compound_name,
+            rt_time_within_error,
+            rt_time_error,
+            target_rt_time,
+            std_rt_time,
+            is_detected,
+            sample_type,
+            data_json,
+            data_result_json,
+            status,
+            create_time,
+            create_by,
+            update_time,
+            update_by,
+            compound_cn_name
     </sql>
 <!--    合并委托、任务、筛查表-->
     <sql id="queryCommoneBusinessSql">