diff --git a/lib/generator/ccda/lib/templating_functions.js b/lib/generator/ccda/lib/templating_functions.js index 74ede6b7..ee4652d4 100644 --- a/lib/generator/ccda/lib/templating_functions.js +++ b/lib/generator/ccda/lib/templating_functions.js @@ -144,8 +144,8 @@ var addr = function (xmlDoc, addr, birthplace) { .attr({use: acronymize(addr[0]["use"])}); } - if (!birthplace && addr[0]["streetLines"] !== undefined) { - xmlDoc = xmlDoc.node('streetAddressLine', addr[0]["streetLines"][0]).parent() + if (!birthplace && addr[0]["street_lines"] !== undefined) { + xmlDoc = xmlDoc.node('streetAddressLine', addr[0]["street_lines"][0]).parent() } xmlDoc = xmlDoc.node('city', addr[0]["city"]).parent() .node('state', addr[0]["state"]).parent() @@ -155,7 +155,7 @@ var addr = function (xmlDoc, addr, birthplace) { } else { xmlDoc = xmlDoc.node('addr'); if (!birthplace) { - xmlDoc = xmlDoc.node('streetAddressLine', addr["streetLines"][0]).parent() + xmlDoc = xmlDoc.node('streetAddressLine', addr["street_lines"][0]).parent() } xmlDoc = xmlDoc.node('city', addr["city"]).parent() .node('state', addr["state"]).parent() diff --git a/lib/parser/ccda/shared.js b/lib/parser/ccda/shared.js index 5f77896c..3a2e00a7 100644 --- a/lib/parser/ccda/shared.js +++ b/lib/parser/ccda/shared.js @@ -150,7 +150,7 @@ var IndividualName = exports.IndividualName = Component.define('IndividualName') var Address = exports.Address = Component.define("Address") .fields([ - ["streetLines", "1..4", "h:streetAddressLine/text()"], + ["street_lines", "1..4", "h:streetAddressLine/text()"], ["city", "1..1", "h:city/text()", Processor.asString], ["state", "0..1", "h:state/text()"], ["zip", "0..1", "h:postalCode/text()"], diff --git a/lib/parser/cms/cmsSpecificSchema.js b/lib/parser/cms/cmsSpecificSchema.js index f33faccc..d7b16737 100644 --- a/lib/parser/cms/cmsSpecificSchema.js +++ b/lib/parser/cms/cmsSpecificSchema.js @@ -8,7 +8,7 @@ ccda */ var schema = { "insurance": { "addresses": [{ - "streetLines": [ + "street_lines": [ "string" ], "city": "string", @@ -170,7 +170,7 @@ var schema = { "provider": { "name": "string", "address": { - "streetLines": [ + "street_lines": [ "string" ], "city": "string", @@ -185,7 +185,7 @@ var schema = { }], "organization": { "address": { - "streetLines": [ + "street_lines": [ "string" ], "city": "string", diff --git a/lib/parser/cms/sections/commonFunctions.js b/lib/parser/cms/sections/commonFunctions.js index 06138287..694a48e4 100644 --- a/lib/parser/cms/sections/commonFunctions.js +++ b/lib/parser/cms/sections/commonFunctions.js @@ -32,7 +32,7 @@ var commonFunctions = function commonFunctions() { function cda_line_address(addressString) { var addressObj = { "use": "primary", - "streetLines": [], + "street_lines": [], "city": "", "state": "", "zip": "", @@ -72,7 +72,7 @@ function cda_line_address(addressString) { foundCityMatch = foundCityMatch.substring(0, foundCityMatch.length - 1); if (foundCityIndex >= 1) { var addressLine = addressString.substring(0, foundCityIndex - 1).trim(); - addressObj.streetLines.push(addressLine); + addressObj.street_lines.push(addressLine); /*TODO: foundCIty, which is the city name obtained from looking up the zip code table, needs to do something like an longest common substring match in case there isn't a 1 to 1 match between the city names of the raw string @@ -95,7 +95,7 @@ function cda_line_address(addressString) { var cityBegIndex = addressString.indexOf(foundWord); var cityEndIndex = cityBegIndex + foundWord.length; var addressLine = addressString.substring(0, cityEndIndex).trim(); - addressObj.streetLines.push(addressLine); + addressObj.street_lines.push(addressLine); //These might not always be the last and second to last, what if there's just state code? need to make changes forthat later. addressObj.zip = tempArr[tempArr.length - 1].trim(); @@ -117,7 +117,7 @@ function cda_line_address(addressString) { var cityBegIndex = addressString.indexOf(foundWord); var cityEndIndex = cityBegIndex + foundWord.length; var addressLine = addressString.substring(cityBegIndex, cityEndIndex).trim(); - addressObj.streetLines.push(addressLine); + addressObj.street_lines.push(addressLine); //These might not always be the last and second to last addressObj.zip = tempArr[tempArr.length - 1].trim(); @@ -236,7 +236,7 @@ function cda_line_address(addressString) { stateAndZip = stateAndZip.split(' '); var state = stateAndZip[0]; var zip = stateAndZip[1]; - addressObj.streetLines.push(street); + addressObj.street_lines.push(street); addressObj.city = city; addressObj.state = state; addressObj.zip = zip; @@ -245,7 +245,7 @@ function cda_line_address(addressString) { } /*ie. 1111 Address Dr, Hoosville, VA 11111*/ else if (addressArray.length === 3) { - addressObj.streetLines[0] = addressArray[0].trim(); + addressObj.street_lines[0] = addressArray[0].trim(); addressObj.city = addressArray[1].trim(); var stateAndZip = addressArray[2].trim().split(' '); addressObj.state = stateAndZip[0]; diff --git a/lib/parser/cms/sections/demographics.js b/lib/parser/cms/sections/demographics.js index f9786e5e..04d3d7b5 100644 --- a/lib/parser/cms/sections/demographics.js +++ b/lib/parser/cms/sections/demographics.js @@ -11,7 +11,7 @@ function parseDemographics(intObj) { var addressObj = { "use": "primary", - "streetLines": [], + "street_lines": [], "city": "", "state": "", "zip": "", @@ -20,8 +20,8 @@ function parseDemographics(intObj) { var addressKeys = { 'address type': 'use', - 'address line 1': 'streetLines', - 'address line 2': 'streetLines', + 'address line 1': 'street_lines', + 'address line 2': 'street_lines', 'city': 'city', 'state': 'state', 'zip': 'zip' diff --git a/lib/validator/schemas/shared.json b/lib/validator/schemas/shared.json index 0d8ebeb2..a48f7895 100644 --- a/lib/validator/schemas/shared.json +++ b/lib/validator/schemas/shared.json @@ -14,7 +14,7 @@ "state": { "type": "string" }, - "streetLines": { + "street_lines": { "type": "array", "items": { "type": "string" @@ -29,7 +29,7 @@ } }, "required": [ - "streetLines", + "street_lines", "city" ] }, diff --git a/test/ccda-sections/test-demographics.js b/test/ccda-sections/test-demographics.js index fc045b07..564cf9fb 100644 --- a/test/ccda-sections/test-demographics.js +++ b/test/ccda-sections/test-demographics.js @@ -147,11 +147,11 @@ describe('Demographics - Schema Conformance', function () { for (var iaddr in demographics.addresses) { var currentAddress = demographics.addresses[iaddr]; - assert.isArray(currentAddress.streetLines, 'street should be array'); - assert.ok(currentAddress.streetLines.length < 4, 'max four street lines'); - for (var iline in currentAddress.streetLines) { - assert.isString(currentAddress.streetLines[iline], 'street lines should be string'); - assert.ok(currentAddress.streetLines[iline].length > 0, 'street lines should have content'); + assert.isArray(currentAddress.street_lines, 'street should be array'); + assert.ok(currentAddress.street_lines.length < 4, 'max four street lines'); + for (var iline in currentAddress.street_lines) { + assert.isString(currentAddress.street_lines[iline], 'street lines should be string'); + assert.ok(currentAddress.street_lines[iline].length > 0, 'street lines should have content'); } assert.isString(currentAddress.city, 'city should be string'); assert.ok(currentAddress.city.length > 0, 'city should have content'); @@ -229,12 +229,12 @@ describe('Demographics - Schema Conformance', function () { if (demographics.birthplace) { var birthPlace = demographics.birthplace; - if (birthPlace.streetLines) { - assert.isArray(birthPlace.streetLines, 'street should be array'); - assert.ok(birthPlace.streetLines.length < 4, 'max four street lines'); - for (var iline in birthPlace.streetLines) { - assert.isString(birthPlace.streetLines[iline], 'street lines should be string'); - assert.ok(birthPlace.streetLines[iline].length > 0, 'street lines should have content'); + if (birthPlace.street_lines) { + assert.isArray(birthPlace.street_lines, 'street should be array'); + assert.ok(birthPlace.street_lines.length < 4, 'max four street lines'); + for (var iline in birthPlace.street_lines) { + assert.isString(birthPlace.street_lines[iline], 'street lines should be string'); + assert.ok(birthPlace.street_lines[iline].length > 0, 'street lines should have content'); } } @@ -276,11 +276,11 @@ describe('Demographics - Schema Conformance', function () { for (var iguardaddr in currentGuardian.addresses) { var currentAddress = currentGuardian.addresses[iguardaddr]; - assert.isArray(currentAddress.streetLines, 'street should be array'); - assert.ok(currentAddress.streetLines.length < 4, 'max four street lines'); - for (var iline in currentAddress.streetLines) { - assert.isString(currentAddress.streetLines[iline], 'street lines should be string'); - assert.ok(currentAddress.streetLines[iline].length > 0, 'street lines should have content'); + assert.isArray(currentAddress.street_lines, 'street should be array'); + assert.ok(currentAddress.street_lines.length < 4, 'max four street lines'); + for (var iline in currentAddress.street_lines) { + assert.isString(currentAddress.street_lines[iline], 'street lines should be string'); + assert.ok(currentAddress.street_lines[iline].length > 0, 'street lines should have content'); } assert.isString(currentAddress.city, 'city should be string'); assert.ok(currentAddress.city.length > 0, 'city should have content'); diff --git a/test/ccda-sections/test-immunizations.js b/test/ccda-sections/test-immunizations.js index 5718041b..5a9d3c05 100644 --- a/test/ccda-sections/test-immunizations.js +++ b/test/ccda-sections/test-immunizations.js @@ -256,11 +256,11 @@ describe('Immunizations - Schema Conformance', function () { if (currentImmunization.performer.address) { for (var iaddr in currentImmunization.performer.address) { var currentAddress = currentImmunization.performer.address[iaddr]; - assert.isArray(currentAddress.streetLines, 'street should be array'); - assert.ok(currentAddress.streetLines.length < 4, 'max four street lines'); - for (var iline in currentAddress.streetLines) { - assert.isString(currentAddress.streetLines[iline], 'street lines should be string'); - assert.ok(currentAddress.streetLines[iline].length > 0, 'street lines should have content'); + assert.isArray(currentAddress.street_lines, 'street should be array'); + assert.ok(currentAddress.street_lines.length < 4, 'max four street lines'); + for (var iline in currentAddress.street_lines) { + assert.isString(currentAddress.street_lines[iline], 'street lines should be string'); + assert.ok(currentAddress.street_lines[iline].length > 0, 'street lines should have content'); } assert.isString(currentAddress.city, 'city should be string'); assert.ok(currentAddress.city.length > 0, 'city should have content'); diff --git a/test/fixtures/cms/bbModel.json b/test/fixtures/cms/bbModel.json index 6434f051..28d35c81 100644 --- a/test/fixtures/cms/bbModel.json +++ b/test/fixtures/cms/bbModel.json @@ -26,7 +26,7 @@ "addresses": [ { "use": "primary", - "streetLines": [ + "street_lines": [ "123 ANY ROAD" ], "city": "ANYTOWN", @@ -270,7 +270,7 @@ "addresses": [ { "use": "primary", - "streetLines": [ + "street_lines": [ "123 Any Road" ], "city": "Anytown", @@ -299,7 +299,7 @@ "addresses": [ { "use": "primary", - "streetLines": [ + "street_lines": [ "123 Any Road" ], "city": "Anytown", @@ -350,7 +350,7 @@ "addresses": [ { "use": "primary", - "streetLines": [ + "street_lines": [ "PO BOX 0000" ], "city": "Anytown", @@ -379,7 +379,7 @@ "addresses": [ { "use": "primary", - "streetLines": [ + "street_lines": [ "0000 Any ROAD" ], "city": "ANYWHERE", @@ -405,7 +405,7 @@ "addresses": [ { "use": "primary", - "streetLines": [ + "street_lines": [ "00 Address STREET" ], "city": "ANYWHERE", @@ -898,7 +898,7 @@ "name": "ANY CARE", "address": { "use": "primary", - "streetLines": [ + "street_lines": [ "123 Any Rd" ], "city": "Anywhere", @@ -915,7 +915,7 @@ "name": "ANY HOSPITAL1", "address": { "use": "primary", - "streetLines": [ + "street_lines": [ "123 Drive" ], "city": "Anywhere", @@ -931,7 +931,7 @@ "type": "person", "address": { "use": "primary", - "streetLines": [ + "street_lines": [ "123 Road" ], "city": "Anywhere", diff --git a/test/fixtures/file-snippets/generatedJSON/CCD_1_payers.json b/test/fixtures/file-snippets/generatedJSON/CCD_1_payers.json index b01c4fa3..d6cf0760 100644 --- a/test/fixtures/file-snippets/generatedJSON/CCD_1_payers.json +++ b/test/fixtures/file-snippets/generatedJSON/CCD_1_payers.json @@ -28,7 +28,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -51,7 +51,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -94,7 +94,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -127,7 +127,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -159,7 +159,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/file-snippets/json/CCD_1_Demographics.json b/test/fixtures/file-snippets/json/CCD_1_Demographics.json index f8852e01..e6ee1f42 100644 --- a/test/fixtures/file-snippets/json/CCD_1_Demographics.json +++ b/test/fixtures/file-snippets/json/CCD_1_Demographics.json @@ -26,7 +26,7 @@ "marital_status": "Married", "addresses": [ { - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -63,7 +63,7 @@ "relation": "Parent", "addresses": [ { - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", diff --git a/test/fixtures/file-snippets/json/CCD_1_Encounters.json b/test/fixtures/file-snippets/json/CCD_1_Encounters.json index 7925baa0..5d515f5e 100644 --- a/test/fixtures/file-snippets/json/CCD_1_Encounters.json +++ b/test/fixtures/file-snippets/json/CCD_1_Encounters.json @@ -24,7 +24,7 @@ "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/file-snippets/json/CCD_1_Immunizations.json b/test/fixtures/file-snippets/json/CCD_1_Immunizations.json index 103bd73b..aef2b8a4 100644 --- a/test/fixtures/file-snippets/json/CCD_1_Immunizations.json +++ b/test/fixtures/file-snippets/json/CCD_1_Immunizations.json @@ -42,7 +42,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -103,7 +103,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -164,7 +164,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -225,7 +225,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", diff --git a/test/fixtures/file-snippets/json/CCD_1_Payers.json b/test/fixtures/file-snippets/json/CCD_1_Payers.json index f76609cf..a25f1dd2 100644 --- a/test/fixtures/file-snippets/json/CCD_1_Payers.json +++ b/test/fixtures/file-snippets/json/CCD_1_Payers.json @@ -28,7 +28,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -51,7 +51,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -84,7 +84,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -127,7 +127,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -159,7 +159,7 @@ ], "address": [ { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/file-snippets/json/CCD_1_Procedures.json b/test/fixtures/file-snippets/json/CCD_1_Procedures.json index d7948d3b..f82432da 100644 --- a/test/fixtures/file-snippets/json/CCD_1_Procedures.json +++ b/test/fixtures/file-snippets/json/CCD_1_Procedures.json @@ -19,7 +19,7 @@ }], "providers": [{ "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -38,7 +38,7 @@ "organization": { "name": "Community Health and Hospitals", "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -78,7 +78,7 @@ }], "providers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -109,7 +109,7 @@ "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -136,7 +136,7 @@ }], "providers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -167,7 +167,7 @@ "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/files/json/CCD_1.json b/test/fixtures/files/json/CCD_1.json index f46ce359..41b7d8fa 100644 --- a/test/fixtures/files/json/CCD_1.json +++ b/test/fixtures/files/json/CCD_1.json @@ -27,7 +27,7 @@ "marital_status": "Married", "addresses": [ { - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -64,7 +64,7 @@ "relation": "Parent", "addresses": [ { - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -356,7 +356,7 @@ "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -485,7 +485,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -546,7 +546,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -607,7 +607,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -668,7 +668,7 @@ "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -774,7 +774,7 @@ }], "providers": [{ "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -789,7 +789,7 @@ "organization": { "name": "Community Health and Hospitals", "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -826,7 +826,7 @@ }], "providers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -850,7 +850,7 @@ "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -877,7 +877,7 @@ }], "providers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -901,7 +901,7 @@ "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/validator/samples/testAddress.js b/test/fixtures/validator/samples/testAddress.js index 42d1ff91..328afabc 100644 --- a/test/fixtures/validator/samples/testAddress.js +++ b/test/fixtures/validator/samples/testAddress.js @@ -1,6 +1,6 @@ var testAddress = { "regular": { - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -10,7 +10,7 @@ var testAddress = { "use": "primary home" }, "missingAddr": { - "streetLines": [], + "street_lines": [], "city": "Beaverton", "state": "OR", "zip": "97867", @@ -18,14 +18,14 @@ var testAddress = { "use": "primary home" }, "noCity": { - "streetLines": [], + "street_lines": [], "state": "OR", "zip": "97867", "country": "US", "use": "primary home" }, "noCityAddr": { - "streetLines": [], + "street_lines": [], "state": "OR", "zip": "97867", "country": "US", @@ -34,7 +34,7 @@ var testAddress = { "empty": {}, "onlyCityAddr": { - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton" diff --git a/test/fixtures/validator/samples/testDemo.js b/test/fixtures/validator/samples/testDemo.js index a69b3f19..a1554eae 100644 --- a/test/fixtures/validator/samples/testDemo.js +++ b/test/fixtures/validator/samples/testDemo.js @@ -23,7 +23,7 @@ var testDemo = { }], "marital_status": "Married", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -53,7 +53,7 @@ var testDemo = { "guardians": [{ "relation": "Parent", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -95,7 +95,7 @@ var testDemo = { }], "marital_status": "Married", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -124,7 +124,7 @@ var testDemo = { "guardians": [{ "relation": "Parent", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -164,7 +164,7 @@ var testDemo = { }], "marital_status": "Married", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", diff --git a/test/fixtures/validator/samples/testDocument.js b/test/fixtures/validator/samples/testDocument.js index a673c927..2705c72c 100644 --- a/test/fixtures/validator/samples/testDocument.js +++ b/test/fixtures/validator/samples/testDocument.js @@ -23,7 +23,7 @@ var testDocList = { }], "marital_status": "Married", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -53,7 +53,7 @@ var testDocList = { "guardians": [{ "relation": "Parent", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -342,7 +342,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -471,7 +471,7 @@ var testDocList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -530,7 +530,7 @@ var testDocList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -589,7 +589,7 @@ var testDocList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -648,7 +648,7 @@ var testDocList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -747,7 +747,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -766,7 +766,7 @@ var testDocList = { "organization": { "name": "Community Health and Hospitals", "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -806,7 +806,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -837,7 +837,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -864,7 +864,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -895,7 +895,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -932,7 +932,7 @@ var testDocList = { }], "marital_status": "Married", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -962,7 +962,7 @@ var testDocList = { "guardians": [{ "relation": "Parent", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -1251,7 +1251,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -1380,7 +1380,7 @@ var testDocList = { "first": "Amanda" }, "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -1439,7 +1439,7 @@ var testDocList = { "first": "Amanda" }, "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -1498,7 +1498,7 @@ var testDocList = { "first": "Amanda" }, "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -1557,7 +1557,7 @@ var testDocList = { "first": "Amanda" }, "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -1656,7 +1656,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -1675,7 +1675,7 @@ var testDocList = { "organization": { "name": "Community Health and Hospitals", "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -1715,7 +1715,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -1746,7 +1746,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -1773,7 +1773,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -1804,7 +1804,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -1864,7 +1864,7 @@ var testDocList = { meta: { version: '0.0.4' }, - errors: ['nullFlavor alert: missing but required streetLines in Address -> Patient -> CCD', + errors: ['nullFlavor alert: missing but required street_lines in Address -> Patient -> CCD', 'nullFlavor alert: missing but required value in PhysicalQuantity -> MedicationAdministration -> Prescription -> MedicationsSection -> CCD' ] }, @@ -1885,7 +1885,7 @@ var testDocList = { }], "marital_status": "Married", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -1915,7 +1915,7 @@ var testDocList = { "guardians": [{ "relation": "Parent", "addresses": [{ - "streetLines": [ + "street_lines": [ "1357 Amber Drive" ], "city": "Beaverton", @@ -2204,7 +2204,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -2333,7 +2333,7 @@ var testDocList = { "first": "Amanda" }, "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -2392,7 +2392,7 @@ var testDocList = { "first": "Amanda" }, "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -2505,7 +2505,7 @@ var testDocList = { "first": "Amanda" }, "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -2604,7 +2604,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -2623,7 +2623,7 @@ var testDocList = { "organization": { "name": "Community Health and Hospitals", "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -2663,7 +2663,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -2694,7 +2694,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -2721,7 +2721,7 @@ var testDocList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -2752,7 +2752,7 @@ var testDocList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/validator/samples/testEncounter.js b/test/fixtures/validator/samples/testEncounter.js index 27d00f01..74144576 100644 --- a/test/fixtures/validator/samples/testEncounter.js +++ b/test/fixtures/validator/samples/testEncounter.js @@ -25,7 +25,7 @@ var testEncounter = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -56,7 +56,7 @@ var testEncounter = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -90,7 +90,7 @@ var testEncounter = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -172,7 +172,7 @@ var testEncounter = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/validator/samples/testImmunization.js b/test/fixtures/validator/samples/testImmunization.js index c9a80939..ff2ed1c8 100644 --- a/test/fixtures/validator/samples/testImmunization.js +++ b/test/fixtures/validator/samples/testImmunization.js @@ -45,7 +45,7 @@ var testImmunList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -107,7 +107,7 @@ var testImmunList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -169,7 +169,7 @@ var testImmunList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -216,7 +216,7 @@ var testImmunList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -264,7 +264,7 @@ var testImmunList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", @@ -325,7 +325,7 @@ var testImmunList = { "first": "Amanda" }], "address": [{ - "streetLines": [ + "street_lines": [ "1021 Health Drive" ], "city": "Ann Arbor", diff --git a/test/fixtures/validator/samples/testLocations.js b/test/fixtures/validator/samples/testLocations.js index 99d41b09..10edbe78 100644 --- a/test/fixtures/validator/samples/testLocations.js +++ b/test/fixtures/validator/samples/testLocations.js @@ -7,7 +7,7 @@ var testLocations = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -24,7 +24,7 @@ var testLocations = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -37,7 +37,7 @@ var testLocations = { "name": "Community Urgent Care Center", "loc_type": {}, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -62,7 +62,7 @@ var testLocations = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -79,7 +79,7 @@ var testLocations = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -95,7 +95,7 @@ var testLocations = { "locTypeUndefined": { "name": "Community Urgent Care Center", "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/validator/samples/testPayers.js b/test/fixtures/validator/samples/testPayers.js index 099bdb02..0fc95181 100644 --- a/test/fixtures/validator/samples/testPayers.js +++ b/test/fixtures/validator/samples/testPayers.js @@ -21,7 +21,7 @@ var test_payers_list = { "identifier": "2.16.840.1.113883.19" }], "address": [{ - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -39,7 +39,7 @@ var test_payers_list = { "Good Health Insurance" ], "address": [{ - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -65,7 +65,7 @@ var test_payers_list = { "identifier": "329fcdf0-7ab3-11db-9fe1-0800200c9a66" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -100,7 +100,7 @@ var test_payers_list = { "identifier_type": "1138345" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -126,7 +126,7 @@ var test_payers_list = { "identifier_type": "1138345" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -172,7 +172,7 @@ var test_payers_list = { "identifier": "2.16.840.1.113883.19" }], "address": [{ - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -190,7 +190,7 @@ var test_payers_list = { "Good Health Insurance" ], "address": [{ - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -216,7 +216,7 @@ var test_payers_list = { "identifier": "329fcdf0-7ab3-11db-9fe1-0800200c9a66" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -251,7 +251,7 @@ var test_payers_list = { "identifier_type": "1138345" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -305,7 +305,7 @@ var test_payers_list = { "identifier": "2.16.840.1.113883.19" }], "address": [{ - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -323,7 +323,7 @@ var test_payers_list = { "Good Health Insurance" ], "address": [{ - "streetLines": [ + "street_lines": [ "123 Insurance Road" ], "city": "Blue Bell", @@ -353,7 +353,7 @@ var test_payers_list = { "identifier_type": "1138345" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -379,7 +379,7 @@ var test_payers_list = { "identifier_type": "1138345" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -416,7 +416,7 @@ var test_payers_list = { "identifier": "329fcdf0-7ab3-11db-9fe1-0800200c9a66" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -451,7 +451,7 @@ var test_payers_list = { "identifier_type": "1138345" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -477,7 +477,7 @@ var test_payers_list = { "identifier_type": "1138345" }], "address": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", diff --git a/test/fixtures/validator/samples/testProcedures.js b/test/fixtures/validator/samples/testProcedures.js index 21db01aa..5505980c 100644 --- a/test/fixtures/validator/samples/testProcedures.js +++ b/test/fixtures/validator/samples/testProcedures.js @@ -22,7 +22,7 @@ var testProcedureList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -41,7 +41,7 @@ var testProcedureList = { "organization": { "name": "Community Health and Hospitals", "address": { - "streetLines": [ + "street_lines": [ "1001 Village Avenue" ], "city": "Portland", @@ -84,7 +84,7 @@ var testProcedureList = { }], "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -115,7 +115,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -145,7 +145,7 @@ var testProcedureList = { }, "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -176,7 +176,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -205,7 +205,7 @@ var testProcedureList = { }, "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -236,7 +236,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -261,7 +261,7 @@ var testProcedureList = { }, "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -292,7 +292,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -320,7 +320,7 @@ var testProcedureList = { }, "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -351,7 +351,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -381,7 +381,7 @@ var testProcedureList = { }, "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -406,7 +406,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -436,7 +436,7 @@ var testProcedureList = { }, "performers": [{ "address": { - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -466,7 +466,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell", @@ -563,7 +563,7 @@ var testProcedureList = { "code_system_name": "HealthcareServiceLocation" }, "addresses": [{ - "streetLines": [ + "street_lines": [ "17 Daws Rd." ], "city": "Blue Bell",