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

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

@@ -58,6 +58,7 @@ public class DoctorConcernController extends BaseController {
                jsonObject.put("address", patient.getAddress());
                jsonObject.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));
                jsonObject.put("isWX", StringUtils.isEmpty(patient.getOpenid()) ? false : true);
                jsonObject.put("deviceType", 0);//绑定设备
                jsonObject.put("concernCode", patient.getConcernCode());
                jsonObject.put("concernTime", DateUtil.dateToStr(patient.getConcernCreateTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -118,6 +119,7 @@ public class DoctorConcernController extends BaseController {
            jsonObject.put("address", patient.getAddress());//患者详细地址
            jsonObject.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));//患者年龄
            jsonObject.put("isWX", StringUtils.isEmpty(patient.getOpenid()) ? false : true);//是否关注微信
            jsonObject.put("deviceType", 0);//绑定设备
            jsonObject.put("concernType", concernDO.getConcernSource());//关注类型
            jsonObject.put("concernTypeName", concernDO.getConcernSourceName());//关注类型