Change patients to be identified by NHI and fix JSON serialization