Merge branch 'srdev' of chenweida/patient-co-management into srdev

common/common-entity/src/main/java/com/yihu/wlyy/entity/concern/ConcernDO.java

@@ -5,6 +5,7 @@ import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.sql.Timestamp;
import java.util.Date;
@@ -144,6 +145,16 @@ public class ConcernDO extends IdEntity {
	public Integer getConcernSource() {
		return this.concernSource;
	}
	@Transient
	public String getConcernSourceName() {
		switch (concernSource){
			case 1:return 	"扫描二维码";
			case 2:return 	"页面跳转";
			case 3:return 	"咨询关注";
			default: return "扫描二维码";
		}
	}
	public void setConcernSource(Integer concernSource) {
		this.concernSource = concernSource;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/concern/DoctorConcernController.java

@@ -117,6 +117,8 @@ public class DoctorConcernController extends BaseController {
            jsonObject.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));//患者年龄
            jsonObject.put("isWX", StringUtils.isEmpty(patient.getOpenid()) ? false : true);//是否关注微信
            jsonObject.put("concernType", concernDO.getConcernSource());//关注类型
            jsonObject.put("concernTypeName", concernDO.getConcernSourceName());//关注类型
            jsonObject.put("concernTime", DateUtil.dateToStr(concernDO.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));//关注事件
            return write(200, "查询成功", "data", jsonObject);