refine code
refine code
test
refine code and isnull isnotnull