AWV-3: Merging changes from upstream

config/dcm4cheeDIMSE.json

@@ -4,7 +4,7 @@
       {
         "name": "DCM4CHEE",
         "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
-        "wadoUriRoot": "http://localhost:8043/dcm4chee-arc/aets/DCM4CHEE/wado",
+        "wadoUriRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/wado",
         "qidoRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/rs",
         "wadoRoot": "http://localhost:8080/dcm4chee-arc/aets/DCM4CHEE/rs",
         "qidoSupportsIncludeField": false,

config/medkenOrthanc.json

@@ -15,20 +15,26 @@
           "logTiming": true
         }
       }
-    ]
+    ],
+    "dimse" : [{
+      "name": "ORTHANC_DIMSE",
+      "peers": [
+        {
+          "host": "208.100.41.100",
+          "port": 4242,
+          "aeTitle": "MKORTHANC",
+          "default": true
+        },
+        {
+          "host": "0.0.0.0",
+          "port": 11119,
+          "aeTitle": "OHIFDCM",
+          "default": true,
+          "server": true
+        }
+      ]
+    }]
   },
-  "dimse" : [{
-    "host" : "208.100.41.100",
-    "port" : 4242,
-    "aeTitle" : "MKORTHANC",
-    "default": true
-  },{
-    "host" : "0.0.0.0",
-    "port" : 11112,    
-    "aeTitle" : "OHIFDCM",
-    "default" : true,
-    "server" : true
-  }],
   "defaultServiceType": "dimse",
   "medkenpanel" : {
     "prefix" : "admin"

config/orthancDICOMWeb.json

@@ -4,7 +4,7 @@
       {
         "name": "Orthanc",
         "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
-        "wadoUriRoot": "http://localhost:8043/wado",
+        "wadoUriRoot": "http://localhost:8042/wado",
         "qidoRoot": "http://localhost:8042/dicom-web",
         "wadoRoot": "http://localhost:8042/dicom-web",
         "qidoSupportsIncludeField": false,

config/orthancDIMSE.json

@@ -4,7 +4,7 @@
       {
         "name": "Orthanc",
         "wadoUriRootNOTE": "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
-        "wadoUriRoot": "http://localhost:8043/wado",
+        "wadoUriRoot": "http://localhost:8042/wado",
         "qidoRoot": "http://localhost:8042/dicom-web",
         "wadoRoot": "http://localhost:8042/dicom-web",
         "qidoSupportsIncludeField": false,
@@ -28,7 +28,7 @@
         },
         {
           "host": "0.0.0.0",
-          "port": 11112,
+          "port": 11119,
           "aeTitle": "OHIFDCM",
           "default": true,
           "server": true