feat: add multiple new configuration files for various services and components

1 month ago · c5a81d9b9b
parent f60de9bcbb
commit c5a81d9b9b
79 changed files with 4993 additions and 0 deletions
--- a/Config-Server/configrepo/CSI-CENTRAL-AUTHENTICATION-SERVICE.yaml
+++ b/Config-Server/configrepo/CSI-CENTRAL-AUTHENTICATION-SERVICE.yaml
@ -0,0 +1,499 @@
+spring:
+  application:
+    name: CSI-CENTRAL-AUTHENTICATION-SERVICE
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 40
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+  http:
+    multipart:
+      max-file-size: 200MB
+      max-request-size: 200MB
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: 'http://localhost:8761/eureka/'
+  fetch-registry: false
+  register-with-eureka: false
+hystrix:
+  shareSecurityContex: true
+  command:
+    default:
+      circuitBreaker:
+        enabled: true
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 300000
+      fallback:
+        enabled: true
+  threadpool:
+    default:
+      coreSize: 10
+      maximumSize: 100
+      allowMaximumSizeToDivergeFromCoreSize: true
+ribbon:
+  ConnectTimeout: 60000
+  MaxAutoRetries: 1
+  MaxAutoRetriesNextServer: 1
+  ReadTimeout: 240000
+opentracing:
+  jaeger:
+    http-sender:
+      url: 'http://jaeger-collector:14268/api/traces'
+    enable-b3-propagation: true
+csi:
+  env:
+    prefix: net-hmg-uat
+  access-token-verification:
+    enabled: true
+debug: false
+zuul:
+  #host:
+  #  connect-timeout-millis: 60000
+  #  socket-timeout-millis: 480000
+  ignore-security-headers: false
+  ignored-headers: >-
+    X-Content-Type-Options,Strict-Transport-Security,X-Frame-Options,X-XSS-Protection
+  routes:
+    ui:
+      path: /**
+      sensitiveHeaders: null
+      url: '${ui.hostname}'
+    report:
+      path: /reporting-service/**
+      sensitiveHeaders: null
+      url: 'http://reporting-service'
+    iam:
+      path: /iam/**
+      sensitiveHeaders: null
+      url: 'http://csi-iam-service'
+    document:
+      path: /document-management/**
+      sensitiveHeaders: null
+      url: 'http://document-management-services'
+    document-engine:
+      path: /document-engine/**
+      sensitiveHeaders: null
+      url: 'http://document-storage-engine-service'
+    medispan:
+      path: /csi-net-medispan/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-medispan'
+    appointment-channel:
+      path: /cas-appointment-channel/**
+      sensitiveHeaders: null
+      url: 'http://cas-appointment-channel'
+    crs-channel:
+      path: /crs-channel/**
+      sensitiveHeaders: null
+      url: 'http://crs-channel'
+    sick-leave-create:
+      path: /sick-leave-create/**
+      sensitiveHeaders: null
+      url: 'http://sick-leave-create'
+    doctor-verify:
+      path: /sick-leave-doctor-verify/**
+      sensitiveHeaders: null
+      url: 'http://sick-leave-doctor-verify'
+    reporting-publisher:
+      path: /reporting-publisher/**
+      sensitiveHeaders: null
+      url: 'http://csi-reporting-publisher'
+    config-repo:
+      path: /config-server/**
+      url: 'http://config-server'
+    econsent:
+      path: /cs-net-econsent/**
+      sensitiveHeaders: null
+      url: 'http://cs-net-econsent'
+    econsentui:
+      path: /cs-net-econsentui/**
+      sensitiveHeaders: null
+      url: 'http://cs-net-econsentui'
+    middleware:
+      path: /document-management-middleware/**
+      sensitiveHeaders: null
+      url: 'http://csi-document-management-service' #'http://document-management-middleware'
+    csi-ie-hpd:
+      path: /csi-ie-hpd/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-hpd'
+    cs-net-physiotherapy:
+      path: /cs-net-physiotherapy/**
+      sensitiveHeaders: null
+      url: 'http://cs-net-physiotherapy'
+    cs-net-physiotherapy-ui:
+      path: /cs-net-physiotherapyui/**
+      sensitiveHeaders: null
+      url: 'http://cs-net-physiotherapyui'
+    cs-net-social-worker-ui:
+      path: /cs-net-social-worker-ui/**
+      url: 'http://cs-net-social-worker-ui'
+      sensitiveHeaders: null
+    cs-net-social-worker:
+      path: /cs-net-social-worker/**
+      url: 'http://cs-net-social-worker'
+      sensitiveHeaders: null
+    csi-reporting:
+      path: /csi-reporting-service/**
+      url: 'http://csi-reporting-service/'
+      sensitiveHeaders: null
+    csi-ie-pdq:
+      path: /csi-ie-pdq/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-pdq'
+    csi-ie-employee:
+      path: /csi-ie-employee/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-employee'
+    csi-ie-xdsb:
+      path: /csi-ie-xdsb/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-xdsb'
+    csi-streaming-etl-service:
+      path: /csi-streaming-etl-service/**
+      sensitiveHeaders: null
+      url: 'http://csi-streaming-etl-service'
+    csi-rf-file-uploader-service:
+      path: /rf/**
+      sensitiveHeaders: null
+      url: 'http://csi-rf-file-uploader-service'
+    medical-report-channel:
+      path: /medical-report-channel/**
+      sensitiveHeaders: null
+      url: 'http://medical-report-channel'
+    service-base-ui-registry:
+      path: /service-base-ui-registry/**
+      url: 'http://service-base-ui-registry'
+    csi-ie-lakum:
+      path: /csi-ie-lakum/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-lakum'
+    csi-ie-interbranch:
+      path: /csi-ie-interbranch/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-interbranch'
+    csi-ie-prescription:
+      path: /csi-ie-prescription/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-prescription'
+    crs-channel-user:
+      path: /crs-channel-user/**
+      sensitiveHeaders: null
+      url: 'http://crs-channel-user'
+    cs-net-econsent:
+      path: /cs-net-econsent/**
+      sensitiveHeaders: null
+      url: 'http://cs-net-econsent'
+    csi-bm-approval:
+      path: /csi-bm-approval/**
+      sensitiveHeaders: null
+      url: 'http://csi-bm-approval'
+    csi-bm-prm:
+      path: /csi-bm-prm/**
+      sensitiveHeaders: null
+      url: 'http://csi-bm-prm'
+    csi-bm-billing:
+      path: /csi-bm-billing/**
+      sensitiveHeaders: null
+      url: 'http://csi-bm-billing'
+    csi-bm-inte-bridge:
+      path: /csi-bm-inte-bridge/**
+      sensitiveHeaders: null
+      url: 'http://csi-bm-inte-bridge'
+    csi-bm-invoice:
+      path: /csi-bm-invoice/**
+      sensitiveHeaders: null
+      url: 'http://csi-bm-invoice'
+    csi-ie-api:
+      path: /csi-ie-api/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-api'
+    csi-ie-cyclus:
+      path: /csi-ie-cyclus/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-cyclus'
+    csi-ie-doctor-api:
+      path: /csi-ie-doctor-api/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-doctor-api'
+    csi-ie-dq:
+      path: /csi-ie-dq/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-dq'
+    csi-ie-general:
+      path: /csi-ie-general/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-general'
+    csi-ie-generalii:
+      path: /csi-ie-generalii/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-generalii'
+    csi-ie-insurance:
+      path: /csi-ie-insurance/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-insurance'
+    csi-ie-lakum-batch:
+      path: /csi-ie-lakum-batch/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-lakum-batch'
+    csi-ie-misc:
+      path: /csi-ie-misc/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-misc'
+    csi-ie-mobile:
+      path: /csi-ie-mobile/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-mobile'
+    csi-ie-pacsurl:
+      path: /csi-ie-pacsurl/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-pacsurl'
+    csi-ie-zatca:
+      path: /csi-ie-zatca/**
+      sensitiveHeaders: null
+      url: 'http://csi-ie-zatca'
+    csi-java-base-utility:
+      path: /csi-java-base-utility/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-base-utility'
+    csi-java-ds-dental-core:
+      path: /csi-java-ds-dental-core/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ds-dental-core'
+    csi-java-ehr-common:
+      path: /csi-java-ehr-common/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-common'
+    csi-java-ehr-common-scheduler:
+      path: /csi-java-ehr-common-scheduler/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-common-scheduler'
+    csi-java-ehr-config:
+      path: /csi-java-ehr-config/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-config'
+    csi-java-ehr-ic-bundle:
+      path: /csi-java-ehr-ic-bundle/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-ic-bundle'
+    csi-java-ehr-ic-dashboard:
+      path: /csi-java-ehr-ic-dashboard/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-ic-dashboard'
+    csi-java-ehr-initialassessment:
+      path: /csi-java-ehr-initialassessment/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-initialassessment'
+    csi-java-ehr-ip:
+      path: /csi-java-ehr-ip/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-ip'
+    csi-java-ehr-ip-doctor-prescription:
+      path: /csi-java-ehr-ip-doctor-prescription/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-ip-doctor-prescription'
+    csi-java-ehr-ldr:
+      path: /csi-java-ehr-ldr/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-ldr'
+    csi-java-ehr-listener:
+      path: /csi-java-ehr-listener/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-listener'
+    csi-java-ehr-opd:
+      path: /csi-java-ehr-opd/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-opd'
+    csi-java-ehr-or-anesthesia:
+      path: /csi-java-ehr-or-anesthesia/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-or-anesthesia'
+    csi-java-ehr-or-book:
+      path: /csi-java-ehr-or-book/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-or-book'
+    csi-java-ehr-or-booking:
+      path: /csi-java-ehr-or-booking/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-or-booking'
+    csi-java-ehr-patient-pomr:
+      path: /csi-java-ehr-patient-pomr/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-patient-pomr'
+    csi-java-ehr-specializedclinic:
+      path: /csi-java-ehr-specializedclinic/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-specializedclinic'
+    csi-java-ehr-specialized-clinic:
+      path: /csi-java-ehr-specialized-clinic/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-specializedclinic'
+    csi-java-ehr-template:
+      path: /csi-java-ehr-template/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-ehr-template'
+    csi-java-workflow-automation:
+      path: /csi-java-workflow-automation/**
+      sensitiveHeaders: null
+      url: 'http://csi-java-workflow-automation'
+    csi-net-base-wss:
+      path: /csi-net-base-wss/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-base-wss'
+    csi-net-bloodbnk:
+      path: /csi-net-bloodbnk/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-bloodbnk'
+    csi-net-bloodbnk-mgt:
+      path: /csi-net-bloodbnk-mgt/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-bloodbnk-mgt'
+    csi-net-ehr-dboardpc:
+      path: /csi-net-ehr-dboardpc/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-ehr-dboardpc'
+    csi-net-ehr-ip-discharg:
+      path: /csi-net-ehr-ip-discharg/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-ehr-ip-discharg'
+    csi-net-ehr-opd-master:
+      path: /csi-net-ehr-opd-master/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-ehr-opd-master'
+    csi-net-ehr-opd-patient:
+      path: /csi-net-ehr-opd-patient/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-ehr-opd-patient'
+    csi-net-empi-crs-inte:
+      path: /csi-net-empi-crs-inte/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-empi-crs-inte'
+    csi-net-empi-hijridte:
+      path: /csi-net-empi-hijridte/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-empi-hijridte'
+    csi-net-empiread:
+      path: /csi-net-empiread/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-empiread'
+    csi-net-empiwrit:
+      path: /csi-net-empiwrit/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-empiwrit'
+    csi-net-erfuncti:
+      path: /csi-net-erfuncti/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-erfuncti'
+    csi-net-hemdialy:
+      path: /csi-net-hemdialy/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-hemdialy'
+    csi-net-himservi:
+      path: /csi-net-himservi/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-himservi'
+    csi-net-lab-scheduled:
+      path: /csi-net-lab-scheduled/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-lab-scheduled'
+    csi-net-lab-vidaptor:
+      path: /csi-net-lab-vidaptor/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-lab-vidaptor'
+    csi-net-labsrvcs:
+      path: /csi-net-labsrvcs/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-labsrvcs'
+    csi-net-medispan:
+      path: /csi-net-medispan/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-medispan'
+    csi-net-noty:
+      path: /csi-net-noty/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-noty'
+    csi-net-noty-email:
+      path: /csi-net-noty-email/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-noty-email'
+    csi-net-noty-msgtempl:
+      path: /csi-net-noty-msgtempl/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-noty-msgtempl'
+    csi-net-noty-query:
+      path: /csi-net-noty-query/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-noty-query'
+    csi-net-noty-sms:
+      path: /csi-net-noty-sms/**
+      sensitiveHeaders: null
+      url: 'http://csi-net-noty-sms'
+    csi-personalization-service:
+      path: /csi-personalization-service/**
+      sensitiveHeaders: null
+      url: 'http://csi-personalization-service'
+    csi-phr-base:
+      path: /csi-phr-base/**
+      sensitiveHeaders: null
+      url: 'http://csi-phr-base'
+    csi-phr-cron:
+      path: /csi-phr-cron/**
+      sensitiveHeaders: null
+      url: 'http://csi-phr-cron'
+    csi-pms-adt-request:
+      path: /csi-pms-adt-request/**
+      sensitiveHeaders: null
+      url: 'http://csi-pms-adt-request'
+    csi-pms-rms-masterdata:
+      path: /csi-pms-rms-masterdata/**
+      sensitiveHeaders: null
+      url: 'http://csi-pms-rms-masterdata'
+    csi-pms-rms-reservation:
+      path: /csi-pms-rms-reservation/**
+      sensitiveHeaders: null
+      url: 'http://csi-pms-rms-reservation'
+    csi-pms-rms-resource-registry:
+      path: /csi-pms-rms-resource-registry/**
+      sensitiveHeaders: null
+      url: 'http://csi-pms-rms-resource-registry'
+    csi-reporting-service:
+      path: /csi-reporting-service/**
+      sensitiveHeaders: null
+      url: 'http://csi-reporting-service'
+    csi-rf-jdbc-sink-service:
+      path: /csi-rf-jdbc-sink-service/**
+      sensitiveHeaders: null
+      url: 'http://csi-rf-jdbc-sink-service'
+    csi-rms-morgue:
+      path: /csi-rms-morgue/**
+      sensitiveHeaders: null
+      url: 'http://csi-rms-morgue'
+    document-management-middleware:
+      path: /document-management-middleware/**
+      sensitiveHeaders: null
+      url: 'http://csi-document-management-service' #'http://document-management-middleware'
+    service-base-masterdata:
+      path: /service-base-masterdata/**
+      sensitiveHeaders: null
+      url: 'http://service-base-masterdata'
+    service-base-role-permission:
+      path: /service-base-role-permission/**
+      sensitiveHeaders: null
+      url: 'http://service-base-role-permission'
+    sick-leave-doctor-verify:
+      path: /sick-leave-doctor-verify/**
+      sensitiveHeaders: null
+      url: 'http://sick-leave-doctor-verify'
+    wasfaty-service-channel:
+      path: /wasfaty-service-channel/**
+      sensitiveHeaders: null
+      url: 'http://wasfaty-service-channel'
+    csi-otp-service:
+      path: /csi-otp-service/**
+      sensitiveHeaders: null
+      url: 'http://csi-otp-service'
--- a/Config-Server/configrepo/CSI-IE-GENERAL.yml
+++ b/Config-Server/configrepo/CSI-IE-GENERAL.yml
@ -0,0 +1,48 @@
+kafka:
+  enable:
+    metrics-listener: false
+    endorsement-listener: false
+    diet-listener: false
+    lab-result-listener: false
+    claim-receiver: true
+    emp-receiver: true
+    payer-policy-receiver: true
+    payer-group-receiver: true
+    appointment: false
+    admission-notify: true
+    asn: false
+    mdi-appointment: true
+    mdi-bb-order: false
+    mdi-bb-result: false
+    mdi-employee-update: true
+    mdi-discharge: true
+    billing-invoice: true
+    mdi-endoscopy-status-update: false
+    mdi-image-profile: true
+    mdi-masterdata-sync: true
+    mdi-staff-registry: true
+    mdi-medi-dispense: false
+    ie-billing-payer-group: true
+    ie-billing-payer-policy: true
+    mdi-invoice-status: true
+    rcm-employee-register: true
+    mdi-admission-update: true
+    mdi-empi-field-update-event: true
+    mdi-empi-merged-event: true
+    mdi-empi-edited-event: true
+    ris-admission: true
+    ris-admission-update: true
+    ris-appointment: true
+    cardiology-order: true
+    ris-discharge: true
+    rad-other-orders-results: true
+    rad-order: true
+    ris-staff-registry: true
+    ris-transfer: true
+    ris-empi-created-event: true
+    ris-empi-field-update-event: true
+    ris-empi-merged-event: true
+    ris-empi-edited-event: true
+    ris-empi-unknown-bluk-created-event: true
+    ris-empi-unknown-created-event: true
+
--- a/Config-Server/configrepo/CSI-JAVA-BASE-UTILITY.yaml
+++ b/Config-Server/configrepo/CSI-JAVA-BASE-UTILITY.yaml
@ -0,0 +1,7 @@
+management:
+  health:
+    redis:
+      enabled: false
+  endpoint:
+    health:
+      show-details: always
--- a/Config-Server/configrepo/CSI-JAVA-BASE-UTILITY.yml
+++ b/Config-Server/configrepo/CSI-JAVA-BASE-UTILITY.yml
@ -0,0 +1,3 @@
+feign:
+  hystrix:
+    enabled: true
--- a/Config-Server/configrepo/CSI-JAVA-BB-SERVICE-java-dev.yml
+++ b/Config-Server/configrepo/CSI-JAVA-BB-SERVICE-java-dev.yml
@ -0,0 +1,6 @@
+spring:
+  rabbitmq:
+    host: 172.15.100.144
+    port: 5672
+    username: admin
+    password: admin
--- a/Config-Server/configrepo/CSI-JAVA-BB-SERVICE.yaml
+++ b/Config-Server/configrepo/CSI-JAVA-BB-SERVICE.yaml
@ -0,0 +1,28 @@
+spring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 30
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 20
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
+      data-source-properties:
+        oracle:
+          net:
+            CONNECT_TIMEOUT: 120000
+            READ_TIMEOUT: 120000
+          jdbc:
+            ReadTimeout: 120000
+  jpa:
+    properties:
+      javax:
+        persistence:
+          query:
+            timeout: 120000
+
--- a/Config-Server/configrepo/CSI-JAVA-BB-SERVICE.yml
+++ b/Config-Server/configrepo/CSI-JAVA-BB-SERVICE.yml
--- a/Config-Server/configrepo/CSI-JAVA-DS-DENTAL-CORE.yml
+++ b/Config-Server/configrepo/CSI-JAVA-DS-DENTAL-CORE.yml
@ -0,0 +1,17 @@
+server:
+  context-path: /dental
+  port: 0
+
+spring:
+  datasource:
+    url: jdbc:postgresql://172.15.100.88:5432/CSI-JAVA-DS-DENTAL-CORE
+    username: postgres
+    password: csi@2017
+  jackson:
+    default-property-inclusion: NON_NULL
+    date-format: yyyy-MM-dd
+  jpa:
+    database: POSTGRESQL
+    hibernate:
+      ddl-auto: none
+      dialect: org.hibernate.dialect.PostgreSQLDialect
--- a/Config-Server/configrepo/CSI-JAVA-EHR-COMMON-REPORT-GENERATOR.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-COMMON-REPORT-GENERATOR.yml
@ -0,0 +1,6 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-COMMON-REPORT-GENERATOR
+feign:
+  hystrix:
+    enabled: true
--- a/Config-Server/configrepo/CSI-JAVA-EHR-COMMON-SCHEDULER.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-COMMON-SCHEDULER.yml
@ -0,0 +1,56 @@
+---
+app:
+  url:
+    path: /api/Task/InActiveDefineDisaster
+    service-name: CSI-NET-ERFUNCTI
+etl-prop:
+  etl-run-period: "0 0 0 * * *"
+  etl-runing-time-zone: UTC
+feign:
+  hystrix:
+    enabled: true
+spring:
+  application:
+    name: CSI-JAVA-EHR-COMMON-SCHEDULER
+  second-datasource:
+    auto-commit: false
+    autocommit: false
+    hikari:
+      auto-commit: false
+      connection:
+        auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 10
+      minimum-idle: 2
+  datasource:
+    auto-commit: false
+    autocommit: false
+    hikari:
+      auto-commit: false
+      connection:
+        auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 50
+      minimum-idle: 2
+master:
+  datasource:
+    liquibase:
+      enabled: false
+      change-log: classpath:db/changelog/ip/db.changelog.xml
+    configuration:
+      auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 5
+      minimum-idle: 2
+      pool-name: Master-DB
+slave:
+  datasource:
+    liquibase:
+      enabled: false
+      change-log: classpath:db/changelog/common/db.changelog.xml
+    configuration:
+      auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 5
+      minimum-idle: 2
+      pool-name: Slave-DB
--- a/Config-Server/configrepo/CSI-JAVA-EHR-COMMON.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-COMMON.yml
@ -0,0 +1,82 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-COMMON
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 50
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 50
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
+hibernate:
+  dialect: org.hibernate.dialect.PostgreSQLDialect
+postgresql:
+  driver: org.postgresql.Driver
+db:
+  configuration: postgresql
+  group-id:
+    medical-rejected: medical-rejected
+    medical-issued: medical-issued
+    medical-approved: medical-approved
+  topic:
+    medical-leave-rejected: medical-leave-rejected
+    medical-leave-issued: medical-leave-issued
+    medical-leave-approved: medical-leave-approved
+app:
+  url.pomrRead: CSI-JAVA-EHR-PATIENT-POMR
+  url.medication: CSI-JAVA-EHR-IP-DOCTOR-PRESCRIPTION
+  url.pomr: CSI-JAVA-EHR-PATIENT-POMR
+  url.procedure: CSI-JAVA-EHR-OPD-PATIENT-ORDER
+  url.patientProblem: CSI-JAVA-EHR-PATIENT-POMR
+  url.problem: CSI-NET-EHR-OPD-MASTER
+  url.reservation: CSI-PMS-RMS-RESERVATION
+  url.patientVisitDetail: CSI-JAVA-EHR-OPD-PATIENT-ORDER
+  url.lab: CSI-NET-LABREQST
+  url.doctor: CSI-PMS-RMS-RESOURCE-REGISTRY
+  url.clinic: CSI-PMS-RMS-MASTERDATA
+  url.patient: CSI-NET-EMPI
+  url.problemMaster: CSI-NET-EHRPROBM
+  url.empi: CSI-NET-EMPIREAD
+  category.consultattion.id: 1
+  category.consultattion.value: CONSULTATION
+  category.laboratory.id: 2
+  category.laboratory.value: LABORATORY
+  category.radiology.id: 3
+  category.radiology.value: RADIOLOGY
+  category.dental.id: 4
+  category.dental.value: OTHER SERVICES
+  category.procedure.id: 5
+  category.procedure.value: PROCEDURES
+  category.inpatientservice.id: 6
+  category.inpatientservice.value: SURGERY PROCEDURES
+  category.vaccination.id: 10
+  category.vaccination.value: VACCINATION
+  amqp:
+    exchange: csi-ehr-icd-exchange
+    routingkey: patient-problem
+debug: true
+csi:
+  persistence:
+    audit: true
+    kafka:
+      bootstrapAddress: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094
+      topic: csi_audit
+  dateformat:
+    format: yyyy-MM-dd HH:mm:ss
+  jpa:
+    event:
+      isReport: true
+etl-prop:
+  pomr-auto-sing-days: 7
+  episode-auto-sing-days: 90
+  etl-run-period: '0 0 0 * * *'
+  etl-runing-minutes: 1410
+  problem-resolved-period-days: 7
+  etl-runing-time-zone: 'UTC'
+  recurring-etl-run-period: '0 */30 * * * *'
--- a/Config-Server/configrepo/CSI-JAVA-EHR-CONFIG.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-CONFIG.yml
@ -0,0 +1,79 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-CONFIG
+  liquibase:
+    enabled: false
+  jpa:
+    open-in-view: false
+    properties:
+      hibernate:
+        enable_lazy_load_no_trans: true
+        connection:
+          provider_disables_autocommit: true
+  second-datasource:
+    auto-commit: false
+    autocommit: false
+    hikari:
+      auto-commit: false
+      connection:
+        auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 10
+      minimum-idle: 2
+  datasource:
+    auto-commit: false
+    autocommit: false
+    hikari:
+      auto-commit: false
+      connection:
+        auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 50
+      minimum-idle: 2
+hibernate:
+  dialect: org.hibernate.dialect.PostgreSQLDialect
+postgresql:
+  driver: org.postgresql.Driver
+db:
+  configuration: postgresql
+csi:
+  persistence:
+    autogen-id: true
+    autogen:
+      sequence: hibernate_sequence
+  dateformat:
+    format: yyyy/MM/dd HH:mm:ss
+kafka:
+  bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094
+  group-id:
+    medical-rejected: medical-rejected
+    medical-issued: medical-issued
+    medical-approved: medical-approved
+  topic:
+    medical-leave-rejected: medical-leave-rejected
+    medical-leave-issued: medical-leave-issued
+    medical-leave-approved: medical-leave-approved
+table:
+  column-definition: TEXT
+master:
+  datasource:
+    liquibase:
+      enabled: false
+      change-log: classpath:db/changelog/db.changelog-master.xml
+    configuration:
+      auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 5
+      minimum-idle: 2
+      pool-name: Master-DB
+slave:
+  datasource:
+    liquibase:
+      enabled: false
+      change-log: classpath:db/changelog/db.changelog-master.xml
+    configuration:
+      auto-commit: false
+      connection-timeout: 10000
+      maximum-pool-size: 5
+      minimum-idle: 2
+      pool-name: Slave-DB
--- a/Config-Server/configrepo/CSI-JAVA-EHR-IC-BUNDLE.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-IC-BUNDLE.yml
@ -0,0 +1,14 @@
+spring:
+  application:
+      name: CSI-JAVA-EHR-IC-BUNDLE
+db: 
+  jpa: 
+    hibernate: 
+      ddl-auto: none
+server:
+  context-path: /ic
+websocket:
+  endpoint: /ic-bundle
+  prefix: /ic
+csi:
+  timezone: Asia/Colombo
--- a/Config-Server/configrepo/CSI-JAVA-EHR-IC-DASHBOARD.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-IC-DASHBOARD.yml
@ -0,0 +1,44 @@
+--- 
+app: 
+  rabbit: 
+    exchanger: ic-notification
+    labTestExchanger: csi.net.labsrvcs
+    queue: 
+      microbiology: ic-notification.infected
+      labTest: ehr-ic-dashboard-lab-test-queue
+    routingkey: ic-notification.infected
+    labTestRoutingKey: csi.net.labsrvcs.status
+csi: 
+  admissionTypeForTransfer: "Transfer from Another Facility"
+  isolatedRoomType: 150
+  jpa: 
+    event: 
+      isReport: true
+      tablePrefix: ehr_service
+db: 
+  jpa: 
+    hibernate: 
+      ddl-auto: none
+kafka: 
+  topic: 
+    admission: adt-admission-generated-response.t
+    serviceName: "${spring.application.name}-JQA"
+    unit-transfer-completed-notification: adt-transfer-completed-notification.t
+    ehr-patient-problem-create-and-update: ehr_patient_problem_create_and_update
+    ehr-common-infection-create-and-update: ehr_common_infection_create_and_update
+    adt-discharge: adt-discharge.t
+server: 
+  context-path: /ic/dashboard
+spring: 
+  application: 
+    name: CSI-JAVA-EHR-IC-DASHBOARD
+websocket: 
+  endpoint: /ic-socket
+  prefix: /ic
+  
+scheduler:
+  infected-admitted-patient:
+    #cron-exp: 0 0 22 * * *
+    #cron-exp: 0 30 10 * * *
+    cron-exp: 0 0 0 * * *
+    timezone: UTC
--- a/Config-Server/configrepo/CSI-JAVA-EHR-INITIALASSESSMENT.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-INITIALASSESSMENT.yml
@ -0,0 +1,3 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-INITIALASSESSMENT
--- a/Config-Server/configrepo/CSI-JAVA-EHR-IP-DOCTOR-PRESCRIPTION.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-IP-DOCTOR-PRESCRIPTION.yml
--- a/Config-Server/configrepo/CSI-JAVA-EHR-IP.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-IP.yml
@ -0,0 +1,45 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-IP
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 50
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 50
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
+app:
+  url.prescription: CSI-JAVA-EHR-IP-DOCTOR-PRESCRIPTION
+  url.read.adt: CSI-JAVA-EHR-COMMON-ADT-INTEGRATION
+  url.read.careplan: CSI-JAVA-EHR-IP-CAREPLAN-READ
+  url.read.initial-assessment: CSI-JAVA-EHR-INITIALASSESSMENT
+  url.notification: CSI-NET-NOTY
+  url.read: CSI-JAVA-EHR-IP-DOCTOR-ADMISSION-READ
+initial-assessment:
+  time: 4
+etl-prop:
+  etl-run-period: '*/30 * * * * *'
+  etl-runing-minutes: 25
+hibernate:
+  dialect: org.hibernate.dialect.PostgreSQLDialect
+postgresql:
+  driver: org.postgresql.Driver
+db:
+  configuration: postgresql
+csi:
+  persistence:
+    autogen-id: true
+    autogen:
+      sequence: hibernate_sequence
+  jpa:
+    event:
+      isReport: true
+  dateformat:
+    format: yyyy/MM/dd HH:mm:ss
+debug: false
--- a/Config-Server/configrepo/CSI-JAVA-EHR-LDR.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-LDR.yml
@ -0,0 +1,84 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-LDR
+  rabbitmq:
+    listener:
+      default-requeue-rejected: false
+      retry:
+        enabled: true
+        initial-interval: 2000
+        max-attempts: 3
+        multiplier: 1.5
+        max-interval: 10000
+  jpa:
+    database: POSTGRESQL
+    hibernate:
+      ddl-auto: none
+      show-sql: true
+      dialect: org.hibernate.dialect.PostgreSQLDialect
+websocket:
+  endpoint: /baby-socket
+  prefix: /baby
+  topic:
+    admission-request: /admission-request
+app:
+  topic:
+    exchange: vidaplus.empi.exchange
+    patientRouteKey: csi.vidaplus.empi.events.patientcreatedevent
+  patientqueue: empi.patientCreateLDRPROD
+  wait: 5
+hibernate:
+  dialect: org.hibernate.dialect.PostgreSQLDialect
+postgresql:
+  driver: org.postgresql.Driver
+db:
+  configuration: postgresql
+orm:
+  configuration: spring
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+  http:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+csi:
+  persistence:
+    autogen-id: true
+    autogen:
+      sequence: hibernate_sequence
+  jpa:
+    event:
+      isReport: true
+    hibernate:
+      ddl-auto: none
+  dateformat:
+    format: yyyy/MM/dd HH:mm:ss
+debug: false
+hystrix:
+  shareSecurityContex: true
+  command:
+    default:
+      circuitBreaker:
+        enabled: true
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 1440000
+logging:
+  level:
+    org:
+      hibernate:
+        SQL: DEBUG
+      type:
+        descriptor:
+          sql:
+            BasicBinder: TRACE
+    com:
+      csi:
+        vidaplus:
+          ehr:
+            ldr:
+              feign:
+                empi:
+                  HijriDateFeignClient: DEBUG
+                  PatientFeignClient: DEBUG
--- a/Config-Server/configrepo/CSI-JAVA-EHR-LISTENER.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-LISTENER.yml
@ -0,0 +1,23 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-LISTENER
+  jackson:
+    serialization-inclusion: non_null
+    
+websocket:
+  endpoint-admission: /admission-socket
+  endpoint-appointment: /appointment-socket
+  
+kafka:
+  topic:
+    #appointment
+    appointment: appointment.t
+    #admission
+    admission: adt-admission-generated-response.t
+    admissionrequest: adt-admission-request.t
+    discharge-request:  adt-discharge-request.t
+    discharge-start-notification: adt-discharge-start-notification.t
+    discharge-summary-clear-notification: adt-discharge-summary-clear-notification.t
+    unit-transfer-request: adt-transfer-request.t
+    unit-transfer-completed-notification: adt-transfer-completed-notification.t
+
--- a/Config-Server/configrepo/CSI-JAVA-EHR-OPD.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-OPD.yml
@ -0,0 +1,52 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-OPD
+  rabbitmq:
+    listener:
+      default-requeue-rejected: false
+      retry:
+        enabled: true
+        initial-interval: 2000
+        max-attempts: 3
+        multiplier: 1.5
+        max-interval: 10000
+  datasource:
+    driverClassName: org.postgresql.Driver
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 50
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 40
+      connection-timeout: 30000
+      idle-timeout: 10000
+      max-lifetime: 40000
+hibernate:
+  dialect: org.hibernate.dialect.PostgreSQLDialect
+postgresql:
+  driver: org.postgresql.Driver
+db:
+  configuration: postgresql
+csi:
+  persistence:
+    autogen-id: true
+    autogen:
+      sequence: hibernate_sequence
+  dateformat:
+    format: yyyy/MM/dd HH:mm:ss
+  jpa:
+    event:
+      isReport: true
+app:
+  url.medication: CSI-JAVA-EHR-IP-DOCTOR-PRESCRIPTION
+  url.pomr: CSI-JAVA-EHR-PATIENT-POMR
+  url.procedure: CSI-JAVA-EHR-OPD-PATIENT-ORDER
+  url.patientProblem: CSI-JAVA-EHR-PATIENT-POMR
+kafka:
+  topic:
+    appointment: appointment
+    admission: adt-admission-generated-response.t
+    discharge: adt-discharge-summary-clear-notification.t
--- a/Config-Server/configrepo/CSI-JAVA-EHR-OR-ANESTHESIA.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-OR-ANESTHESIA.yml
@ -0,0 +1,51 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-OR-ANESTHESIA
+#  main:
+#    allow-bean-definition-overriding: true
+#  resources:
+#    cache:
+#      period: "3600s"
+  datasource:    
+#    url: jdbc:postgresql://172.15.100.141:5432/CSI-EHR-OR-ANESTHESIA?autoReconnect=true
+#    username: ehr_common
+#    password: db@common
+    tomcat:
+      remove-abandoned: true
+#  jpa:
+#    database: POSTGRESQL
+#    hibernate:
+      #ddl-auto: none
+#      dialect: org.hibernate.dialect.PostgreSQLDialect
+#    database-platform: org.hibernate.dialect.PostgreSQLDialect
+#hibernate:
+#  dialect: org.hibernate.dialect.PostgreSQLDialect
+#postgresql:
+#  driver: org.postgresql.Driver
+#  jpa:
+#    properties:
+#      hibernate:
+#        format_sql: true
+#        temp:
+#          use_jdbc_metadata_defaults: false
+#  liquibase:
+#    change-log: classpath:db/changelog/db.changelog-master.xml
+logging:
+  level:
+    root: ERROR
+    org:
+      springframework:
+        web: DEBUG
+      hibernate: ERROR
+csi:
+  jpa:
+    event:
+      isReport: false
+app:
+  anesthesia:
+    clinic-code: ANES001
+  procedure:
+    surgery-caegory: 7
+  appointment-type:
+    walking: WALKIN
+    regular: REGULAR
--- a/Config-Server/configrepo/CSI-JAVA-EHR-OR-BOOK.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-OR-BOOK.yml
@ -0,0 +1,48 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-OR-BOOK
+#  main:
+#    allow-bean-definition-overriding: true
+#  resources:
+#    cache:
+#      period: "3600s"
+  jpa:
+    open-in-view: false
+#  datasource:
+#    url: jdbc:postgresql://172.15.100.141:5432/CSI-EHR-RW-OR-BOOK?autoReconnect=true
+#    username: ehr_common
+#    password: db@common
+#    properties:
+#      hibernate:
+#        format_sql: true
+#        temp:
+#          use_jdbc_metadata_defaults: false
+#  liquibase:
+#    change-log: classpath:db/changelog/db.changelog-master.xml
+csi:
+  jpa:
+    event:
+      isReport: true 
+      tablePrefix: ehr_service
+      rabbitmq:
+          host: 172.200.0.204
+          port: 5672
+          userName: reporting
+          password: reporting
+          queueName: csi-reporting
+          exchangeName: csi.reporting
+websocket:
+    endpoint: /common-socket
+logging:
+  level:
+    com:
+      csi:
+        ehr:
+          or:
+            book:
+              feign:
+                ProcedureFeignClient : DEBUG
+                AnesthesiaFeignClient : DEBUG
+                OperationFeignClient : DEBUG
+                PomrFeignClient : DEBUG
+                Procedure2 : DEBUG
--- a/Config-Server/configrepo/CSI-JAVA-EHR-OR-BOOKING.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-OR-BOOKING.yml
@ -0,0 +1,48 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-OR-BOOKING
+#  main:
+#    allow-bean-definition-overriding: true
+#  resources:
+#    cache:
+#      period: "3600s"
+#  datasource:
+#    url: jdbc:postgresql://172.15.100.141:5432/CSI-EHR-OR-BOOKING?autoReconnect=true
+#    username: ehr_common
+#    password: db@common
+#  jpa:
+#    database: POSTGRESQL
+#    hibernate:
+#      ddl-auto: none
+#      dialect: org.hibernate.dialect.PostgreSQLDialect
+#    database-platform: org.hibernate.dialect.PostgreSQLDialect
+#hibernate:
+#  dialect: org.hibernate.dialect.PostgreSQLDialect
+#postgresql:
+#  driver: org.postgresql.Driver
+#  jpa:
+#    properties:
+#      hibernate:
+#        format_sql: true
+#        temp:
+#          use_jdbc_metadata_defaults: false
+#  liquibase:
+#    change-log: classpath:db/changelog/db.changelog-master.xml
+server:
+  context-path: /OR
+debug: true
+app:
+  anesthesia:
+    inpatient: 1
+    appointment-duration: 1
+  my-surgery:
+    history-days: 90
+  procedure:
+    surgery-caegory: 7
+  casetime:
+    cron: 50 01 * * * *
+    historydays: 2
+csi:
+  jpa:
+    event:
+      isReport: true
--- a/Config-Server/configrepo/CSI-JAVA-EHR-PATIENT-POMR.yaml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-PATIENT-POMR.yaml
@ -0,0 +1,14 @@
+spring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 50
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 50
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
--- a/Config-Server/configrepo/CSI-JAVA-EHR-PATIENT-POMR.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-PATIENT-POMR.yml
@ -0,0 +1,10 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-PATIENT-POMR
+feign:
+  hystrix:
+    enabled: true
+csi:
+  jpa:
+    event:
+      isReport: true
--- a/Config-Server/configrepo/CSI-JAVA-EHR-SPECIALIZED-CLINIC.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-SPECIALIZED-CLINIC.yml
@ -0,0 +1,50 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-SPECIALIZED-CLINIC
+  jackson:
+    default-property-inclusion: NON_NULL
+    date-format: yyyy-MM-dd HH:mm:ss
+  main:
+    allow-bean-definition-overriding: true
+  resources:
+    cache:
+      period: "3600s"
+  datasource:    
+#    url: jdbc:postgresql://172.15.100.141:5432/CSI-EHR-OR-ANESTHESIA?autoReconnect=true
+#    username: ehr_common
+#    password: db@common
+    tomcat:
+      remove-abandoned: true
+  jpa:
+    properties:
+      hibernate:
+        format_sql: true
+        temp:
+          use_jdbc_metadata_defaults: false
+#    database: POSTGRESQL
+#    hibernate:
+      #ddl-auto: none
+#      dialect: org.hibernate.dialect.PostgreSQLDialect
+#    database-platform: org.hibernate.dialect.PostgreSQLDialect
+#hibernate:
+#  dialect: org.hibernate.dialect.PostgreSQLDialect
+#postgresql:
+#  driver: org.postgresql.Driver
+#logging:
+#  level:
+#    root: ERROR
+#    org:
+#      springframework:
+#        web: DEBUG
+#      hibernate: ERROR
+csi:
+  base:
+    util:
+      url: csi-java-base-utility
+      #url: https://vida.dev.cloudsolution.lk/csi-java-base-utility
+      moduleKey: ehr
+      patient-merge:
+        url: CSI-NET-EMPIREAD
+  jpa:
+    event:
+      isReport: false
--- a/Config-Server/configrepo/CSI-JAVA-EHR-TEMPLATE.yml
+++ b/Config-Server/configrepo/CSI-JAVA-EHR-TEMPLATE.yml
@ -0,0 +1,18 @@
+spring:
+  application:
+    name: CSI-JAVA-EHR-TEMPLATE
+hibernate:
+  dialect: org.hibernate.dialect.PostgreSQLDialect
+postgresql:
+  driver: org.postgresql.Driver
+db:
+  configuration: postgresql
+csi:
+  persistence:
+    autogen-id: true
+    autogen:
+      sequence: hibernate_sequence
+  dateformat:
+    format: yyyy/MM/dd HH:mm:ss
+table:
+  column-definition: TEXT
--- a/Config-Server/configrepo/CSI-JAVA-FAC-PATIENT-SNAPSHOT.yml
+++ b/Config-Server/configrepo/CSI-JAVA-FAC-PATIENT-SNAPSHOT.yml
@ -0,0 +1,7 @@
+server:
+  port: 0
+
+spring:
+  jackson:
+    default-property-inclusion: NON_NULL
+    date-format: yyyy-MM-dd
--- a/Config-Server/configrepo/CSI-NET-BLOODBNK-MGT.yml
+++ b/Config-Server/configrepo/CSI-NET-BLOODBNK-MGT.yml
@ -0,0 +1,26 @@
+--- 
+AppSettings: 
+  SiteTitle: CSI-NET-BLOODBNK-MGT-{env}
+  SiteUrl: ""
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:bloodBank:dbName};User Id={database:bloodBank:userId};Password={database:bloodBank:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:bloodBank:dbName};User Id={database:bloodBank:userId};Password={database:bloodBank:password};"
+#Oracle: 
+#  ReadCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:host})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:bloodBank:userId};Password={database:bloodBank:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+#  WriteCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:host})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:bloodBank:userId};Password={database:bloodBank:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+
+contextSkipOn: 
+kafka: 
+  service_name: CSI-NET-BLOODBNK-MGT-{env}
+
+Report:
+  Mongo:
+   Collection: BLOODBANK
+BloodBankMiddlewareEnabledGroups:
+ - "105"
+ElasticApm:
+  ServiceName: CSI-NET-BLOODBNK-MGT
+serviceurls:
+  NewVitalUrl: "http://csi-java-ehr-common/vital-signs//displayV2/patient/"
+IsKafkaEnabledInEmpi: true
--- a/Config-Server/configrepo/CSI-NET-BLOODBNK.yml
+++ b/Config-Server/configrepo/CSI-NET-BLOODBNK.yml
@ -0,0 +1,42 @@
+--- 
+AppSettings: 
+  SiteTitle: CSI-NET-BLOODBNK-{env}
+  SiteUrl: ""
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:bloodBank:dbName};User Id={database:bloodBank:userId};Password={database:bloodBank:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:bloodBank:dbName};User Id={database:bloodBank:userId};Password={database:bloodBank:password};"
+Oracle:
+  ReadCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:bloodBank:userId};Password={database:bloodBank:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+  WriteCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:bloodBank:userId};Password={database:bloodBank:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+
+#Oracle: 
+ # ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:bloodBank:userId};Password={database:bloodBank:password}"
+  #WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:bloodBank:userId};Password={database:bloodBank:password}"
+BloodBankMiddlewareEnabledGroups:
+ - "105"
+contextSkipOn: 
+kafka: 
+  service_name: CSI-NET-BLOODBNK-{env}
+Report:
+  Mongo:
+   Collection: BLOODBANK
+KafkaTopics:
+  NewDonorCreate: "{env}-csi-net-bloodbnk.new-donor-create"
+  NewDonationCreate: "{env}-csi-net-bloodbnk.new-donation-create"
+  EmpiRegisterPatientTopic: "csi.vidaplus.empi.events.patientcreatedevent"
+  EmpiEditPatientTopic: "csi.vidaplus.empi.events.patienteditedevent"
+  EmpiPatientUpdateSpecificFieldsTopic: "csi.vidaplus.empi.events.updatespecificfieldsevent"
+  NewMachineBloodSampleRequestSend: "csi-net-bloodbnk.machine-integration.blood-sample-request"
+  NewMachineBloodSampleRequestResponse: "csi-net-bloodbnk.machine-integration.blood-sample-response"
+  EmpiPatientMergeTopic: "csi.vidaplus.empi.events.patientmergedevent"
+IsKafkaEnabledInEmpi: true
+ElasticApm:
+  ServiceName: CSI-NET-BLOODBNK
+
+serviceurls: 
+  transfutionJavaService: "http://csi-net-bloodbnk-mgt/api/1.0/bloodRequest/"
+  employeeMasterService: "http://csi-pms-rms-resource-registry/"
+  globalConfig: "http://csi-java-base-utility/base/util/config/key?lang=en&internationalization=false"
+  bbCrossMatchResultsByPatientId: "http://csi-net-labsrvcs/api/v1.1/LabValueBasedResults/bbCrossMatchResultsByPatientId?lang=en&internationalization=false"
+
--- a/Config-Server/configrepo/CSI-NET-BLOODBNK_old17-12-21.yml
+++ b/Config-Server/configrepo/CSI-NET-BLOODBNK_old17-12-21.yml
@ -0,0 +1,83 @@
+--- 
+AppSettings: 
+  SiteTitle: CSI-NET-BLOODBNK-{env}
+  SiteUrl: ""
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:bloodBank:dbName};User Id={database:bloodBank:userId};Password={database:bloodBank:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:bloodBank:dbName};User Id={database:bloodBank:userId};Password={database:bloodBank:password};"
+Oracle: 
+  ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:bloodBank:userId};Password={database:bloodBank:password}"
+  WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:bloodBank:userId};Password={database:bloodBank:password}"
+
+contextSkipOn: 
+kafka: 
+  service_name: CSI-NET-BLOODBNK-{env}
+rabbitmq:
+  exchnage:
+    exchangeName: vidaplus.empi.exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+    queue:
+      name: bb-donor-patient
+      routekey: csi.vidaplus.empi.events.patientcreatedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+      autoAck: false
+    queue2:
+      name: bb-donor-patient-n
+      routekey: csi.vidaplus.empi.events.patientcreatedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+      autoAck: false
+    patient-edit-queue:
+      name: bb-donor-patient-edit
+      routekey: csi.vidaplus.empi.events.patienteditedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+      autoAck: false
+    update-specific-field-queue:
+      name: bb-donor-patient-update-specific-field
+      routekey: csi.vidaplus.empi.events.updatespecificfieldsevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+      autoAck: false
+rabbitmqDebug:
+  exchnage:
+    exchangeName: vidaplus.empi.exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+    queue:
+      name: bb-donor-patient
+      routekey: bb-donor-patient
+      durable: true
+      exclusive: false
+      autoDelete: false
+      autoAck: false
+    queue2:
+      name: bb-donor-patient-n
+      routekey: bb-donor-patient-n
+      durable: true
+      exclusive: false
+      autoDelete: false
+      autoAck: false
+Report:
+  Mongo:
+   Collection: BLOODBANK
+KafkaTopics:
+ NewDonorCreate: "{env}-csi-net-bloodbnk.new-donor-create"
+ NewDonationCreate: "{env}-csi-net-bloodbnk.new-donation-create"
+ EmpiRegisterPatientTopic: "csi.vidaplus.empi.events.patientcreatedevent"
+ EmpiEditPatientTopic: "csi.vidaplus.empi.events.patienteditedevent"
+ EmpiPatientUpdateSpecificFieldsTopic: "csi.vidaplus.empi.events.updatespecificfieldsevent"
+IsKafkaEnabledInEmpi: false
+ElasticApm:
+  ServiceName: CSI-NET-BLOODBNK
--- a/Config-Server/configrepo/CSI-NET-DATAPERM.yml
+++ b/Config-Server/configrepo/CSI-NET-DATAPERM.yml
@ -0,0 +1,23 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-DATAPERM-{env}
+kafka: 
+  serviceName: CSI-NET-DATAPERM-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "Data Permission Api"
+  api-title-desc: "Data Permission Api"
+DefaultDbConnection: "Server={empi:database:host};Database=csi-data-permission;User Name={empi:database:username};Password={empi:database:password};"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://172.15.100.147:27017/csi-data-permission"
+  DbName: "csi-data-permission"
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+ElasticApm:
+  ServiceName: CSI-NET-DATAPERM
--- a/Config-Server/configrepo/CSI-NET-EHR-DBOARDPC.yml
+++ b/Config-Server/configrepo/CSI-NET-EHR-DBOARDPC.yml
@ -0,0 +1,25 @@
+AppSettings: 
+  SiteTitle: CSI-NET-EHR-DBOARDPC-{env}
+kafka: 
+  service_name: CSI-NET-EHR-DBOARDPC-{env}
+ConnectionStrings:
+  ReadCon: ""
+  WriteCon: ""
+Utilities: 
+  Images: 
+    AdmissionImg: /csi-net-ehr-dboardpc/images/admission-requests.png
+    InPatientImg: /csi-net-ehr-dboardpc/images/in-patients.png
+    InPatientTransferImg: /csi-net-ehr-dboardpc/images/patient-transfer.png
+    OPDImg: /csi-net-ehr-dboardpc/images/opd-patientrs.png
+    ORAnesthesiaImg: /csi-net-ehr-dboardpc/images/or-anesthesia.png
+    ORPlanSurgeriesImg: /csi-net-ehr-dboardpc/images/or-plsurg.png
+    ORSurgeriesImg: /csi-net-ehr-dboardpc/images/or-surg.png
+    ORUnplanSurgeriesImg: /csi-net-ehr-dboardpc/images/or-unplansurg.png
+    ORWaitSurgeriesImg: /csi-net-ehr-dboardpc/images/or-waitsurg.png
+    ReferralImg: /csi-net-ehr-dboardpc/images/refferal.png
+    DrTskListImg: /csi-net-ehr-dboardpc/images/dr-task-list.png
+    OncoTCImg: /csi-net-ehr-dboardpc/images/onco-tc.png
+    OncoCBImg: /csi-net-ehr-dboardpc/images/onco-cb.png
+    OncoCRImg: /csi-net-ehr-dboardpc/images/onco-cr.png
+ElasticApm:
+  ServiceName: CSI-NET-EHR-DBOARDPC
--- a/Config-Server/configrepo/CSI-NET-EHR-IP-DISCHARG.yml
+++ b/Config-Server/configrepo/CSI-NET-EHR-IP-DISCHARG.yml
@ -0,0 +1,21 @@
+AppSettings: 
+  SiteTitle: CSI-NET-EHR-IP-DISCHARG-{env}
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:ehrDischarge:dbName};User Id={database:ehrDischarge:userId};Password={database:ehrDischarge:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:ehrDischarge:dbName};User Id={database:ehrDischarge:userId};Password={database:ehrDischarge:password};"
+Oracle:
+  ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:ehrDischarge:userId};Password={database:ehrDischarge:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+  WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:ehrDischarge:userId};Password={database:ehrDischarge:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+
+#Oracle: 
+ # ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:ehrDischarge:userId};Password={database:ehrDischarge:password}"
+  #WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:ehrDischarge:userId};Password={database:ehrDischarge:password}"
+kafka: 
+  service_name: CSI-NET-EHR-IP-DISCHARG-{env}
+  kafka_him_charting_component:
+    topic: "{env}-him-charting-component"
+Report:
+  Mongo:
+    Collection: "IPDISCHARG"
+ElasticApm:
+  ServiceName: CSI-NET-EHR-IP-DISCHARG
--- a/Config-Server/configrepo/CSI-NET-EHR-OPD-MASTER.yml
+++ b/Config-Server/configrepo/CSI-NET-EHR-OPD-MASTER.yml
@ -0,0 +1,80 @@
+AppSettings: 
+  SiteTitle: CSI-NET-EHR-OPD-MASTER-{env}
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:opdMaster:dbName};User Id={database:opdMaster:userId};Password={database:opdMaster:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:opdMaster:dbName};User Id={database:opdMaster:userId};Password={database:opdMaster:password};"
+Oracle: 
+  ReadCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdMaster:userId};Password={database:opdMaster:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+  WriteCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdMaster:userId};Password={database:opdMaster:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+
+#Oracle:
+  #ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdMaster:userId};Password={database:opdMaster:password}"
+  #WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdMaster:userId};Password={database:opdMaster:password}"
+
+kafka: 
+  service_name: CSI-NET-EHR-OPD-MASTER-{env}
+ProcedurePropertyMap:
+  ProcedureID: id
+  ProcedureCode: procedureId
+  ProcedureName: name
+  ProcedureNameN:
+  Alias: alias
+  AliasN:
+  CategoryID: categoryId
+  GroupID: groupId
+  SubGroupID: subGroupId
+  ProcedureExtendedProperties: procedureExtendedProperties
+  PriceExtendedProperty: procedurePricing
+  Price:
+    IDValue: 248 # This is ADT Master data ID for Price
+    MasterID: priceGroupId
+    MasterValue: price
+  PublishedPrice:
+    IDValue: 249 # This is ADT Master data ID for PublishedPrice
+    MasterID: priceGroupId
+    MasterValue: price
+  GrossPrice:
+    IDValue: 244 # This is ADT Master data ID for GrossPrice
+    MasterID: priceGroupId
+    MasterValue: price
+  SpecialPrice:
+    IDValue: 250 # This is ADT Master data ID for SpecialPrice
+    MasterID: priceGroupId
+    MasterValue: price
+  IsRemarkMandatory: isRemarksRequired
+  IsPackage: isPackageProcedure
+  ParentProcedureCode:
+  ProcedureDTO:
+  HospitalExtendedProperty: availableHospitals
+  Hospital:
+    HospitalGroupID: hospitalGroupId
+    HospitalID: id
+    HospitalName: name
+    Alias: alias
+    IsActive: isActive
+  ClinicExtendedProperty: clinic
+  Clinic:
+    ClinicID: id
+    ClinicDescription: clinicDescription
+    IsActive: isActive
+    RowVersion: rowVersion
+    IsSchedulable: isSchedulable
+  GeneralExtendedProperty:
+    IsSurgeryProcedure: isSurgeryProcedure
+    IsPermissionRequired: isPermissionRequired
+  MasterData:
+    Name: name
+    Code: code
+  PackageDetails: procedurePackageDetails
+  Package:
+    IsSpecialDiscount: isSpecialDiscount
+    PackageProcedureId: packageProcedureId
+    PackageProcedureCode: 
+    IsActive: isActive
+  ConfigurationStatus: configurationStatus
+Report:
+  Mongo:
+    Collection: "OPDMASTER"
+ElasticApm:
+  ServiceName: CSI-NET-EHR-OPD-MASTER  
--- a/Config-Server/configrepo/CSI-NET-EHR-OPD-PATIENT.yml
+++ b/Config-Server/configrepo/CSI-NET-EHR-OPD-PATIENT.yml
@ -0,0 +1,22 @@
+AppSettings: 
+  SiteTitle: CSI-NET-EHR-OPD-PATIENT-{env}
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:opdPatient:dbName};User Id={database:opdPatient:userId};Password={database:opdPatient:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:opdPatient:dbName};User Id={database:opdPatient:userId};Password={database:opdPatient:password};"
+Oracle:
+  ReadCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdPatient:userId};Password={database:opdPatient:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+  WriteCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdPatient:userId};Password={database:opdPatient:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+#Oracle: 
+ # ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdPatient:userId};Password={database:opdPatient:password}"
+  #WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:opdPatient:userId};Password={database:opdPatient:password}"
+
+kafka: 
+  service_name: CSI-NET-EHR-OPD-PATIENT-{env}
+  kafka_him_charting_component:
+   topic: "{env}-him-charting-component"
+Report:
+  Mongo:
+    Collection: "OPDPATIENT"
+ElasticApm:
+  ServiceName: CSI-NET-EHR-OPD-PATIENT
--- a/Config-Server/configrepo/CSI-NET-EMPI-CRS-INTE.yml
+++ b/Config-Server/configrepo/CSI-NET-EMPI-CRS-INTE.yml
@ -0,0 +1,47 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPI-CRS-INTE-{env}
+kafka: 
+  service_name: CSI-NET-EMPI-CRS-INTE-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi  Api"
+  api-title-desc: "EMpi Api Desc"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+Hangfire:
+  Storage: "mongodb://{empi:database:nodes}/csi-net-empi-crs-inte"
+UrlOptions:
+  #CSRIntegrationServiceEndPoint: "http://172.15.100.130:8093/api/Client"
+  CSRIntegrationServiceEndPoint: "http://crs-channel/api/Client"
+  CSRIntegrationServiceFrontEndEndPoint: "http://crs-channel-user/api/Client"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://{empi:database:nodes}/csi-net-empiread"
+  DbName: "csi-net-empiread"
+ElasticApm:
+  ServiceName: CSI-NET-EMPI-CRS-INTE
+KafkaEnabled: true
+crsConstants:
+  normalCrsReCheckSequence: 3
+  maximunCrsReCheckSequence: 6
+  crsReCheckMonthsRange: 2
+CrsPatientSearchConstants:
+  GetPatientBulkNew:
+    limit: 50
+    repeatCount: 3
+  GetPatientsWithMergeInProgressFlag:
+    limit: 50
+    repeatCount: 3
+  UpdateFullName:
+    limit: 50
+    repeatCount: 3   
--- a/Config-Server/configrepo/CSI-NET-EMPI-CRS-INTE.yml_bk20211112
+++ b/Config-Server/configrepo/CSI-NET-EMPI-CRS-INTE.yml_bk20211112
@ -0,0 +1,41 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPI-CRS-INTE-{env}
+kafka: 
+  service_name: CSI-NET-EMPI-CRS-INTE-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi  Api"
+  api-title-desc: "EMpi Api Desc"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+Hangfire:
+  Storage: "mongodb://{empi:database:nodes}/csi-net-empi-crs-inte"
+UrlOptions:
+  #CSRIntegrationServiceEndPoint: "http://172.15.100.130:8093/api/Client"
+  CSRIntegrationServiceEndPoint: "http://crs-channel/api/Client"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://{empi:database:nodes}/csi-net-empiread"
+  DbName: "csi-net-empiread"
+ElasticApm:
+  ServiceName: CSI-NET-EMPI-CRS-INTE
+CrsPatientSearchConstants:
+  GetPatientBulkNew:
+    limit: 50
+    repeatCount: 3
+  GetPatientsWithMergeInProgressFlag:
+    limit: 50
+    repeatCount: 3
+  UpdateFullName:
+    limit: 50
+    repeatCount: 3   
--- a/Config-Server/configrepo/CSI-NET-EMPI-HIJRIDTE.yml
+++ b/Config-Server/configrepo/CSI-NET-EMPI-HIJRIDTE.yml
@ -0,0 +1,21 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPI-HIJRIDTE-{env}
+kafka:
+  service_name: CSI-NET-EMPI-HIJRIDTE-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+DefaultConnection: "Server={empi:database:host};Database=HijriCalendar;User Name={empi:database:username};Password={empi:database:password}"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://172.15.100.24:27017/csi-net-empi-hijridte"
+  DbName: "csi-net-empi-hijridte"
+#eureka:
+#  instance:
+#    hostname: csi-net-empi-hijridte
+ElasticApm:
+  ServiceName: CSI-NET-EMPI-HIJRIDTE
--- a/Config-Server/configrepo/CSI-NET-EMPIREAD.yml
+++ b/Config-Server/configrepo/CSI-NET-EMPIREAD.yml
@ -0,0 +1,69 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIREAD-{env}
+kafka: 
+  service_name: CSI-NET-EMPIREAD-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi Read Api"
+  api-title-desc: "EMpi  Read Api Desc"
+dbConnection: "Server={empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+ConnectionStrings:
+  ReadCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  WriteCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  EventStoreCon: Server="{empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+ConsentScreenOptions:
+  AgeFormat: yy Year mm Months dd Days
+  AgeNFormat: yy سنة mm شهر dd أيام
+  DOBArabicFormat: dd/MM/yyyy
+UrlOptions:
+  HijriDateEndpoint: "http://csi-net-empi-hijridte/api/HijriDate/preformatted"
+  HijriAgeEndpoint: "http://csi-net-empi-hijridte/api/HijriCalculations/preformatted"
+  GenderEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/General/Gender"
+  NationalityEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/nationalities"
+  #UserServiceEndPoint: "https://umm.dev.cloudsolutions.lk/auth/realms/apphiss2vi/csi-user-detail/"
+  UserServiceEndPoint: "https://csi-iam-service/auth/realms/master/csi-user-detail/"
+  CSRIntegrationServiceEndPoint: "http://crs-channel/api/Client"
+  CSRIntegrationServiceFrontEndEndPoint: "http://crs-channel-user/api/Client"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BloodGroupEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/bloodgroups"
+  IHEIntegrationUrl: "http://csi-ie-general/api"
+  EmpiWriteServiceEndPoitnt: "https://csi-net-empiwrit/api/patients/specific-fields/"
+  GloblPermissionEndPoint: "http://csi-java-base-utility/base/util/config/key?lang=en&internationalization=false"
+UseResilientHttp: true
+DataPermissionOptions:
+  #DataPermissionServiceEndPoint: "http://csi-vidaplus-empi-csi-data-permission/"
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+UserDetailsOptions:
+  UserServiceEndPoint: "http://service-base-user/"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://{empi:database:nodes}/csi-net-empiread"
+  DbName: "csi-net-empiread"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+SetupDataOptions:
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+
+BillingSetupDataOptions:
+  BillingSetupDataEndPoint: "http://csi-bm-billing"
+IsEnabledMerge: true 
+KafkaEnabled: true
+ElasticApm:
+  ServiceName: CSI-NET-EMPIREAD
--- a/Config-Server/configrepo/CSI-NET-EMPIREAD.yml_bk20211112
+++ b/Config-Server/configrepo/CSI-NET-EMPIREAD.yml_bk20211112
@ -0,0 +1,61 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIREAD-{env}
+kafka: 
+  service_name: CSI-NET-EMPIREAD-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi Read Api"
+  api-title-desc: "EMpi  Read Api Desc"
+dbConnection: "Server={empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+ConnectionStrings:
+  ReadCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  WriteCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  EventStoreCon: Server="{empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+ConsentScreenOptions:
+  AgeFormat: yy Year mm Months dd Days
+  AgeNFormat: yy سنة mm شهر dd أيام
+  DOBArabicFormat: dd/MM/yyyy
+UrlOptions:
+  HijriDateEndpoint: "http://csi-net-empi-hijridte/api/HijriDate/preformatted"
+  HijriAgeEndpoint: "http://csi-net-empi-hijridte/api/HijriCalculations/preformatted"
+  GenderEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/General/Gender"
+  NationalityEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/nationalities"
+  #UserServiceEndPoint: "https://umm.dev.cloudsolutions.lk/auth/realms/apphiss2vi/csi-user-detail/"
+  UserServiceEndPoint: "https://csi-iam-service/auth/realms/master/csi-user-detail/"
+  CSRIntegrationServiceEndPoint: "http://crs-channel/api/Client"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BloodGroupEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/bloodgroups"
+  IHEIntegrationUrl: "http://csi-ie-general/api"
+  CSRIntegrationServiceFrontEndEndPoint: "http://crs-channel-user/api/Client"
+
+UseResilientHttp: true
+DataPermissionOptions:
+  #DataPermissionServiceEndPoint: "http://csi-vidaplus-empi-csi-data-permission/"
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+UserDetailsOptions:
+  UserServiceEndPoint: "http://service-base-user/"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://{empi:database:nodes}/csi-net-empiread"
+  DbName: "csi-net-empiread"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+ElasticApm:
+  ServiceName: CSI-NET-EMPIREAD
--- a/Config-Server/configrepo/CSI-NET-EMPIREAD_17122021.yml_old
+++ b/Config-Server/configrepo/CSI-NET-EMPIREAD_17122021.yml_old
@ -0,0 +1,68 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIREAD-{env}
+kafka: 
+  service_name: CSI-NET-EMPIREAD-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi Read Api"
+  api-title-desc: "EMpi  Read Api Desc"
+dbConnection: "Server={empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+ConnectionStrings:
+  ReadCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  WriteCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  EventStoreCon: Server="{empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+ConsentScreenOptions:
+  AgeFormat: yy Year mm Months dd Days
+  AgeNFormat: yy سنة mm شهر dd أيام
+  DOBArabicFormat: dd/MM/yyyy
+UrlOptions:
+  HijriDateEndpoint: "http://csi-net-empi-hijridte/api/HijriDate/preformatted"
+  HijriAgeEndpoint: "http://csi-net-empi-hijridte/api/HijriCalculations/preformatted"
+  GenderEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/General/Gender"
+  NationalityEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/nationalities"
+  #UserServiceEndPoint: "https://umm.dev.cloudsolutions.lk/auth/realms/apphiss2vi/csi-user-detail/"
+  UserServiceEndPoint: "https://csi-iam-service/auth/realms/master/csi-user-detail/"
+  CSRIntegrationServiceEndPoint: "http://crs-channel/api/Client"
+  CSRIntegrationServiceFrontEndEndPoint: "http://crs-channel-user/api/Client"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BloodGroupEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/bloodgroups"
+  IHEIntegrationUrl: "http://csi-ie-general/api"
+
+UseResilientHttp: true
+DataPermissionOptions:
+  #DataPermissionServiceEndPoint: "http://csi-vidaplus-empi-csi-data-permission/"
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+UserDetailsOptions:
+  UserServiceEndPoint: "http://service-base-user/"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://{empi:database:nodes}/csi-net-empiread"
+  DbName: "csi-net-empiread"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+SetupDataOptions:
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+
+BillingSetupDataOptions:
+  BillingSetupDataEndPoint: "http://csi-bm-billing"
+  
+KafkaEnabled: false
+ElasticApm:
+  ServiceName: CSI-NET-EMPIREAD
--- a/Config-Server/configrepo/CSI-NET-EMPIREAD_old.yml
+++ b/Config-Server/configrepo/CSI-NET-EMPIREAD_old.yml
@ -0,0 +1,68 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIREAD-{env}
+kafka: 
+  service_name: CSI-NET-EMPIREAD-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi Read Api"
+  api-title-desc: "EMpi  Read Api Desc"
+dbConnection: "Server={empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+ConnectionStrings:
+  ReadCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  WriteCon: Server="{empi:database:host};Database=csi-empi-read;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+  EventStoreCon: Server="{empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password};Timeout=15;Connection Idle Lifetime=30;Minimum Pool Size=1;"
+ConsentScreenOptions:
+  AgeFormat: yy Year mm Months dd Days
+  AgeNFormat: yy سنة mm شهر dd أيام
+  DOBArabicFormat: dd/MM/yyyy
+UrlOptions:
+  HijriDateEndpoint: "http://csi-net-empi-hijridte/api/HijriDate/preformatted"
+  HijriAgeEndpoint: "http://csi-net-empi-hijridte/api/HijriCalculations/preformatted"
+  GenderEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/General/Gender"
+  NationalityEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/nationalities"
+  #UserServiceEndPoint: "https://umm.dev.cloudsolutions.lk/auth/realms/apphiss2vi/csi-user-detail/"
+  UserServiceEndPoint: "https://csi-iam-service/auth/realms/master/csi-user-detail/"
+  CSRIntegrationServiceEndPoint: "http://crs-channel/api/Client"
+  CSRIntegrationServiceFrontEndEndPoint: "http://crs-channel-user/api/Client"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BloodGroupEndPoint: "http://csi-pms-rms-masterdata/amd-masterdata/common/getByCode/EMPI/bloodgroups"
+  IHEIntegrationUrl: "http://csi-ie-general/api"
+
+UseResilientHttp: true
+DataPermissionOptions:
+  #DataPermissionServiceEndPoint: "http://csi-vidaplus-empi-csi-data-permission/"
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+UserDetailsOptions:
+  UserServiceEndPoint: "http://service-base-user/"
+EmpiMongoDbConnectionOptions:
+  ConnectionString: "mongodb://{empi:database:nodes}/csi-net-empiread"
+  DbName: "csi-net-empiread"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+SetupDataOptions:
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+
+BillingSetupDataOptions:
+  BillingSetupDataEndPoint: "http://csi-bm-billing"
+  
+KafkaEnabled: false
+ElasticApm:
+  ServiceName: CSI-NET-EMPIREAD
--- a/Config-Server/configrepo/CSI-NET-EMPIWRIT.yml
+++ b/Config-Server/configrepo/CSI-NET-EMPIWRIT.yml
@ -0,0 +1,82 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIWRIT-{env}
+kafka: 
+  service_name: CSI-NET-EMPIWRIT-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi  Api"
+  api-title-desc: "EMpi Api Desc"
+UserRolePermissionOptions: 
+  fileType: 
+    Edit: ""
+    View: ""
+  approvalToProcceedWithoutId:
+    Edit: "DOCTOR,ADMIN,NURSE"
+    View: ""
+
+DataPermissionOptions:
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+  
+UserDetailsOptions:
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"  
+  
+UrlOptions:
+  FormTemplateUrl: "http://csi-net-empiread/api/RegistrationFormTemplate"
+  PatientSearchServiceUrl: "http://csi-net-empiread/api/patient"
+  BillingGetAccountIdUrl: "http://csi-bm-invoice/billing/account/create"
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BaseUtilityServiceUrl: "http://csi-java-base-utility"
+  EHRPatientPOMRUrl: "http://csi-java-ehr-patient-pomr"
+  RMSReservationServiceUrl: "http://csi-pms-rms-reservation"
+  ADTRequestUrl: "http://csi-pms-adt-request"
+  EHRPatientIpUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/read/carePlan/getMrpIdsAndNursingGroupId"
+  PHRRequestUrl: "http://csi-phr-base/api/v1.0/masterData/txnUsersList"
+  LABRequestUrl: "http://csi-net-labsrvcs/api/UserManagement/AllUsersForLabRoles"
+  RMSResourceRegistryUrl: "http://csi-pms-rms-resource-registry/amd-doctor/search"
+  IEGenaralUrl: "http://csi-ie-general/api/patient"
+  
+writeDbConnection: Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}
+
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+  
+NotificationsConfigOptions:
+  EventStoreConnectionString: ""
+  MessageStoreConnectionString: ""
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+  
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+SetupDataOptions:
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+
+BillingSetupDataOptions:
+  BillingSetupDataEndPoint: "http://csi-bm-billing"
+KafkaEnabled: true
+MaximumPatientAgeLimitYears: 150
+ElasticApm:
+  ServiceName: CSI-NET-EMPIWRIT
+
+SetSelfForUnknownPatientInsurance: true
--- a/Config-Server/configrepo/CSI-NET-EMPIWRIT.yml_bk20211112
+++ b/Config-Server/configrepo/CSI-NET-EMPIWRIT.yml_bk20211112
@ -0,0 +1,78 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIWRIT-{env}
+kafka: 
+  service_name: CSI-NET-EMPIWRIT-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi  Api"
+  api-title-desc: "EMpi Api Desc"
+UserRolePermissionOptions: 
+  fileType: 
+    Edit: ""
+    View: ""
+  approvalToProcceedWithoutId:
+    Edit: "DOCTOR,ADMIN,NURSE"
+    View: ""
+
+DataPermissionOptions:
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+  
+UserDetailsOptions:
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"  
+  
+UrlOptions:
+  FormTemplateUrl: "http://csi-net-empiread/api/RegistrationFormTemplate"
+  PatientSearchServiceUrl: "http://csi-net-empiread/api/patient"
+  BillingGetAccountIdUrl: "http://csi-bm-invoice/billing/account/create"
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BaseUtilityServiceUrl: "http://csi-java-base-utility"
+  EHRPatientPOMRUrl: "http://csi-java-ehr-patient-pomr"
+  RMSReservationServiceUrl: "http://csi-pms-rms-reservation"
+  ADTRequestUrl: "http://csi-pms-adt-request"
+  EHRPatientIpUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/read/carePlan/getMrpIdsAndNursingGroupId"
+  PHRRequestUrl: "http://csi-phr-base/api/v1.0/masterData/txnUsersList"
+  LABRequestUrl: "http://csi-net-labsrvcs/api/UserManagement/AllUsersForLabRoles"
+  RMSResourceRegistryUrl: "http://csi-pms-rms-resource-registry/amd-doctor/search"
+  IEGenaralUrl: "http://csi-ie-general/api/patient"
+  
+writeDbConnection: Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}
+
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+  
+NotificationsConfigOptions:
+  EventStoreConnectionString: ""
+  MessageStoreConnectionString: ""
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+  
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+SetupDataOptions:
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+
+BillingSetupDataOptions:
+  BillingSetupDataEndPoint: "http://csi-bm-billing"
+ElasticApm:
+  ServiceName: CSI-NET-EMPIWRIT
--- a/Config-Server/configrepo/CSI-NET-EMPIWRIT_17122021.yml_old
+++ b/Config-Server/configrepo/CSI-NET-EMPIWRIT_17122021.yml_old
@ -0,0 +1,80 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIWRIT-{env}
+kafka: 
+  service_name: CSI-NET-EMPIWRIT-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi  Api"
+  api-title-desc: "EMpi Api Desc"
+UserRolePermissionOptions: 
+  fileType: 
+    Edit: ""
+    View: ""
+  approvalToProcceedWithoutId:
+    Edit: "DOCTOR,ADMIN,NURSE"
+    View: ""
+
+DataPermissionOptions:
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+  
+UserDetailsOptions:
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"  
+  
+UrlOptions:
+  FormTemplateUrl: "http://csi-net-empiread/api/RegistrationFormTemplate"
+  PatientSearchServiceUrl: "http://csi-net-empiread/api/patient"
+  BillingGetAccountIdUrl: "http://csi-bm-invoice/billing/account/create"
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BaseUtilityServiceUrl: "http://csi-java-base-utility"
+  EHRPatientPOMRUrl: "http://csi-java-ehr-patient-pomr"
+  RMSReservationServiceUrl: "http://csi-pms-rms-reservation"
+  ADTRequestUrl: "http://csi-pms-adt-request"
+  EHRPatientIpUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/read/carePlan/getMrpIdsAndNursingGroupId"
+  PHRRequestUrl: "http://csi-phr-base/api/v1.0/masterData/txnUsersList"
+  LABRequestUrl: "http://csi-net-labsrvcs/api/UserManagement/AllUsersForLabRoles"
+  RMSResourceRegistryUrl: "http://csi-pms-rms-resource-registry/amd-doctor/search"
+  IEGenaralUrl: "http://csi-ie-general/api/patient"
+  
+writeDbConnection: Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}
+
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+  
+NotificationsConfigOptions:
+  EventStoreConnectionString: ""
+  MessageStoreConnectionString: ""
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+  
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+SetupDataOptions:
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+
+BillingSetupDataOptions:
+  BillingSetupDataEndPoint: "http://csi-bm-billing"
+KafkaEnabled: false
+MaximumPatientAgeLimitYears: 150
+ElasticApm:
+  ServiceName: CSI-NET-EMPIWRIT
--- a/Config-Server/configrepo/CSI-NET-EMPIWRIT_old.yml
+++ b/Config-Server/configrepo/CSI-NET-EMPIWRIT_old.yml
@ -0,0 +1,80 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-EMPIWRIT-{env}
+kafka: 
+  service_name: CSI-NET-EMPIWRIT-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMpi  Api"
+  api-title-desc: "EMpi Api Desc"
+UserRolePermissionOptions: 
+  fileType: 
+    Edit: ""
+    View: ""
+  approvalToProcceedWithoutId:
+    Edit: "DOCTOR,ADMIN,NURSE"
+    View: ""
+
+DataPermissionOptions:
+  DataPermissionServiceEndPoint: "http://csi-net-dataperm/"
+  
+UserDetailsOptions:
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"  
+  
+UrlOptions:
+  FormTemplateUrl: "http://csi-net-empiread/api/RegistrationFormTemplate"
+  PatientSearchServiceUrl: "http://csi-net-empiread/api/patient"
+  BillingGetAccountIdUrl: "http://csi-bm-invoice/billing/account/create"
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BaseUtilityServiceUrl: "http://csi-java-base-utility"
+  EHRPatientPOMRUrl: "http://csi-java-ehr-patient-pomr"
+  RMSReservationServiceUrl: "http://csi-pms-rms-reservation"
+  ADTRequestUrl: "http://csi-pms-adt-request"
+  EHRPatientIpUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/read/carePlan/getMrpIdsAndNursingGroupId"
+  PHRRequestUrl: "http://csi-phr-base/api/v1.0/masterData/txnUsersList"
+  LABRequestUrl: "http://csi-net-labsrvcs/api/UserManagement/AllUsersForLabRoles"
+  RMSResourceRegistryUrl: "http://csi-pms-rms-resource-registry/amd-doctor/search"
+  IEGenaralUrl: "http://csi-ie-general/api/patient"
+  
+writeDbConnection: Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}
+
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  MessageStoreConnectionString: "Server={empi:database:host};Database=empi-event-store;User Name={empi:database:username};Password={empi:database:password}"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-empi-events-store"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "vidaplus.empi.exchange"
+  
+NotificationsConfigOptions:
+  EventStoreConnectionString: ""
+  MessageStoreConnectionString: ""
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+  
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+SetupDataOptions:
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+
+BillingSetupDataOptions:
+  BillingSetupDataEndPoint: "http://csi-bm-billing"
+KafkaEnabled: false
+MaximumPatientAgeLimitYears: 150
+ElasticApm:
+  ServiceName: CSI-NET-EMPIWRIT
--- a/Config-Server/configrepo/CSI-NET-ERFUNCTI.yml
+++ b/Config-Server/configrepo/CSI-NET-ERFUNCTI.yml
@ -0,0 +1,86 @@
+AppSettings: 
+  SiteTitle: CSI-NET-ERFUNCTI-{env}
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:erFuncti:dbName};User Id={database:erFuncti:userId};Password={database:erFuncti:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:erFuncti:dbName};User Id={database:erFuncti:userId};Password={database:erFuncti:password};"
+#Oracle:
+#  ReadCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:erFuncti:userId};Password={database:erFuncti:password};Password={database:erFuncti:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+#  WriteCon: "Data Source=(description=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:erFuncti:userId};Password={database:erFuncti:password};Password={database:erFuncti:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+
+#Oracle: 
+ # ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:erFuncti:userId};Password={database:erFuncti:password}"
+  #WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:erFuncti:userId};Password={database:erFuncti:password}"
+
+IsKafkaQueueEnv: false
+kafka: 
+  service_name: CSI-NET-ERFUNCTI-{env}
+  kafka_group_id: er-kafka-group-{env}
+  adt_discharge_topic: adt-discharge.t
+  empi_register-patient_topic: csi.vidaplus.empi.events.unknownpatientcreatedevent
+  admission_request_update_topic: adt-update-admission-request-notification
+  empi_register-patient_bulk_topic: csi.vidaplus.empi.events.bulkunknownpatientscreatedevent
+  kafka_topics: "er-register-patient,er-register-patient-bulk,discharge-exchange,nurse-task-queue"
+  kafka_him_charting_component:
+    topic: "{env}-him-charting-component"
+  nurse_task_topic: nurse-task-queue
+  empi_patient_update_topic: csi.vidaplus.empi.events.patienteditedevent
+  adt-admission-response-topic: adt-admission-generated-response.t
+  bm-er-consultation-invoice-topic : bm-er-consultation-invoice
+  mrg-work-list: mrg-work-list
+  er-doctor-details-topic: kafka_er_doctor_details
+  adt-discharge-topic: adt-discharge-request.t
+  er-patient-assignment-details-topic : patient-assignment-details-topic
+  er_patient_journey : kafka-er-patient-journey
+rabbitmq:
+  exchnage:
+    exchangeName: vidaplus.empi.exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+    queue:
+      name: er-register-patient
+      routekey: csi.vidaplus.empi.events.unknownpatientcreatedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+    queueBulk:
+      name: er-register-patient-bulk
+      routekey: csi.vidaplus.empi.events.bulkunknownpatientscreatedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+    createPatient:
+      name: er-create-patient
+      routekey: csi.vidaplus.empi.events.patientcreatedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+    editPatient:
+      name: er-edit-patient
+      routekey: csi.vidaplus.empi.events.patienteditedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+  dischargeExchange: 
+    exchangeName: discharge-exchange
+    type: direct
+    durable: true
+    exclusive: false
+    autoDelete: false
+    nurseTaskQueue:
+      name: nurse-task-queue
+      routekey: discharge-init
+      durable: true
+      exclusive: false
+      autoDelete: false
+Report:
+  Mongo:
+     Collection: "ERFUNCTI"
+RabbitMQ:
+  Mongo:
+     Collection: "ERFUNCTI"
+
+ElasticApm:
+  ServiceName: CSI-NET-ERFUNCTI
--- a/Config-Server/configrepo/CSI-NET-HEALTH-CHECK.yml
+++ b/Config-Server/configrepo/CSI-NET-HEALTH-CHECK.yml
@ -0,0 +1,24 @@
+GlobalConfigs: 
+ RabbitMqConfig: "HostName={HealthChecker:Global:Rabbit:Ip}; UserName={HealthChecker:Global:Rabbit:UserName}; Password={HealthChecker:Global:Rabbit:Password};"
+HealthCheckConfigs: 
+  ConnectionStrings: 
+    DataBaseReadViewName: "READ DB CONTEXT"
+    DataBaseWriteViewName: "WRITE DB CONTEXT"
+    DefaultConnectionString: "Server=CSI-ASHAN;Database=WideWorldImporters;User ID=sa;Password=pass#word1;Trusted_Connection=False;"
+    DefaultConnectionStringViewName: "DATABASE CONNECTIVITY"
+  DbContextViewName: "DB CONTEXT STORE"
+  HealthAction: /health
+  HealthCheckDbName: healthchecksdb
+  HealthClientEndPoint: /health-ui
+  MemoryConfigs: 
+    MemoryThreshldBytes: 3072
+    MemoryViewName: MEMORY
+  RabbitMqViewName: "RABBIT MQ"
+  ServerDrive: 
+    DrivePartition: "C:\\,"
+    HealthPartitionCapacity: 50000
+    ViewValue: DRIVE
+  StyleUri: ../HEALTH.CHECK.UTIL/HealthCheckStyles/HealthCheck.css
+
+ElasticApm:
+  ServiceName: CSI-NET-HEALTH-CHECK
--- a/Config-Server/configrepo/CSI-NET-HEMDIALY.yml
+++ b/Config-Server/configrepo/CSI-NET-HEMDIALY.yml
@ -0,0 +1,146 @@
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-HEM-WR-{env}
+kafka:
+  service_name: CSI-HEM-WR-{env}
+  enableautocommit: true
+  autocommitintervalms: 5000
+  autooffsetreset: "latest"
+  admissiongroupid: "3995405ehdf#df"
+  apointmentgroupid: "17309927#dgfh"
+  topic:
+    admission: "adt-admission-generated-response.t"
+    apointment: "appointment"
+    RenalPatientStatus: "renal-patient-status"
+    RenalRunsheetStatus: "renal-runsheet-status"
+  reservation:
+    topic: "rms-reservation-notification"
+    reservationgroupid: "rmsreservationnotification#group"
+  ehr_custom_order:
+    topic: "ehr-custom-order-queue"
+  ehr_delete_patient_order:
+    topic: "ehr-delete-patient-order"
+  empi_patient_update:
+    topic: "csi.vidaplus.empi.events.patienteditedevent"
+  empi_patient_merge:
+    topic: "csi.vidaplus.empi.events.patientmergedevent"
+  empi_patient_add:
+    topic: "csi.vidaplus.empi.events.patientcreatedevent"
+
+  kafka_group: renal_kafka_group   
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:renal:dbName};User Id={database:renal:userId};Password={database:renal:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:renal:dbName};User Id={database:renal:userId};Password={database:renal:password};"
+#Oracle: 
+  #ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:renal:userId};Password={database:renal:password}"
+  #WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:renal:userId};Password={database:renal:password}"
+
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+
+Utilities: 
+  Images: 
+    ImgAllMachines: /csi-net-hemdialy/images/all-machines.png
+    ImgConfirmPatient: /csi-net-hemdialy/images/confirm-patient.png
+    ImgNurse: /csi-net-hemdialy/images/nurse.png
+    ImgOnboardPatient: /csi-net-hemdialy/images/onboard-patient.png
+
+TestVal: testvalue
+contextSkipOn: "REN_Appointment"
+serviceurls: 
+  UserManagement: "http://172.16.16.109/service-base-security-token/"
+rabbitmq:
+  ehrexchnage:
+    exchangeName: ehr-custom-order-exchange
+    type: fanout
+    durable: true
+    exclusive: false
+    autoDelete: false
+    ehrqueue:
+      name: ehr-custom-order-queue
+      routekey: ehr-custom-order-queue
+      durable: true
+      exclusive: false
+      autoDelete: false
+  referralexchange:
+    exchangename: referral-exchange
+    type: topic
+    durable: false
+    exclusive: false
+    autoDelete: false
+    hemodialysisqueue: 
+      name: hemodialysis-queue
+      routekey: hemodialysis-queue
+      durable: true
+      exclusive: false
+      autoDelete: false  
+  empiexchnage:
+    exchangeName: vidaplus.empi.exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+    empiqueue:
+      name: hemodialysis-patient-update
+      routekey: csi.vidaplus.empi.events.patienteditedevent
+      durable: true
+      exclusive: false
+      autoDelete: false
+    empipatientmergequeue:
+      name: renal-patient-merge
+      routekey: csi.vidaplus.empi.events.patientmergedevent
+      durable: true
+      exclusive: false
+      autoDelete: false  
+    empipatientaddqueue: 
+      name: renal-patient-add
+      routekey: csi.vidaplus.empi.events.patientcreatedevent
+      durable: true
+      exclusive: false
+      autoDelete: false  
+rabbitmqqa:
+  referralexchange:
+    exchangename: referral-exchange
+    type: topic
+    durable: false
+    exclusive: false
+    autoDelete: false
+    hemodialysisqueue: 
+      name: hemodialysis-queue
+      routekey: hemodialysis-queue
+      durable: true
+      exclusive: false
+      autoDelete: false
+    hemodialysisqueueDev: 
+      name: hemodialysis-queue-dev
+      routekey: hemodialysis-queue
+      durable: true
+      exclusive: false
+      autoDelete: false
+
+UnitId:
+  HEMO01: 550
+systemuser:
+  username: "rojjer@abcd.com"
+  password: "ABcde@1234"
+  passwordR: "123"
+  usernameR: Omar
+Report:
+  Mongo:
+    Collection: "RENAL"
+RabbitMQ:
+  Mongo:
+    Collection: "RENAL"
+MongoLogs: "mongodb://{empi:database:nodes}/app-logs"
+
+# Elastic Apm Ends ==============================================
+
+ElasticApm:
+  ServiceName: "CSI-NET-HEMDIALY"
+  
+# Service Specific URL Start ==============================================
--- a/Config-Server/configrepo/CSI-NET-HHC.yml
+++ b/Config-Server/configrepo/CSI-NET-HHC.yml
@ -0,0 +1,33 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: "CSI-NET-HHC-{env}"
+ConnectionStrings: 
+  ReadCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:host})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:hhc:userId};Password={database:hhc:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+  WriteCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:host})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:hhc:userId};Password={database:hhc:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+ElasticApm: 
+  ServiceName: CSI-NET-HHC
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+UrlOptions: 
+  AdtRequestEndPoint: "http://csi-pms-adt-request"
+  BillingEndPoint: "http://csi-bm-billing"
+  EhrCommonEndPoint: "http://csi-java-ehr-common"
+  EhrOpdEndPoint: "https://csi-java-ehr-opd"
+  EhrOpdNetEndPoint: "http://csi-net-ehr-opd-patient"
+  EhrOpdRiskAssessmentEndPoint: "http://csi-java-ehr-opd-riskassessment"
+  EhrPomrEndPoint: "http://csi-java-ehr-patient-pomr"
+  EmpiReadEndPoint: "http://csi-net-empiread"
+  EmpiWriteEndPoint: "http://csi-net-empiwrit"
+  RmsSchduleEndPoint: "http://csi-pms-rms-schedule"
+  SetupDataEndPoint: "http://csi-pms-rms-masterdata"
+UseResilientHttp: true
+ReadCon: "Pooling=false;Data Source=10.201.206.40:1521/PERFPDB1;User Id=CSI_HCC;Password= mt5WYvzY48rQ;"
+WriteCon: "Pooling=false;Data Source=10.201.206.40:1521/PERFPDB1;User Id=CSI_HCC;Password= mt5WYvzY48rQ;"
+kafka: 
+  referral-status-topic: hhc-referral-status
+  service_name: "CSI-NET-HHC-{env}"
--- a/Config-Server/configrepo/CSI-NET-HIMSERVI.yml
+++ b/Config-Server/configrepo/CSI-NET-HIMSERVI.yml
@ -0,0 +1,30 @@
+AppSettings: 
+ SiteTitle: CSI-NET-HIMSERVI-{env}
+  
+PostgreSQL: 
+ ReadCon: "Host={database:host};Port={database:port};Database={database:himServi:dbName};User Id={database:himServi:userId};Password={database:himServi:password};"
+ WriteCon: "Host={database:host};Port={database:port};Database={database:himServi:dbName};User Id={database:himServi:userId};Password={database:himServi:password};"
+Oracle: 
+ ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:himServi:userId};Password={database:himServi:password}"
+ WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:himServi:userId};Password={database:himServi:password}"
+  
+kafka: 
+ service_name: CSI-NET-HIMSERVI-{env}
+ kafka_group_id: "{env}-him-kafka-group"
+ kafka_him_charting_component: 
+    topic: "{env}-him-charting-component"
+ empi_patient_update_topic: csi.vidaplus.empi.events.patienteditedevent
+ critical_lab_result_topic: csi.net.labsrvcs.status
+  
+Report:
+ Mongo:
+  Collection: "HIMSERVI"
+
+RabbitMQ:
+ Mongo:
+   Collection: "HIMSERVI"
+
+ElasticApm:
+  ServiceName: CSI-NET-HIMSERVI
+
+IsAccessRequestCheckerEnable: false  
--- a/Config-Server/configrepo/CSI-NET-LAB-SCHEDULED.yml
+++ b/Config-Server/configrepo/CSI-NET-LAB-SCHEDULED.yml
@ -0,0 +1,32 @@
+---
+AppSettings:
+  CacheDbResults: true
+  SiteTitle: "CSI-NET-LAB-SCHEDULED-{env}"
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+#Oracle:
+#  ReadCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:host})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size=50;Connection Timeout=30"
+#  WriteCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:host})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size=50;Connection Timeout=30"
+Logging:
+  IncludeScopes: false
+  LogLevel:
+    Default: Debug
+    Microsoft: Information
+    System: Information
+kafka:
+  service_name: "CSI-NET-LAB-SCHEDULED-{env}"
+Mongo:
+   Collection: "VIDAPTOR-INT"
+   ConnectionString: {mongoConString}
+ElasticApm:
+  ServiceName: "CSI-NET-LAB-SCHEDULED"
+Serilog:
+  MinimumLevel:
+    Default: Error
+    Override:
+      Microsoft: Error
+      System: Error
+#eureka:
+#  instance:
+#    hostname: CSI-NET-LAB-SCHEDULED
--- a/Config-Server/configrepo/CSI-NET-LAB-VIDAPTOR.yml
+++ b/Config-Server/configrepo/CSI-NET-LAB-VIDAPTOR.yml
@ -0,0 +1,26 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: "CSI-NET-LAB-VIDAPTOR-{env}"
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+Oracle: 
+# ReadCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+#  WriteCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+  ReadCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:secondaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password}"
+  WriteCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password}"
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+kafka: 
+  service_name: "CSI-NET-LAB-VIDAPTOR-{env}"
+Mongo:
+   Collection: "VIDAPTOR-INT"
+   ConnectionString: {mongoConString}
+#eureka:
+#  instance:
+#    hostname: csi-net-lab-vidaptor
--- a/Config-Server/configrepo/CSI-NET-LABSRVCS-changed.yml
+++ b/Config-Server/configrepo/CSI-NET-LABSRVCS-changed.yml
@ -0,0 +1,196 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: "CSI-NET-LABSRVCS-{env}"
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+Oracle: 
+  ReadCon: "Data Source=(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST= OracleDBUATScan)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST= OracleDBUATScan)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=KAUATPDB)));User Id={database:lab:userId};Password={database:lab:password}"
+  WriteCon: "Data Source=(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=OracleDBUATScan)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=OracleDBUATScan)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=KAUATPDB)));User Id={database:lab:userId};Password={database:lab:password}"
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+TestVal: testvalue
+kafka: 
+  service_name: "CSI-NET-LABSRVCS-{env}"
+billing-notification-rabbitmq: 
+  exchange: 
+    exchangeName: billing-notification-exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+  queue:
+    name: billing-notification-queue
+    routekey: billing-notification-queueKey
+    autoDelete: false
+    durable: true
+    exclusive: false
+lab-request-rabbitmq: 
+  exchange: 
+    exchangeName: lab-request-exchange
+    type: fanout
+    durable: false
+    exclusive: false
+    autoDelete: false
+  queue:
+    name: LabRequestEvent
+    routekey: LabRequestEvent
+    autoDelete: false
+    durable: true
+    exclusive: false
+    autoack: false
+lab-rabbitmq:
+    exchangeName: net-template
+    durable: true
+    queue:
+      name: masterdata-sync
+      routeKey: masterdata-sync
+      durable: true
+    ic-notification: 
+      exchangeName: ic-notification
+      durable: true
+      Type: direct
+      queue: 
+       durable: true
+       routekey: ic-notification.infected
+    serio-ic-notification: 
+      exchangeName: ic-notification
+      durable: true
+      Type: direct
+      queue: 
+       durable: true
+       routekey: lab-test-infected
+lab-request-rabbitmq-billing: 
+  exchange: 
+    exchangeName: invoice-status-lab-exchange
+    type: direct
+    durable: true
+  queue:
+    name: lab-invoice-status-queue
+    routekey: lab-invoice-status-queueKey
+    durable: true
+rabbitmq:
+  client:
+    exchange: lab-td-exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+    queue: 
+      name: TestDirectoryProcedure
+      routekey: TestDirectoryProcedure
+  lab-order-exchange: 
+    exchangename: feature-ehr-exchange
+    queue: 
+      name: feature-ehr-queue
+      routekey: feature-ehr-queue
+  exchange-notification: 
+    autoDelete: false
+    durable: false
+    exchangeName: lab.qa.notifications.exchange
+    exclusive: false
+    queue: 
+      routekey: lab.qa.notifications
+  sample-collection-exchnage: 
+    exchangeName: lab-exchange
+    queue: 
+      name: lab-orders-queue
+      routekey: lab-orders-queue
+    queue2: 
+      name: sample-rejecting-notify-queue
+      routekey: sample-rejecting-notify-queue
+redis: 
+  client: 
+    instanceName: "lab:"
+contextSkipOn: ""
+ADT:
+  DataKey: masterdataObject
+  TypeKey: masterdataType
+ADTType:
+  Hospital: Hospitals
+  HospitalGroup: HospitalGroup
+HospitalAttribute:
+  HospitalGroupKey: hospitalGroup
+  HospitalID: id
+  HospitalGroupIdKey: id
+  TranslationLanguageArrayKey: translationLanguages
+  LabHospitalTranslationAttribute:
+    TranslationValueObjKey: translationValues
+    LanguageObjKey: language
+    ColumnName: columnName
+    ColumnValue: value
+    TranslationId: id
+    HospitalName: hospitalName
+    Language: language
+    LanguageCode: languageCode
+    LabHospitalGroupAttribute:
+  HospitalGroupId: id
+LabHospitalGroupAttribute:
+  HospitalGroupId: id
+  TranslationLanguageArrayKey: translationLanguages
+  LabHospitalGroupTransalationAttribute:
+    TranslationId: id
+    ColumnName: columnName
+    ColumnValue: value
+    HospitalGroupName: hospitalGroupName
+    TranslationValueObjKey: translationValues
+    LanguageObjKey: language
+    LanguageCode: language
+    Language: language
+ProceduresAttribute:
+  ProcedureCode: procedureId
+  ProcedureName: name
+  LanguageCode: languageCode
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+Report:
+ Mongo:
+   Collection: "LAB"
+RabbitMQ:
+ Mongo:
+   Collection: "LAB"
+RmqLabNotificationsExchange:
+  exchangename: csi.net.labsrvcs.notifications
+  durable: true
+  routeKeys:
+    LabOrderCancelation: csi.net.labsrvcs.notifications
+    VerifyTextBasedResults: csi.net.labsrvcs.notifications
+    VerifyHistopathologyResults: csi.net.labsrvcs.notifications
+    SampleRejected: csi.net.labsrvcs.notifications
+    SampleCollected: csi.net.labsrvcs.notifications
+    SampleRecieved: csi.net.labsrvcs.notifications
+    IHEPublish: csi.net.labsrvcs.ihe
+RmqICNotificationsExchange:
+  exchangename: csi.net.labsrvcs.ic.notifications
+  routeKeys:
+    InfectedNotifyToIC: csi.net.labsrvcs.lab.sample.infected
+    InfectedMicroNotifyToIC: csi.net.labsrvcs.sample.micro.infected
+RmqSampleCollectionExchange:
+  exchangename: csi.net.labsrvcs
+  routeKeys:
+    SampleRejected: csi.net.labsrvcs.sample.reject.notifications
+    SampleRecieved: csi.net.labsrvcs.sample.recieved
+    LabOrderStatus: csi.net.labsrvcs.status
+    IHEPublish: csi.net.labsrvcs.ihe
+    TestStatusPublish: csi.net.labsrvcs.TestStatus
+SetupMasterDataExchange:
+  exchangeName: net-template
+  durable: true
+  queue:
+    name: masterdata-sync
+    routeKey: masterdata-sync
+    durable: true
+RmqBillingCollectionExchange:
+  exchangeName: csi.net.labsrvcs.billing
+  durable: true
+  routeKeys:
+    PerformedStatus: csi.net.labsrvcs.billing
+LabUserRoles:
+  -"Lab Technician"
+  -"Lab_Doctor"
+  -"LAB_Manager"
+  -"Lab  Receptionist"
--- a/Config-Server/configrepo/CSI-NET-LABSRVCS.yml
+++ b/Config-Server/configrepo/CSI-NET-LABSRVCS.yml
@ -0,0 +1,246 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: "CSI-NET-LABSRVCS-{env}"
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:lab:dbName};User Id={database:lab:userId};Password={database:lab:password};"
+#Oracle:
+ # ReadCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+ # WriteCon: "Data Source=(DESCRIPTION=(CONNECT_TIMEOUT={database:connectTimeout})(RETRY_COUNT={database:retryCount})(RETRY_DELAY={database:retryDelay})(TRANSPORT_CONNECT_TIMEOUT={database:transportConnecttimeout})(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size={database:maxPoolsize};Connection Timeout={database:connectionTimeout}"
+#Oracle:
+ # ReadCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password}"
+  #WriteCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password}"
+
+#Oracle:
+#  ReadCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size=50;Connection Timeout=30"
+#  WriteCon: "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={database:primaryHost})(PORT={database:port}))(CONNECT_DATA=(SERVICE_NAME={database:serviceName})));User Id={database:lab:userId};Password={database:lab:password};Max Pool Size=50;Connection Timeout=30"
+
+# HIGH AVAILABILITY
+#Oracle: 
+#  ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:lab:userId};Password={database:lab:password}"
+#  WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:lab:userId};Password={database:lab:password}"
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+TestVal: testvalue
+kafka: 
+  service_name: "CSI-NET-LABSRVCS-{env}"
+billing-notification-rabbitmq: 
+  exchange: 
+    exchangeName: billing-notification-exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+  queue:
+    name: billing-notification-queue
+    routekey: billing-notification-queueKey
+    autoDelete: false
+    durable: true
+    exclusive: false
+lab-request-rabbitmq: 
+  exchange: 
+    exchangeName: lab-request-exchange
+    type: fanout
+    durable: false
+    exclusive: false
+    autoDelete: false
+  queue:
+    name: LabRequestEvent
+    routekey: LabRequestEvent
+    autoDelete: false
+    durable: true
+    exclusive: false
+    autoack: false
+lab-rabbitmq:
+    exchangeName: net-template
+    durable: true
+    queue:
+      name: masterdata-sync
+      routeKey: masterdata-sync
+      durable: true
+    ic-notification: 
+      exchangeName: ic-notification
+      durable: true
+      Type: direct
+      queue: 
+       durable: true
+       routekey: ic-notification.infected
+    serio-ic-notification: 
+      exchangeName: ic-notification
+      durable: true
+      Type: direct
+      queue: 
+       durable: true
+       routekey: lab-test-infected
+lab-request-rabbitmq-billing: 
+  exchange: 
+    exchangeName: invoice-status-lab-exchange
+    type: direct
+    durable: true
+  queue:
+    name: lab-invoice-status-queue
+    routekey: lab-invoice-status-queueKey
+    durable: true
+rabbitmq:
+  client:
+    exchange: lab-td-exchange
+    type: topic
+    durable: true
+    exclusive: false
+    autoDelete: false
+    queue: 
+      name: TestDirectoryProcedure
+      routekey: TestDirectoryProcedure
+  lab-order-exchange: 
+    exchangename: feature-ehr-exchange
+    queue: 
+      name: feature-ehr-queue
+      routekey: feature-ehr-queue
+  exchange-notification: 
+    autoDelete: false
+    durable: false
+    exchangeName: lab.qa.notifications.exchange
+    exclusive: false
+    queue: 
+      routekey: lab.qa.notifications
+  sample-collection-exchnage: 
+    exchangeName: lab-exchange
+    queue: 
+      name: lab-orders-queue
+      routekey: lab-orders-queue
+    queue2: 
+      name: sample-rejecting-notify-queue
+      routekey: sample-rejecting-notify-queue
+redis: 
+  client: 
+    instanceName: "lab:"
+contextSkipOn: ""
+ADT:
+  DataKey: masterdataObject
+  TypeKey: masterdataType
+ADTType:
+  Hospital: Hospitals
+  HospitalGroup: HospitalGroup
+HospitalAttribute:
+  HospitalGroupKey: hospitalGroup
+  HospitalID: id
+  HospitalGroupIdKey: id
+  TranslationLanguageArrayKey: translationLanguages
+  LabHospitalTranslationAttribute:
+    TranslationValueObjKey: translationValues
+    LanguageObjKey: language
+    ColumnName: columnName
+    ColumnValue: value
+    TranslationId: id
+    HospitalName: hospitalName
+    Language: language
+    LanguageCode: languageCode
+    LabHospitalGroupAttribute:
+  HospitalGroupId: id
+LabHospitalGroupAttribute:
+  HospitalGroupId: id
+  TranslationLanguageArrayKey: translationLanguages
+  LabHospitalGroupTransalationAttribute:
+    TranslationId: id
+    ColumnName: columnName
+    ColumnValue: value
+    HospitalGroupName: hospitalGroupName
+    TranslationValueObjKey: translationValues
+    LanguageObjKey: language
+    LanguageCode: language
+    Language: language
+ProceduresAttribute:
+  ProcedureCode: procedureId
+  ProcedureName: name
+  LanguageCode: languageCode
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+Report:
+ Mongo:
+   Collection: "LAB"
+RabbitMQ:
+ Mongo:
+   Collection: "LAB"
+RmqLabNotificationsExchange:
+  exchangename: csi.net.labsrvcs.notifications
+  durable: true
+  routeKeys:
+    LabOrderCancelation: csi.net.labsrvcs.notifications
+    VerifyTextBasedResults: csi.net.labsrvcs.notifications
+    VerifyHistopathologyResults: csi.net.labsrvcs.notifications
+    SampleRejected: csi.net.labsrvcs.notifications
+    SampleCollected: csi.net.labsrvcs.notifications
+    SampleRecieved: csi.net.labsrvcs.notifications
+    IHEPublish: csi.net.labsrvcs.ihe
+RmqICNotificationsExchange:
+  exchangename: csi.net.labsrvcs.ic.notifications
+  routeKeys:
+    InfectedNotifyToIC: csi.net.labsrvcs.lab.sample.infected
+    InfectedMicroNotifyToIC: csi.net.labsrvcs.sample.micro.infected
+RmqSampleCollectionExchange:
+  exchangename: csi.net.labsrvcs
+  routeKeys:
+    SampleRejected: csi.net.labsrvcs.sample.reject.notifications
+    SampleRecieved: csi.net.labsrvcs.sample.recieved
+    LabOrderStatus: csi.net.labsrvcs.status
+    IHEPublish: csi.net.labsrvcs.ihe
+    TestStatusPublish: csi.net.labsrvcs.TestStatus
+SetupMasterDataExchange:
+  exchangeName: net-template
+  durable: true
+  queue:
+    name: masterdata-sync
+    routeKey: masterdata-sync
+    durable: true
+RmqBillingCollectionExchange:
+  exchangeName: csi.net.labsrvcs.billing
+  durable: true
+  routeKeys:
+    PerformedStatus: csi.net.labsrvcs.billing
+LabUserRoles:
+  -"Lab Technician"
+  -"Lab_Doctor"
+  -"LAB_Manager"
+  -"Lab  Receptionist"
+KafkaTopics:
+  PerformedStatus: "{env}-csi.net.labsrvcs.billing"
+  SampleCollected: "{env}-csi.net.labsrvcs.samplecollected"
+  TestStatusPublish: "{env}-csi.net.labsrvcs.TestStatus"
+  SampleRecieved: "{env}-csi.net.labsrvcs.sample.recieved"
+  LabOrderCancelation: "{env}-csi.net.labsrvcs.labordercancellation"
+UrlOptions:
+  FormTemplateUrl: "http://csi-net-empiread/api/RegistrationFormTemplate"
+  PatientSearchServiceUrl: "http://csi-net-empiread/api/patient"
+  BillingGetAccountIdUrl: "http://csi-bm-invoice/billing/account/create"
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BaseUtilityServiceUrl: "http://csi-java-base-utility"
+  EHRPatientPOMRUrl: "http://csi-java-ehr-patient-pomr"
+  RMSReservationServiceUrl: "http://csi-pms-rms-reservation"
+  ADTRequestUrl: "http://csi-pms-adt-request"
+  EHRPatientIpUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/read/carePlan/getMrpIdsAndNursingGroupId"
+  PHRRequestUrl: "http://csi-phr-base/api/v1.0/masterData/txnUsersList"
+  LABRequestUrl: "http://csi-net-labsrvcs/api/UserManagement/AllUsersForLabRoles"
+  RMSResourceRegistryUrl: "http://csi-pms-rms-resource-registry/amd-doctor/search"
+  IEGenaralUrl: "http://csi-ie-general/api/patient"
+  ErPatientAssigneeUri : "http://csi-net-erfuncti/api/ERDashboard/GetPatientAssignees"
+  PomrForPomrId: "http://csi-java-ehr-patient-pomr/ehr/opd/pomr/byPomrId?"
+  ClinicDetails": "http://csi-pms-rms-masterdata/amd-masterdata/clinic/getById/"
+  ClinicalAcknowledgeURL : "http://csi-java-ehr-ip/v1.0/ehr/ip/clinical-result-acknowledgement/getData"
+  RMSProcedureDetailsURL: "http://csi-pms-rms-masterdata/amd-masterdata/procedures/light-weight-search?isExternal=true&includeAllConfigCodes=true&lang=en&internationalization=false"
+
+ElasticApm:
+  ServiceName: CSI-NET-LABSRVCS
+
+Serilog:
+  MinimumLevel:
+    Default: Debug
+    Override:
+      Microsoft: Debug
+      System: Error
--- a/Config-Server/configrepo/CSI-NET-MEDISPAN.yml
+++ b/Config-Server/configrepo/CSI-NET-MEDISPAN.yml
@ -0,0 +1,44 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-MEDISPAN-{env}
+
+PostgreSQL:
+  ReadCon: "Host={database:host};Port={database:port};Database={database:medispan:dbName};User Id={database:medispan:userId};Password={database:medispan:password};"
+
+SQLServer: 
+  ReadCon: "Data Source={database:medispan:host};Initial Catalog={database:medispan:dbName};User ID={database:medispan:userId};Password={database:medispan:password};"
+Oracle: 
+  ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:medispan:userId};Password={database:medispan:password}"
+kafka: 
+  service_name: CSI-NET-MEDISPAN-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "Medi span integration api"
+  api-title-desc: "Medi span integration api Desc"
+Integrations-DbConnectionString: Server=172.15.100.88;Database=medispan-integrations;User Name=postgres;Password=cloud@123
+UrlOptions:
+  AllergiesUrl: "http://csi-net-ehr-opd-patient/api/EHRPatientsAllergy/PatientsAllergyByPatientID"
+  PatinetInfoUrl: "http://csi-net-empiread/api/patient/pre-formatted"
+  ConditionsUrl: "http://csi-java-ehr-patient-pomr/ehr/opd/patientProblem/byPatientId"
+  VitalSignsUrl: "http://csi-java-ehr-common/vital-signs/displayV2/patient"
+  DrugsUrl: "http://csi-phr-base/api/v1.0/formulary/getCodeDetail"
+  LabResultsUrl: "http://csi-net-labsrvcs/api/LabResults/GetResultsByPatient"
+  ProcedureUrl: "http://csi-phr-base/api/v1.0/masterData/getProcedureConfig"
+  LdrService: "http://csi-java-ehr-ldr/ehr/labor-and-delivery/lactation/last/lactation-id"
+  SnowmedAlergyUrl: "http://csi-net-ehr-opd-master/api/EHRMaster/GetAllergy"
+  PregnancyUrl: "https://csi-java-ehr-opd/ehr/opd/pregnancy/byPatientIdAndPOMRId"
+UseResilientHttp: true
+preloadCache: true
+useICD10AM6: true
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+Hangfire:
+  Storage: "mongodb://{Mongo:appLogs}/csi-net-medispan"
+
+ElasticApm:
+  ServiceName: CSI-NET-MEDISPAN
--- a/Config-Server/configrepo/CSI-NET-NOTY-EMAIL.yml
+++ b/Config-Server/configrepo/CSI-NET-NOTY-EMAIL.yml
@ -0,0 +1,45 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-NOTY-EMAIL-{env}
+kafka: 
+  serviceName: CSI-NET-NOTY-EMAIL-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "EMAIL Api"
+  api-title-desc: "EMAIL Api Desc"
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-email"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  MessageStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+NotificationConfigOptions:
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: notifications.exchange
+SendGridEmailOptios:
+  ApiKey: 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
+EmailOptions:
+  DefaultFromAddress: "HMG-VIDA-Notifications@drsulaimanalhabib.com"
+  DefaultFromEmailDescription: "Notification"
+  EnableSsl: false
+  UserName: "vida4.notifications"
+  Password: 'V!78945392$@'
+  SmtpHost: "RAYCAS01.HMG.LOCAL"
+  SmtpPort: '25'
+  UseDefaultCredentials: false
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+
+ElasticApm:
+  ServiceName: CSI-NET-NOTY-EMAIL
--- a/Config-Server/configrepo/CSI-NET-NOTY-MSGTEMPL.yml
+++ b/Config-Server/configrepo/CSI-NET-NOTY-MSGTEMPL.yml
@ -0,0 +1,25 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-NOTY-MSGTEMPL-{env}
+kafka: 
+  serviceName: CSI-NET-NOTY-MSGTEMPL-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "Notifications  Api"
+  api-title-desc: "Notifications  Api Desc"
+DefaultDbConnection: "mongodb://{empi:database:nodes}/csi-net-noty-msgtempl"
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{noty:database:nodes}/csi-net-noty-events-store"
+  MessageStoreConnectionString: "mongodb://{noty:database:nodes}/csi-net-noty-events-store"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+
+ElasticApm:
+  ServiceName: CSI-NET-NOTY-MSGTEMPL
--- a/Config-Server/configrepo/CSI-NET-NOTY-QUERY.yml
+++ b/Config-Server/configrepo/CSI-NET-NOTY-QUERY.yml
@ -0,0 +1,59 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-NOTY-QUERY-{env}
+kafka: 
+  serviceName: CSI-NET-NOTY-QUERY-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "Notifications  Api"
+  api-title-desc: "Notifications Api Desc"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-events-store/?readPreference=secondaryPreferred"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-events-store/?readPreference=secondaryPreferred"
+  RmqConnectionUrl: "amqp://{empi:rabbitmq:server:username}:{empi:rabbitmq:server:password}@{empi:rabbitmq:server:host}:{empi:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  MessageStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+NotificationConfigOptions:
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+NotificationDeliveryRuleOptions:
+  critical:
+  - sms
+  - email
+  - in-app-realtime
+  high:
+  - sms
+  - email
+  - in-app-realtime
+  low:
+  - sms
+  - email
+  - in-app-realtime
+  normal:
+  - in-app-realtime
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+NotificationDependencyOptions:
+  user-details-service: "http://service-base-user/user/logged-in"
+  message-template-service: "http://csi-net-noty-msgtempl/api/Notifications"
+  user-details-for-role-service: "http://service-base-user/user/get/users/rolecode"
+DefaultDbConnection: "Server={noty:database:host};Database=notifications-store;User Name={noty:database:username};Password={noty:database:password}"
+QueryDbConnection: "mongodb://{empi:database:nodes}/csi-net-noty-query/?readPreference=secondaryPreferred"
+NewNotificationDependencyOptions:
+  user-details-service: "http://csi-iam-service/auth/realms/master/csi-user-detail/user-by-id"
+  message-template-service: "http://csi-net-noty-msgtempl/api/Notifications"
+  user-details-for-role-service: "https://csi-iam-service/auth/realms/apphiss2vi/csi-user-detail/users-by-role"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs/?readPreference=secondaryPreferred"
+
+ElasticApm:
+  ServiceName: CSI-NET-NOTY-QUERY
--- a/Config-Server/configrepo/CSI-NET-NOTY-QUEUE.yml
+++ b/Config-Server/configrepo/CSI-NET-NOTY-QUEUE.yml
@ -0,0 +1,31 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-NOTY-QUEUE-{env}
+kafka: 
+  serviceName: CSI-NET-NOTY-QUEUE-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: Notifications WSS Api
+  api-title-desc: Web Sockets Service (In App Notifications)
+ServiceUrls:
+  UserPermission: "http://service-base-security-token/service-base-security-token/token/logged-in-user"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-queue"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  MessageStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+
+ElasticApm:
+  ServiceName: CSI-NET-NOTY-QUEUE  
--- a/Config-Server/configrepo/CSI-NET-NOTY-SMS.yml
+++ b/Config-Server/configrepo/CSI-NET-NOTY-SMS.yml
@ -0,0 +1,46 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-NOTY-SMS-{env}
+kafka: 
+  serviceName: CSI-NET-NOTY-SMS-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "SMS Api"
+  api-title-desc: "SMS Api Desc"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-events-store"
+  MessageStoreConnectionString: "mongodb://{empi:database:nodes}/csi-noty-sms"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  MessageStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+SmsGateWayProvider: yamamah
+TwilioOptions:
+  AccountId: AC29aae4c5e4a95eee5cec5c875ef09fb7
+  AuthToken: bd45e51e42ba85c6e69d60803db916cc
+  PhoneNumber: "+18443081192"
+SmsGateWayOptions:
+  AppSid: K1pmBl_9JboGOtcXcVgdxJ1exOoAZ
+  StatusEndPoint: http://basic.unifonic.com/rest/SMS/Messages/GetMessagesDetails
+  Sender: DR.ALHABIB
+  EndPoint: http://basic.unifonic.com/wrapper/sendSMS.php
+YamamahaOptions:
+  UserName: "username"
+  Password: "password"
+  TagName: "Vida Plus"
+  SendUrl: "https://api1.yamamah.com/SendSMS"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+
+ElasticApm:
+  ServiceName: CSI-NET-NOTY-SMS
--- a/Config-Server/configrepo/CSI-NET-NOTY-WSS.yml
+++ b/Config-Server/configrepo/CSI-NET-NOTY-WSS.yml
@ -0,0 +1,38 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-NOTY-WSS-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: Notifications WSS Api
+  api-title-desc: Web Sockets Service (In App Notifications)
+ServiceUrls:
+  UserPermission: "http://service-base-security-token/service-base-security-token/token/logged-in-user"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{noty:database:nodes}/csi-net-noty-events-store"
+  MessageStoreConnectionString: "mongodb://{noty:database:nodes}/csi-net-noty-events-store"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  MessageStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+WssChannelStore:
+  Connection: "mongodb://172.200.0.218:27017/csi-net-noty-ws-connection-store"
+  DbName: "csi-net-noty-ws-connection-store"
+eureka: 
+  instance:
+   preferIpAddress: true
+   hostname: csi-net-noty-wss
+   secure-port-enabled: true
+   secure-virtual-host-name: csi-net-noty-wss
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+
+ElasticApm:
+  ServiceName: CSI-NET-NOTY-WSS
--- a/Config-Server/configrepo/CSI-NET-NOTY.yml
+++ b/Config-Server/configrepo/CSI-NET-NOTY.yml
@ -0,0 +1,59 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-NOTY-{env}
+kafka: 
+  serviceName: CSI-NET-NOTY-{env}
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+swaggerschema:
+  api-title: "Notifications  Api"
+  api-title-desc: "Notifications Api Desc"
+EventStoreConfigOptions:
+  EventStoreConnectionString: "mongodb://{noty:database:nodes}/csi-net-noty-events-store"
+  MessageStoreConnectionString: "mongodb://{noty:database:nodes}/csi-net-noty-events-store"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+BrighterConfigOptions:
+  EventStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  MessageStoreConnectionString: "Server={noty:database:host};Database=notifications-event-store;User Name={noty:database:username};Password={noty:database:password}"
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+NotificationConfigOptions:
+  RmqConnectionUrl: "amqp://{noty:rabbitmq:server:username}:{noty:rabbitmq:server:password}@{noty:rabbitmq:server:host}:{noty:rabbitmq:server:port}"
+  RmqExchangeName: "notifications.exchange"
+NotificationDeliveryRuleOptions:
+  critical:
+  - sms
+  - email
+  - in-app-realtime
+  high:
+  - sms
+  - email
+  - in-app-realtime
+  low:
+  - sms
+  - email
+  - in-app-realtime
+  normal:
+  - in-app-realtime
+ServiceUrls:
+  UserPermission: http://service-base-security-token/token/logged-in-user
+NotificationDependencyOptions:
+  user-details-service: "http://service-base-user/user/logged-in"
+  message-template-service: "http://csi-net-noty-msgtempl/api/Notifications"
+  user-details-for-role-service: "http://service-base-user/user/get/users/rolecode"
+NewNotificationDependencyOptions:
+  user-details-service: "http://csi-iam-service/auth/realms/master/csi-user-detail/user-by-id"
+  message-template-service: "http://csi-net-noty-msgtempl/api/Notifications"
+  user-details-for-role-service: "http://csi-iam-service/auth/realms/apphiss2vi/csi-user-detail/users-by-role"
+MongoLogs: "mongodb://{Mongo:appLogs}/app-logs"
+NotificationHttpClientOptions:
+  GetConfigByEventNameEndPoint: "http://csi-net-noty-query/api/NotifiableConfigMappings/event"
+
+ElasticApm:
+  ServiceName: CSI-NET-NOTY
--- a/Config-Server/configrepo/CSI-NET-PATIENTS.yml
+++ b/Config-Server/configrepo/CSI-NET-PATIENTS.yml
@ -0,0 +1,48 @@
+--- 
+AppSettings: 
+  SiteTitle: CSI-NET-PATIENTS-{env}
+
+PostgreSQL:   
+  ReadCon: "Host={database:host};Port={database:port};Database={database:labPatient:dbName};User Id={database:labPatient:userId};Password={database:labPatient:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:labPatient:dbName};User Id={database:labPatient:userId};Password={database:labPatient:password};"
+Oracle: 
+  ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:labPatient:userId};Password={database:labPatient:password}"
+  WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:labPatient:userId};Password={database:labPatient:password}"
+
+contextSkipOn: HIS_PatientMaster
+kafka: 
+  service_name: CSI-NET-PATIENTS-{env}
+rabbitmq: 
+  client: 
+    autoDelete: false
+    durable: true
+    exchangename: vidaplus.empi.exchange
+    exclusive: false
+    unknownPatientQueue: 
+      name: csi.vidaplus.lab.uat.unknown.patient.add
+      routekey: csi.vidaplus.empi.events.unknownpatientcreatedevent
+    bulkPatientQueue: 
+      name: csi.vidaplus.lab.uat.bulk.patient.add
+      routekey: csi.vidaplus.empi.events.bulkunknownpatientscreatedevent
+    queueAdd: 
+      name: csi.vidaplus.lab.uat.patient.add
+      routekey: csi.vidaplus.empi.events.patientcreatedevent
+    queueEdit: 
+      name: csi.vidaplus.lab.uat.patient.edit
+      routekey: csi.vidaplus.empi.events.patienteditedevent
+    empiDataPermissionSavedQueue: 
+      name: csi.vidaplus.lab.uat.empi.data.permission.saved
+      routekey: csi.vidaplus.empi.events.empidatapermissionsavedevent
+    quickRegisterQueue: 
+      name: csi.vidaplus.lab.uat.patient.quickregister
+      routekey: csi.vidaplus.empi.events.quickregisteredinhospitalevent
+    type: topic
+    virtualHost: /
+Report:
+ Mongo:
+   Collection: "PATIENTS"
+RabbitMQ:
+ Mongo:
+   Collection: "LAB"
+ElasticApm:
+  ServiceName: CSI-NET-PATIENTS
--- a/Config-Server/configrepo/CSI-NET-PHRMI.yml
+++ b/Config-Server/configrepo/CSI-NET-PHRMI.yml
@ -0,0 +1,26 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: CSI-NET-PHRMI-{env}
+kafka:
+  service_name: CSI-NET-PHRMI-{env}
+
+PostgreSQL: 
+  ReadCon: "Host={database:host};Port={database:port};Database={database:pharmacy:dbName};User Id={database:pharmacy:userId};Password={database:pharmacy:password};"
+  WriteCon: "Host={database:host};Port={database:port};Database={database:pharmacy:dbName};User Id={database:pharmacy:userId};Password={database:pharmacy:password};"
+  
+Oracle: 
+  ReadCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:pharmacy:userId};Password={database:pharmacy:password}"
+  WriteCon: "Data Source=(description=(address=(host={database:primaryHost})(protocol=tcp)(port={database:port}))(address=(host={database:secondaryHost})(protocol=tcp)(port={database:port}))(failover=yes)(connect_data=(service_name={database:serviceName})(failover_mode=(type=select)(method=basic))));User Id={database:pharmacy:userId};Password={database:pharmacy:password}"
+
+Logging: 
+  IncludeScopes: false
+  LogLevel: 
+    Default: Debug
+    Microsoft: Information
+    System: Information
+Report:
+  Mongo:
+    Collection: "PHARMACY"
+ElasticApm:
+  ServiceName: CSI-NET-PHRMI
--- a/Config-Server/configrepo/CSI-PHR-BASE-java-hmg-uat.yml
+++ b/Config-Server/configrepo/CSI-PHR-BASE-java-hmg-uat.yml
@ -0,0 +1,29 @@
+pring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 50
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 50
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
+
+#logging:
+#  level:
+#    com:
+#      csi:
+#        phr:
+#          feign:
+#            billing:
+#              BillingInvoiceApi: DEBUG
+
+debug: true
+logging:
+  level:
+    com: DEBUG
+
--- a/Config-Server/configrepo/CSI-PMS-RMS-MASTERDATA.yaml
+++ b/Config-Server/configrepo/CSI-PMS-RMS-MASTERDATA.yaml
@ -0,0 +1,14 @@
+spring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 60
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 60
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
--- a/Config-Server/configrepo/api-gateway.yaml
+++ b/Config-Server/configrepo/api-gateway.yaml
@ -0,0 +1,693 @@
+eureka:
+  client:
+    enabled: false
+    serviceUrl:
+      defaultZone: 'http://localhost:8761/eureka/'
+  fetch-registry: false
+  register-with-eureka: false
+debug: false
+logging:
+  level:
+    org:
+      springframework:
+        web:
+          server: DEBUG
+          client: ERROR
+reactor:
+   netty:
+     ioWorkerCount: 20
+     io-worker-count: 30
+server:
+   tomcat:
+     max-threads: 100
+     threads:
+       min: 10
+       max: 100
+spring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 30
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+  http:
+    multipart:
+      max-file-size: 200MB
+      max-request-size: 200MB
+  cloud:
+    gateway:
+      httpclient:
+        connect-timeout: 1000
+        response-timeout: 50s
+        pool:
+          max-connections: 100
+      routes:
+      - id: report
+        uri: 'http://reporting-service'
+        predicates:
+        - Path=/reporting-service/**
+        filters:
+        - StripPrefix=1
+      - id: iam
+        uri: 'http://csi-iam-service'
+        predicates:
+        - Path=/iam/**
+        filters:
+        - StripPrefix=1
+      - id: document
+        uri: 'http://document-management-services'
+        predicates:
+        - Path=/document-management/**
+        filters:
+        - StripPrefix=1
+      - id: document-engine
+        uri: 'http://document-storage-engine-service'
+        predicates:
+        - Path=/document-engine/**
+        filters:
+        - StripPrefix=1
+      - id: medispan
+        uri: 'http://csi-net-medispan'
+        predicates:
+        - Path=/csi-net-medispan/**
+        filters:
+        - StripPrefix=1
+      - id: appointment-channel
+        uri: 'http://cas-appointment-channel'
+        predicates:
+        - Path=/cas-appointment-channel/**
+        filters:
+        - StripPrefix=1
+      - id: crs-channel
+        uri: 'http://crs-channel'
+        predicates:
+        - Path=/crs-channel/**
+        filters:
+        - StripPrefix=1
+      - id: sick-leave-create
+        uri: 'http://sick-leave-create'
+        predicates:
+        - Path=/sick-leave-create/**
+        filters:
+        - StripPrefix=1
+      - id: doctor-verify
+        uri: 'http://sick-leave-doctor-verify'
+        predicates:
+        - Path=/sick-leave-doctor-verify/**
+        filters:
+        - StripPrefix=1
+      - id: reporting-publisher
+        uri: 'http://csi-reporting-publisher'
+        predicates:
+        - Path=/reporting-publisher/**
+        filters:
+        - StripPrefix=1
+      - id: config-repo
+        uri: 'http://config-server'
+        predicates:
+        - Path=/config-server/**
+        filters:
+        - StripPrefix=1
+      - id: econsent
+        uri: 'http://cs-net-econsent'
+        predicates:
+        - Path=/cs-net-econsent/**
+        filters:
+        - StripPrefix=1
+      - id: econsentui
+        uri: 'http://cs-net-econsentui'
+        predicates:
+        - Path=/cs-net-econsentui/**
+        filters:
+        - StripPrefix=1
+      - id: middleware
+        uri: 'http://csi-document-management-service' #'http://document-management-service'
+        predicates:
+        - Path=/document-management-middleware/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-hpd
+        uri: 'http://csi-ie-hpd'
+        predicates:
+        - Path=/csi-ie-hpd/**
+        filters:
+        - StripPrefix=1
+      - id: cs-net-physiotherapy
+        uri: 'http://cs-net-physiotherapy'
+        predicates:
+        - Path=/cs-net-physiotherapy/**
+        filters:
+        - StripPrefix=1
+      - id: cs-net-physiotherapy-ui
+        uri: 'http://cs-net-physiotherapyui'
+        predicates:
+        - Path=/cs-net-physiotherapyui/**
+        filters:
+        - StripPrefix=1
+      - id: cs-net-social-worker-ui
+        uri: 'http://cs-net-social-worker-ui'
+        predicates:
+        - Path=/cs-net-social-worker-ui/**
+        filters:
+        - StripPrefix=1
+      - id: cs-net-social-worker
+        uri: 'http://cs-net-social-worker'
+        predicates:
+        - Path=/cs-net-social-worker/**
+        filters:
+        - StripPrefix=1
+      - id: csi-reporting
+        uri: 'http://csi-reporting-service/'
+        predicates:
+        - Path=/csi-reporting-service/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-pdq
+        uri: 'http://csi-ie-pdq'
+        predicates:
+        - Path=/csi-ie-pdq/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-employee
+        uri: 'http://csi-ie-employee'
+        predicates:
+        - Path=/csi-ie-employee/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-xdsb
+        uri: 'http://csi-ie-xdsb'
+        predicates:
+        - Path=/csi-ie-xdsb/**
+        filters:
+        - StripPrefix=1
+      - id: csi-streaming-etl-service
+        uri: 'http://csi-streaming-etl-service'
+        predicates:
+        - Path=/csi-streaming-etl-service/**
+        filters:
+        - StripPrefix=1
+      - id: csi-rf-file-uploader-service
+        uri: 'http://csi-rf-file-uploader-service'
+        predicates:
+        - Path=/rf/**
+        filters:
+        - StripPrefix=1
+      - id: medical-report-channel
+        uri: 'http://medical-report-channel'
+        predicates:
+        - Path=/medical-report-channel/**
+        filters:
+        - StripPrefix=1
+      - id: service-base-ui-registry
+        uri: 'http://service-base-ui-registry'
+        predicates:
+        - Path=/service-base-ui-registry/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-lakum
+        uri: 'http://csi-ie-lakum'
+        predicates:
+        - Path=/csi-ie-lakum/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-interbranch
+        uri: 'http://csi-ie-interbranch'
+        predicates:
+        - Path=/csi-ie-interbranch/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-prescription
+        uri: 'http://csi-ie-prescription'
+        predicates:
+        - Path=/csi-ie-prescription/**
+        filters:
+        - StripPrefix=1
+      - id: crs-channel-user
+        uri: 'http://crs-channel-user'
+        predicates:
+        - Path=/crs-channel-user/**
+        filters:
+        - StripPrefix=1
+      - id: cs-net-econsent
+        uri: 'http://cs-net-econsent'
+        predicates:
+        - Path=/cs-net-econsent/**
+        filters:
+        - StripPrefix=1
+      - id: csi-bm-approval
+        uri: 'http://csi-bm-approval'
+        predicates:
+        - Path=/csi-bm-approval/**
+        filters:
+        - StripPrefix=1
+      - id: csi-bm-prm
+        uri: 'http://csi-bm-prm'
+        predicates:
+        - Path=/csi-bm-prm/**
+        filters:
+        - StripPrefix=1
+      - id: csi-bm-billing
+        uri: 'http://csi-bm-billing'
+        predicates:
+        - Path=/csi-bm-billing/**
+        filters:
+        - StripPrefix=1
+      - id: csi-bm-inte-bridge
+        uri: 'http://csi-bm-inte-bridge'
+        predicates:
+        - Path=/csi-bm-inte-bridge/**
+        filters:
+        - StripPrefix=1
+      - id: csi-bm-invoice
+        uri: 'http://csi-bm-invoice'
+        predicates:
+        - Path=/csi-bm-invoice/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-api
+        uri: 'http://csi-ie-api'
+        predicates:
+        - Path=/csi-ie-api/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-cyclus
+        uri: 'http://csi-ie-cyclus'
+        predicates:
+        - Path=/csi-ie-cyclus/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-doctor-api
+        uri: 'http://csi-ie-doctor-api'
+        predicates:
+        - Path=/csi-ie-doctor-api/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-dq
+        uri: 'http://csi-ie-dq'
+        predicates:
+        - Path=/csi-ie-dq/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-general
+        uri: 'http://csi-ie-general'
+        predicates:
+        - Path=/csi-ie-general/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-generalii
+        uri: 'http://csi-ie-generalii'
+        predicates:
+        - Path=/csi-ie-generalii/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-insurance
+        uri: 'http://csi-ie-insurance'
+        predicates:
+        - Path=/csi-ie-insurance/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-lakum-batch
+        uri: 'http://csi-ie-lakum-batch'
+        predicates:
+        - Path=/csi-ie-lakum-batch/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-misc
+        uri: 'http://csi-ie-misc'
+        predicates:
+        - Path=/csi-ie-misc/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-mobile
+        uri: 'http://csi-ie-mobile'
+        predicates:
+        - Path=/csi-ie-mobile/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-pacsurl
+        uri: 'http://csi-ie-pacsurl'
+        predicates:
+        - Path=/csi-ie-pacsurl/**
+        filters:
+        - StripPrefix=1
+      - id: csi-ie-zatca
+        uri: 'http://csi-ie-zatca'
+        predicates:
+        - Path=/csi-ie-zatca/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-base-utility
+        uri: 'http://csi-java-base-utility'
+        predicates:
+        - Path=/csi-java-base-utility/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ds-dental-core
+        uri: 'http://csi-java-ds-dental-core'
+        predicates:
+        - Path=/csi-java-ds-dental-core/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-common
+        uri: 'http://csi-java-ehr-common'
+        predicates:
+        - Path=/csi-java-ehr-common/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-common-scheduler
+        uri: 'http://csi-java-ehr-common-scheduler'
+        predicates:
+        - Path=/csi-java-ehr-common-scheduler/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-config
+        uri: 'http://csi-java-ehr-config'
+        predicates:
+        - Path=/csi-java-ehr-config/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-ic-bundle
+        uri: 'http://csi-java-ehr-ic-bundle'
+        predicates:
+        - Path=/csi-java-ehr-ic-bundle/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-ic-dashboard
+        uri: 'http://csi-java-ehr-ic-dashboard'
+        predicates:
+        - Path=/csi-java-ehr-ic-dashboard/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-initialassessment
+        uri: 'http://csi-java-ehr-initialassessment'
+        predicates:
+        - Path=/csi-java-ehr-initialassessment/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-ip
+        uri: 'http://csi-java-ehr-ip'
+        predicates:
+        - Path=/csi-java-ehr-ip/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-ip-doctor-prescription
+        uri: 'http://csi-java-ehr-ip-doctor-prescription'
+        predicates:
+        - Path=/csi-java-ehr-ip-doctor-prescription/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-ldr
+        uri: 'http://csi-java-ehr-ldr'
+        predicates:
+        - Path=/csi-java-ehr-ldr/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-listener
+        uri: 'http://csi-java-ehr-listener'
+        predicates:
+        - Path=/csi-java-ehr-listener/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-opd
+        uri: 'http://csi-java-ehr-opd'
+        predicates:
+        - Path=/csi-java-ehr-opd/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-or-anesthesia
+        uri: 'http://csi-java-ehr-or-anesthesia'
+        predicates:
+        - Path=/csi-java-ehr-or-anesthesia/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-or-book
+        uri: 'http://csi-java-ehr-or-book'
+        predicates:
+        - Path=/csi-java-ehr-or-book/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-or-booking
+        uri: 'http://csi-java-ehr-or-booking'
+        predicates:
+        - Path=/csi-java-ehr-or-booking/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-patient-pomr
+        uri: 'http://csi-java-ehr-patient-pomr'
+        predicates:
+        - Path=/csi-java-ehr-patient-pomr/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-specializedclinic
+        uri: 'http://csi-java-ehr-specializedclinic'
+        predicates:
+        - Path=/csi-java-ehr-specializedclinic/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-specialized-clinic
+        uri: 'http://csi-java-ehr-specializedclinic'
+        predicates:
+        - Path=/csi-java-ehr-specialized-clinic/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-ehr-template
+        uri: 'http://csi-java-ehr-template'
+        predicates:
+        - Path=/csi-java-ehr-template/**
+        filters:
+        - StripPrefix=1
+      - id: csi-java-workflow-automation
+        uri: 'http://csi-java-workflow-automation'
+        predicates:
+        - Path=/csi-java-workflow-automation/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-base-wss
+        uri: 'http://csi-net-base-wss'
+        predicates:
+        - Path=/csi-net-base-wss/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-bloodbnk
+        uri: 'http://csi-net-bloodbnk'
+        predicates:
+        - Path=/csi-net-bloodbnk/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-bloodbnk-mgt
+        uri: 'http://csi-net-bloodbnk-mgt'
+        predicates:
+        - Path=/csi-net-bloodbnk-mgt/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-ehr-dboardpc
+        uri: 'http://csi-net-ehr-dboardpc'
+        predicates:
+        - Path=/csi-net-ehr-dboardpc/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-ehr-ip-discharg
+        uri: 'http://csi-net-ehr-ip-discharg'
+        predicates:
+        - Path=/csi-net-ehr-ip-discharg/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-ehr-opd-master
+        uri: 'http://csi-net-ehr-opd-master'
+        predicates:
+        - Path=/csi-net-ehr-opd-master/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-ehr-opd-patient
+        uri: 'http://csi-net-ehr-opd-patient'
+        predicates:
+        - Path=/csi-net-ehr-opd-patient/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-empi-crs-inte
+        uri: 'http://csi-net-empi-crs-inte'
+        predicates:
+        - Path=/csi-net-empi-crs-inte/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-empi-hijridte
+        uri: 'http://csi-net-empi-hijridte'
+        predicates:
+        - Path=/csi-net-empi-hijridte/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-empiread
+        uri: 'http://csi-net-empiread'
+        predicates:
+        - Path=/csi-net-empiread/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-empiwrit
+        uri: 'http://csi-net-empiwrit'
+        predicates:
+        - Path=/csi-net-empiwrit/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-erfuncti
+        uri: 'http://csi-net-erfuncti'
+        predicates:
+        - Path=/csi-net-erfuncti/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-hemdialy
+        uri: 'http://csi-net-hemdialy'
+        predicates:
+        - Path=/csi-net-hemdialy/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-himservi
+        uri: 'http://csi-net-himservi'
+        predicates:
+        - Path=/csi-net-himservi/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-lab-scheduled
+        uri: 'http://csi-net-lab-scheduled'
+        predicates:
+        - Path=/csi-net-lab-scheduled/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-lab-vidaptor
+        uri: 'http://csi-net-lab-vidaptor'
+        predicates:
+        - Path=/csi-net-lab-vidaptor/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-labsrvcs
+        uri: 'http://csi-net-labsrvcs'
+        predicates:
+        - Path=/csi-net-labsrvcs/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-medispan
+        uri: 'http://csi-net-medispan'
+        predicates:
+        - Path=/csi-net-medispan/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-noty
+        uri: 'http://csi-net-noty'
+        predicates:
+        - Path=/csi-net-noty/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-noty-email
+        uri: 'http://csi-net-noty-email'
+        predicates:
+        - Path=/csi-net-noty-email/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-noty-msgtempl
+        uri: 'http://csi-net-noty-msgtempl'
+        predicates:
+        - Path=/csi-net-noty-msgtempl/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-noty-query
+        uri: 'http://csi-net-noty-query'
+        predicates:
+        - Path=/csi-net-noty-query/**
+        filters:
+        - StripPrefix=1
+      - id: csi-net-noty-sms
+        uri: 'http://csi-net-noty-sms'
+        predicates:
+        - Path=/csi-net-noty-sms/**
+        filters:
+        - StripPrefix=1
+      - id: csi-personalization-service
+        uri: 'http://csi-personalization-service'
+        predicates:
+        - Path=/csi-personalization-service/**
+        filters:
+        - StripPrefix=1
+      - id: csi-phr-base
+        uri: 'http://csi-phr-base'
+        predicates:
+        - Path=/csi-phr-base/**
+        filters:
+        - StripPrefix=1
+      - id: csi-phr-cron
+        uri: 'http://csi-phr-cron'
+        predicates:
+        - Path=/csi-phr-cron/**
+        filters:
+        - StripPrefix=1
+      - id: csi-pms-adt-request
+        uri: 'http://csi-pms-adt-request'
+        predicates:
+        - Path=/csi-pms-adt-request/**
+        filters:
+        - StripPrefix=1
+      - id: csi-pms-rms-masterdata
+        uri: 'http://csi-pms-rms-masterdata'
+        predicates:
+        - Path=/csi-pms-rms-masterdata/**
+        filters:
+        - StripPrefix=1
+      - id: csi-pms-rms-reservation
+        uri: 'http://csi-pms-rms-reservation'
+        predicates:
+        - Path=/csi-pms-rms-reservation/**
+        filters:
+        - StripPrefix=1
+      - id: csi-pms-rms-resource-registry
+        uri: 'http://csi-pms-rms-resource-registry'
+        predicates:
+        - Path=/csi-pms-rms-resource-registry/**
+        filters:
+        - StripPrefix=1
+      - id: csi-reporting-service
+        uri: 'http://csi-reporting-service'
+        predicates:
+        - Path=/csi-reporting-service/**
+        filters:
+        - StripPrefix=1
+      - id: csi-rf-jdbc-sink-service
+        uri: 'http://csi-rf-jdbc-sink-service'
+        predicates:
+        - Path=/csi-rf-jdbc-sink-service/**
+        filters:
+        - StripPrefix=1
+      - id: csi-rms-morgue
+        uri: 'http://csi-rms-morgue'
+        predicates:
+        - Path=/csi-rms-morgue/**
+        filters:
+        - StripPrefix=1
+      - id: document-management-middleware
+        uri: 'http://csi-document-management-service' #'http://document-management-middleware'
+        predicates:
+        - Path=/document-management-middleware/**
+        filters:
+        - StripPrefix=1
+      - id: service-base-masterdata
+        uri: 'http://service-base-masterdata'
+        predicates:
+        - Path=/service-base-masterdata/**
+        filters:
+        - StripPrefix=1
+      - id: service-base-role-permission
+        uri: 'http://service-base-role-permission'
+        predicates:
+        - Path=/service-base-role-permission/**
+        filters:
+        - StripPrefix=1
+      - id: sick-leave-doctor-verify
+        uri: 'http://sick-leave-doctor-verify'
+        predicates:
+        - Path=/sick-leave-doctor-verify/**
+        filters:
+        - StripPrefix=1
+      - id: wasfaty-service-channel
+        uri: 'http://wasfaty-service-channel'
+        predicates:
+        - Path=/wasfaty-service-channel/**
+        filters:
+        - StripPrefix=1
--- a/Config-Server/configrepo/application-java-hmg-uat.yml
+++ b/Config-Server/configrepo/application-java-hmg-uat.yml
@ -0,0 +1,149 @@
+eureka:
+  client:
+    enabled: false
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+    fetch-registry: false
+    register-with-eureka: false
+#feign:
+#  hystrix:
+#    enabled: true
+hystrix:
+  shareSecurityContex: true
+  command:
+    default:
+      circuitBreaker:
+        enabled: true
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 144000
+      fallback:
+        enabled: true
+  threadpool:
+    default:
+      coreSize: 30
+      maximumSize: 35
+      allowMaximumSizeToDivergeFromCoreSize: true
+ribbon:
+  ConnectTimeout: 770000
+  MaxAutoRetries: 1
+  MaxAutoRetriesNextServer: 1
+  ReadTimeout: 770000
+management:
+  endpoint:
+    health:
+      show-details: always
+  health:
+    redis:
+      enabled: false
+opentracing:
+  jaeger:
+    http-sender:
+      url: http://jaeger-collector:14268/api/traces
+    enable-b3-propagation: true
+kafka:
+  numPartitions: 3
+  replicationFactor: 3 
+  topic:
+      general-notifications: noty.c.notificationrequestfromextenalcommand
+      notification: noty.c.notificationrequestfromextenalcommand
+      notification_topic: noty.c.notificationrequestfromextenalcommand
+spring:
+  liquibase:
+    enabled: false
+  cache:
+    type: redis
+  redis:
+    host: redis
+    timeout: 20000
+    port: 3060
+#    sentinel:
+#      master: mymaster
+#      nodes: 10.9.203.26:6379
+#    cluster:
+#      max-redirects: 8
+#      nodes: 10.4.41.60:7010,10.4.41.60:7011,10.4.41.60:7012,10.4.41.61:7013,10.4.41.61:7014,10.4.41.61:7015,10.4.41.62:7016,10.4.41.62:7018
+  http:
+    multipart:
+      max-file-size: 200MB
+      max-request-size: 200MB
+  data:
+    elasticsearch:
+      cluster-name: elasticsearch
+      cluster-nodes: 10.201.216.63:9200
+    redis:
+      sentinel:
+        master: mymaster
+        nodes: 10.201.216.30:26379,10.201.216.31:26379,10.201.216.32:26379
+  kafka:
+    bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094
+    numPartitions: 3
+    replicationFactor: 3 
+    consumer:
+      bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094
+  rabbitmq:
+    host: 10.4.41.7
+    port: 5672
+    username: admin
+    password: admin     
+  #liquibase:
+  #  enabled: false
+#liquibase:
+#  enabled: false
+server:
+  shutdown: graceful
+  shutdown.timeout: 30s  
+csi:
+  env:
+    prefix: net-hmg-uat
+  mongo:
+    host: 10.201.216.35	
+    port: 27017
+  jpa:
+    event:
+      rabbitmq:
+        host: 10.4.41.7
+        port: 5672
+        userName: admin
+        password: admin
+        queueName: csi-reporting
+        exchangeName: csi.reporting
+  access-token-verification:
+    enabled: true
+  base:
+     util:
+       url: csi-java-base-utility
+debug: false
+phr:
+  auth-key:
+    client-secret: "3001029e-27e2-4165-98c7-f0ac6496d0eb"
+  kafka:
+    bootstrap-servers: 10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094
+    auto-offset-reset: latest
+    group-id:
+      discharge: phr-discharge
+    topic:
+      discharge-start-notification: adt-discharge-start-notification.t
+      discharge-clear-notification: adt-discharge-clear-notification.t
+      discharge-summary-clear-notification: adt-discharge-summary-clear-notification.t
+app:
+  procedure:
+    code:
+      iv : "01002008251"
+      urinary : "01002008302"
+      ventilator: "01002008352"
+      ssi : "01002008356"
+      mdro : "01002008301"
+      mrsa : "01002008351"
+      cl: "01002060852"
+elasticsearch:
+  cluster-nodes: 10.201.216.63:9200
+  index-name: patient-snapshot-uat
+
+logging:
+  level:
+    com:
+      csi:
+        phr: DEBUG
--- a/Config-Server/configrepo/application-net-hmg-uat.yml
+++ b/Config-Server/configrepo/application-net-hmg-uat.yml
@ -0,0 +1,390 @@
+--- 
+# Global Parameters Start =================================================
+env: net-hmg-uat
+apiGateway: "https://vida.hmg.edu.sa"
+gateway: "http://csi-central-authentication-service/"
+contextSkipOn: "HIS_PatientMaster,LAB_LabRequestEventStore,LAB_Procedure_Billing_Code,LAB_Procedure_Billing_Code_Translation, csi_er_PatientJourney, csi_er_UnknownPatientRegistration, csi_er_PatientAdmission, csi_ehr_ip_DischargeDetails,AllergyType,HistoryType,csi_ehr_opd_ProblemMaster,Allergy,AllergyReaction,AllergyReactionMapping,PhysicalExaminationSystem,ProblemMasters,ProblemMasterEventStore,PESClinicMapping,csi_ehr_opd_ProcedureICDMappings,csi_ehr_opd_ProcedurePackageMapping,csi_ehr_opd_SoapExpressTemplate,History,csi_ehr_ip_DischargeRequest,csi_ehr_opd_Procedures"
+patientMergeCheck: true
+
+# Mongo
+Mongo:
+  mongoIpAndPort: &mongoIpAndPort "10.201.216.35:27017"
+  mongoConString: &mongoConString "mongodb://10.201.216.35:27017"
+  appLogs: *mongoIpAndPort
+  
+# Kafka
+kafka: 
+  servers: "10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094"
+  service_name: default-net
+  period: 100
+  batchSizeLimit: 100
+
+# Redis
+redis: 
+  client: 
+   # host: "10.201.216.30:3060,10.201.216.31:3060,10.201.216.32:3060"
+    host: "10.201.216.30:6379,10.201.216.31:6379,10.201.216.32:6379" 
+# "10.4.41.60:7010,10.4.41.60:7011,10.4.41.60:7012,10.4.41.61:7013,10.4.41.61:7014,10.4.41.61:7015,10.4.41.62:7016,10.4.41.62:7018"
+
+# RabbitMQ
+rabbitmq_server_id: &rabbitmq_server_id "10.4.41.7"
+rabbitmq_server_port: &rabbitmq_server_port 5672
+rabbitmq_server_user: &rabbitmq_server_user "admin"
+rabbitmq_server_pwd: &rabbitmq_server_pwd "admin"
+rabbitmq_server_vhost: &rabbitmq_server_vhost "~"
+
+# Database
+Provider: "PostgreSQL"
+CommandTimoutInMins: 1.0
+database:
+  host: "10.201.215.11"
+ # primaryHost: "10.201.215.11"
+ # secondaryHost: "10.201.215.11"
+  port: 5432
+  serviceName: "HMG_UAT"
+  transportConnectTimeout: 5
+  connectTimeout: 5
+  retryDelay: 10
+  retryCount: 2
+  failOver: "ON"
+  loadBalance: "off"
+  lab:
+    dbName: "HMG_UAT"
+    userId: "lb_labservice"
+    password: "hmguat@csi"
+  labPatient:
+    dbName: "HMG_UAT"
+    userId: "lb_patient"
+    password: "hmguat@csi"
+  pharmacy:
+    dbName: "HMG_UAT"
+    userId: "ph_pharmacy"
+    password: "hmguat@csi"
+  bloodBank:
+    dbName: "HMG_UAT"
+    userId: "bb_bloodbank"
+    password: "hmguat@csi"
+  renal:
+    dbName: "HMG_UAT"
+    userId: "re_hemdialy"
+    password: "hmguat@csi"
+  erFuncti:
+    dbName: "HMG_UAT"
+    userId: "er_erfun"
+    password: "hmguat@csi"
+  opdPatient:
+    dbName: "HMG_UAT"
+    userId: "eh_npatient"
+    password: "hmguat@csi"
+  opdMaster:
+    dbName: "HMG_UAT"
+    userId: "eh_nmaster"
+    password: "hmguat@csi"
+  ehrDischarge:
+    dbName: "HMG_UAT"
+    userId: "eh_ndischarge"
+    password: "hmguat@csi"
+  medispan:
+    provider: "PostgreSQL"
+    dbName: "HMG_UAT"
+    userId: "ph_medispan"
+    password: "hmguat@csi"
+  himServi:
+    dbName: "HMG_UAT"
+    userId: "hm_himservice"
+    password: "hmguat@csi"
+  hhc:
+    dbName: "HMG_UAT"
+    userId: "csi_hhc"
+    password: "hmguat@csi"
+# Global Parameters End =================================================
+
+# Eureka Configuration Starts ===========================================
+eureka: 
+  client: 
+    healthcheck: 
+      enabled: true
+    serviceUrl: "http://eureka:8761/eureka/"
+    shouldFetchRegistry: false
+    shouldRegisterWithEureka: false
+  instance: 
+    healthCheckUrl: ""
+    preferIpAddress: true
+# Eureka Configuration Ends ===========================================
+
+# Reporting Configuration Starts ======================================
+reportingFrm: "http://csi-reporting-publisher"
+Report:
+ SkipSendToReporting: true
+ Mongo:
+   ConnectionString: *mongoConString
+   DbName: "csi-net-reporting"
+RabbitMQ:
+ Mongo:
+  ConnectionString: *mongoConString
+  DbName: "csi-net-rabbitmq"
+# Reporting Configuration Ends ======================================
+
+# EMPI Configuration Starts =========================================
+empi: 
+  database: 
+    nodes: *mongoIpAndPort
+    host: ""
+  rabbitmq: 
+    server: 
+      host: *rabbitmq_server_id
+      password: *rabbitmq_server_pwd
+      port: *rabbitmq_server_port
+      username: *rabbitmq_server_user
+      virtualhost: *rabbitmq_server_vhost
+# EMPI Configuration Ends =========================================
+
+# NOTIFICATION Configuration Starts =========================================
+
+noty: 
+  database: 
+    nodes: *mongoIpAndPort
+    host: ""
+  rabbitmq: 
+    server: 
+      host: *rabbitmq_server_id
+      password: *rabbitmq_server_pwd
+      port: *rabbitmq_server_port
+      username: *rabbitmq_server_user
+      virtualhost: ~
+
+# NOTIFICATION Configuration Ends =========================================
+
+# BLOOD-BANK Configuration Starts =========================================
+bloodbank: 
+  econcentUrl: "https://hmgvidau.hmg.com.sa"
+# BLOOD-BANK Configuration Ends =========================================
+
+# LAB Configuration Starts =========================================
+patientServiceUri: "http://csi-net-patients/api/patient/"
+lab-rabbitmq: 
+  server: 
+    password: *rabbitmq_server_pwd
+    port: *rabbitmq_server_port
+    serverId: *rabbitmq_server_id
+    username: *rabbitmq_server_user
+
+rabbitmq:
+  server: 
+    password: *rabbitmq_server_pwd
+    port: *rabbitmq_server_port
+    serverId: *rabbitmq_server_id
+    username: *rabbitmq_server_user
+rabbitmqDebug: 
+  server: 
+    password: *rabbitmq_server_pwd
+    port: *rabbitmq_server_port
+    serverId: *rabbitmq_server_id
+    username: *rabbitmq_server_user
+# LAB Configuration Ends =========================================
+
+# EHR Configuration Starts =========================================
+
+ehr-rabbitmq: 
+  server: 
+    password: *rabbitmq_server_pwd
+    port: *rabbitmq_server_port
+    serverId: *rabbitmq_server_id
+    username: *rabbitmq_server_user
+
+# EHR Configuration Ends =========================================
+
+# RENAL Configuration Starts =========================================
+
+renal: 
+  adtMachineOwnStrId: "0"
+  adtMachineCode: "7"
+
+# RENAL Configuration Ends =========================================
+
+# ELK Stack Configuration Start ==============================================
+
+Elk:
+  KafkaTopic: "log-sinks-kafka-hmg-uat"
+# ELK Stack Configuration Ends ==============================================
+
+# Elastic Apm start ==============================================
+
+# Elastic Apm Ends ==============================================
+
+ElasticApm:
+  ServerUrls: "http://10.201.216.60:8200/"
+  Recording: true
+  
+# Service Specific URL Start ==============================================
+
+ServiceURIS: 
+  ADTMasterDataURI: "http://csi-pms-rms-masterdata/amd-masterdata/"
+  AdmissionURI: "http://csi-java-ehr-ip/ehr/ip/doctor/read/admission"
+  AdtIntegrationQueURI: "http://csi-java-ehr-listener/"
+  BulkCURI: "http://csi-pms-rms-masterdata/amd-masterdata/getAllByIds"
+  BulkNSURI: "http://csi-net-ehr-ip-discharg/api/NDsummary/IsExistNDsummaryDTOByPomrList"
+  BulkNURI: "http://csi-net-empiread/api/patient/bulk"
+  ClinicURI: "http://csi-java-ehr-patient-pomr/ehr/opd/pomr/byPomrIds"
+  PomrUriByPomrIdAndPatient: "http://csi-java-ehr-patient-pomr/ehr/opd/pomr/byPomrIdAndPatientId?"
+  DeathNotificationURI: "http://csi-pms-adt-request/death/save"
+  DischargeDetailsURI: "http://csi-net-ehr-ip-discharg/api/DischargeDetails"
+  DischargeQueURI: "http://csi-java-ehr-listener/summary-clear"
+  EMPIURI: "http://csi-net-empiread/api/patient/"
+  IDTURI: "http://csi-java-ehr-ip/interDepartmentTransfer/"
+  IPDURI: "http://csi-java-ehr-ip/ehr/ip/doctor/read/admission/getAdmissions"
+  InitialAssesURI: "http://csi-java-ehr-ip-initial-assessment-read/ehr/initialAssessment/read/getInitialAssessmentByFieldIds"
+  MasterURI: "http://csi-net-ehr-opd-master/api/EHRMaster/"
+  MedicationsURI: "http://csi-java-ehr-ip-doctor-prescription/api/prescription/"
+  MrpURI: "http://csi-java-ehr-ip/ehr/ip/doctor/read/carePlan/mrp/validate-all-discharge-goals?"
+  NGroupURI: "http://csi-pms-rms-masterdata/amd-masterdata/getById?"
+  NsumURI: "http://csi-net-ehr-ip-discharg/api/NDsummary/IsNDSummaryExist/"
+  OPDURI: "http://csi-pms-rms-reservation/reservation/widgetCount"
+  EHROPDURI: "http://csi-java-ehr-opd/ehr/opd/appointment/widget"
+  OPDURIN: "http://csi-pms-rms-reservation/reservation/summary/status"
+  ORURI:  "http://csi-java-ehr-or-booking/OR/dashboard/widgets/"
+  PNameURI: "http://csi-net-empiread/api/patient/pre-formatted/"
+  PatientProblemsURI: "http://csi-java-ehr-patient-pomr/ehr/opd/patientProblem/"
+  ProblemMasterURI: "http://csi-net-ehr-opd-master/api/ProblemMaster/"
+  ProceduresURI: "http://csi-java-ehr-common/ehr/opd/patientOrder/"
+  RadiologyURI: "http://172.15.100.153:9021/rmw/reports/"
+  RecurringAppointment: "http://csi-pms-rms-reservation/reservation/recurringAppointment/create"
+  RecurringAppointmentN: "http://csi-pms-rms-reservation/reservation/recurringAppointment/createcsi-pms-rms-reservation/reservation/recurringappointment/create"
+  ReferralURI: "http://csi-java-ehr-ip/ehr/opd/referral/"
+  VitalSignsURI: "http://csi-java-ehr-common/vital-signs/displayV2/patient/"
+  labReportsURI: "http://csi-net-labsrvcs/api/LabResults/"
+  IcDashboardUrl: "http://csi-java-ehr-ic-dashboard/"
+  PatientAllergyUrl: "http://csi-net-ehr-opd-patient/api/"
+  DocumentManagementUrl: "http://qa.csi.local/document-management/v1/"
+  ADTEmployeeURI: "http://csi-pms-rms-resource-registry/amd-doctor/"
+  NGPendingURI: "http://csi-java-bb-service/api/transfusion/request/list/initiated/"
+  OutOrdReasonURI: "http://csi-pms-rms-masterdata/amd-masterdata/common/get/Procedure/OutOfOrderingReasons/en"
+  MasterDataSetUpURI: "http://csi-pms-rms-masterdata/amd-masterdata/common/"
+  ERfunctiUri: "http://csi-net-erfuncti"
+  EhrService: "http://csi-net-ehr-opd-master"
+  ReanlWidget: "http://csi-net-hemdialy/api/dashboard/widget-data/"
+  GlobalConfigService: "http://csi-java-base-utility/base/util/config/key"
+  GlobalConfigsService: "http://csi-java-base-utility/base/util/config/keys"
+  OR_dashboard_uri: "http://csi-java-ehr-or-booking/OR/dashboard/"
+  OrService: "http://csi-java-ehr-or-book/ehr/or/orbook/histopathologyrequest/patientOrderId/"
+  EhrTemplate: "http://csi-java-ehr-template/"
+  ProcedureURI: "http://csi-net-ehr-opd-master/api/EHRProcedure/ProcedureByCode/"
+  patientOrderIdService: "http://csi-java-ehr-common/ehr/opd/patientOrder/generate-patient-order-id"
+
+serviceurls: 
+  ADTAdmission: "http://csi-pms-adt-request/"
+  ADTAdmissionUrl: "http://csi-pms-adt-request/admission-request/"
+  ADTEmployeeUrl: "http://csi-pms-rms-resource-registry/amd-doctor/"
+  AdmissionData: "http://csi-java-ehr-ip"
+  AdmissionUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/read/admission/"
+  BBDonation: "http://csi-net-bloodbnk/api/Donation/"
+  BloodBank: "http://csi-net-bloodbnk/api/1.0"
+  EMPIUrl: "http://csi-net-empiread/api/patient/"
+  EMPIWriteUrl: "http://csi-net-empiwrit/api/"
+  ERConfigUrl: "https://csi-java-ehr-er-config-read/ehr/config/read/"
+  FallRiskScoreUrl: "http://csi-java-ehr-opd-riskassessment/nurse/risk-assessment/"
+  HospitalDetails: "http://csi-pms-rms-masterdata/amd-masterdata/getHospitalById/"
+  IPAdmissionUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/"
+  ReferralsBaseUrl: "http://csi-java-ehr-ip/ehr/opd/"
+  MARUrl: ""
+  MachineDetails: "http://csi-pms-rms-resource-registry/"
+  NotificationService: "http://csi-net-noty/api/Notifications"
+  NursingGroup: "http://csi-pms-rms-masterdata/amd-masterdata/"
+  OrderUrl: "http://csi-java-ehr-common/ehr/opd/patientOrder/"
+  POMRData: "http://csi-java-ehr-patient-pomr"
+  PatientChronicUrl: "http://csi-java-ehr-patient-pomr/ehr/opd/patientProblem/"
+  PatientData: "http://csi-net-empiread/api/patient/pre-formatted/"
+  PatientPOMRUrl: "http://csi-java-ehr-patient-pomr/"
+  ProgressNoteUrl: "http://csi-java-ehr-opd/ehr/opd/soap/progressNote/"
+  RadiologyReportsUrl: "http://csi-java-ehr-common/ehr/opd/radiologyRequest/"
+  RenalService: "http://csi-net-hemdialy/api/RunSheets"
+  ReservationUrl: "http://csi-pms-rms-reservation/schedule/reservation/"
+  SoapUrl: "http://csi-java-ehr-opd/ehr/opd/soap/"
+  TaskListUrl: "http://csi-java-ehr-common/task-list/"
+  UserManagement: "http://service-base-security-token/"
+  UserToken: "http://csi-central-authentication-service/service-base-security-token/"
+  VitalsUrl: "http://csi-java-ehr-common/vital-signs/displayV2/"
+  amdService: "http://172.15.100.142:10011/amd-doctor/"
+  empiwritpatientservice: "http://csi-net-empiwrit/api/patients"
+  ftplocation: "http://csi-net-ftparchv/api/FTPArchive/ArchivetoFTP"
+  histopathology: "http://csi-net-histopat/api/Histopathology/"
+  invService: "http://csi-net-phrmi/api/"
+  labOrder: "http://csi-net-labsrvcs/api/LabOrder/"
+  labresult: "http://csi-net-labsrvcs/api/LabResults/"
+  labusermanagement: "http://csi-net-usermgmt/"
+  medAdmService: "http://csi-java-phr-item-master-rw/api/"
+  notification: TestURL
+  parameterService: "http://csi-java-phr-item-master-rw/api/itemMaster/parameter/paramSummary/"
+  patientservice: "http://csi-net-patients/api/Patient/"
+  userpermission: "http://service-base-security-token/token/logged-in-user"
+  PomrUri: "http://csi-java-ehr-patient-pomr/ehr/opd/pomr/byPatientId?"
+  IpUrl: "http://csi-java-ehr-ip/ehr/ip/"
+  servicebaseuser: "http://service-base-user/user/get/"
+  PatientAllergyUrl: "http://csi-net-ehr-opd-patient/api/"
+  BloodTransfusionRequestUrl: "http://csi-net-bloodbnk-mgt/api/1.0/bloodRequest/all"
+  #BloodTransfusionRequestUrl: "http://csi-java-blood-transfusion/blood-transfusion/bloodRequest/all"
+  PharmacyService: "http://csi-phr-base/api/"
+  inventorySaveUrl: "http://csi-net-bloodbnk-mgt/api/1.0/inventory/unit/save"
+  #inventorySaveUrl: "http://csi-java-bb-service/api/inventory/unit/save"
+  inventoryDeleteUrl: "http://csi-net-bloodbnk-mgt/api/1.0/inventory/unit/delete/"
+  #inventoryDeleteUrl: "http://csi-java-bb-service/api/inventory/unit/delete/"
+  EmpiWriteService: "http://csi-net-empiwrit/api/"
+  MasterDataSetUpURI: "http://csi-pms-rms-masterdata/amd-masterdata/common/"
+  ADTReservation: "http://csi-pms-rms-reservation/"
+  UserService: "http://csi-iam-service/auth/realms/master/csi-user-detail/user-by-id/"
+  GlobalConfigService: "http://csi-java-base-utility/base/util/config/key"
+  UserService2: "http://csi-iam-service/auth/realms/hmgvidau/csi-user-detail/"
+  SpecializedClinicService: "http://csi-java-ehr-specialized-clinic/"
+  bloodbankJavaService: "http://csi-net-bloodbnk-mgt/api/1.0"
+  #bloodbankJavaService: "http://csi-java-bb-service/api"
+  OrService: "http://csi-java-ehr-or-book/ehr/or/orbook/histopathologyrequest/patientOrderId/"
+  DMSFileUrl: "http://document-management-middleware/v1/download/getFile?fileHash="
+  DMSImagesDelete: "http://document-management-middleware/v1/document/delete-multiple"
+  ErPatientAssigneeUri : "http://csi-net-erfuncti/api/ERDashboard/GetPatientAssignees"
+  ImagePropertyUrl: "http://document-management-middleware/v1/property/all-properties"
+  PomrForPomrId: "http://csi-java-ehr-patient-pomr/ehr/opd/pomr/byPomrId?"
+  ClinicDetails": "http://csi-pms-rms-masterdata/amd-masterdata/clinic/getById/"
+  empiReadService: "http://csi-net-empiread/api"
+  EHRCommon: "http://csi-java-ehr-common"
+  NewVitalUrl: "http://csi-java-ehr-common/vital-signs//displayV2/patient/"
+  GlobalConfigsService: "http://csi-java-base-utility/base/util/config/keys"
+  EBPConfigUrl: "http://csi-bm-billing/billing/payer-group/ebp-config/patient/" 
+
+UrlOptions:
+  FormTemplateUrl: "http://csi-net-empiread/api/RegistrationFormTemplate"
+  PatientSearchServiceUrl: "http://csi-net-empiread/api/patient"
+  BillingGetAccountIdUrl: "http://csi-bm-invoice/billing/account/create"
+  UserServiceEndPoint: "http://csi-iam-service/auth/realms/master/csi-user-detail/"
+  BillingDefaultPayerEndPoint: "http://csi-bm-billing/billing/payer-group/get-default"
+  BillingSearchPayerContract: "http://csi-bm-billing/billing/payer-contract/search"
+  BillingSearchPayerPolicy: "http://csi-bm-billing/billing/payer-contract-policies/search"
+  BaseUtilityServiceUrl: "http://csi-java-base-utility"
+  EHRPatientPOMRUrl: "http://csi-java-ehr-patient-pomr"
+  RMSReservationServiceUrl: "http://csi-pms-rms-reservation"
+  ADTRequestUrl: "http://csi-pms-adt-request"
+  EHRPatientIpUrl: "http://csi-java-ehr-ip/ehr/ip/doctor/read/carePlan/getMrpIdsAndNursingGroupId"
+  PHRRequestUrl: "http://csi-phr-base/api/v1.0/masterData/txnUsersList"
+  LABRequestUrl: "http://csi-net-labsrvcs/api/UserManagement/AllUsersForLabRoles"
+  RMSResourceRegistryUrl: "http://csi-pms-rms-resource-registry/amd-doctor/search"
+  IEGenaralUrl: "http://csi-ie-general/api/patient"
+
+  # Service Specific URLs End ==============================================
+BloodBankUserRoles:
+ - "Blood Bank Doctor"
+ - "BB Technician"
+LabMiddlewareEnabledGroups:
+ - "105"
+LabBarcodeGenLogicName: "HMGBarcodeLogic" #"MOHBarcodeLogic" # MOHBarcodeLogic or DQBarcodeLogic
+IsKafkaEnabledForEMPI: "true"
+Serilog:
+  Using:
+  - "Serilog.Sinks.Kafka"
+  WriteTo: 
+  - Name: "Kafka"
+    Args:
+      batchSizeLimit: 50
+      period: 5
+      brokers: "10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094"
+      topic: "log-sinks-kafka-hmg-uat"
+  Properties:
+    Application: "Kafka"
--- a/Config-Server/configrepo/application.yml
+++ b/Config-Server/configrepo/application.yml
@ -0,0 +1,44 @@
+--- 
+AppSettings: 
+  CacheDbResults: true
+  SiteTitle: "Application.yml"
+  AppName: "test App"
+kafka:
+  brokers: "10.201.216.25:9092,10.201.216.26:9093,10.201.216.27:9094"
+  topic: csi_demo_final
+  batchSizeLimit: 50
+  period: 1
+reportingFrm: "http://172.15.100.60:9020"
+eureka:
+ server:
+   enableSelfPreservation: false
+ instance:
+   leaseRenewalIntervalInSeconds: 1
+   leaseExpirationDurationInSeconds: 2
+spring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 30
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 40
+      connection-timeout: 30000
+      idle-timeout: 10000
+      max-lifetime: 40000
+      data-source-properties:
+        oracle:
+          net:
+            CONNECT_TIMEOUT: 30000
+            READ_TIMEOUT: 30000
+          jdbc:
+            ReadTimeout: 30000
+  jpa:
+    properties:
+      javax:
+        persistence:
+          query:
+            timeout: 30000
--- a/Config-Server/configrepo/configfile.zip
+++ b/Config-Server/configrepo/configfile.zip
--- a/Config-Server/configrepo/configzip.zip
+++ b/Config-Server/configrepo/configzip.zip
--- a/Config-Server/configrepo/csi-bm-invoice.yaml
+++ b/Config-Server/configrepo/csi-bm-invoice.yaml
@ -0,0 +1,3 @@
+kafka:
+  group-id:
+    doctor-orders-queue: doctor-orders-invoice-queue2
--- a/Config-Server/configrepo/csi-phr-base-java-hmg-uat.yml
+++ b/Config-Server/configrepo/csi-phr-base-java-hmg-uat.yml
@ -0,0 +1,29 @@
+pring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 50
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 50
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
+
+logging:
+  level:
+    com:
+      csi:
+        phr:
+          feign:
+            billing:
+              BillingInvoiceApi: DEBUG
+
+debug: true
+logging:
+  level:
+    com: DEBUG
+
--- a/Config-Server/configrepo/csi-phr-base.yml
+++ b/Config-Server/configrepo/csi-phr-base.yml
@ -0,0 +1,29 @@
+pring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 50
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 50
+      connection-timeout: 15000
+      idle-timeout: 10000
+      max-lifetime: 40000
+
+logging:
+  level:
+    com:
+      csi:
+        phr:
+          feign:
+            billing:
+              BillingInvoiceApi: DEBUG
+
+debug: true
+logging:
+  level:
+    com: DEBUG
+
--- a/Config-Server/configrepo/csi-pms-rms-resource-registry.yml
+++ b/Config-Server/configrepo/csi-pms-rms-resource-registry.yml
@ -0,0 +1,14 @@
+spring:
+  datasource:
+    tomcat:
+      min-evictable-idle-time-millis: 200000
+      max-active: 60
+      max-idle: 2
+      min-idle: 1
+      max-age: 200000
+    hikari:
+      minimum-idle: 2
+      maximum-pool-size: 60
+      connection-timeout: 30000
+      idle-timeout: 10000
+      max-lifetime: 40000
--- a/Config-Server/configrepo/test
+++ b/Config-Server/configrepo/test