NIAD-2772: adding identifier block to practitioner section (#371)

* adding identifier to practitioner section * small test optimizations * fixing integration tests * empty or null string check optimization
NHSDigital · Nov 14, 2023 · ae07902 · ae07902
1 parent dbfcda2
commit ae07902
Show file tree

Hide file tree

Showing 23 changed files with 326 additions and 143 deletions.
diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP10-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP10-output.json
@@ -46,7 +46,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7882315"
+        } ]
       }
     },
     {
@@ -69,7 +73,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP11-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP11-output.json
@@ -46,7 +46,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP2-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP2-output.json
@@ -46,7 +46,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7882315"
+        } ]
       }
     },
     {
@@ -92,7 +96,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP3-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP3-output.json
@@ -46,7 +46,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7882315"
+        } ]
       }
     },
     {
@@ -69,7 +73,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP4-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP4-output.json
@@ -63,7 +63,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7882315"
+        } ]
       }
     },
     {
@@ -132,7 +136,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP5-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP5-output.json
@@ -46,7 +46,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP6-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP6-output.json
@@ -46,7 +46,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7882315"
+        } ]
       }
     },
     {
@@ -69,7 +73,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP7_vis-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP7_vis-output.json
@@ -63,7 +63,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7882315"
+        } ]
       }
     },
     {
@@ -86,7 +90,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP9-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP9-output.json
@@ -46,7 +46,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7882315"
+        } ]
       }
     },
     {
@@ -92,7 +96,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "7889233"
+        } ]
       }
     },
     {

diff --git a/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario1.json b/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario1.json
@@ -97,7 +97,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G2141239"
+        } ]
       }
     },
     {
@@ -210,7 +214,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G9489493"
+        } ]
       }
     },
     {

diff --git a/...-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario10.json b/...-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario10.json
@@ -92,7 +92,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "12345"
+        } ]
       }
     },
     {

diff --git a/...-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario11.json b/...-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario11.json
@@ -92,7 +92,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "12345"
+        } ]
       }
     },
     {

diff --git a/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario2.json b/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario2.json
@@ -97,7 +97,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G2141239"
+        } ]
       }
     },
     {
@@ -210,7 +214,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G9489493"
+        } ]
       }
     },
     {

diff --git a/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario3.json b/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario3.json
@@ -97,7 +97,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G2141239"
+        } ]
       }
     },
     {
@@ -210,7 +214,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G9489493"
+        } ]
       }
     },
     {

diff --git a/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario4.json b/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario4.json
@@ -97,7 +97,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G2141239"
+        } ]
       }
     },
     {
@@ -210,7 +214,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G9489493"
+        } ]
       }
     },
     {

diff --git a/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario5.json b/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario5.json
@@ -97,7 +97,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G2141239"
+        } ]
       }
     },
     {
@@ -210,7 +214,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G9489493"
+        } ]
       }
     },
     {

diff --git a/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario6.json b/...p-translator/src/integrationTest/resources/json/LargeMessage/expectedBundleScenario6.json
@@ -96,7 +96,11 @@
               "Dr"
             ]
           }
-        ]
+        ],
+        "identifier": [ {
+          "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+          "value": "G7777781"
+        } ]
       }
     },
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,7 +46,11 @@ @@
                   "Dr"
                 ]
               }
-            ]
+            ],
+            "identifier": [ {
+              "system": "https://fhir.hl7.org.uk/Id/gmp-number",
+              "value": "7889233"
+            } ]
           }
         },
         {
@@ Expand Down @@