Merge branch 'dev' of EHR/ehr.config into master

ag-admin.yml

@@ -49,3 +49,7 @@ spring:
---
spring:
  profiles: prod_fz
---
spring:
  profiles: prod_sr

ag-ehr-cloud.yml

@@ -123,4 +123,19 @@ spring:
    export:
      statsd:
        host: 192.168.135.29
        port: 8125
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  thymeleaf:
    cache: false
  metrics:
    export:
      statsd:
        host: 10.176.97.10
        port: 8125

ag-portal-cloud.yml

@@ -49,4 +49,8 @@ spring:
---
spring:
  profiles: prod_fz
  profiles: prod_fz
---
spring:
  profiles: prod_sr

application.yml

@@ -154,4 +154,17 @@ eureka:
  instance:
    prefer-ip-address: true
eureka-server-ip: 192.168.135.29:8761
eureka-server-ip: 192.168.135.29:8761
---
spring:
  profiles: prod_sr
#If true, each application use ip to register it in eureka, eureka host is defined in "eureka-server-ip".
#else the server must have host map.
eureka:
  instance:
    prefer-ip-address: true
eureka-server-ip: 10.176.97.10:8761

svr-ehr-basic.yml

@@ -132,3 +132,24 @@ spring:
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  data:
    mongodb:
      host: 10.176.97.9
      port: 29000
      username: jkzlehr
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122

svr-health-profile.yml

@@ -134,4 +134,18 @@ spring:
    id: JKZL
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  public-server: http://192.168.135.42:22122
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  application:
    id: JKZL
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122

svr-logCollection.yml

@@ -52,4 +52,17 @@ spring:
      username: sr_ehr
      password: ehr@#(2^
      authenticationDatabase: admin
      database: ehr
---
spring:
  profiles: prod_sr
  data:
    mongodb:
      host: 10.176.97.9
      port: 29000
      username: jkzlehr
      password: GMLBq1LG
      authenticationDatabase: admin
      database: ehr

svr-pack-mgr.yml

@@ -143,4 +143,20 @@ spring:
    password: redis!@456
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  public-server: http://192.168.135.42:22122
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 10.176.97.5 # Redis server host.
    port: 6379
    password: q4YaQemf
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122

svr-pack-resolve.yml

@@ -72,33 +72,38 @@ ehr:
    # 住院从“病人摘要”，“入院记录”与“病案首页”提取事件    Clinic 0门诊 Resident 1住院  MedicalExam 2体检
    event:
      data-sets:
        - HDSC01_01: Clinic
        - HDSC01_02: Clinic
        - HDSD00_85: Clinic #门诊-挂号
        - HDSD00_72: Clinic
        - HDSC02_01: Resident
        - HDSC02_02: Resident
        - HDSC02_09: Resident
        - HDSD00_13: Resident #住院-入院记录
        - HDSD00_77: Resident
        - HDSD00_76: Resident
        - HDSC01_02: Clinic #门诊-挂号 v1.0
        - HDSD00_85: Clinic #门诊-挂号 v1.3
        - HDSD00_72: Clinic #门诊-症状 v1.3
        - HDSC02_09: Resident #住院-入院记录 v1.0
        - HDSC02_01: Resident #检验-报告单 v1.0
        - HDSC02_02: Resident #检验-图片报告单 v1.0
        - HDSD00_13: Resident #住院-入院记录 v1.3
        - HDSD00_77: Resident #检验-报告单 v1.3
        - HDSD00_76: Resident #检验-图片报告单 v1.3
        - HDSB05_03: MedicalExam #体检-登记信息 v1.3
      meta-data:
        - HDSD00_01_457 # 挂号时间
        - HDSD00_13_057 # 入院时间-v1.3
        - HDSD00_01_575 # 入院时间
        - HDSD00_01_457 #就诊日期时间 v.1.0 & v.13
        - HDSD00_01_575 #入院日期时间 v1.0
        - HDSD00_13_057 #入院日期时间 v1.3
        - HDSB05_03_011 #体检日期 v1.3
    #诊断信息
    diagnosis:
      data-sets:
        - HDSD00_73 #门诊-诊断记录
        - HDSC01_03
        - HDSC02_17
        - HDSC01_03 #门诊-诊断记录 v1.0
        - HDSD00_73 #门诊-诊断记录 v1.3
        - HDSC02_17 #住院-诊断记录 v1.0
        - HDSD00_69 #住院-诊断记录 v1.3
        - HDSB05_84 #体检-诊断记录 v1.3
      meta-data:
        - HDSD00_01_550 # 门诊/住院诊断
        - HDSD00_01_550 #门诊-疾病临床诊断在特定分类体系中的代码 v1.0(住院代码相同) & v1.3
        - HDSD00_69_002 #住院-疾病临床诊断在特定分类体系中的代码 v1.3
        - JDSB05_84_003 #体检-疾病临床诊断在特定分类体系中的代码 v1.3
    # 身份提取参数，从人口学提取
    identity:
      data-sets:
        - HDSA00_01
        - HDSA00_01  #人口学信息 v1.0 & v1.3
      meta-data:
        id-card-no: HDSA00_01_017     # 身份标识
        id-card-type: HDSA00_01_016   # 身份类型
