diff --git a/.gitignore b/.gitignore index 2176ca25..1018851c 100644 --- a/.gitignore +++ b/.gitignore @@ -251,3 +251,6 @@ paket-files/ .idea/ *.sln.iml +.vscode/launch.json +.vscode/tasks.json +TestResults.xml diff --git a/Data/NHSNoMap.csv b/Data/NHSNoMap.csv deleted file mode 120000 index fa2e16f7..00000000 --- a/Data/NHSNoMap.csv +++ /dev/null @@ -1,17 +0,0 @@ -NATIVE_NHS_NUMBER,PROVIDER_NHS_NUMBER -9000000001,9658218865 -9000000002,9658218873 -9000000003,9658218881 -9000000004,9658218903 -9000000005,9658218989 -9000000006,9658218997 -9000000007,9658219004 -9000000008,9658219012 -9000000009,9658220142 -9000000010,9658220150 -9000000011,9658220223 -9000000012,9658220215 -9000000013,9658219691 -9000000014,9476718943 -9000000015,9658220169 -9000000018,9658220290 diff --git a/Data/NHSNoMap.csv b/Data/NHSNoMap.csv new file mode 100644 index 00000000..11eff4b9 --- /dev/null +++ b/Data/NHSNoMap.csv @@ -0,0 +1,17 @@ +NATIVE_NHS_NUMBER,PROVIDER_NHS_NUMBER +9000000001,9658218865 +9000000002,9658218873 +9000000003,9658218881 +9000000004,9658218903 +9000000005,9658218989 +9000000006,9658218997 +9000000007,9658219004 +9000000008,9658219012 +9000000009,9658220142 +9000000010,9658220150 +9000000011,9658220223 +9000000012,9658220215 +9000000013,9658219691 +9000000014,9476718943 +9000000015,9658220169 +9000000018,9658220290 \ No newline at end of file diff --git a/FHIR/ValueSets/Human-Language-1.xml b/FHIR/ValueSets/Human-Language-1.xml new file mode 100644 index 00000000..969f7cd0 --- /dev/null +++ b/FHIR/ValueSets/Human-Language-1.xml @@ -0,0 +1,777 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FHIR/ValueSets/administrative-gender-1.xml b/FHIR/ValueSets/administrative-gender-1.xml new file mode 100644 index 00000000..151c5e74 --- /dev/null +++ b/FHIR/ValueSets/administrative-gender-1.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FHIR/ValueSets/cda-person-relationship-type-1.xml b/FHIR/ValueSets/cda-person-relationship-type-1.xml new file mode 100644 index 00000000..98d81c73 --- /dev/null +++ b/FHIR/ValueSets/cda-person-relationship-type-1.xml @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FHIR/ValueSets/martial-status-1.xml b/FHIR/ValueSets/martial-status-1.xml new file mode 100644 index 00000000..f5e253a3 --- /dev/null +++ b/FHIR/ValueSets/martial-status-1.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GPConnect.Provider.AcceptanceTests/App.config b/GPConnect.Provider.AcceptanceTests/App.config index 7bd9c26f..925fe35e 100644 --- a/GPConnect.Provider.AcceptanceTests/App.config +++ b/GPConnect.Provider.AcceptanceTests/App.config @@ -18,18 +18,29 @@ - + - - + + - + + + + + + + + + + @@ -40,7 +51,7 @@ - + diff --git a/GPConnect.Provider.AcceptanceTests/Steps/HttpSteps.cs b/GPConnect.Provider.AcceptanceTests/Steps/HttpSteps.cs index 6c626c3a..aac650d5 100644 --- a/GPConnect.Provider.AcceptanceTests/Steps/HttpSteps.cs +++ b/GPConnect.Provider.AcceptanceTests/Steps/HttpSteps.cs @@ -81,8 +81,8 @@ public void GivenIAmUsingTheDefaultServer() // Load The Default Settings From The App.config File HttpContext.LoadAppConfig(); - Given(@"I configure server certificate and ssl"); - And($@"I am using ""{FhirConst.ContentTypes.kJsonFhir}"" to communicate with the server"); + // Given(@"I configure server certificate and ssl"); + Given($@"I am using ""{FhirConst.ContentTypes.kJsonFhir}"" to communicate with the server"); And(@"I am generating a random message trace identifier"); And($@"I am accredited system ""{HttpContext.ConsumerASID}"""); And($@"I am connecting to accredited system ""{HttpContext.ProviderASID}""");