|
3 | 3 | using Bogus.Extensions.UnitedStates; |
4 | 4 | using System.Linq; |
5 | 5 | using VRDR; |
| 6 | +using Hl7.Fhir.Support; |
6 | 7 |
|
7 | 8 | namespace canary.Models |
8 | 9 | { |
@@ -49,8 +50,8 @@ public DeathRecord Generate(bool simple = false) |
49 | 50 | record.Identifier = Convert.ToString(faker.Random.Number(999999)); |
50 | 51 | // record.BundleIdentifier = Convert.ToString(faker.Random.Number(999999)); |
51 | 52 | DateTime date = faker.Date.Recent(); |
52 | | - record.CertifiedTime = date.ToString("s"); |
53 | | - record.RegisteredTime = new DateTimeOffset(date.AddDays(-1).Year, date.AddDays(-1).Month, date.AddDays(-1).Day, 0, 0, 0, TimeSpan.Zero).ToString("s"); |
| 53 | + record.CertifiedTime = new DateTimeOffset(date).ToFhirDateTime(); |
| 54 | + record.RegisteredTime = new DateTimeOffset(date.AddDays(-1).Year, date.AddDays(-1).Month, date.AddDays(-1).Day, 0, 0, 0, TimeSpan.Zero).ToFhirDateTime(); |
54 | 55 | record.StateLocalIdentifier1 = Convert.ToString(faker.Random.Number(999999)); |
55 | 56 |
|
56 | 57 | // Basic Decedent information |
@@ -114,7 +115,7 @@ public DeathRecord Generate(bool simple = false) |
114 | 115 | placeOfBirth.Add("addressCountry", "US"); |
115 | 116 | record.PlaceOfBirth = placeOfBirth; |
116 | 117 | record.BirthRecordState = state; |
117 | | - |
| 118 | + |
118 | 119 | // Place of death |
119 | 120 |
|
120 | 121 | record.DeathLocationName = "Bedford Hospital"; |
@@ -250,7 +251,7 @@ public DeathRecord Generate(bool simple = false) |
250 | 251 | certifierIdentifier.Add("system", "http://hl7.org/fhir/sid/us-npi"); |
251 | 252 | certifierIdentifier.Add("value", Convert.ToString(faker.Random.Number(999999))); |
252 | 253 | record.CertifierIdentifier = certifierIdentifier; |
253 | | - |
| 254 | + |
254 | 255 | record.CertifierFamilyName = faker.Name.LastName(); |
255 | 256 | record.CertifierGivenNames = new string[] { faker.Name.FirstName(Bogus.DataSets.Name.Gender.Female), faker.Name.FirstName(Bogus.DataSets.Name.Gender.Female) }; |
256 | 257 | record.CertifierSuffix = "MD"; |
@@ -425,7 +426,7 @@ public DeathRecord Generate(bool simple = false) |
425 | 426 | detailsOfInjuryAddr.Add("addressState", "MA"); |
426 | 427 | detailsOfInjuryAddr.Add("addressCountry", "US"); |
427 | 428 | record.InjuryLocationAddress = detailsOfInjuryAddr; |
428 | | - |
| 429 | + |
429 | 430 | record.InjuryPlaceDescription = "Trade and Service Area"; |
430 | 431 | } |
431 | 432 | else if (choice == 2) |
|
0 commit comments