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

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

@@ -25,7 +25,7 @@ public class ConcernDO extends IdEntity {
	private String mobile;//患者手机号
	private Integer status;//状态 -1取消关注 1已关注
	private String teamCode;//关注的团队code
	private Integer concernSource;//关注方式: 1扫描二维码 2页面跳转 3.咨询关注
	private Integer concernSource;//关注方式: 1扫描二维码 2咨询关注 3.其他
	private String concernDoctorCode;//关注的医生code
	private String concernDoctorName;//关注的医生名称
	private Date createTime;//创建时间

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

@@ -38,7 +38,7 @@ public class PatientConcernController extends BaseController {
    public String addConcern(
            @ApiParam(name = "patient", value = "患者", required = false) @RequestParam(required = false, name = "patient") String patient,
            @ApiParam(name = "doctor", value = "医生Code") @RequestParam(required = true, name = "doctor") String doctor,
            @ApiParam(name = "concernSource", value = "关注方式: 1扫描二维码 2页面跳转 3.咨询关注") @RequestParam(required = true, name = "concernSource") Integer concernSource
            @ApiParam(name = "concernSource", value = "关注方式: 1扫描二维码 2咨询关注 3.其他") @RequestParam(required = true, name = "concernSource") Integer concernSource
    ) {
        try {
            if (StringUtils.isEmpty(patient)) {