Merge branch 'srdev' of chenweida/patient-co-management into srdev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/system/Icd10DictServcie.java

@@ -77,7 +77,7 @@ public class Icd10DictServcie {
     *
     * @return
     */
    @PostConstruct
   // @PostConstruct
    public boolean cacheDict() {
        if (redisTemplate.hasKey(ok)) {

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -1,16 +1,19 @@
##测试的配置
spring:
  profiles: test
  profiles: dev
  datasource:
    wlyy:
      url: jdbc:mysql://172.17.110.160/wlyy?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
      username: ssgg
      password: ssgg
      url: jdbc:mysql://172.19.103.77/wlyy_sr?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
      username: root
      password: 123456
    health:
      url: jdbc:mysql://172.17.110.160/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: ssgg
      password: ssgg
      url: jdbc:mysql://172.19.103.77/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: root
      password: 123456
    jkedu:
      url: jdbc:mysql://172.19.103.77/jkedudb?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: root
      password: 123456
  redis:
    host: 172.19.103.88 # Redis server host.
@@ -18,10 +21,10 @@ spring:
#    password: jkzl_ehr
server:
  server_url: http://ehr.yihu.com/wlyy/
  server_url: http://weixin.xmtyw.cn/wlyy-dev/
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)
doctorAssistant:
  api: http://172.19.103.88:443/assistant/
  api: http://192.168.131.113:8080/
  target_url: home/html/unreadMessageStatistic.html
wlyy:
@@ -29,18 +32,18 @@ wlyy:
im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: im_new
  data_base_name: ichat
#物联网配置
iot:
  url: http://172.19.103.33:8088/svr-iot/
  url: http://192.168.131.24:8088/svr-iot/
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb
  appId: wxe627ffaee2d05a40
  appSecret: 7c29f6b28be7e54b742883a47ff39767
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_ffd64560fb21
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_733f975e0bed
  message:
   #咨询回复
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
@@ -60,14 +63,18 @@ yihu:
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
message:
  messageServerUrl: http://10.0.1.3:8080/OpenPlatform/cgiBin/1.0/smsgw/smsSendWS/send
  messageAppId: 9000286
  messageSecret: NW63YK778QPRUD2A6K5SNF7LYRQ888BWOVD6R4FG2VF
images:
  path: /var/local/upload/images
  renew_path: /usr/local/apache-tomcat-8.0.36/webapps/wlyy/images/renew.png
  sign_path: /usr/local/apache-tomcat-8.0.36/webapps/wlyy/images/familycontract.png
  renew_path: /usr/local/apache-tomcat-8.0.26/webapps/wlyy/images/renew.png
  sign_path: /usr/local/apache-tomcat-8.0.26/webapps/wlyy/images/familycontract.png
sign:
  check_upload: http://172.19.103.88:8011/wlyy_service
  check_upload: http://172.19.103.87:8011/wlyy_service
express:
  sf_url: http://218.17.248.244:11080/bsp-oisp/sfexpressService
@@ -75,22 +82,22 @@ express:
  sf_code: SDDF
  sf_check_word: ttzlgGyOQu4L
pushMes:
# 1为推送redis,0为推送消息队列
  # 1为推送redis,0为推送消息队列
  method: 0
  # redis队列名称
  redis_prescription_title: redisMessage
  redis_prescription_title: redisPrescription
es:
  index:
    HealthEduArticlePatient: health_edu_article_patient
    FollowUp: wlyy_followup
    Statistics: wlyy_quota_test
    FollowUp: wlyy_followup
    QuestionnaireWinning: wlyy_questionnaire_winning
    patientDevice: wlyy_patient_device
  type:
    HealthEduArticlePatient: health_edu_article_patient
    FollowUpContent: wlyy_followup_content
    Statistics: wlyy_quota_test
    FollowUpContent: wlyy_followup_content
    QuestionnaireWinning: wlyy_questionnaire_winning
    patientDevice: wlyy_patient_device
  host:  http://172.19.103.68:9200
@@ -101,19 +108,20 @@ es:
jkEdu:
  web:
    articleBaseUrl: http://172.19.103.87:9088/
    #articleBaseUrl: http://192.168.131.131:8088/
#消息队列
activemq:
  username: admin
  password: admin
  url: tcp://172.19.103.87:61616
  queue:
    healtHarticleQueue: healthArticleChannel_test  #健康文章推送
    healtHarticleQueue: healthArticleChannel_dev  #健康文章推送
##如果是外网项目就是flase,false会调用内网http接口项目提交  内网是true直接上传fastDfs
##如果是外网项目就是flase 内网是true
neiwang:
  enable: true
  wlyy: http://59.61.92.90:8072/wlyy
  #wlyy: http://59.61.92.90:8072/wlyy
  wlyy: http://192.168.131.131:8080/
#系统中使用的双层对称加密使用到的KEY
Riva:
@@ -121,7 +129,6 @@ Riva:
  RIVAED_KEY2: C3SHUI8OWBOA4ZASS7FEYJ6RIVXA9SW6U5OA56ERUYZTRFHCRZO8AHT4TTW2MAGT80MGXN
##福州健康之路总部的接口
jkzl:
  zongbu: