Merge branch 'dev' of trick9191/patient-co-management into dev

edu-article/JkEdu/src/com/yihu/jk/api/ArticleApiTest.java

@@ -68,11 +68,11 @@ public class ArticleApiTest {
//		obj.put("articlelevel","1");
//		obj.put("articleTitle","1");
//		obj.put("userCode","0de7295862dd11e69faffa163e8aee56");
		//obj.put("roleType",1);
		obj.put("currentUserRole","3502110400");
		//obj.put("userCode","0de7295862dd11e69faffa163e8aee56");//ylp201703150222
		obj.put("currentUserRole","3502110400");
		obj.put("userCode","37959ddf86f211e6b394fa163e424525");//ylp201703150222
		obj.put("roleType",1);
		obj.put("isMyArticle",true);
		obj.put("page","0");
		obj.put("pageSize","9");
@@ -83,8 +83,8 @@ public class ArticleApiTest {
		initDB();
		try{
//			api.authenticationArticle(im);
//			System.out.println(api.authenArticlePCList(im));//initArticleStatistic
			api.initArticleStatistic();
			System.out.println(api.queryArticlePcList(im));//initArticleStatistic
//W			api.initArticleStatistic();
		}catch(Exception e){
			e.printStackTrace();
		}

edu-article/JkEdu/src/com/yihu/jk/dao/ArticleDao.java

@@ -586,9 +586,8 @@ public class ArticleDao {
		}else if("4".equals(vo.getOperatorRoleLevel())){//社区、机构
			param.append(" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ");
		}
		param.append(" and UserScope <= ? ");
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			param.append(" and UserScope <= ? ");
            sql.addParamValue(Integer.valueOf(vo.getOperatorRoleLevel())-1);
        }else{
            sql.addParamValue(3);