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

edu-article/JkEdu/src/Article.sql.xml

@@ -3,8 +3,8 @@
	<Sqls>
		<Sql name='getArticleList'>
			<![CDATA[
		select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber  from Org_Article m
LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
		select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber
		from Org_Article m JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
		
			]]>
		</Sql>

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

@@ -236,6 +236,7 @@ public class ArticleApi {
					jsonObj.put("userScope", StringUtil.getJSONValue(vbo.getUserScope()));
					jsonObj.put("articleCategoryId", StringUtil.getJSONValue(vbo.getArticleCategoryId()));
					jsonObj.put("articleCategoryName", StringUtil.getJSONValue(vbo.getArticleCategoryName()));
					jsonObj.put("pushNumber", StringUtil.getJSONValue(vbo.getPushNumber()));
					if (StringUtil.isNotEmpty(userId)) {
						vo.setUserId(userId);
						vo.setUserType(userType);
@@ -281,7 +282,8 @@ public class ArticleApi {
				dao.updateArticleStatistic(articleId, "CommentNumber", behaviorAction, number);
			} else if (behaviorAction == 6) {// 收藏
				dao.updateArticleStatistic(articleId, "CollectionNumber", behaviorAction, number);
			}else if (behaviorAction == 7) {// 发送
				dao.updateArticleStatistic(articleId, "PushNumber", behaviorAction, number);
			}
		} catch (SQLException e) {
			// TODO Auto-generated catch block

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

@@ -60,25 +60,25 @@ public class ArticleApiTest {
//		obj.put("articleId","0");
//		obj.put("isAuthentication","1");
		obj.put("secondLevelCategoryId","74889da6-955e-4454-870f-4da37b466264");
//		obj.put("secondLevelCategoryId","74889da6-955e-4454-870f-4da37b466264");
//        obj.put("firstLevelCategoryName","健康文章");
//        obj.put("secondLevelCategoryName","孕检知识");
//		obj.put("insertTimeStart","1");
//		obj.put("insertTimeEnd","1");
//		obj.put("articlelevel","1");
//		obj.put("articleTitle","1");
//		obj.put("articleTitle","我是");
//		obj.put("userCode","0de7295862dd11e69faffa163e8aee56");
		obj.put("currentUserRole","3502110100");
		obj.put("currentUserRole","350200");
		obj.put("userCode","37959ddf86f211e6b394fa163e424525");//ylp201703150222
		obj.put("roleType",1);
		obj.put("isMyArticle",true);
		obj.put("page","0");
		obj.put("pageSize","9");
		obj.put("currentUserRoleLevel",4);//
		obj.put("currentUserRoleLevel",2);//
		obj.put("sEcho","1");
//		obj.put("articleTitle","我口试");
		obj.put("articleTitle","健管师");
		im.setParam(obj.toString());
		initDB();
		try{

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

@@ -33,8 +33,7 @@ public class BehaviorApi {
		String userId = StringUtil.isEmpty(json.get("userId")) ? null : json.getString("userId");
		// 1、点赞 2、转发3、分享 4、浏览
		Integer behaviorAction = StringUtil.isEmpty(json.get("behaviorAction")) ? null : json.getInt("behaviorAction");
		if (StringUtil.isEmpty(articleId) || StringUtil.isEmpty(behaviorAction) || StringUtil.isEmpty(cName)
				|| StringUtil.isEmpty(userId)) {
		if (StringUtil.isEmpty(articleId) || StringUtil.isEmpty(behaviorAction) || StringUtil.isEmpty(userId)) {
			return ApiUtil.getRespJSON(-10000, "ArticleId,BehaviorAction,CName,UserId 为必填项，入参为：" + json.toString())
					.toString();
		}

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

@@ -560,6 +560,31 @@ public class ArticleDao {
		if (StringUtil.isNotEmpty(vo.getOperatorId())) {
			param.append(" and OperatorId ='"+vo.getOperatorId()+"' ");
		}
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			int roleLevel = Integer.valueOf(vo.getOperatorRoleLevel())-1;
			String temp = "";
			for(int i=1;i<roleLevel;i++){//123
				switch(i){
					case 1:{temp+=" or UserScope = 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,4)+"00 "):vo.getOperatorRoleCode())+"'";break;}
					case 2:{temp+=" or UserScope = 2 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,6)):vo.getOperatorRoleCode())+"'";break;}
					case 3:{temp+=" or UserScope = 3 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode()):vo.getOperatorRoleCode())+"'";break;}
				}
			}
			if(!StringUtils.isEmpty(temp)){
				param3.append(temp.substring(3));
				param3.append("  or (UserScope = ? and OperatorRoleCode =?) ");
			}else{
				param3.append("  (UserScope = ? and OperatorRoleCode =?) ");
			}
			sql.addParamValue(Integer.valueOf(vo.getOperatorRoleLevel())-1);
			sql.addParamValue(vo.getOperatorRoleCode());
		}else{
			param3.append(" UserScope <= 3 ");
//
		}
		param3.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 "+(vo.getRoleType()!=null?" and RoleType = "+vo.getRoleType().intValue():"")+")");
		if("1".equals(vo.getOperatorRoleLevel())){//省
//			param.append(" and OperatorRoleCode like '"+vo.getOperatorRoleCode().substring(0,3)+"%' ");
		}else if("2".equals(vo.getOperatorRoleLevel())){//市
@@ -574,20 +599,10 @@ public class ArticleDao {
		}
		param3.append(" or (OperatorRoleLevel= "+vo.getOperatorRoleLevel()+" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ) ");
		if(param3.toString().startsWith(" or")){
			param.append("and ("+param3.toString().substring(3)+")");
		}
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			param.append(" and (UserScope <= ? ");
            sql.addParamValue(Integer.valueOf(vo.getOperatorRoleLevel())-1);
        }else{
			param.append(" and (UserScope <= 3 ");
//
        }
        param.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 and RoleType = "+vo.getRoleType()+"))");
		if(StringUtil.isNotEmpty(vo.getRoleType())) {
		param.append("and ("+param3.toString()+")");
		if(vo.getRoleType()!=null) {
			param.append(" and RoleType = ? ");
			sql.addParamValue(vo.getRoleType());
			sql.addParamValue(vo.getRoleType().intValue());
		}
		if (StringUtil.isNotEmpty(vo.getFirstLevelCategoryId())) {
			param.append(" and FirstLevelCategoryId = ? ");
@@ -598,7 +613,8 @@ public class ArticleDao {
			sql.addParamValue(vo.getSecondLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
			param.append(" and ArticleTitle like '%"+vo.getArticleTitle()+"%' ");
			param.append(" and m.ArticleTitle like ? ");
			sql.addParamValue("%"+vo.getArticleTitle()+"%");
		}
		if (StringUtil.isNotEmpty(vo.getStartTime())) {
			param.append(" and m.InsertTime >= ? ");
@@ -643,8 +659,8 @@ public class ArticleDao {
//			result = dao.getCategoryList( temp, 0, 1000);
//			one.setSecondLevelCategoryName(result.get("CategoryName")+"");
//		}
		log.info("queryArticlePcList:"+sql.toString());
		System.out.printf("queryArticlePcList:"+sql.toString());
//		log.info("queryArticlePcList:"+sql.toString());
//		System.out.printf("queryArticlePcList:"+sql.toString());
		return DB.me().queryForJson(MyDatabaseEnum.JkEduDB, sql, start, pageSize);
	}
@@ -670,6 +686,26 @@ public class ArticleDao {
		if (StringUtil.isNotEmpty(vo.getOperatorId())) {
			param.append(" and OperatorId ='"+vo.getOperatorId()+"' ");
		}
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			int roleLevel = Integer.valueOf(vo.getOperatorRoleLevel())-1;
			String temp = "";
			for(int i=1;i<roleLevel;i++){//123
				switch(i){
					case 1:{temp+=" or (UserScope = 1 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,4)+"00 "):vo.getOperatorRoleCode())+"')";break;}
					case 2:{temp+=" or (UserScope = 2 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,6)):vo.getOperatorRoleCode())+"')";break;}
					case 3:{temp+=" or (UserScope = 3 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode()):vo.getOperatorRoleCode())+"')";break;}
				}
			}
			if(!StringUtils.isEmpty(temp)){
				param3.append(temp.substring(3));
				param3.append("  or (UserScope = ? and OperatorRoleCode =?) ");
			}else{
				param3.append("  (UserScope = ? and OperatorRoleCode =?) ");
			}
			sql.addParamValue(Integer.valueOf(vo.getOperatorRoleLevel())-1);
			sql.addParamValue(vo.getOperatorRoleCode());
		}
		param3.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 "+(vo.getRoleType()!=null?" and RoleType = "+vo.getRoleType().intValue():"")+")");
		if("1".equals(vo.getOperatorRoleLevel())){//省
//			param.append(" and OperatorRoleCode like '"+vo.getOperatorRoleCode().substring(0,3)+"%' ");
		}else if("2".equals(vo.getOperatorRoleLevel())){//市
@@ -683,19 +719,11 @@ public class ArticleDao {
			param3.append(" or (OperatorRoleLevel= 3 and OperatorRoleCode = '"+(vo.getOperatorRoleCode().length()<=10?(vo.getOperatorRoleCode().substring(0,6)+" "):vo.getOperatorRoleCode())+"') ");
		}
		param3.append(" or (OperatorRoleLevel= "+vo.getOperatorRoleLevel()+" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ) ");
		if(param3.toString().startsWith(" or")){
			param.append("and ("+param3.toString().substring(3)+")");
		}
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			param.append(" and (UserScope <= ? ");
			sql.addParamValue(Integer.valueOf(vo.getOperatorRoleLevel())-1);
		}else{
            param.append(" and (UserScope <= 3 ");
		}
		param.append(" or  ( OperatorId='"+userCode+"' and UserScope=4 and RoleType = "+vo.getRoleType()+"))");
		if(StringUtil.isNotEmpty(vo.getRoleType())) {
		param.append("and ("+param3.toString()+")");
		if(vo.getRoleType()!=null) {
			param.append(" and RoleType = ? ");
			sql.addParamValue(vo.getRoleType());
			sql.addParamValue(vo.getRoleType().intValue());
		}
		if (StringUtil.isNotEmpty(vo.getFirstLevelCategoryId())) {
			param.append(" and FirstLevelCategoryId = ? ");
@@ -706,7 +734,8 @@ public class ArticleDao {
			sql.addParamValue(vo.getSecondLevelCategoryId());
		}
		if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
			param.append(" and ArticleTitle like '%"+vo.getArticleTitle()+"%' ");
			param.append(" and m.ArticleTitle like ? ");
			sql.addParamValue("%"+vo.getArticleTitle()+"%");
		}
		if (StringUtil.isNotEmpty(vo.getStartTime())) {
			param.append(" and m.InsertTime >= ? ");
@@ -732,8 +761,8 @@ public class ArticleDao {
		sql.addVar("@Condition", param.toString());
		sql.addVar("@Condition2", param2.toString());
		sql.addVar("@PageParam", pageParam.toString());
		log.info("queryArticleAPPList:"+sql.toString());
		System.out.printf("queryArticleAPPList:"+sql.toString());
//		log.info("queryArticleAPPList:"+sql.toString());
//		System.out.printf("queryArticleAPPList:"+sql.toString());
		List<Article> list = DB.me().queryForBeanList(MyDatabaseEnum.JkEduDB, sql,Article.class);
		return list;
//		Category temp = null;
@@ -795,7 +824,8 @@ public class ArticleDao {
			sql.addParamValue(vo.getOperatorRoleLevel());
		}
		if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
			param.append(" and ArticleTitle like '%"+vo.getArticleTitle()+"%' ");
			param.append(" and m.ArticleTitle like ? ");
			sql.addParamValue("%"+vo.getArticleTitle()+"%");
		}
		sql.addVar("@Condition", param.toString());
@@ -828,15 +858,16 @@ public class ArticleDao {
        }
        if (vo.getIsAuthentication() != null ) {
            param.append(" and IsAuthentication = ? ");
            sql.addParamValue(vo.getEndTime());
            sql.addParamValue(vo.getIsAuthentication());
        }
        if (StringUtil.isNotEmpty(vo.getOperatorRoleLevel())) {
            param.append(" and OperatorRoleLevel = ? ");
            sql.addParamValue(vo.getOperatorRoleLevel());
        }
        if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
            param.append(" and ArticleTitle like '%"+vo.getArticleTitle()+"%' ");
        }
		if (StringUtil.isNotEmpty(vo.getArticleTitle())) {
			param.append(" and m.ArticleTitle like ? ");
			sql.addParamValue("%"+vo.getArticleTitle()+"%");
		}
        if (StringUtil.isNotEmpty(vo.getOperatorRoleCode())) {
            param.append(" and OperatorRoleCode ='"+vo.getOperatorRoleCode()+"' ");
        }

edu-article/JkEdu/src/com/yihu/jk/vo/ArticleStatistic.java

@@ -33,6 +33,7 @@ public class ArticleStatistic {
	private int commentNumber;// 评论数
	private int shareNumber;// 分享数
	private int collectionNumber;// 收藏数
	private Integer PushNumber;//发送数
	private String secondLevelCategoryName;// 一级类别名称
	private String secondLevelCategoryId;// 二级类别ID
	private String firstLevelCategoryId;// 一级类别ID
@@ -41,8 +42,8 @@ public class ArticleStatistic {
	private int userType;// 用户类别 1医生 2居民
	private String DeptName;// 操作人所在科室
	private String TitleLevel;// 等级职称
	private String OperatorImg;// 操作人头像
	private String OperatorImg;// 操作人头像
	private String OperatorRoleCode;//操作人角色code
	private String OperatorRoleLevel;//操作人角色级别
	private Integer UserScope;//使用范围（1、全市使用，2、全区使用，3、全社区使用）
@@ -367,4 +368,12 @@ public class ArticleStatistic {
	public void setArticleCategoryName(String articleCategoryName) {
		ArticleCategoryName = articleCategoryName;
	}
	public Integer getPushNumber() {
		return PushNumber;
	}
	public void setPushNumber(Integer pushNumber) {
		PushNumber = pushNumber;
	}
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jkEduArticle/ThirdJkEduArticleService.java

@@ -945,11 +945,16 @@ public class ThirdJkEduArticleService extends BaseService {
    /**************************************************** behaver *******************************************************/
    public void saveBehavior(String articleId,String cName,String userId) throws Exception {
    public void saveBehavior(String articleId,String userId) throws Exception {
        JSONObject json = null;
        try{
            JSONObject param = new JSONObject();
            param.put("articleId",articleId);// 文章ID
            Patient patient = patientDao.findByCode(userId);
            String cName = "";
            if(patient!=null){
                cName = patient.getName();
            }
            param.put("cName",cName);//用户名称
            param.put("userId",userId);//用户ID

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/BaseController.java

@@ -199,7 +199,7 @@ public class BaseController {
            if(StringUtils.isNotEmpty(currentUserRole)){
                Hospital hospital = hospitalDao.findByCode(currentUserRole);
                if(hospital.getLevel()==3){
                if(hospital!=null&&hospital.getLevel()==3){
                    return hospital.getTown();
                }
            }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/jimeiJkEdu/PatientJMJkEduArticleController.java

@@ -190,11 +190,9 @@ public class PatientJMJkEduArticleController extends BaseController {
    @RequestMapping(value = "saveBehavior", method = RequestMethod.POST)
    @ApiOperation("添加 浏览、转发、分享、点赞 ")
    public String saveBehavior(
            @ApiParam(name = "articleId", value = "文章ID", required = true) @RequestParam(value = "articleId", required = true) String articleId,
            @ApiParam(name = "cName", value = "用户名称", required = true) @RequestParam(value = "cName", required = true) String cName,
            @ApiParam(name = "userId", value = "用户ID", required = true) @RequestParam(value = "userId", required = false) String  userId){
            @ApiParam(name = "articleId", value = "文章ID", required = true) @RequestParam(value = "articleId", required = true) String articleId){
        try {
            thirdJkEduArticleService.saveBehavior(articleId,cName,userId);
            thirdJkEduArticleService.saveBehavior(articleId,getUID());
//            Long count = healthEducationArticleService.pushArticleLogsCount("ece5c665b16542b0847e52b4a9fee44a");
            return write(200,"保存成功！");
        }catch (Exception e) {