Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/org/dao/BaseOrgDao.java

@@ -55,5 +55,6 @@ public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String
    @Query(value="select b.* from base_org b where b.level= ?1 and b.del=?2  and b.name like ?3 ORDER BY sort DESC",nativeQuery = true)
    List<BaseOrgDO> findByLevelAndName(Integer level,String del,String name);
    
    @Query(value="select b.* from base_org b where b.level= ?1 and b.del=?2 ORDER BY sort DESC",nativeQuery = true)
    List<BaseOrgDO> findByLevelAndDel(Integer level,String del);
}

business/base-service/src/main/java/com/yihu/jw/wechat/service/WxTemplateService.java

@@ -67,7 +67,7 @@ public class WxTemplateService {
        if(basePatientDO!=null){
            List<BasePatientWechatDo> ps = basePatientWechatDao.findByWechatIdAndPatientId(wechatId,reciver_id);
            if(ps.isEmpty()){
                logger.info("该用户"+sender_name+"没有openid,无法推送模版消息，用户ID："+sender_id);
                logger.info("该用户"+reciver_name+"没有openid,无法推送模版消息，用户ID："+reciver_id+"wechatId:"+wechatId);
            }else{
                for (BasePatientWechatDo basePatientWechatDo:ps){
                    WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId,"template_consult_notice","spthtx",1);

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

@@ -217,7 +217,7 @@ FileTempPath:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ehr.yihu.com/wlyy/
---
spring:
  profiles: jwprod
@@ -365,7 +365,7 @@ es:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ehr.yihu.com/wlyy/
---
spring:
  profiles: jwOracleProd
@@ -441,7 +441,7 @@ es:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ehr.yihu.com/wlyy/
---
##==心脏中心 ===============================================================================
@@ -512,7 +512,7 @@ es:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ehr.yihu.com/wlyy/
---
##==心脏中心外 ===============================================================================
spring:
@@ -583,7 +583,7 @@ es:
testPattern:
  sign: 0
wlyy:
  url: http://www.xmtyw.cn/wlyytest/
  url: http://ehr.yihu.com/wlyy/
---
##==厦门卫计委 ===============================================================================
spring: