diff --git a/mzcx/src/main/resources/mapper/MZCXMapper.xml b/mzcx/src/main/resources/mapper/MZCXMapper.xml index 9e61c49..c859fce 100644 --- a/mzcx/src/main/resources/mapper/MZCXMapper.xml +++ b/mzcx/src/main/resources/mapper/MZCXMapper.xml @@ -29,8 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lab_reqmain.brsr, lab_reqmain.jzbz, lab_reqmain.txm, - '' as cp_xmlb, - 0 as cp_color, + lab_feeitemclass.sflbmc as cp_xmlb, + lab_feeitemclass.bkcolor as cp_color, '0' as cp_cflag, 0 as cp_row, lab_reqdetail.bz1 as detailBZ1, @@ -54,16 +54,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lab_reqmain.zd, lab_reqmain.cysj FROM lab_reqdetail, - lab_reqmain + lab_reqmain left join lab_feeitemclass on lab_feeitemclass.sflbdh=lab_reqmain.bgddh WHERE ( lab_reqdetail.sqh = lab_reqmain.sqh ) and (lab_reqmain.brly = '1' or lab_reqmain.brly = '4' or lab_reqmain.brly = '5') and - ( lab_reqmain.brdh=#{brdh} or lab_reqmain.kh = #{brdh} or lab_reqmain.bz1 = #{brdh}) and - (( lab_reqmain.zt=#{zt} ) OR (#{zt}='1' and lab_reqmain.zt<'2' AND lab_reqmain.zxsj is null)) and + lab_reqmain.brdh=#{brdh} and + ( lab_reqmain.zt=#{zt} ) and ( lab_reqmain.sqsj>=#{st} ) and - (lab_reqmain.sqsj <= #{et} ) and lab_reqmain.yljg = #{as_yljg} + (lab_reqmain.sqsj <= #{et} ) + ]]> + + - \ No newline at end of file