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

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/Patient.java

@@ -106,9 +106,13 @@ public class Patient extends IdEntity implements Serializable {
    private String medicareNumber;
    ///非映射字段
    //关注是间
    private Date concernCreateTime;//创建时间
    private String concernCode;// 关注code
    public String getPrincipalCode() {
        return principalCode;
    }
@@ -480,4 +484,13 @@ public class Patient extends IdEntity implements Serializable {
    public void setConcernCreateTime(Date concernCreateTime) {
        this.concernCreateTime = concernCreateTime;
    }
    @Transient
    public String getConcernCode() {
        return concernCode;
    }
    public void setConcernCode(String concernCode) {
        this.concernCode = concernCode;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/concern/ConcernService.java

@@ -211,7 +211,7 @@ public class ConcernService extends BaseService {
     */
    public List<Patient> listPatientsByDoctorCode(String doctorCode,Integer page,Integer pageSize) {
        String sql="select  " +
                " p.`code`,p.name,p.idcard,p.sex,p.photo,p.openid,c.create_time concern_create_time " +
                " p.`code`,p.name,p.idcard,p.sex,p.photo,p.openid,c.create_time concern_create_time,c.code concern_code " +
                " from wlyy_patient p,wlyy_concern c " +
                " where " +
                " p.`code`=c.patient and " +

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

@@ -53,10 +53,11 @@ public class DoctorConcernController extends BaseController {
                jsonObject.put("name", patient.getName());
                jsonObject.put("photo", patient.getPhoto());
                jsonObject.put("sex", patient.getSex());
                jsonObject.put("phone", patient.getPhone());
                jsonObject.put("phone", patient.getMobile());
                jsonObject.put("address", patient.getAddress());
                jsonObject.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));
                jsonObject.put("isWX", StringUtils.isEmpty(patient.getOpenid()) ? false : true);
                jsonObject.put("concernCode", patient.getConcernCode());
                jsonObject.put("concernTime", DateUtil.dateToStr(patient.getConcernCreateTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -111,6 +112,7 @@ public class DoctorConcernController extends BaseController {
            jsonObject.put("sex", patient.getSex());//患者性别
            jsonObject.put("phone", patient.getPhone());//患者电话
            jsonObject.put("idcard", patient.getIdcard());//患者身份证
            jsonObject.put("ssc", patient.getSsc());//患者医保卡
            jsonObject.put("address", patient.getAddress());//患者详细地址
            jsonObject.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));//患者年龄
            jsonObject.put("isWX", StringUtils.isEmpty(patient.getOpenid()) ? false : true);//是否关注微信