Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after

朱佳吉

2024-05-07 ad54d502450e219c38f7d9b878ae07f759ab2a23

 inspect-server/src/main/resources/mapper/StandardTreeMapper.xml

@@ -130,7 +130,7 @@
        group by sto.specimen_name
    </select>
    <select id="selectStandardProductListByTree" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select sample,
        select sample sample2,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
@@ -152,7 +152,10 @@
               checkout_number,
               section,
               dic,
               0 state
               0 state,
               #{model} model,
               #{sample} sample,
               #{trees} tree
        from structure_item_parameter
        where (
                      sample is NULL
@@ -162,6 +165,37 @@
                  )
    </select>

    <select id="selectStandardProductListByTree2" resultType="com.yuanchu.mom.pojo.StandardProductList">
        select sample sample2,
               inspection_item,
               inspection_item_en,
               inspection_item_subclass,
               inspection_item_subclass_en,
               method,
               son_laboratory,
               unit,
               ask_tell tell,
               ask,
               price,
               man_hour,
               man_hour_group,
               man_day,
               inspection_item_type,
               inspection_value_type,
               bsm,
               template_id,
               laboratory,
               checkout_number,
               section,
               dic,
               0 state,
               #{model} model,
               #{sample} sample,
               #{trees} tree
        from structure_item_parameter
        where sample LIKE CONCAT('%[', #{tree}, ']%')
    </select>

    <select id="getStandardTree2" resultMap="SampleTypeDto">
        select sto.specimen_name sample_type,
               p.name            sample,