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

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

@@ -31,7 +31,7 @@ User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
		</Sql>-->
		<Sql name='getCollectionArticleList'>
			<![CDATA[
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber from (
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber,n.InsertTime as collectionInsertTime from (
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 and  m.ArticleState =1  @UserParam) as aa LEFT JOIN
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			]]>

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

@@ -146,7 +146,7 @@ public class ArticleApi {
					jsonObj.put("articleSource", StringUtil.getJSONValue(vbo.getArticleSource()));
					jsonObj.put("articlelevel", StringUtil.getJSONValue(vbo.getArticlelevel()));
					jsonObj.put("articleCover", StringUtil.getJSONValue(vbo.getArticleCover()));
					jsonObj.put("insertTime", StringUtil.getJSONValue(vbo.getInsertTime()));
					jsonObj.put("insertTime", StringUtil.getJSONValue(vbo.getCollectionInsertTime()));
					jsonObj.put("updateTime", StringUtil.getJSONValue(vbo.getUpdateTime()));
					jsonObj.put("operatorName", StringUtil.getJSONValue(vbo.getOperatorName()));
					jsonObj.put("operatorId", StringUtil.getJSONValue(vbo.getOperatorId()));

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

@@ -48,6 +48,7 @@ public class ArticleStatistic {
	private String OperatorRoleLevel;//操作人角色级别
	private Integer UserScope;//使用范围（1、全市使用，2、全区使用，3、全社区使用）
	private Integer RoleType;//1、健管师，2、管理员
	private String collectionInsertTime;//收藏时间
	public String getDeptName() {
		return DeptName;
@@ -376,4 +377,12 @@ public class ArticleStatistic {
	public void setPushNumber(Integer pushNumber) {
		PushNumber = pushNumber;
	}
	public String getCollectionInsertTime() {
		return collectionInsertTime;
	}
	public void setCollectionInsertTime(String collectionInsertTime) {
		this.collectionInsertTime = collectionInsertTime;
	}
}