Przeglądaj źródła

海沧bug修复及眼科bug修复

wangzhinan 2 lat temu
rodzic
commit
a77cf7be75

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@ -5413,7 +5413,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }else if ("prescriptionPayRemind".equalsIgnoreCase(titelType)) {
        }else if ("prescriptionPayRemind".equalsIgnoreCase(titelType)) {
            //开具处方后向患者发送支付提醒
            //开具处方后向患者发送支付提醒
            first = outpatientDO.getConsumerName() + ",您好! 医生已为您开具处方,请及时支付。";
            first = outpatientDO.getConsumerName() + ",您好! 医生已为您开具处方,请及时支付。";
            contentMsg = "医生已为您开具处方,请及时支付。";
            contentMsg = "医生已为您开具处方,请及时支付(有效期七天)。";
            remark = "点击完成支付,如您已支付请忽略本条信息";
            remark = "点击完成支付,如您已支付请忽略本条信息";
            msgUrl="/ims-wx/index.html#/returnVisit/prescriptionDetail?outpatientId="+outpatientId+"&id="+remindMsg;
            msgUrl="/ims-wx/index.html#/returnVisit/prescriptionDetail?outpatientId="+outpatientId+"&id="+remindMsg;
            logger.info("处方支付微信消息模板推送开始");
            logger.info("处方支付微信消息模板推送开始");

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@ -722,7 +722,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                    param.put("timeStamp",getTimeStamp());
                    param.put("timeStamp",getTimeStamp());
                    param = WeiXinPayUtils.getMapAfterUnifiedorder(param,wxWechatDO.getAppKey());
                    param = WeiXinPayUtils.getMapAfterUnifiedorder(param,wxWechatDO.getAppKey());
                    pay.put("jsapi",param);
                    pay.put("jsapi",param);
            }
                }
            }else {
            }else {
                //支付失败返回信息
                //支付失败返回信息
                Map<String,String> param = new HashedMap();
                Map<String,String> param = new HashedMap();

+ 2 - 2
gateway/ag-basic/src/main/resources/bootstrap.yml

@ -5,7 +5,7 @@ spring:
    config:
    config:
      failFast: true
      failFast: true
      username: jw
      username: jw
      password: jkzl
      password: Zjxl2023*
#发现服务
#发现服务
eureka:
eureka:
@ -13,7 +13,7 @@ eureka:
    healthcheck:
    healthcheck:
      enabled: false #监控检查
      enabled: false #监控检查
    serviceUrl:
    serviceUrl:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:Zjxl2023*@127.0.0.1:8761/eureka/
  instance:
  instance:
    prefer-ip-address: false
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}

+ 1 - 1
server/svr-authentication/src/main/resources/bootstrap.yml

@ -5,7 +5,7 @@ spring:
    config:
    config:
      failFast: true
      failFast: true
      username: jw
      username: jw
      password: jkzl
      password: Zjxl2023*
---
---
spring:
spring:

+ 2 - 2
server/svr-configuration/src/main/resources/application.yml

@ -8,14 +8,14 @@ server:
security:
security:
  user:
  user:
    name: jw
    name: jw
    password: jkzl
    password: Zjxl2023*
eureka:
eureka:
  client:
  client:
    healthcheck:
    healthcheck:
      enabled: false #启动监控检查,
      enabled: false #启动监控检查,
    serviceUrl: # 默认正式线地址
    serviceUrl: # 默认正式线地址
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka  # 默认本机环境
      defaultZone: http://jw:Zjxl2023*@127.0.0.1:8761/eureka  # 默认本机环境
#      defaultZone: http://jw:jkzl@172.16.1.42:8761/eureka # 中山医院
#      defaultZone: http://jw:jkzl@172.16.1.42:8761/eureka # 中山医院
#      defaultZone: http://jw:jkzl@192.0.33.26:8762/eureka
#      defaultZone: http://jw:jkzl@192.0.33.26:8762/eureka
#      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka
#      defaultZone: http://jw:jkzl@192.168.33.199:8761/eureka

+ 2 - 2
server/svr-discovery/src/main/resources/application.yml

@ -12,7 +12,7 @@ security:
    enabled: true
    enabled: true
  user:
  user:
    name: jw
    name: jw
    password: jkzl
    password: Zjxl2023*
eureka:
eureka:
  server:
  server:
@ -23,4 +23,4 @@ eureka:
    fetch-registry: false #如果是做高可用的发现服务那就要改成 true
    fetch-registry: false #如果是做高可用的发现服务那就要改成 true
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    service-url:
    service-url:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:Zjxl2023*@127.0.0.1:8761/eureka/

+ 1 - 1
svr/svr-base/src/main/resources/application.yml

@ -93,7 +93,7 @@ swagger:
  basic:
  basic:
    enable: true
    enable: true
    username: jw
    username: jw
    password: jkzl
    password: Zjxl2023*
---
---
spring:
spring:
  profiles: jwdev
  profiles: jwdev

+ 1 - 1
svr/svr-base/src/main/resources/bootstrap.yml

@ -5,7 +5,7 @@ spring:
    config:
    config:
      failFast: true
      failFast: true
      username: jw
      username: jw
      password: jkzl
      password: Zjxl2023*
---
---
spring:
spring:

+ 1 - 1
svr/svr-internet-hospital-job/src/main/resources/application.yml

@ -62,7 +62,7 @@ swagger:
  basic:
  basic:
    enable: true
    enable: true
    username: jw
    username: jw
    password: jkzl
    password: Zjxl*#2023
---
---
spring:
spring:
  profiles: jwdev
  profiles: jwdev

+ 1 - 1
svr/svr-internet-hospital/src/main/resources/application.yml

@ -84,7 +84,7 @@ swagger:
  basic:
  basic:
    enable: true
    enable: true
    username: jw
    username: jw
    password: jkzl
    password: Zjxl2023*
---
---
spring:
spring:

+ 2 - 2
svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@ -1,11 +1,11 @@
spring:
spring:
  application:
  application:
    name:  svr-internet-hospital
    name:  svr-internet-hospital-wangzhinan
  cloud:
  cloud:
    config:
    config:
      failFast: true
      failFast: true
      username: jw
      username: jw
      password: jkzl
      password: Zjxl2023*
---
---
spring:
spring: