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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -401,6 +401,8 @@ public class ConsultController extends WeixinBaseController {
            }
            if (res == -1) {
                return error(-1, "还有咨询未结束，不允许再次提交咨询！");
            }else if (res == -2) {
                return error(-1, "您还未关注医生，无法发起咨询！");
            }
            // 添加到统计队列

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

@@ -31,7 +31,7 @@ wlyy:
  hospital: 49229004X # 默认医院code
im:
  im_list_get: http://58.22.123.195:3000
  im_list_get: http://58.22.123.195:3000/
  data_base_name: im
#物联网配置

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

@@ -31,8 +31,8 @@ wlyy:
  hospital: 49229004X # 默认医院code
im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: ichat
  im_list_get: http://172.19.103.72:3000/
  data_base_name: im_sr
#物联网配置
iot:

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

@@ -53,6 +53,12 @@ spring:
      max-idle: 20  # 连接池中的最大空闲连接
      min-idle: 5  # 连接池中的最小空闲连接
  http:
    multipart:
      enabled: true
      max-file-size: 50mb
      max-request-size: 50mb
logging:
  level:
    root: INFO
@@ -64,24 +70,16 @@ redis:
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
  show_sql: false
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy
multipart:
  enabled: true
  max-file-size: 50mb
  max-request-size: 50mb
security:
  basic:
    username: jkzl
    password: jkzlehr
##拦截器开关
interceptor:
  doctor: