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

common/common-entity/src/main/java/com/yihu/wlyy/entity/message/Message.java

@@ -52,6 +52,7 @@ public class Message extends IdEntity {
	private String over;//是否操作结束 是否操作结束 1是 0否
	private Double value1;// 当前值/收缩压，正数为高，负数为低
	private Double value2;// 上次值/舒张压，正数为高，负数为低
	//(type=14、15的时候，即健康文章消息类型，tzType表示健康文章发送给同个医生哪个角色下等同roleType)
	private String tzType;//体征类别
	private String tzCode;//体征code
	private Integer sex;//患者性别

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

@@ -135,4 +135,6 @@ public class ArticleApiTest {
		}
	}
}

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

@@ -510,7 +510,7 @@ public class ArticleDao {
		}
		if(!StringUtils.isEmpty(vo.getUserScope())){
			behaviorParam += ",UserScope="+vo.getUserScope();
			sql.addVar("@behaviorParam"," UserScope="+vo.getUserScope());
//			sql.addVar("@behaviorParam"," UserScope="+vo.getUserScope());
		}
		if(!StringUtils.isEmpty(vo.getArticleContent())){
			behaviorParam += ",ArticleContent='"+vo.getArticleContent()+"'";
@@ -520,6 +520,9 @@ public class ArticleDao {
			behaviorParam += ",UpdateTime='"+vo.getUpdateTime()+"'";
//			sql.addVar("@behaviorParam"," UpdateTime='"+vo.getUpdateTime()+"'");
		}
		if(!StringUtils.isEmpty(vo.getIsAuthentication())){
			behaviorParam += ",IsAuthentication="+vo.getIsAuthentication();
		}
		if(!StringUtils.isEmpty(behaviorParam)){
			sql.addVar("@behaviorParam",behaviorParam.substring(1));
		}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -1207,6 +1207,7 @@ public class JMJkEduArticleService extends BaseService {
                message.setDel("1");
                message.setData(b);
                message.setRelationCode("0");
                message.setTzType(roleType.toString());
                messageDao.save(message);
                if(messageService.getMessageNoticeSettingByMessageType(one.get("code")+"","1", MessageNoticeSetting.MessageTypeEnum.signSwitch.getValue())){
                    // 发送消息给医生
@@ -1370,6 +1371,7 @@ public class JMJkEduArticleService extends BaseService {
                message.setDel("1");
                message.setData(article.get("articleId")+"");
                message.setRelationCode(isAuthentication);
                message.setTzType(article.get("roleType")+"");
                messageDao.save(message);
                if(messageService.getMessageNoticeSettingByMessageType(receiveDoctor.getCode(),"1", MessageNoticeSetting.MessageTypeEnum.signSwitch.getValue())){
                    // 发送消息给医生