测试环境

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

@@ -46,15 +46,15 @@ public interface BaseOrgDao extends PagingAndSortingRepository<BaseOrgDO, String
    List<BaseOrgDO> findByCityCode(String cityCode);
    List<BaseOrgDO> findByCityCodeAndLevel(String cityCode,Integer level);
    List<BaseOrgDO> findByCityCodeAndOrgLevel(String cityCode,Integer level);
    List<BaseOrgDO> findByDel(String del);
    @Query(value="select b.* from base_org b where b.del=?1  and b.name like ?2 ORDER BY sort DESC",nativeQuery = true)
    List<BaseOrgDO> findByDelAndName(String del,String name);
    
    @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)
    @Query(value="select b.* from base_org b where b.org_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)
    @Query(value="select b.* from base_org b where b.org_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/org/service/BaseOrgInfoService.java

@@ -18,7 +18,7 @@ public class BaseOrgInfoService extends BaseJpaService<BaseOrgDO, BaseOrgDao> {
    // 基于市，获取医院列表信息
    public List<BaseOrgDO> getOrgByCity(String cityCode,Integer level) {
        if(level!=null){
            return baseOrgDao.findByCityCodeAndLevel(cityCode,level);
            return baseOrgDao.findByCityCodeAndOrgLevel(cityCode,level);
        }
        return baseOrgDao.findByCityCode(cityCode);
    }

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -392,7 +392,7 @@ public class WlyyBusinessService {
                        org.setCityName(h.getString("cityName"));
                        org.setTownCode(h.getString("town"));
                        org.setTownName(h.getString("townName"));
                        org.setLevel(h.getInteger("level"));
                        org.setOrgLevel(h.getInteger("level"));
                        org.setType("1");
                        org.setWinNo("-1");
                        org.setDel("1");
@@ -407,7 +407,7 @@ public class WlyyBusinessService {
                        org.setCityName(h.getString("cityName"));
                        org.setTownCode(h.getString("town"));
                        org.setTownName(h.getString("townName"));
                        org.setLevel(h.getInteger("level"));
                        org.setOrgLevel(h.getInteger("level"));
                        baseOrgDao.save(org);
                        updateCount++;
                    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/org/BaseOrgDO.java

@@ -154,7 +154,7 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
    /**
     * 1.等級醫院,2.社區醫院
     */
    private Integer level;
    private Integer orgLevel;
    /**
     * 机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾 默认1
@@ -395,13 +395,22 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
        this.del = del;
    }
//    @Column(name = "org_level")
//    public Integer getLevel() {
//        return level;
//    }
//
//    public void setLevel(Integer level) {
//        this.level = level;
//    }
    @Column(name = "org_level")
    public Integer getLevel() {
        return level;
    public Integer getOrgLevel() {
        return orgLevel;
    }
    public void setLevel(Integer level) {
        this.level = level;
    public void setOrgLevel(Integer orgLevel) {
        this.orgLevel = orgLevel;
    }
    @Column(name = "win_no")

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/org/BaseOrgVO.java

@@ -150,7 +150,7 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
     * 31三级特等 32三级甲等 33三级乙等 34三级丙级
     */
    @ApiModelProperty(value = "11一级甲等 12一级乙等 13一级丙等二级甲等 22二级乙等 23二级丙等31三级特等 32三级甲等 33三级乙等 34三级丙级", example = "1")
    private Integer level;
    private Integer orgLevel;
    @ApiModelProperty(value = "机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾", example = "1")
    private String winNo;
@@ -301,12 +301,12 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        return depts;
    }
    public Integer getLevel() {
        return level;
    public Integer getOrgLevel() {
        return orgLevel;
    }
    public void setLevel(Integer level) {
        this.level = level;
    public void setOrgLevel(Integer orgLevel) {
        this.orgLevel = orgLevel;
    }
    public void setDepts(List<DictHospitalDeptVO> depts) {

server/svr-authentication/src/main/java/com/yihu/jw/security/service/OauthYlzConfigService.java

@@ -133,7 +133,7 @@ public class OauthYlzConfigService {
    public Map<String,Object> getOauthQRCodeImg(){
        try {
            logger.info("getOauthQRCodeImg dao1:"+DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss:SSS"));
            OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findOne("ylz_config");
            OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findOne("ylz_config1");
            logger.info("getOauthQRCodeImg dao2:"+DateUtil.dateToStr(new Date(),"yyyy-MM-dd HH:mm:ss:SSS"));
            TransRequest e = new TransRequest();
            e.setMethod("ehc.ehealthcard.authurl");