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

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

@@ -106,7 +106,6 @@ public class BehaviorApi {
//			ArticleStatistic arvo = new ArticleStatistic();
			arvo.setArticleId(articleId);
			subDao.saveBehavior(behavior);
			ArticleApi.updateArticleStatistic(articleId, behaviorAction, number);
			return ApiUtil.getRespJSON(10000, "成功").toString();
		} catch (SQLException e) {
@@ -144,11 +143,11 @@ public class BehaviorApi {
		try {
			int count = subDao.deleteArticleCollection(vo);
			if (userType == 2) {
//			if (userType == 2) {
				int behaviorAction = 6;
				int number = -1;
				ArticleApi.updateArticleStatistic(articleId, behaviorAction, number);
			}
//			}
			if (count == 0) {
				return ApiUtil.getRespJSON(-10001, "收藏失败").toString();
			}

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

@@ -265,7 +265,7 @@ public class ArticleDao {
		StringBuffer param = new StringBuffer();
		param.append(" and ArticleId = '").append(articleId).append("'");
		sql.addVar("@Condition", param.toString());
		sql.addVar("@behaviorParam", behaviorParam.toString() + "=" + behaviorParam + "+" + number);
		sql.addVar("@behaviorParam", behaviorParam.toString() + "=" + behaviorParam + "+ " + number);
		sql.addVar("@ArticleId", "ArticleId ='" + articleId + "'");
		DB.me().update(MyDatabaseEnum.JkEduDB, sql);
	}