|
|
|
@ -25,17 +25,18 @@
|
|
|
|
|
</sql>
|
|
|
|
|
<select id="queryPhysicalResultByProcessId"
|
|
|
|
|
resultType="com.supervision.vo.result.PhysicalRecordByResultDAO">
|
|
|
|
|
select concat_ws(t3.tool_name, t4.location_name, '|') as toolLocationName,
|
|
|
|
|
t1.id as recordId,
|
|
|
|
|
t2.require_check as requireCheck,
|
|
|
|
|
t2.basis_confirm as basisConfirm,
|
|
|
|
|
t2.basis_identification as basisIdentification,
|
|
|
|
|
t3.id as toolId,
|
|
|
|
|
t4.id as locationId
|
|
|
|
|
select (IF(t4.location_name IS NULL, t3.tool_name,
|
|
|
|
|
CONCAT_WS(' | ', t3.tool_name, t4.location_name))) AS toolLocationName,
|
|
|
|
|
t1.id as recordId,
|
|
|
|
|
t2.require_check as requireCheck,
|
|
|
|
|
t2.basis_confirm as basisConfirm,
|
|
|
|
|
t2.basis_identification as basisIdentification,
|
|
|
|
|
t3.id as toolId,
|
|
|
|
|
t4.id as locationId
|
|
|
|
|
from vp_diagnosis_physical_record t1
|
|
|
|
|
left join vp_disease_physical t2 on t1.physical_id = t2.id
|
|
|
|
|
left join vp_config_physical_tool t3 on t2.tool_id = t3.id
|
|
|
|
|
left join vp_config_physical_location t4 on t2.location_id = t3.id
|
|
|
|
|
left join vp_config_physical_location t4 on t2.location_id = t4.id
|
|
|
|
|
where t1.process_id = #{processId}
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
@ -50,7 +51,7 @@
|
|
|
|
|
t1.create_time as createTime
|
|
|
|
|
from vp_diagnosis_physical_record t1
|
|
|
|
|
left join vp_config_physical_tool t3 on t1.tool_id = t3.id
|
|
|
|
|
left join vp_config_physical_location t4 on t1.location_id = t3.id
|
|
|
|
|
left join vp_config_physical_location t4 on t1.location_id = t4.id
|
|
|
|
|
where t1.process_id = #{processId}
|
|
|
|
|
order by t1.create_time desc
|
|
|
|
|
</select>
|
|
|
|
|