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

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

@@ -188,6 +188,7 @@ public class ArticleApi {
		JSONObject json = JSONObject.fromObject(im.getParam());
		String articleId = StringUtil.isEmpty(json.get("articleId")) ? null : json.getString("articleId");
		String userId = StringUtil.isEmpty(json.get("userId")) ? null : json.getString("userId");
		Integer userType = StringUtil.isEmpty(json.get("userType")) ? 0 : json.getInt("userType");
		if (StringUtil.isEmpty(articleId)) {
			return ApiUtil.getRespJSON(-10000, "articleId 必传").toString();
@@ -237,6 +238,7 @@ public class ArticleApi {
					jsonObj.put("articleCategoryName", StringUtil.getJSONValue(vbo.getArticleCategoryName()));
					if (StringUtil.isNotEmpty(userId)) {
						vo.setUserId(userId);
						vo.setUserType(userType);
						int pointNumberCount = dao.pointNumberCount(vo);
						int collectionNumberCount = dao.collectionNumberCount(vo);
						jsonObj.put("pointNumberCount", pointNumberCount);

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

@@ -251,7 +251,10 @@ public class ArticleDao {
		if (StringUtil.isNotEmpty(vo.getUserId())) {
			param.append(" and UserId = '").append(vo.getUserId()).append("'");
		}
		param.append(" and usertype = 2");
		if(vo.getUserType()!=0){
			param.append(" and usertype = ").append(vo.getUserType());
		}
		sql.addVar("@Condition", param.toString());
		List<ArticleStatistic> list = DB.me().queryForBeanList(MyDatabaseEnum.JkEduDB, sql, ArticleStatistic.class);
@@ -601,7 +604,7 @@ public class ArticleDao {
        if(StringUtil.isNotEmpty(userCode)){
			param2.append(" and  a.UserId='"+userCode+"'");
			param.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 and RoleType = '"+vo.getRoleType()+"')");
			param.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 and RoleType = "+vo.getRoleType()+")");
		}
//		pageParam.append(" limit ").append(start * pageSize + "," + pageSize);
		sql.addVar("@Condition", param.toString());
@@ -699,7 +702,7 @@ public class ArticleDao {
		if(StringUtil.isNotEmpty(userCode)){
			param2.append(" and  a.UserId='"+userCode+"'");
			param.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 and RoleType = '"+vo.getRoleType()+"')");
			param.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 and RoleType = "+vo.getRoleType()+")");
		}
		pageParam.append(" limit ").append(start * pageSize + "," + pageSize);
		sql.addVar("@Condition", param.toString());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -117,7 +117,7 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
                                      @ApiParam(name = "sEcho", value = "插件自带")
                                      @RequestParam(value = "sEcho", required = false) Integer sEcho,
                                      @ApiParam(name = "roleType", value = "1、普通医生，2、管理员")
                                      @RequestParam(value = "archive", required = false) Integer roleType,
                                      @RequestParam(value = "roleType", required = false) Integer roleType,
                                      @ApiParam(name = "patient", value = "居民CODE")
                                      @RequestParam(value = "patient", required = false) String patient){
        try {