医保结算代码迁移

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareNewService.java

@@ -2355,6 +2355,11 @@ public class HealthCareNewService {
     */
    public YlzMedicalUserInfoDO updateUserInfo(String no,String token) throws Exception {
        YlzMedicalUserInfoDO ylzMedicalUserInfoDO = ylzMedicalUserInfoDao.findByNo(no);
        if (ylzMedicalUserInfoDO==null){
            ylzMedicalUserInfoDO = new YlzMedicalUserInfoDO();
            no = UUID.randomUUID().toString().substring(0,30);
            ylzMedicalUserInfoDO.setNo(no);
        }
        String result = getUserInfo(token);
        ylzMedicalUserInfoDO.setToken(token);
        ylzMedicalUserInfoDO.setJson(result);

business/base-service/src/main/java/com/yihu/jw/hospital/dict/WlyyHospitalSysDictDao.java

@@ -21,6 +21,7 @@ public interface WlyyHospitalSysDictDao extends JpaRepository<WlyyHospitalSysDic
    @Query("from WlyyHospitalSysDictDO where dictName = ?1  and  dictCode is null order by sort asc")
    List<WlyyHospitalSysDictDO> findByDictNameNotNull(String dictName);
    @Query("from WlyyHospitalSysDictDO where dictName = ?1 ")
    List<WlyyHospitalSysDictDO> findByDictName(String dictName);
    @Query("from WlyyHospitalSysDictDO where 1=1")
    List<WlyyHospitalSysDictDO> findAlldict();

gateway/ag-basic/src/main/resources/application.yml

@@ -417,7 +417,7 @@ spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236?schema=base
    url: jdbc:dm://172.26.0.183:5236?schema=base&clobAsString=true&useSSL=false&userUnicode=true&characterEncoding=utf8&serverTimezone=GMT
    username: SYSDBA
    password: SYSDBA
  redis:

server/svr-authentication/src/main/resources/application.yml

@@ -838,7 +838,7 @@ spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236?schema=base
    url: jdbc:dm://172.26.0.183:5236?schema=base&clobAsString=true&useSSL=false&userUnicode=true&characterEncoding=utf8&serverTimezone=GMT
    username: SYSDBA
    password: SYSDBA
  jpa:
@@ -866,7 +866,7 @@ testPattern:
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
wechat:
  id: xm_mlwyy_wx  # base库中,wx_wechat 的id字段
  id: xm_qsyy_wx  # base库中,wx_wechat 的id字段
im:
  im_list_get: http://172.26.0.105:3000/

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

@@ -1170,7 +1170,7 @@ spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:dm://172.26.0.183:5236?schema=base&clobAsString=true&useSSL=false&userUnicode=true&characterEncoding=utf8&serverTimezone=GMT
    username: SYSDBA
    password: SYSDBA
  jpa:
@@ -1217,7 +1217,7 @@ hospital:
wlyy:
  url: http://ehr.yihu.com/wlyy/
wechat:
  id: hz_yyyzh_wx
  id: xm_qsyy_wx
  url: https://zhyzh.gongshu.gov.cn/
  flag: false
pay:

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -668,7 +668,7 @@ spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236?schema=base
    url: jdbc:dm://172.26.0.183:5236?schema=base&clobAsString=true&useSSL=false&userUnicode=true&characterEncoding=utf8&serverTimezone=GMT
    username: SYSDBA
    password: SYSDBA
  jpa:
@@ -702,7 +702,7 @@ testPattern:
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
wechat:
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段
  id: xm_qsyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
express:

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/healthCare/HealthCareEndPoint.java

@@ -770,8 +770,12 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
        try {
            if (wechatId.equalsIgnoreCase("xm_hcyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.getYbImage());
            }else if (wechatId.equalsIgnoreCase("xm_dsyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.getYbImage());
            }else if (wechatId.equalsIgnoreCase("xm_qsyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.getYbImage());
            }else{
                return null;
                return ObjEnvelop.getSuccess("尚未开放",null);
            }
        }catch (Exception e){
            e.printStackTrace();
@@ -788,8 +792,12 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
        try {
            if (wechatId.equalsIgnoreCase("xm_hcyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.updateUserInfo(no,token));
            }else if (wechatId.equalsIgnoreCase("xm_dsyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.updateUserInfo(no,token));
            }else if (wechatId.equalsIgnoreCase("xm_qsyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.updateUserInfo(no,token));
            }else{
                return null;
                return ObjEnvelop.getSuccess("尚未开放",null);
            }
        }catch (Exception e){
            e.printStackTrace();
@@ -805,8 +813,12 @@ public class HealthCareEndPoint extends EnvelopRestEndpoint {
        try {
            if (wechatId.equalsIgnoreCase("xm_hcyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.checkOauthQRCode(authorizeNo));
            }else if (wechatId.equalsIgnoreCase("xm_dsyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.checkOauthQRCode(authorizeNo));
            }else if (wechatId.equalsIgnoreCase("xm_qsyy_wx")) {
                return ObjEnvelop.getSuccess("ok",healthCareNewService.checkOauthQRCode(authorizeNo));
            }else{
                return null;
                return ObjEnvelop.getSuccess("尚未开放",null);
            }
        }catch (Exception e){
            e.printStackTrace();

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

@@ -1561,7 +1561,7 @@ spring:
  profiles: qsyyProd
  datasource:
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://172.26.0.183:5236?schema=base
    url: jdbc:dm://172.26.0.183:5236?schema=base&clobAsString=true&useSSL=false&userUnicode=true&characterEncoding=utf8&serverTimezone=GMT
    username: SYSDBA
    password: SYSDBA
  jpa:
@@ -1590,7 +1590,7 @@ fastDFS:
fast-dfs:
  tracker-server: 172.26.0.110:22122 #服务器地址
wechat:
  id: xm_mlwyy_wx  # base库中,wx_wechat 的id字段
  id: xm_qsyy_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
# 短信验证码发送的客户端标识,居民端

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

@@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-internet-hospital
    name:  svr-internet-hospital-wangzhinan
  cloud:
    config:
      failFast: true
@@ -159,5 +159,5 @@ spring:
  profiles: qsyyProd
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.26.0.153:1221}
      uri: ${wlyy.pring.config.uri:http://172.26.0.184:1221}
      label: ${wlyy.spring.config.label:master}