代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/dao/ResourceBrowseDao.java

@@ -662,9 +662,9 @@ public class ResourceBrowseDao {
        if (StringUtils.isNoneBlank(queryParam)){
            queryParam =" where 1=1 "+ queryParam;
        }
        if(dataSource==2){
            queryParam = "";
        }
//        if(dataSource==2){
//            queryParam = "";
//        }
        //判定是否完整sql语句
        sql =sql+queryParam+sortOrderSql;
        //查询总条数
@@ -835,7 +835,7 @@ public class ResourceBrowseDao {
     * date	时间
     * groupScreeningStatus1	分组
     * hospital	社区医院
     * org	等级医院
     * orgCode	等级医院
     * town	区
     * @param paramValue
     * @param dataMap
@@ -922,7 +922,7 @@ public class ResourceBrowseDao {
                //区
                filterAreaCode += " and h.town = '"+value+"' ";
            }
            if("org".equals(key)){
            if("orgCode".equals(key)){
                //等级医院
                filterAreaCode += " and d.class_name = '"+value+"' ";
            }

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceBrowseService.java

@@ -509,7 +509,7 @@ public class ResourceBrowseService extends BaseJpaService {
        String where = "";
        Map<String,Integer> relationMap = new HashMap<>();//多视图关联
        Map<String,String> filedMap = new HashMap<>();//参数加别名
        Map<String,String> dataMap = null;
        Map<String,String> dataMap = new HashMap<>();
        if (!StringUtils.isEmpty(queryCondition)) {
            dataMap = parseConditionMap(queryCondition);
        }