revise AggregateCaculate

now add COUNT situation to this function