@@ -106,12 +111,10 @@ ehr:
    # 卡提取参数，从就诊摘要提取
    card:
      data-sets:
        - HDSD00_85: 门诊-挂号 # -v1.3
        - HDSD00_13: 住院-入院记录 # -v1.3
        - HDSC01_01: 门诊-病人摘要
        - HDSC01_02: 门诊-挂号
        - HDSC02_01: 住院-病人摘要
        - HDSC02_02: 住院-首页
        - HDSD00_85: 门诊-挂号 #v1.3
        - HDSD00_13: 住院-入院记录 #v1.3
        - HDSC01_02: 门诊-挂号 #v1.0
        - HDSC02_09: 住院-入院记录 #v1.0
      meta-data:
        - card-no: JDSD00_85_005 #就诊卡号 CARD_NO
        - card-type: JDSD00_85_006  #就诊卡类型 CARD_TYPE
@@ -126,9 +129,11 @@ ehr:
      - HDSD00_01_579 #会诊记录表编号
      - EVENT_NO
    eventTime:
      - HDSD00_01_457 #就诊日期时间 v1.3
      - HDSD00_16_005 #v1.3出院时间
      - HDSD00_01_185
      - HDSD00_01_457 #就诊日期时间 v1.0 & v1.3
      - HDSD00_16_031 #入院时间 v1.0
      - HDSD00_13_057 #入院日期时间 v1.3
      - HDSD00_01_185 #出院日期 v1.0
      - HDSD00_16_005 #出院日期时间 v1.3
#error code and message
@@ -280,6 +285,37 @@ fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 10.176.97.5 # Redis server host.
    port: 6379
    password: q4YaQemf
  data:
    solr:
      zk-host: node1.hde.h3c.com,node2.hde.h3c.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
  metrics:
    export:
      statsd:
        host: 10.176.97.10
        port: 8125
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com

svr-quota.yml

@@ -67,6 +67,18 @@ spring:
    username: sr_healtharchive
    password: data!@)1
  data:
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr # ZooKeeper host address in the form HOST:PORT.
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  data:
    solr:
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr # ZooKeeper host address in the form HOST:PORT.

svr-redis.yml

@@ -136,4 +136,21 @@ spring:
    password: redis!@456
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  public-server: http://192.168.135.42:22122
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 10.176.97.5 # Redis server host.
    port: 6379
    password: q4YaQemf
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122

svr-resource.yml

@@ -121,4 +121,28 @@ hadoop:
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  public-server: http://192.168.135.42:22122
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 10.176.97.5 # Redis server host.
    port: 6379
    password: q4YaQemf
  data:
    solr:
      #zk-host: 11.1.2.51,11.1.2.52,11.1.2.53:2181/solr # ZooKeeper host address in the form HOST:PORT.
      zk-host: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com:2181/solr
hadoop:
  hbase-properties:
    - hbase.zookeeper.quorum: node1.jkzl.com,node2.jkzl.com,node3.jkzl.com
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122

svr-standard.yml

@@ -141,4 +141,20 @@ spring:
    password: redis!@456
fast-dfs:
  tracker-server: 192.168.135.42:22122
  public-server: http://192.168.135.42:22122
  public-server: http://192.168.135.42:22122
---
spring:
  profiles: prod_sr
  datasource:
    url: jdbc:mysql://10.176.97.9:3310/healtharchive?useUnicode=true&characterEncoding=UTF-8
    username: healthcloud
    password: GP8Qz4qU
  redis:
    host: 10.176.97.5 # Redis server host.
    port: 6379
    password: q4YaQemf
fast-dfs:
  tracker-server: 10.176.97.5:22122
  public-server: http://10.176.97.5:22122