松套管修改

zss

2024-08-06 a968d22689475fc7ddea69ee408b290e810dd835

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

@@ -153,7 +153,7 @@
        select *
        from (
        select
        i.id,isa.sample_code,isa.sample,isa.model,isa.ins_state,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
        i.id,isa.sample_code,isa.sample,isa.model,isa.ins_state,ip.id insProductId,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
        ip.son_laboratory,ip.inspection_item_type,ip.inspection_value_type,ip.tell,ip.`last_value`,ip.ins_result,ipr.equip_value
        from ins_sample isa
        left join ins_order i on isa.ins_order_id = i.id
@@ -476,23 +476,5 @@
        select name
        from department_lims
        where id = #{depLimsId}
    </select>

    <select id="getDeviceMessage" resultType="java.util.Map">
        select d.device_name, d.management_number, d.file_type, d.collect_url
        FROM
            device d,
            device_data_config ddc
        <if test="sample != '' and sample != null">
            inner join structure_item_parameter sip on sip.sample like concat('%', #{sample}, '%') and sip.id = ddc.structure_item_parameter_id
        </if>
        where d.ip = #{ip}
          and ddc.inspection_item = #{inspectionItem}
            <if test="inspectionItemSubclass != '' and inspectionItemSubclass != null">
                and ddc.inspection_item_subclass = #{inspectionItemSubclass}
            </if>
          and d.device_status = 0
          and d.ins_product_ids is not null
        limit 1
    </select>
</mapper>