adding an option on either to automatch or not patients that has huma…

…n adjudication tag. add PUT end point for submitting patients
intrahealth · Oct 5, 2020 · cf539e3 · cf539e3
1 parent 032b2f8
commit cf539e3
Show file tree

Hide file tree

Showing 9 changed files with 244 additions and 118 deletions.
diff --git a/server/config/config_development_template.json b/server/config/config_development_template.json
@@ -18,9 +18,9 @@
     "register": false
   },
   "fhirServer": {
-    "baseURL": "http://localhost:8081/clientregistry/fhir",
     "username": "hapi",
-    "password": "hapi"
+    "password": "hapi",
+    "baseURL": "http://localhost:8080/hapi/fhir"
   },
   "elastic": {
     "server": "http://localhost:9200",
@@ -30,7 +30,8 @@
     "index": "patients"
   },
   "matching": {
-    "tool": "elasticsearch"
+    "tool": "elasticsearch",
+    "autoMatchPatientWithHumanAdjudTag": false
   },
   "codes": {
     "goldenRecord": "5c827da5-4858-4f3d-a50c-62ece001efea"
@@ -44,34 +45,45 @@
       "id": "openmrs",
       "displayName": "OpenMRS"
     },
+    {
+      "id": "dhis2",
+      "displayName": "DHIS2"
+    },
     {
       "id": "lims",
       "displayName": "Lab Info Management System"
+    },
+    {
+      "id": "cr",
+      "displayName": "Client Registry"
     }
   ],
   "systems": {
     "CRBaseURI": "http://openclientregistry.org/fhir",
     "internalid": {
       "uri": [
         "http://health.go.ug/cr/internalid",
-        "http://clientregistry.org/openmrs"
+        "http://openmrs.org/openmrs2",
+        "http://clientregistry.org/openmrs",
+        "http://clientregistry.org/dhis2",
+        "http://clientregistry.org/lims"
       ],
       "displayName": "Internal ID"
     },
     "nationalid": {
-      "uri": "http://health.go.ug/cr/natioanlid",
+      "uri": "http://clientregistry.org/cr/natioanlid",
       "displayName": "National ID"
     },
     "artnumber": {
-      "uri": "http://health.go.ug/cr/artnumber",
+      "uri": "http://clientregistry.org/cr/artnumber",
       "displayName": "ART Number"
     },
     "brokenMatch": {
       "uri": "http://clientregistry.org/brokenMatch"
     }
   },
   "sync": {
-    "lastFHIR2ESSync": "2020-02-21T14:51:41"
+    "lastFHIR2ESSync": "1970-10-05T08:15:12"
   },
   "__comments": {
     "matching.tool": "this tells if the app should use mediator algorithms or elasticsearch algorithms for matching, two options mediator and elasticsearch"

diff --git a/server/config/config_production_template.json b/server/config/config_production_template.json
@@ -18,9 +18,9 @@
     "register": false
   },
   "fhirServer": {
-    "baseURL": "http://localhost:8081/clientregistry/fhir",
     "username": "hapi",
-    "password": "hapi"
+    "password": "hapi",
+    "baseURL": "http://localhost:8080/hapi/fhir"
   },
   "elastic": {
     "server": "http://localhost:9200",
@@ -30,7 +30,8 @@
     "index": "patients"
   },
   "matching": {
-    "tool": "elasticsearch"
+    "tool": "elasticsearch",
+    "autoMatchPatientWithHumanAdjudTag": false
   },
   "codes": {
     "goldenRecord": "5c827da5-4858-4f3d-a50c-62ece001efea"
@@ -44,34 +45,45 @@
       "id": "openmrs",
       "displayName": "OpenMRS"
     },
+    {
+      "id": "dhis2",
+      "displayName": "DHIS2"
+    },
     {
       "id": "lims",
       "displayName": "Lab Info Management System"
+    },
+    {
+      "id": "cr",
+      "displayName": "Client Registry"
     }
   ],
   "systems": {
     "CRBaseURI": "http://openclientregistry.org/fhir",
     "internalid": {
       "uri": [
         "http://health.go.ug/cr/internalid",
-        "http://clientregistry.org/openmrs"
+        "http://openmrs.org/openmrs2",
+        "http://clientregistry.org/openmrs",
+        "http://clientregistry.org/dhis2",
+        "http://clientregistry.org/lims"
       ],
       "displayName": "Internal ID"
     },
     "nationalid": {
-      "uri": "http://health.go.ug/cr/natioanlid",
+      "uri": "http://clientregistry.org/cr/natioanlid",
       "displayName": "National ID"
     },
     "artnumber": {
-      "uri": "http://health.go.ug/cr/artnumber",
+      "uri": "http://clientregistry.org/cr/artnumber",
       "displayName": "ART Number"
     },
     "brokenMatch": {
       "uri": "http://clientregistry.org/brokenMatch"
     }
   },
   "sync": {
-    "lastFHIR2ESSync": "2020-02-21T14:51:41"
+    "lastFHIR2ESSync": "1970-10-05T08:15:12"
   },
   "__comments": {
     "matching.tool": "this tells if the app should use mediator algorithms or elasticsearch algorithms for matching, two options mediator and elasticsearch"

diff --git a/server/config/config_test_template.json b/server/config/config_test_template.json
@@ -20,7 +20,7 @@
   "fhirServer": {
     "username": "hapi",
     "password": "hapi",
-    "baseURL": "http://localhost:8081/clientregistry/fhir"
+    "baseURL": "http://localhost:8080/hapi/fhir"
   },
   "elastic": {
     "server": "http://localhost:9200",
@@ -30,7 +30,8 @@
     "index": "patients"
   },
   "matching": {
-    "tool": "elasticsearch"
+    "tool": "elasticsearch",
+    "autoMatchPatientWithHumanAdjudTag": false
   },
   "codes": {
     "goldenRecord": "5c827da5-4858-4f3d-a50c-62ece001efea"
@@ -82,7 +83,7 @@
     }
   },
   "sync": {
-    "lastFHIR2ESSync": "2020-09-22T18:02:56"
+    "lastFHIR2ESSync": "1970-10-05T08:15:12"
   },
   "__comments": {
     "matching.tool": "this tells if the app should use mediator algorithms or elasticsearch algorithms for matching, two options mediator and elasticsearch"

diff --git a/server/lib/esMatching.js b/server/lib/esMatching.js
@@ -417,7 +417,6 @@ const performMatch = ({
           goldenRecords.entry = goldenRecords.entry.filter((entry) => {
             return entry.resource.resourceType + '/' + entry.resource.id === goldenID;
           });
-
           logger.info('Done matching');
           return callback({
             error,