ขอสบถามการ query โดยมีเงื่อนไข แต่ไม่ใช้ if else เป็น query โปรแกรม report builder

SELECT  op_dept,OP_HIST.OP_TYPE,to_char(OP_HIST.OP_DATE,'dd/MM/yyyy') as OP_DATE, 
OP_HIST.OP_WO_OP, OP_HIST.OP_QTY_RJCT, OP_HIST.OP_WKCTR, OP_HIST.OP_WO_LOT, 
OP_HIST.OP_DOMAIN,   WC_MSTR.WC_DESC,  PT_MSTR.PT_PART, PT_MSTR.PT_DESC1, 
PT_MSTR.PT_DESC2, PT_MSTR.PT_UM, PT_MSTR.PT_PROD_LINE,     
DPT_MSTR.DPT_DEPT, DPT_MSTR.DPT_DESC  
FROM  QAD.OP_HIST OP_HIST,  QAD.WC_MSTR WC_MSTR,   
QAD.PT_MSTR PT_MSTR,     QAD.DPT_MSTR DPT_MSTR   
WHERE  Upper(OP_HIST.OP_DOMAIN) = '2000' and  (Upper(OP_HIST.op_dept) like '3%' or Upper(OP_HIST.op_dept) = ''
and Upper(OP_HIST.OP_WKCTR) like '5%')



and Upper(OP_HIST.OP_WKCTR) =  Upper(WC_MSTR.WC_WKCTR (+)) AND  
OP_HIST.OP_MCH = WC_MSTR.WC_MCH (+) AND  Upper(OP_HIST.OP_DOMAIN) =  Upper(WC_MSTR.WC_DOMAIN (+)) AND  
Upper(OP_HIST.OP_PART) =  Upper(PT_MSTR.PT_PART (+)) AND   Upper(OP_HIST.OP_DOMAIN) =  Upper(PT_MSTR.PT_DOMAIN (+)) AND  
OP_HIST.OP_DEPT = DPT_MSTR.DPT_DEPT (+) AND   Upper(OP_HIST.OP_DOMAIN) =  Upper(DPT_MSTR.DPT_DOMAIN (+))    and 
OP_HIST.OP_QTY_RJCT <> 0.00   and
Upper(OP_HIST.OP_TYPE) = 'LABOR' and
(Upper(PT_MSTR.PT_PART)>= '6GR' || Decode('6GR','',' ','') and Upper(PT_MSTR.PT_PART) <= '6GRz' ) and 
(OP_HIST.OP_DATE >= To_Date('01/09/17','dd/MM/yy') AND OP_HIST.OP_DATE <= To_Date('09/10/18','dd/MM/yy'))
--and (Upper(OP_HIST.OP_EMP) >=  :OP_EMP1 || Decode(:OP_EMP1,'',' ','') and Upper(OP_HIST.OP_EMP) <= :OP_EMP2 )
-- and (PT_MSTR.PT_DESC2 >= :PT_DESC21 || Decode(:PT_DESC21,'',' ','') and Upper(PT_MSTR.PT_DESC2) <= :PT_DESC22 )



 and (Upper(OP_HIST.OP_WKCTR) >= '5' || Decode('5','',' ','') and Upper(OP_HIST.OP_WKCTR) <= '5z' )