fix: exchange pat identifier with actual id, handle empty conditiondate

fix: exchange pat identifier with actual id, handle empty conditiondate #1404