Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseCityDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * 城市字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,24 +19,25 @@ import java.util.Date;
public class BaseCityDO extends IntegerIdentityEntity {
    /**
	* 省编码
	*/
    private String province;
	 * 省编码
	 */
	private String province;
    /**
	* 城市编码
	*/
    private String code;
	 * 城市编码
	 */
	private String code;
    /**
	* 城市名称
	*/
    private String name;
	 * 城市名称
	 */
	private String name;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "province")

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseCommitteeDO.java

@@ -0,0 +1,100 @@
package com.yihu.jw.entity.base.area;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 居委会实体
*
* @author Administrator on  2018年09月05日
*
*/
@Entity
@Table(name = "base_committee")
public class BaseCommitteeDO extends UuidIdentityEntityWithOperator {
    /**
	 * 省标识
	 */
	private String province;
    /**
	 * 市标识
	 */
	private String city;
    /**
	 * 区县标识
	 */
	private String town;
    /**
	 * 街道标识
	 */
	private String street;
    /**
	 * 居委会标识
	 */
	private String code;
    /**
	 * 居委会名称
	 */
	private String name;
	@Column(name = "province")
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
	@Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
	@Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
	@Column(name = "street")
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseProvinceDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -8,9 +9,9 @@ import java.util.Date;
/**
 * 省字典实体
 * 省份字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,19 +19,20 @@ import java.util.Date;
public class BaseProvinceDO extends IntegerIdentityEntity {
    /**
	* 省份编码
	*/
    private String code;
	 * 省份编码
	 */
	private String code;
    /**
	* 省份名称
	*/
    private String name;
	 * 省份名称
	 */
	private String name;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "code")

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseStreetDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * 街道字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,34 +19,35 @@ import java.util.Date;
public class BaseStreetDO extends IntegerIdentityEntity {
    /**
	* 省标识
	*/
    private String province;
	 * 省标识
	 */
	private String province;
    /**
	* 市标识
	*/
    private String city;
	 * 市标识
	 */
	private String city;
    /**
	* 区县标识
	*/
    private String town;
	 * 区县标识
	 */
	private String town;
    /**
	* 街道标识
	*/
    private String code;
	 * 街道标识
	 */
	private String code;
    /**
	* 街道名称
	*/
    private String name;
	 * 街道名称
	 */
	private String name;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "province")

common/common-entity/src/main/java/com/yihu/jw/entity/base/area/BaseTownDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * 区县字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,29 +19,30 @@ import java.util.Date;
public class BaseTownDO extends IntegerIdentityEntity {
    /**
	* 省编码
	*/
    private String province;
	 * 省编码
	 */
	private String province;
    /**
	* 城市编码
	*/
    private String city;
	 * 城市编码
	 */
	private String city;
    /**
	* 区县编码
	*/
    private String code;
	 * 区县编码
	 */
	private String code;
    /**
	* 区县名称
	*/
    private String name;
	 * 区县名称
	 */
	private String name;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "province")

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictDiseaseDO.java

@@ -0,0 +1,77 @@
package com.yihu.jw.entity.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 病种字典实体
 * 
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@Table(name = "dict_disease")
public class DictDiseaseDO extends IntegerIdentityEntity {
    /**
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	 * 疾病编码
	 */
	private String code;
    /**
	 * 疾病名称
	 */
	private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictHealthProblemDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * 健康问题字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,29 +19,30 @@ import java.util.Date;
public class DictHealthProblemDO extends IntegerIdentityEntity {
    /**
	* saas配置id，null标识公共字典
	*/
    private String saasId;
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	* 字典编码
	*/
    private String code;
	 * 字典编码
	 */
	private String code;
    /**
	* 字典名称
	*/
    private String name;
	 * 字典名称
	 */
	private String name;
    /**
	* 描述
	*/
    private String description;
	 * 描述
	 */
	private String description;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictHospitalDeptDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * 医院科室字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,24 +19,25 @@ import java.util.Date;
public class DictHospitalDeptDO extends IntegerIdentityEntity {
    /**
	* saas配置id，null标识公共字典
	*/
    private String saasId;
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	* 科室标识
	*/
    private String code;
	 * 科室标识
	 */
	private String code;
    /**
	* 科室名称
	*/
    private String name;
	 * 科室名称
	 */
	private String name;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictIcd10DO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * ICD10字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,44 +19,45 @@ import java.util.Date;
public class DictIcd10DO extends IntegerIdentityEntity {
    /**
	* saas配置id，null标识公共字典
	*/
    private String saasId;
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	* icd10字典编码
	*/
    private String code;
	 * icd10字典编码
	 */
	private String code;
    /**
	* icd10字典名称
	*/
    private String name;
	 * icd10字典名称
	 */
	private String name;
    /**
	* 字典名称拼音首字母
	*/
    private String phoneticCode;
	 * 字典名称拼音首字母
	 */
	private String phoneticCode;
    /**
	* 是否慢病
	*/
    private String chronicFlag;
	 * 是否慢病
	 */
	private String chronicFlag;
    /**
	* 是否传染病
	*/
    private String infectiousFlag;
	 * 是否传染病
	 */
	private String infectiousFlag;
    /**
	* 描述
	*/
    private String description;
	 * 描述
	 */
	private String description;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictJobTitleDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * 职称字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,24 +19,25 @@ import java.util.Date;
public class DictJobTitleDO extends IntegerIdentityEntity {
    /**
	* saas配置id，null标识公共字典
	*/
    private String saasId;
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	* 职称标识
	*/
    private String code;
	 * 职称标识
	 */
	private String code;
    /**
	* 职称名
	*/
    private String name;
	 * 职称名
	 */
	private String name;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictMedicineDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import java.util.Date;
/**
 * 药品字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,29 +19,30 @@ import java.util.Date;
public class DictMedicineDO extends IntegerIdentityEntity {
    /**
	* saas配置id，null标识公共字典
	*/
    private String saasId;
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	* 药品编码
	*/
    private String code;
	 * 药品编码
	 */
	private String code;
    /**
	* 药品名称
	*/
    private String name;
	 * 药品名称
	 */
	private String name;
    /**
	* 药品类型：1健康记录
	*/
    private String type;
	 * 药品类型：1健康记录
	 */
	private String type;
    /**
	* 创建时间
	*/
    private Date createTime;
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorDO.java

@@ -9,9 +9,9 @@ import java.util.Date;
/**
* 医生基础信息实体
* 医生基本信息实体
*
* @author litaohong on  2018年08月31日
* @author Administrator on  2018年09月05日
*
*/
@Entity
@@ -19,144 +19,146 @@ import java.util.Date;
public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    /**
	* 机构id
	*/
    private String orgId;
	 * 机构id
	 */
	private String orgId;
    /**
	* 密码
	*/
    private String password;
	 * 密码
	 */
	private String password;
    /**
	* 
	*/
    private String salt;
	 * 
	 */
	private String salt;
    /**
	* 姓名
	*/
    private String name;
	 * 姓名
	 */
	private String name;
    /**
	* 性别（1男，2女） 用国家标准字典
	*/
    private String sex;
	 * 性别（1男，2女） 用国家标准字典
	 */
	private String sex;
    /**
	* 医生专长
	*/
    private String expertise;
	 * 医生专长
	 */
	private String expertise;
    /**
	* 医生介绍
	*/
    private String introduce;
	 * 医生介绍
	 */
	private String introduce;
    /**
	*  身份证
	*/
    private String idcard;
	 *  身份证
	 */
	private String idcard;
    /**
	* 生日
	*/
    private Date birthday;
	 * 生日
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date birthday;
    /**
	* 头像http地址
	*/
    private String photo;
	 * 头像http地址
	 */
	private String photo;
    /**
	* 手机号
	*/
    private String mobile;
	 * 手机号
	 */
	private String mobile;
    /**
	* 医生二维码
	*/
    private String qrcode;
	 * 医生二维码
	 */
	private String qrcode;
    /**
	* 省代码
	*/
    private String provinceCode;
	 * 省代码
	 */
	private String provinceCode;
    /**
	* 省名称
	*/
    private String provinceName;
	 * 省名称
	 */
	private String provinceName;
    /**
	* 市代码
	*/
    private String cityCode;
	 * 市代码
	 */
	private String cityCode;
    /**
	* 市名称
	*/
    private String cityName;
	 * 市名称
	 */
	private String cityName;
    /**
	* 区县代码
	*/
    private String townCode;
	 * 区县代码
	 */
	private String townCode;
    /**
	* 区县名称
	*/
    private String townName;
	 * 区县名称
	 */
	private String townName;
    /**
	* 街道代码
	*/
    private String streetCode;
	 * 街道代码
	 */
	private String streetCode;
    /**
	* 街道名称
	*/
    private String streetName;
	 * 街道名称
	 */
	private String streetName;
    /**
	* 资格是否认证通过，1是，0否
	*/
    private String iscertified;
	 * 资格是否认证通过，1是，0否
	 */
	private String iscertified;
    /**
	* 是否是名医，1是，0否
	*/
    private String isFamous;
	 * 是否是名医，1是，0否
	 */
	private String isFamous;
    /**
	* 是否提示设置密码  1 提示过 0未提示
	*/
    private String isPasswordPrompt;
	 * 是否提示设置密码  1 提示过 0未提示
	 */
	private String isPasswordPrompt;
    /**
	* 名称拼音首字母
	*/
    private String spell;
	 * 名称拼音首字母
	 */
	private String spell;
    /**
	* CA证书过期时间
	*/
    private Date certifiedOvertime;
	 * CA证书过期时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date certifiedOvertime;
    /**
	* CA证书编号
	*/
    private String certificateNum;
	 * CA证书编号
	 */
	private String certificateNum;
    /**
	* 
	*/
    private String openid;
	 * 用户微信openid
	 */
	private String openid;
    /**
	* 作废标识，1正常，0作废
	*/
    private String del;
	 * 作废标识，1正常，0作废
	 */
	private String del;
	@Column(name = "org_id")
@@ -223,7 +225,6 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
        this.idcard = idcard;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "birthday")
    public Date getBirthday() {
        return birthday;
@@ -352,7 +353,6 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
        this.spell = spell;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name = "certified_overtime")
    public Date getCertifiedOvertime() {
        return certifiedOvertime;

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorHospitalDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.doctor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -8,9 +9,9 @@ import java.util.Date;
/**
 * 医生职业信息实体
 * 医生执业信息实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,44 +19,45 @@ import java.util.Date;
public class BaseDoctorHospitalDO extends IntegerIdentityEntity {
    /**
	* 医院标识
	*/
    private String hospCode;
	 * 医院标识
	 */
	private String hospCode;
    /**
	* 医院名称
	*/
    private String hospName;
	 * 医院名称
	 */
	private String hospName;
    /**
	* 医生角色标识
	*/
    private String roleCode;
	 * 医生角色标识
	 */
	private String roleCode;
    /**
	* 医院角色名称
	*/
    private String roleName;
	 * 医院角色名称
	 */
	private String roleName;
    /**
	* 职称代码
	*/
    private String jobTitleCode;
	 * 职称代码
	 */
	private String jobTitleCode;
    /**
	* 职称名称
	*/
    private String jobTitleName;
	 * 职称名称
	 */
	private String jobTitleName;
    /**
	* 作废标识，1正常，0作废
	*/
    private String del;
	 * 作废标识，1正常，0作废
	 */
	private String del;
    /**
	* 
	*/
    private Date createTime;
	 * 
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "hosp_code")

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorRoleDictDO.java

@@ -10,7 +10,7 @@ import java.util.Date;
/**
 * 医生角色字典实体
 * 
 * @author litaohong on  2018年08月31日
 * @author Administrator on  2018年09月05日
 *
 */
@Entity
@@ -18,19 +18,19 @@ import java.util.Date;
public class BaseDoctorRoleDictDO extends IntegerIdentityEntity {
    /**
	* 角色code
	*/
    private String code;
	 * 角色code
	 */
	private String code;
    /**
	* 角色名称：全科医生、专科医生、健康管理师、管理员等
	*/
    private String name;
	 * 角色名称：全科医生、专科医生、健康管理师、管理员等
	 */
	private String name;
    /**
	* 作废标识，1正常，0作废
	*/
    private String del;
	 * 作废标识，1正常，0作废
	 */
	private String del;
	@Column(name = "code")

common/common-entity/src/main/java/com/yihu/jw/entity/base/org/BaseOrgDO.java

@@ -1,7 +1,6 @@
package com.yihu.jw.entity.base.org;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -9,280 +8,263 @@ import java.util.Date;
/**
 * 机构信息实体
 *
 * @author litaohong on  2018年08月31日
 */
* 机构信息（医院）实体
*
* @author Administrator on  2018年09月05日
*
*/
@Entity
@Table(name = "base_org")
public class BaseOrgDO extends UuidIdentityEntityWithOperator {
    /**
     * saas化配置
     */
    private String saasid;
	 * saas化配置
	 */
	private String saasid;
    /**
     * 省份标识
     */
    private String provinceCode;
	 * 省份标识
	 */
	private String provinceCode;
    /**
     * 城市标识
     */
    private String cityCode;
	 * 城市标识
	 */
	private String cityCode;
    /**
     * 区县标识
     */
    private String townCode;
	 * 区县标识
	 */
	private String townCode;
    /**
     * 机构名称
     */
    private String name;
	 * 机构名称
	 */
	private String name;
    /**
     * 机构别名
     */
    private String alias;
	 * 机构别名
	 */
	private String alias;
    /**
     * 机构名称拼音首字母
     */
    private String spell;
	 * 机构名称拼音首字母
	 */
	private String spell;
    /**
     * 机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构
     */
    private String type;
	 * 机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构
	 */
	private String type;
    /**
     * 机构简介
     */
    private String brief;
	 * 机构简介
	 */
	private String brief;
    /**
     * 机构详细地址
     */
    private String address;
	 * 机构详细地址
	 */
	private String address;
    /**
     * 机构图片
     */
    private String photo;
	 * 机构图片
	 */
	private String photo;
    /**
     * 经度
     */
    private String longitude;
	 * 经度
	 */
	private String longitude;
    /**
     * 纬度
     */
    private String latitude;
	 * 纬度
	 */
	private String latitude;
    /**
     * 法人
     */
    private String legalperson;
	 * 法人
	 */
	private String legalperson;
    /**
     * 机构管理员
     */
    private String orgAdmin;
	 * 机构管理员
	 */
	private String orgAdmin;
    /**
     * 机构网址
     */
    private String orgUrl;
	 * 机构网址
	 */
	private String orgUrl;
    /**
     * 机构简介
     */
    private String intro;
	 * 机构简介
	 */
	private String intro;
    /**
     * 机构二维码
     */
    private String qrcode;
	 * 机构二维码
	 */
	private String qrcode;
    /**
     * 作废标识，1正常，0作废
     */
    private String del;
	 * 作废标识，1正常，0作废
	 */
	private String del;
    @Column(name = "saasid")
	@Column(name = "saasid")
    public String getSaasid() {
        return saasid;
    }
    public void setSaasid(String saasid) {
        this.saasid = saasid;
    }
    @Column(name = "province_code")
	@Column(name = "province_code")
    public String getProvinceCode() {
        return provinceCode;
    }
    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }
    @Column(name = "city_code")
	@Column(name = "city_code")
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
    @Column(name = "town_code")
	@Column(name = "town_code")
    public String getTownCode() {
        return townCode;
    }
    public void setTownCode(String townCode) {
        this.townCode = townCode;
    }
    @Column(name = "name")
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "alias")
	@Column(name = "alias")
    public String getAlias() {
        return alias;
    }
    public void setAlias(String alias) {
        this.alias = alias;
    }
    @Column(name = "spell")
	@Column(name = "spell")
    public String getSpell() {
        return spell;
    }
    public void setSpell(String spell) {
        this.spell = spell;
    }
    @Column(name = "type")
	@Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "brief")
	@Column(name = "brief")
    public String getBrief() {
        return brief;
    }
    public void setBrief(String brief) {
        this.brief = brief;
    }
    @Column(name = "address")
	@Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    @Column(name = "photo")
	@Column(name = "photo")
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    @Column(name = "longitude")
	@Column(name = "longitude")
    public String getLongitude() {
        return longitude;
    }
    public void setLongitude(String longitude) {
        this.longitude = longitude;
    }
    @Column(name = "latitude")
	@Column(name = "latitude")
    public String getLatitude() {
        return latitude;
    }
    public void setLatitude(String latitude) {
        this.latitude = latitude;
    }
    @Column(name = "legalperson")
	@Column(name = "legalperson")
    public String getLegalperson() {
        return legalperson;
    }
    public void setLegalperson(String legalperson) {
        this.legalperson = legalperson;
    }
    @Column(name = "org_admin")
	@Column(name = "org_admin")
    public String getOrgAdmin() {
        return orgAdmin;
    }
    public void setOrgAdmin(String orgAdmin) {
        this.orgAdmin = orgAdmin;
    }
    @Column(name = "org_url")
	@Column(name = "org_url")
    public String getOrgUrl() {
        return orgUrl;
    }
    public void setOrgUrl(String orgUrl) {
        this.orgUrl = orgUrl;
    }
    @Column(name = "intro")
	@Column(name = "intro")
    public String getIntro() {
        return intro;
    }
    public void setIntro(String intro) {
        this.intro = intro;
    }
    @Column(name = "qrcode")
	@Column(name = "qrcode")
    public String getQrcode() {
        return qrcode;
    }
    public void setQrcode(String qrcode) {
        this.qrcode = qrcode;
    }
    @Column(name = "del")
	@Column(name = "del")
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.base.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -8,9 +9,9 @@ import java.util.Date;
/**
* 居民信息实体
* 居民信息（居民就是患者）实体
*
* @author litaohong on  2018年08月31日
* @author Administrator on  2018年09月05日
*
*/
@Entity
@@ -18,179 +19,182 @@ import java.util.Date;
public class BasePatientDO extends UuidIdentityEntityWithOperator {
    /**
	* saas配置id
	*/
    private String saasId;
	 * saas配置id
	 */
	private String saasId;
    /**
	* 身份证号
	*/
    private String idcard;
	 * 身份证号
	 */
	private String idcard;
    /**
	* 登录密码
	*/
    private String password;
	 * 登录密码
	 */
	private String password;
    /**
	* 
	*/
    private String salt;
	 *
	 */
	private String salt;
    /**
	* 姓名
	*/
    private String name;
	 * 姓名
	 */
	private String name;
    /**
	* 生日
	*/
    private Date birthday;
	 * 生日
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date birthday;
    /**
	* 性别，1男，2女
	*/
    private String sex;
	 * 性别，1男，2女
	 */
	private Integer sex;
    /**
	* 手机号
	*/
    private String mobile;
	 * 手机号
	 */
	private String mobile;
    /**
	* 联系电话
	*/
    private String phone;
	 * 联系电话
	 */
	private String phone;
    /**
	* 社保卡号
	*/
    private String ssc;
	 * 社保卡号
	 */
	private String ssc;
    /**
	* 头像http地址
	*/
    private String photo;
	 * 头像http地址
	 */
	private String photo;
    /**
	* 省编码
	*/
    private String provinceCode;
	 * 省编码
	 */
	private String provinceCode;
    /**
	* 市编码
	*/
    private String cityCode;
	 * 市编码
	 */
	private String cityCode;
    /**
	* 区县编码
	*/
    private String townCode;
	 * 区县编码
	 */
	private String townCode;
    /**
	* 街道编码
	*/
    private String streetCode;
	 * 街道编码
	 */
	private String streetCode;
    /**
	* 具体详细地址
	*/
    private String address;
	 * 具体详细地址
	 */
	private String address;
    /**
	* 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
	*/
    private String disease;
	 * 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
	 */
	private String disease;
    /**
	* 病情：0绿标，1黄标，2红标，3重点关注,
	*/
    private String diseaseCondition;
	 * 病情：0绿标，1黄标，2红标，3重点关注,
	 */
	private String diseaseCondition;
    /**
	* 总积分
	*/
    private String points;
	 * 总积分
	 */
	private String points;
    /**
	* 病历总数
	*/
    private String recordAmount;
	 * 病历总数
	 */
	private String recordAmount;
    /**
	* 微信编号
	*/
    private String openid;
	 * 微信编号
	 */
	private String openid;
    /**
	* 用户状态：1正常，0禁用，-1恶意注册，2审核中
	*/
    private String patientStatus;
	 * 用户状态：1正常，0禁用，-1恶意注册，2审核中
	 */
	private String patientStatus;
    /**
	* 联系方式备注【基卫】
	*/
    private String mobileRemarks;
	 * 联系方式备注【基卫】
	 */
	private String mobileRemarks;
    /**
	* 第一次添加open的时间
	*/
    private Date openidTime;
	 * 第一次添加open的时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date openidTime;
    /**
	* 居委会代码
	*/
    private String sickVillage;
	 * 居委会代码
	 */
	private String sickVillage;
    /**
	* 
	*/
    private String sickVillageName;
	 *
	 */
	private String sickVillageName;
    /**
	* 绑定电子社保卡主体（共济为操作人code）
	*/
    private String principalCode;
	 * 绑定电子社保卡主体（共济为操作人code）
	 */
	private String principalCode;
    /**
	* 是否绑定电子社保卡 （0否 1是）
	*/
    private String sicardStatus;
	 * 是否绑定电子社保卡 （0否 1是）
	 */
	private String sicardStatus;
    /**
	* 电子社保卡绑定时间
	*/
    private Date sicardTime;
	 * 电子社保卡绑定时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date sicardTime;
    /**
	* 是否分配过微信标签
	*/
    private Integer isWxtag;
	 * 是否分配过微信标签
	 */
	private Integer isWxtag;
    /**
	* 微信tagId
	*/
    private String wxtagid;
	 * 微信tagId
	 */
	private String wxtagid;
    /**
	* 居民预警状态：0为标准，1为预警状态
	*/
    private Integer standardStatus;
	 * 居民预警状态：0为标准，1为预警状态
	 */
	private Integer standardStatus;
    /**
	* 医疗保险号
	*/
    private String medicareNumber;
	 * 医疗保险号
	 */
	private String medicareNumber;
    /**
	* unionId 开发平台唯一标识
	*/
    private String unionid;
	 * unionId 开发平台唯一标识
	 */
	private String unionid;
    /**
	* 作废标识，1正常，0作废
	*/
    private String del;
	 * 作废标识，1正常，0作废
	 */
	private String del;
	@Column(name = "saas_id")
@@ -242,10 +246,10 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    }
	@Column(name = "sex")
    public String getSex() {
    public Integer getSex() {
        return sex;
    }
    public void setSex(String sex) {
    public void setSex(Integer sex) {
        this.sex = sex;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientFamilyMemberDO.java

@@ -0,0 +1,56 @@
package com.yihu.jw.entity.base.patient;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2018/8/31.
 */
@Entity
@Table(name = "base_patient_family_member")
public class BasePatientFamilyMemberDO extends UuidIdentityEntityWithOperator {
    private String patient;//居民code',
    private String familyMember;//家庭成员code',
    private Integer familyRelation;//家庭关系',
    private Integer isAuthorize;//是否授权0:未授权,1:已授权，默认为1',
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "family_member")
    public String getFamilyMember() {
        return familyMember;
    }
    public void setFamilyMember(String familyMember) {
        this.familyMember = familyMember;
    }
    @Column(name = "family_relation")
    public Integer getFamilyRelation() {
        return familyRelation;
    }
    public void setFamilyRelation(Integer familyRelation) {
        this.familyRelation = familyRelation;
    }
    @Column(name = "is_authorize")
    public Integer getIsAuthorize() {
        return isAuthorize;
    }
    public void setIsAuthorize(Integer isAuthorize) {
        this.isAuthorize = isAuthorize;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/peopel_num/BasePeopleNumDO.java

@@ -0,0 +1,233 @@
package com.yihu.jw.entity.base.peopel_num;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
* 基础人口基数信息实体
*
* @author Administrator on  2018年09月05日
*
*/
@Entity
@Table(name = "base_people_num")
public class BasePeopleNumDO extends UuidIdentityEntityWithOperator {
    /**
	 * saas化的id
	 */
	private String saasId;
    /**
	 * 所属省代码
	 */
	private String provinceCode;
    /**
	 * 所属市代码
	 */
	private String cityCode;
    /**
	 * 所属区代码
	 */
	private String districtCode;
    /**
	 * 所属具体名称
	 */
	private String name;
    /**
	 * 人口数
	 */
	private Integer num;
    /**
	 * 类别 0是省，1是市，2是区，3是机构
	 */
	private String type;
    /**
	 * 每年的人口数
	 */
	private Integer year;
    /**
	 * 高血压发病数
	 */
	private Integer gxyNum;
    /**
	 * 糖尿病发病数
	 */
	private Integer tnbNum;
    /**
	 * 65岁以上老年人口数
	 */
	private Integer sixFiveNum;
    /**
	 * 高血压任务数
	 */
	private Integer gxyTaskNum;
    /**
	 * 糖尿病任务数
	 */
	private Integer tnbTaskNum;
    /**
	 * 65岁以上老年人口任务数
	 */
	private Integer sixFiveTaskNum;
    /**
	 * 户籍人口任务数
	 */
	private Integer taskNum;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "province_code")
    public String getProvinceCode() {
        return provinceCode;
    }
    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }
	@Column(name = "city_code")
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
	@Column(name = "district_code")
    public String getDistrictCode() {
        return districtCode;
    }
    public void setDistrictCode(String districtCode) {
        this.districtCode = districtCode;
    }
	@Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "num")
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
	@Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
	@Column(name = "year")
    public Integer getYear() {
        return year;
    }
    public void setYear(Integer year) {
        this.year = year;
    }
	@Column(name = "gxy_num")
    public Integer getGxyNum() {
        return gxyNum;
    }
    public void setGxyNum(Integer gxyNum) {
        this.gxyNum = gxyNum;
    }
	@Column(name = "tnb_num")
    public Integer getTnbNum() {
        return tnbNum;
    }
    public void setTnbNum(Integer tnbNum) {
        this.tnbNum = tnbNum;
    }
	@Column(name = "six_five_num")
    public Integer getSixFiveNum() {
        return sixFiveNum;
    }
    public void setSixFiveNum(Integer sixFiveNum) {
        this.sixFiveNum = sixFiveNum;
    }
	@Column(name = "gxy_task_num")
    public Integer getGxyTaskNum() {
        return gxyTaskNum;
    }
    public void setGxyTaskNum(Integer gxyTaskNum) {
        this.gxyTaskNum = gxyTaskNum;
    }
	@Column(name = "tnb_task_num")
    public Integer getTnbTaskNum() {
        return tnbTaskNum;
    }
    public void setTnbTaskNum(Integer tnbTaskNum) {
        this.tnbTaskNum = tnbTaskNum;
    }
	@Column(name = "six_five_task_num")
    public Integer getSixFiveTaskNum() {
        return sixFiveTaskNum;
    }
    public void setSixFiveTaskNum(Integer sixFiveTaskNum) {
        this.sixFiveTaskNum = sixFiveTaskNum;
    }
	@Column(name = "task_num")
    public Integer getTaskNum() {
        return taskNum;
    }
    public void setTaskNum(Integer taskNum) {
        this.taskNum = taskNum;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/score/BaseEvaluateDO.java

@@ -0,0 +1,46 @@
package com.yihu.jw.entity.base.score;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2018/8/31.
 */
@Entity
@Table(name = "base_evaluate")
public class BaseEvaluateDO extends UuidIdentityEntityWithOperator {
    private String relationCode;//关联业务CODE（关联主表evlute_score）',
    private String scoreType;//评价类型：1、专业能力，2、服务态度，3、回复速度 (可拓展字段)',
    private Double score;//单项得分',
    @Column(name = "relation_code")
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    @Column(name = "score_type")
    public String getScoreType() {
        return scoreType;
    }
    public void setScoreType(String scoreType) {
        this.scoreType = scoreType;
    }
    @Column(name = "score")
    public Double getScore() {
        return score;
    }
    public void setScore(Double score) {
        this.score = score;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/score/BaseEvaluateScoreDO.java

@@ -0,0 +1,136 @@
package com.yihu.jw.entity.base.score;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by Trick on 2018/8/31.
 */
@Entity
@Table(name = "base_evaluate_score")
public class BaseEvaluateScoreDO extends UuidIdentityEntityWithOperator {
    private String city;//城市编码',
    private String town;//城镇编码',
    private String hospital;//医院编码',
    private String team;//团队编码',
    private String doctor;//被评价的医生编码',
    private String doctorName;//医生名字',
    private String patient;//评价人',
    private String patientName;//评价人姓名',
    private Integer evaluateType;//.咨询评价；',
    private String relationCode;//所属业务关系code，例如：1为咨询code',
    private Double score;//主表分数',
    private Integer type;//1、实名，2、匿名',
    @Column(name = "city")
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    @Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    @Column(name = "hospital")
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    @Column(name = "team")
    public String getTeam() {
        return team;
    }
    public void setTeam(String team) {
        this.team = team;
    }
    @Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    @Column(name = "evaluate_type")
    public Integer getEvaluateType() {
        return evaluateType;
    }
    public void setEvaluateType(Integer evaluateType) {
        this.evaluateType = evaluateType;
    }
    @Column(name = "relation_code")
    public String getRelationCode() {
        return relationCode;
    }
    public void setRelationCode(String relationCode) {
        this.relationCode = relationCode;
    }
    @Column(name = "score")
    public Double getScore() {
        return score;
    }
    public void setScore(Double score) {
        this.score = score;
    }
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/sms/SmsDO.java

@@ -21,7 +21,7 @@ public class SmsDO extends UuidIdentityEntity {
	//请求的ip地址
	private String requestIp;
	//短信接收号码
	private String to;
	private String mobile;
	//短信内容
	private String content;
	//过期时间
@@ -58,13 +58,13 @@ public class SmsDO extends UuidIdentityEntity {
		this.requestIp = requestIp;
	}
	@Column(name = "to", nullable = false)
	public String getTo() {
		return to;
	@Column(name = "mobile", nullable = false)
	public String getMobile() {
		return mobile;
	}
	public void setTo(String to) {
		this.to = to;
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
	@Column(name = "content", nullable = false)

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/HospitalServiceItemDO.java

@@ -32,12 +32,21 @@ public class HospitalServiceItemDO extends UuidIdentityEntityWithOperator implem
    @Column(name = "service_item_id")
    private String serviceItemId;//服务项目id
    @Column(name = "service_item_name")
    private String serviceItemName;//服务项目名称
    @Column(name = "status")
    private Integer status;//状态
    @Column(name = "expense")
    private Integer expense;//价格
    @Transient
    private Integer flag;//标识（1：社区，2、医院，3、社区、医院）
    @Column(name = "imediate")
    private Integer imediate;//(1:立即生效、0：未立即生效 )
    @Transient
    private SpecialistServiceItemDO specialistServiceItemDO;
@@ -103,4 +112,31 @@ public class HospitalServiceItemDO extends UuidIdentityEntityWithOperator implem
    public void setExpense(Integer expense) {
        this.expense = expense;
    }
    @Column(name = "service_item_name")
    public String getServiceItemName() {
        return serviceItemName;
    }
    public void setServiceItemName(String serviceItemName) {
        this.serviceItemName = serviceItemName;
    }
    @Transient
    public Integer getFlag() {
        return flag;
    }
    public void setFlag(Integer flag) {
        this.flag = flag;
    }
    @Column(name = "imediate")
    public Integer getImediate() {
        return imediate;
    }
    public void setImediate(Integer imediate) {
        this.imediate = imediate;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/SpecialistServiceItemDO.java

@@ -74,7 +74,7 @@ public class SpecialistServiceItemDO extends UuidIdentityEntityWithOperator impl
    private Integer status; //删除状态
    @Transient
    public Integer flag;
    public Integer flag;//标识（1：社区，2、医院，3、社区、医院）
    @Column(name = "saas_id")

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -137,6 +137,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/sms_template";
    }
    /**
     * 短信模板
     */
    public static class Sms extends Basic {
        public static final String PREFIX  = "/sms";
    }
    /**
     * 服务包
     */
@@ -180,6 +187,27 @@ public class BaseRequestMapping {
    public static class ImGetuiConfig extends Basic{
        public static final String PREFIX  = "/im_getui";
    }
    /**
     * 家庭成员管理
     */
    public static class PatientMember extends Basic{
        public static final String PREFIX = "/patient_member";
    }
    /**
     * 医生评价
     */
    public static class Score extends Basic{
        public static final String PREFIX = "/score";
    }
    /**
     * 团队
     */
    public static class team extends Basic{
        public static final String PREFIX = "/team";
    }
    /**
     * 城市字典
@@ -228,6 +256,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/basePatient";
    }
    /**
     * 基础人口基数
     */
    public static class BasePeopleNum extends Basic {
        public static final String PREFIX  = "/basePeopleNum";
    }
    /**
     * 省份字典
@@ -275,6 +310,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/dictHealthProblem";
    }
    /**
     * 健康问题字典
     */
    public static class DictDisease extends Basic {
        public static final String PREFIX  = "/dictDisease";
    }
    /**
     * 医院科室字典

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/WechatRequestMapping.java

@@ -18,6 +18,10 @@ public class WechatRequestMapping {
    }
    public static  class  WxQrcode{
        public static final String api_getQrcode="/getQrcode";
    }
    //微信按钮模块常量
    public static class WxMenu{
        public static final String api_create="/menu";

common/common-request-mapping/src/main/java/com/yihu/jw/rm/specialist/SpecialistMapping.java

@@ -73,7 +73,7 @@ public class SpecialistMapping {
        public static final String updateStatusRehabilitationOperate = "/updateStatusRehabilitationOperate";
        public static final String patientRehabilitationDetail = "/patientRehabilitationDetail";
        public static final String recentPlanDetailRecord = "/recentPlanDetailRecord";
        public static final String saveRehabilitationOperateRecodr="/saveRehabilitationOperateRecodr";
        public static final String saveRehabilitationOperateRecord="/saveRehabilitationOperateRecord";
        public static final String updateNoteAndImageRehabilitationOperate = "/updateNoteAndImageRehabilitationOperate";
        public static final String findServiceItemsByHospital = "/findServiceItemsByHospital";
@@ -96,5 +96,11 @@ public class SpecialistMapping {
        public static final String selectByHospital = "/selectByHospital";
        public static final String selectById="/selectById";
        public static final String selectItemByHospital= "/selectItemByHospital";
        public static final String selectByOperate = "/selectByOperate";
        public static final String selectByCondition="/selectByCondition";
        public static final String deleteHospitalItem = "/deleteHospitalItem";
        public static final String selectByHospital1 = "/selectByHospital1";
        public static final String importData1 = "/importData1";
        public static final String importData2 = "/importData2";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseCityVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,19 +23,31 @@ import java.util.Date;
public class BaseCityVO extends IntegerIdentityVO{
    /**
	省编码	*/
	 * 省编码
	 */
	@ApiModelProperty(value = "省编码", example = "模块1")
    private String province;
    /**
	城市编码	*/
	 * 城市编码
	 */
	@ApiModelProperty(value = "城市编码", example = "模块1")
    private String code;
    /**
	城市名称	*/
	 * 城市名称
	 */
	@ApiModelProperty(value = "城市名称", example = "模块1")
    private String name;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "省编码", example = "模块1")
    public String getProvince() {
        return province;
    }
@@ -42,7 +55,6 @@ public class BaseCityVO extends IntegerIdentityVO{
        this.province = province;
    }
	@ApiModelProperty(value = "城市编码", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -50,7 +62,6 @@ public class BaseCityVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "城市名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -58,7 +69,6 @@ public class BaseCityVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -67,5 +77,4 @@ public class BaseCityVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/area/BaseCommitteeVO.java

@@ -0,0 +1,103 @@
package com.yihu.jw.restmodel.base.area;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * 
 * 居委会vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BaseCommitteeVO", description = "居委会")
public class BaseCommitteeVO extends UuidIdentityVOWithOperator {
    /**
	 * 省标识
	 */
	@ApiModelProperty(value = "省标识", example = "模块1")
    private String province;
    /**
	 * 市标识
	 */
	@ApiModelProperty(value = "市标识", example = "模块1")
    private String city;
    /**
	 * 区县标识
	 */
	@ApiModelProperty(value = "区县标识", example = "模块1")
    private String town;
    /**
	 * 街道标识
	 */
	@ApiModelProperty(value = "街道标识", example = "模块1")
    private String street;
    /**
	 * 居委会标识
	 */
	@ApiModelProperty(value = "居委会标识", example = "模块1")
    private String code;
    /**
	 * 居委会名称
	 */
	@ApiModelProperty(value = "居委会名称", example = "模块1")
    private String name;
    public String getProvince() {
        return province;
    }
    public void setProvince(String province) {
        this.province = province;
    }
    public String getCity() {
        return city;
    }
    public void setCity(String city) {
        this.city = city;
    }
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    public String getStreet() {
        return street;
    }
    public void setStreet(String street) {
        this.street = street;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseProvinceVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,30 +9,39 @@ import java.util.Date;
/**
 * 
 * 省字典vo
 * 省份字典vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BaseProvinceVO", description = "省字典")
@ApiModel(value = "BaseProvinceVO", description = "省份字典")
public class BaseProvinceVO extends IntegerIdentityVO{
    /**
	省份编码	*/
	 * 省份编码
	 */
	@ApiModelProperty(value = "省份编码", example = "模块1")
    private String code;
    /**
	省份名称	*/
	 * 省份名称
	 */
	@ApiModelProperty(value = "省份名称", example = "模块1")
    private String name;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "省份编码", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -39,7 +49,6 @@ public class BaseProvinceVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "省份名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -47,7 +56,6 @@ public class BaseProvinceVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -56,5 +64,4 @@ public class BaseProvinceVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseStreetVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,25 +23,43 @@ import java.util.Date;
public class BaseStreetVO extends IntegerIdentityVO{
    /**
	省标识	*/
	 * 省标识
	 */
	@ApiModelProperty(value = "省标识", example = "模块1")
    private String province;
    /**
	市标识	*/
	 * 市标识
	 */
	@ApiModelProperty(value = "市标识", example = "模块1")
    private String city;
    /**
	区县标识	*/
	 * 区县标识
	 */
	@ApiModelProperty(value = "区县标识", example = "模块1")
    private String town;
    /**
	街道标识	*/
	 * 街道标识
	 */
	@ApiModelProperty(value = "街道标识", example = "模块1")
    private String code;
    /**
	街道名称	*/
	 * 街道名称
	 */
	@ApiModelProperty(value = "街道名称", example = "模块1")
    private String name;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "省标识", example = "模块1")
    public String getProvince() {
        return province;
    }
@@ -48,7 +67,6 @@ public class BaseStreetVO extends IntegerIdentityVO{
        this.province = province;
    }
	@ApiModelProperty(value = "市标识", example = "模块1")
    public String getCity() {
        return city;
    }
@@ -56,7 +74,6 @@ public class BaseStreetVO extends IntegerIdentityVO{
        this.city = city;
    }
	@ApiModelProperty(value = "区县标识", example = "模块1")
    public String getTown() {
        return town;
    }
@@ -64,7 +81,6 @@ public class BaseStreetVO extends IntegerIdentityVO{
        this.town = town;
    }
	@ApiModelProperty(value = "街道标识", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -72,7 +88,6 @@ public class BaseStreetVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "街道名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -80,7 +95,6 @@ public class BaseStreetVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -89,5 +103,4 @@ public class BaseStreetVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseTownVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.area;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,22 +23,37 @@ import java.util.Date;
public class BaseTownVO extends IntegerIdentityVO{
    /**
	省编码	*/
	 * 省编码
	 */
	@ApiModelProperty(value = "省编码", example = "模块1")
    private String province;
    /**
	城市编码	*/
	 * 城市编码
	 */
	@ApiModelProperty(value = "城市编码", example = "模块1")
    private String city;
    /**
	区县编码	*/
	 * 区县编码
	 */
	@ApiModelProperty(value = "区县编码", example = "模块1")
    private String code;
    /**
	区县名称	*/
	 * 区县名称
	 */
	@ApiModelProperty(value = "区县名称", example = "模块1")
    private String name;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "省编码", example = "模块1")
    public String getProvince() {
        return province;
    }
@@ -45,7 +61,6 @@ public class BaseTownVO extends IntegerIdentityVO{
        this.province = province;
    }
	@ApiModelProperty(value = "城市编码", example = "模块1")
    public String getCity() {
        return city;
    }
@@ -53,7 +68,6 @@ public class BaseTownVO extends IntegerIdentityVO{
        this.city = city;
    }
	@ApiModelProperty(value = "区县编码", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -61,7 +75,6 @@ public class BaseTownVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "区县名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -69,7 +82,6 @@ public class BaseTownVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -78,5 +90,4 @@ public class BaseTownVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictDiseaseVO.java

@@ -0,0 +1,80 @@
package com.yihu.jw.restmodel.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
 * 
 * 病种字典vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "DictDiseaseVO", description = "病种字典")
public class DictDiseaseVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    private String saasId;
    /**
	 * 疾病编码
	 */
	@ApiModelProperty(value = "疾病编码", example = "模块1")
    private String code;
    /**
	 * 疾病名称
	 */
	@ApiModelProperty(value = "疾病名称", example = "模块1")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictHealthProblemVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,22 +23,37 @@ import java.util.Date;
public class DictHealthProblemVO extends IntegerIdentityVO{
    /**
	saas配置id，null标识公共字典	*/
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    private String saasId;
    /**
	字典编码	*/
	 * 字典编码
	 */
	@ApiModelProperty(value = "字典编码", example = "模块1")
    private String code;
    /**
	字典名称	*/
	 * 字典名称
	 */
	@ApiModelProperty(value = "字典名称", example = "模块1")
    private String name;
    /**
	描述	*/
	 * 描述
	 */
	@ApiModelProperty(value = "描述", example = "模块1")
    private String description;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    public String getSaasId() {
        return saasId;
    }
@@ -45,7 +61,6 @@ public class DictHealthProblemVO extends IntegerIdentityVO{
        this.saasId = saasId;
    }
	@ApiModelProperty(value = "字典编码", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -53,7 +68,6 @@ public class DictHealthProblemVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "字典名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -61,7 +75,6 @@ public class DictHealthProblemVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "描述", example = "模块1")
    public String getDescription() {
        return description;
    }
@@ -69,7 +82,6 @@ public class DictHealthProblemVO extends IntegerIdentityVO{
        this.description = description;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -78,5 +90,4 @@ public class DictHealthProblemVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictHospitalDeptVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,19 +23,31 @@ import java.util.Date;
public class DictHospitalDeptVO extends IntegerIdentityVO{
    /**
	saas配置id，null标识公共字典	*/
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    private String saasId;
    /**
	科室标识	*/
	 * 科室标识
	 */
	@ApiModelProperty(value = "科室标识", example = "模块1")
    private String code;
    /**
	科室名称	*/
	 * 科室名称
	 */
	@ApiModelProperty(value = "科室名称", example = "模块1")
    private String name;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    public String getSaasId() {
        return saasId;
    }
@@ -42,7 +55,6 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
        this.saasId = saasId;
    }
	@ApiModelProperty(value = "科室标识", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -50,7 +62,6 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "科室名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -58,7 +69,6 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -67,5 +77,4 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictIcd10VO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,31 +23,55 @@ import java.util.Date;
public class DictIcd10VO extends IntegerIdentityVO{
    /**
	saas配置id，null标识公共字典	*/
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    private String saasId;
    /**
	icd10字典编码	*/
	 * icd10字典编码
	 */
	@ApiModelProperty(value = "icd10字典编码", example = "模块1")
    private String code;
    /**
	icd10字典名称	*/
	 * icd10字典名称
	 */
	@ApiModelProperty(value = "icd10字典名称", example = "模块1")
    private String name;
    /**
	字典名称拼音首字母	*/
	 * 字典名称拼音首字母
	 */
	@ApiModelProperty(value = "字典名称拼音首字母", example = "模块1")
    private String phoneticCode;
    /**
	是否慢病	*/
	 * 是否慢病
	 */
	@ApiModelProperty(value = "是否慢病", example = "模块1")
    private String chronicFlag;
    /**
	是否传染病	*/
	 * 是否传染病
	 */
	@ApiModelProperty(value = "是否传染病", example = "模块1")
    private String infectiousFlag;
    /**
	描述	*/
	 * 描述
	 */
	@ApiModelProperty(value = "描述", example = "模块1")
    private String description;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    public String getSaasId() {
        return saasId;
    }
@@ -54,7 +79,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.saasId = saasId;
    }
	@ApiModelProperty(value = "icd10字典编码", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -62,7 +86,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "icd10字典名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -70,7 +93,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "字典名称拼音首字母", example = "模块1")
    public String getPhoneticCode() {
        return phoneticCode;
    }
@@ -78,7 +100,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.phoneticCode = phoneticCode;
    }
	@ApiModelProperty(value = "是否慢病", example = "模块1")
    public String getChronicFlag() {
        return chronicFlag;
    }
@@ -86,7 +107,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.chronicFlag = chronicFlag;
    }
	@ApiModelProperty(value = "是否传染病", example = "模块1")
    public String getInfectiousFlag() {
        return infectiousFlag;
    }
@@ -94,7 +114,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.infectiousFlag = infectiousFlag;
    }
	@ApiModelProperty(value = "描述", example = "模块1")
    public String getDescription() {
        return description;
    }
@@ -102,7 +121,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.description = description;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -111,5 +129,4 @@ public class DictIcd10VO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictJobTitleVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,19 +23,31 @@ import java.util.Date;
public class DictJobTitleVO extends IntegerIdentityVO{
    /**
	saas配置id，null标识公共字典	*/
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    private String saasId;
    /**
	职称标识	*/
	 * 职称标识
	 */
	@ApiModelProperty(value = "职称标识", example = "模块1")
    private String code;
    /**
	职称名	*/
	 * 职称名
	 */
	@ApiModelProperty(value = "职称名", example = "模块1")
    private String name;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    public String getSaasId() {
        return saasId;
    }
@@ -42,7 +55,6 @@ public class DictJobTitleVO extends IntegerIdentityVO{
        this.saasId = saasId;
    }
	@ApiModelProperty(value = "职称标识", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -50,7 +62,6 @@ public class DictJobTitleVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "职称名", example = "模块1")
    public String getName() {
        return name;
    }
@@ -58,7 +69,6 @@ public class DictJobTitleVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -67,5 +77,4 @@ public class DictJobTitleVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictMedicineVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,22 +23,37 @@ import java.util.Date;
public class DictMedicineVO extends IntegerIdentityVO{
    /**
	saas配置id，null标识公共字典	*/
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    private String saasId;
    /**
	药品编码	*/
	 * 药品编码
	 */
	@ApiModelProperty(value = "药品编码", example = "模块1")
    private String code;
    /**
	药品名称	*/
	 * 药品名称
	 */
	@ApiModelProperty(value = "药品名称", example = "模块1")
    private String name;
    /**
	药品类型：1健康记录	*/
	 * 药品类型：1健康记录
	 */
	@ApiModelProperty(value = "药品类型：1健康记录", example = "模块1")
    private String type;
    /**
	创建时间	*/
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    public String getSaasId() {
        return saasId;
    }
@@ -45,7 +61,6 @@ public class DictMedicineVO extends IntegerIdentityVO{
        this.saasId = saasId;
    }
	@ApiModelProperty(value = "药品编码", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -53,7 +68,6 @@ public class DictMedicineVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "药品名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -61,7 +75,6 @@ public class DictMedicineVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "药品类型：1健康记录", example = "模块1")
    public String getType() {
        return type;
    }
@@ -69,7 +82,6 @@ public class DictMedicineVO extends IntegerIdentityVO{
        this.type = type;
    }
	@ApiModelProperty(value = "创建时间", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -78,5 +90,4 @@ public class DictMedicineVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseDoctorHospitalVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.doctor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,45 +9,69 @@ import java.util.Date;
/**
 * 
 * 医生职业信息vo
 * 医生执业信息vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BaseDoctorHospitalVO", description = "医生职业信息")
@ApiModel(value = "BaseDoctorHospitalVO", description = "医生执业信息")
public class BaseDoctorHospitalVO extends IntegerIdentityVO{
    /**
	医院标识	*/
	 * 医院标识
	 */
	@ApiModelProperty(value = "医院标识", example = "模块1")
    private String hospCode;
    /**
	医院名称	*/
	 * 医院名称
	 */
	@ApiModelProperty(value = "医院名称", example = "模块1")
    private String hospName;
    /**
	医生角色标识	*/
	 * 医生角色标识
	 */
	@ApiModelProperty(value = "医生角色标识", example = "模块1")
    private String roleCode;
    /**
	医院角色名称	*/
	 * 医院角色名称
	 */
	@ApiModelProperty(value = "医院角色名称", example = "模块1")
    private String roleName;
    /**
	职称代码	*/
	 * 职称代码
	 */
	@ApiModelProperty(value = "职称代码", example = "模块1")
    private String jobTitleCode;
    /**
	职称名称	*/
	 * 职称名称
	 */
	@ApiModelProperty(value = "职称名称", example = "模块1")
    private String jobTitleName;
    /**
	作废标识，1正常，0作废	*/
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
    /**
		*/
	 * 
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "医院标识", example = "模块1")
    public String getHospCode() {
        return hospCode;
    }
@@ -54,7 +79,6 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
        this.hospCode = hospCode;
    }
	@ApiModelProperty(value = "医院名称", example = "模块1")
    public String getHospName() {
        return hospName;
    }
@@ -62,7 +86,6 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
        this.hospName = hospName;
    }
	@ApiModelProperty(value = "医生角色标识", example = "模块1")
    public String getRoleCode() {
        return roleCode;
    }
@@ -70,7 +93,6 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
        this.roleCode = roleCode;
    }
	@ApiModelProperty(value = "医院角色名称", example = "模块1")
    public String getRoleName() {
        return roleName;
    }
@@ -78,7 +100,6 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
        this.roleName = roleName;
    }
	@ApiModelProperty(value = "职称代码", example = "模块1")
    public String getJobTitleCode() {
        return jobTitleCode;
    }
@@ -86,7 +107,6 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
        this.jobTitleCode = jobTitleCode;
    }
	@ApiModelProperty(value = "职称名称", example = "模块1")
    public String getJobTitleName() {
        return jobTitleName;
    }
@@ -94,7 +114,6 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
        this.jobTitleName = jobTitleName;
    }
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    public String getDel() {
        return del;
    }
@@ -102,7 +121,6 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
        this.del = del;
    }
	@ApiModelProperty(value = "", example = "模块1")
    public Date getCreateTime() {
        return createTime;
    }
@@ -111,5 +129,4 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseDoctorRoleDictVO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.doctor;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
@@ -13,7 +13,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,16 +22,24 @@ import java.util.Date;
public class BaseDoctorRoleDictVO extends IntegerIdentityVO{
    /**
	角色code	*/
	 * 角色code
	 */
	@ApiModelProperty(value = "角色code", example = "模块1")
    private String code;
    /**
	角色名称：全科医生、专科医生、健康管理师、管理员等	*/
	 * 角色名称：全科医生、专科医生、健康管理师、管理员等
	 */
	@ApiModelProperty(value = "角色名称：全科医生、专科医生、健康管理师、管理员等", example = "模块1")
    private String name;
    /**
	作废标识，1正常，0作废	*/
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
	@ApiModelProperty(value = "角色code", example = "模块1")
    public String getCode() {
        return code;
    }
@@ -39,7 +47,6 @@ public class BaseDoctorRoleDictVO extends IntegerIdentityVO{
        this.code = code;
    }
	@ApiModelProperty(value = "角色名称：全科医生、专科医生、健康管理师、管理员等", example = "模块1")
    public String getName() {
        return name;
    }
@@ -47,7 +54,6 @@ public class BaseDoctorRoleDictVO extends IntegerIdentityVO{
        this.name = name;
    }
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    public String getDel() {
        return del;
    }
@@ -56,5 +62,4 @@ public class BaseDoctorRoleDictVO extends IntegerIdentityVO{
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseDoctorVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.doctor;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,105 +9,190 @@ import java.util.Date;
/**
 * 
 * 医生基础信息vo
 * 医生基本信息vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BaseDoctorVO", description = "医生基础信息")
@ApiModel(value = "BaseDoctorVO", description = "医生基本信息")
public class BaseDoctorVO extends UuidIdentityVOWithOperator {
    /**
	机构id	*/
	 * 机构id
	 */
	@ApiModelProperty(value = "机构id", example = "模块1")
    private String orgId;
    /**
	密码	*/
	 * 密码
	 */
	@ApiModelProperty(value = "密码", example = "模块1")
    private String password;
    /**
		*/
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String salt;
    /**
	姓名	*/
	 * 姓名
	 */
	@ApiModelProperty(value = "姓名", example = "模块1")
    private String name;
    /**
	性别（1男，2女） 用国家标准字典	*/
	 * 性别（1男，2女） 用国家标准字典
	 */
	@ApiModelProperty(value = "性别（1男，2女） 用国家标准字典", example = "模块1")
    private String sex;
    /**
	医生专长	*/
	 * 医生专长
	 */
	@ApiModelProperty(value = "医生专长", example = "模块1")
    private String expertise;
    /**
	医生介绍	*/
	 * 医生介绍
	 */
	@ApiModelProperty(value = "医生介绍", example = "模块1")
    private String introduce;
    /**
	 身份证	*/
	 *  身份证
	 */
	@ApiModelProperty(value = " 身份证", example = "模块1")
    private String idcard;
    /**
	生日	*/
	 * 生日
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "生日", example = "模块1")
    private Date birthday;
    /**
	头像http地址	*/
	 * 头像http地址
	 */
	@ApiModelProperty(value = "头像http地址", example = "模块1")
    private String photo;
    /**
	手机号	*/
	 * 手机号
	 */
	@ApiModelProperty(value = "手机号", example = "模块1")
    private String mobile;
    /**
	医生二维码	*/
	 * 医生二维码
	 */
	@ApiModelProperty(value = "医生二维码", example = "模块1")
    private String qrcode;
    /**
	省代码	*/
	 * 省代码
	 */
	@ApiModelProperty(value = "省代码", example = "模块1")
    private String provinceCode;
    /**
	省名称	*/
	 * 省名称
	 */
	@ApiModelProperty(value = "省名称", example = "模块1")
    private String provinceName;
    /**
	市代码	*/
	 * 市代码
	 */
	@ApiModelProperty(value = "市代码", example = "模块1")
    private String cityCode;
    /**
	市名称	*/
	 * 市名称
	 */
	@ApiModelProperty(value = "市名称", example = "模块1")
    private String cityName;
    /**
	区县代码	*/
	 * 区县代码
	 */
	@ApiModelProperty(value = "区县代码", example = "模块1")
    private String townCode;
    /**
	区县名称	*/
	 * 区县名称
	 */
	@ApiModelProperty(value = "区县名称", example = "模块1")
    private String townName;
    /**
	街道代码	*/
	 * 街道代码
	 */
	@ApiModelProperty(value = "街道代码", example = "模块1")
    private String streetCode;
    /**
	街道名称	*/
	 * 街道名称
	 */
	@ApiModelProperty(value = "街道名称", example = "模块1")
    private String streetName;
    /**
	资格是否认证通过，1是，0否	*/
	 * 资格是否认证通过，1是，0否
	 */
	@ApiModelProperty(value = "资格是否认证通过，1是，0否", example = "模块1")
    private String iscertified;
    /**
	是否是名医，1是，0否	*/
	 * 是否是名医，1是，0否
	 */
	@ApiModelProperty(value = "是否是名医，1是，0否", example = "模块1")
    private String isFamous;
    /**
	是否提示设置密码  1 提示过 0未提示	*/
	 * 是否提示设置密码  1 提示过 0未提示
	 */
	@ApiModelProperty(value = "是否提示设置密码  1 提示过 0未提示", example = "模块1")
    private String isPasswordPrompt;
    /**
	名称拼音首字母	*/
	 * 名称拼音首字母
	 */
	@ApiModelProperty(value = "名称拼音首字母", example = "模块1")
    private String spell;
    /**
	CA证书过期时间	*/
	 * CA证书过期时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "CA证书过期时间", example = "模块1")
    private Date certifiedOvertime;
    /**
	CA证书编号	*/
	 * CA证书编号
	 */
	@ApiModelProperty(value = "CA证书编号", example = "模块1")
    private String certificateNum;
    /**
		*/
	 * 用户微信openid
	 */
	@ApiModelProperty(value = "用户微信openid", example = "模块1")
    private String openid;
    /**
	作废标识，1正常，0作废	*/
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
	@ApiModelProperty(value = "机构id", example = "模块1")
    public String getOrgId() {
        return orgId;
    }
@@ -114,7 +200,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.orgId = orgId;
    }
	@ApiModelProperty(value = "密码", example = "模块1")
    public String getPassword() {
        return password;
    }
@@ -122,7 +207,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.password = password;
    }
	@ApiModelProperty(value = "", example = "模块1")
    public String getSalt() {
        return salt;
    }
@@ -130,7 +214,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.salt = salt;
    }
	@ApiModelProperty(value = "姓名", example = "模块1")
    public String getName() {
        return name;
    }
@@ -138,7 +221,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.name = name;
    }
	@ApiModelProperty(value = "性别（1男，2女） 用国家标准字典", example = "模块1")
    public String getSex() {
        return sex;
    }
@@ -146,7 +228,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.sex = sex;
    }
	@ApiModelProperty(value = "医生专长", example = "模块1")
    public String getExpertise() {
        return expertise;
    }
@@ -154,7 +235,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.expertise = expertise;
    }
	@ApiModelProperty(value = "医生介绍", example = "模块1")
    public String getIntroduce() {
        return introduce;
    }
@@ -162,7 +242,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.introduce = introduce;
    }
	@ApiModelProperty(value = " 身份证", example = "模块1")
    public String getIdcard() {
        return idcard;
    }
@@ -170,7 +249,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.idcard = idcard;
    }
	@ApiModelProperty(value = "生日", example = "模块1")
    public Date getBirthday() {
        return birthday;
    }
@@ -178,7 +256,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.birthday = birthday;
    }
	@ApiModelProperty(value = "头像http地址", example = "模块1")
    public String getPhoto() {
        return photo;
    }
@@ -186,7 +263,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.photo = photo;
    }
	@ApiModelProperty(value = "手机号", example = "模块1")
    public String getMobile() {
        return mobile;
    }
@@ -194,7 +270,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.mobile = mobile;
    }
	@ApiModelProperty(value = "医生二维码", example = "模块1")
    public String getQrcode() {
        return qrcode;
    }
@@ -202,7 +277,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.qrcode = qrcode;
    }
	@ApiModelProperty(value = "省代码", example = "模块1")
    public String getProvinceCode() {
        return provinceCode;
    }
@@ -210,7 +284,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.provinceCode = provinceCode;
    }
	@ApiModelProperty(value = "省名称", example = "模块1")
    public String getProvinceName() {
        return provinceName;
    }
@@ -218,7 +291,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.provinceName = provinceName;
    }
	@ApiModelProperty(value = "市代码", example = "模块1")
    public String getCityCode() {
        return cityCode;
    }
@@ -226,7 +298,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.cityCode = cityCode;
    }
	@ApiModelProperty(value = "市名称", example = "模块1")
    public String getCityName() {
        return cityName;
    }
@@ -234,7 +305,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.cityName = cityName;
    }
	@ApiModelProperty(value = "区县代码", example = "模块1")
    public String getTownCode() {
        return townCode;
    }
@@ -242,7 +312,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.townCode = townCode;
    }
	@ApiModelProperty(value = "区县名称", example = "模块1")
    public String getTownName() {
        return townName;
    }
@@ -250,7 +319,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.townName = townName;
    }
	@ApiModelProperty(value = "街道代码", example = "模块1")
    public String getStreetCode() {
        return streetCode;
    }
@@ -258,7 +326,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.streetCode = streetCode;
    }
	@ApiModelProperty(value = "街道名称", example = "模块1")
    public String getStreetName() {
        return streetName;
    }
@@ -266,7 +333,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.streetName = streetName;
    }
	@ApiModelProperty(value = "资格是否认证通过，1是，0否", example = "模块1")
    public String getIscertified() {
        return iscertified;
    }
@@ -274,7 +340,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.iscertified = iscertified;
    }
	@ApiModelProperty(value = "是否是名医，1是，0否", example = "模块1")
    public String getIsFamous() {
        return isFamous;
    }
@@ -282,7 +347,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.isFamous = isFamous;
    }
	@ApiModelProperty(value = "是否提示设置密码  1 提示过 0未提示", example = "模块1")
    public String getIsPasswordPrompt() {
        return isPasswordPrompt;
    }
@@ -290,7 +354,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.isPasswordPrompt = isPasswordPrompt;
    }
	@ApiModelProperty(value = "名称拼音首字母", example = "模块1")
    public String getSpell() {
        return spell;
    }
@@ -298,7 +361,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.spell = spell;
    }
	@ApiModelProperty(value = "CA证书过期时间", example = "模块1")
    public Date getCertifiedOvertime() {
        return certifiedOvertime;
    }
@@ -306,7 +368,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.certifiedOvertime = certifiedOvertime;
    }
	@ApiModelProperty(value = "CA证书编号", example = "模块1")
    public String getCertificateNum() {
        return certificateNum;
    }
@@ -314,7 +375,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.certificateNum = certificateNum;
    }
	@ApiModelProperty(value = "", example = "模块1")
    public String getOpenid() {
        return openid;
    }
@@ -322,7 +382,6 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
        this.openid = openid;
    }
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    public String getDel() {
        return del;
    }
@@ -331,5 +390,4 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseOrgVO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.org;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
@@ -8,78 +8,134 @@ import java.util.Date;
/**
 * 
 * 机构信息vo
 * 机构信息（医院）vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BaseOrgVO", description = "机构信息")
@ApiModel(value = "BaseOrgVO", description = "机构信息（医院）")
public class BaseOrgVO extends UuidIdentityVOWithOperator {
    /**
	saas化配置	*/
	 * saas化配置
	 */
	@ApiModelProperty(value = "saas化配置", example = "模块1")
    private String saasid;
    /**
	省份标识	*/
	 * 省份标识
	 */
	@ApiModelProperty(value = "省份标识", example = "模块1")
    private String provinceCode;
    /**
	城市标识	*/
	 * 城市标识
	 */
	@ApiModelProperty(value = "城市标识", example = "模块1")
    private String cityCode;
    /**
	区县标识	*/
	 * 区县标识
	 */
	@ApiModelProperty(value = "区县标识", example = "模块1")
    private String townCode;
    /**
	机构名称	*/
	 * 机构名称
	 */
	@ApiModelProperty(value = "机构名称", example = "模块1")
    private String name;
    /**
	机构别名	*/
	 * 机构别名
	 */
	@ApiModelProperty(value = "机构别名", example = "模块1")
    private String alias;
    /**
	机构名称拼音首字母	*/
	 * 机构名称拼音首字母
	 */
	@ApiModelProperty(value = "机构名称拼音首字母", example = "模块1")
    private String spell;
    /**
	机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构	*/
	 * 机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构
	 */
	@ApiModelProperty(value = "机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构", example = "模块1")
    private String type;
    /**
	机构简介	*/
	 * 机构简介
	 */
	@ApiModelProperty(value = "机构简介", example = "模块1")
    private String brief;
    /**
	机构详细地址	*/
	 * 机构详细地址
	 */
	@ApiModelProperty(value = "机构详细地址", example = "模块1")
    private String address;
    /**
	机构图片	*/
	 * 机构图片
	 */
	@ApiModelProperty(value = "机构图片", example = "模块1")
    private String photo;
    /**
	经度	*/
	 * 经度
	 */
	@ApiModelProperty(value = "经度", example = "模块1")
    private String longitude;
    /**
	纬度	*/
	 * 纬度
	 */
	@ApiModelProperty(value = "纬度", example = "模块1")
    private String latitude;
    /**
	法人	*/
	 * 法人
	 */
	@ApiModelProperty(value = "法人", example = "模块1")
    private String legalperson;
    /**
	机构管理员	*/
	 * 机构管理员
	 */
	@ApiModelProperty(value = "机构管理员", example = "模块1")
    private String orgAdmin;
    /**
	机构网址	*/
	 * 机构网址
	 */
	@ApiModelProperty(value = "机构网址", example = "模块1")
    private String orgUrl;
    /**
	机构简介	*/
	 * 机构简介
	 */
	@ApiModelProperty(value = "机构简介", example = "模块1")
    private String intro;
    /**
	机构二维码	*/
	 * 机构二维码
	 */
	@ApiModelProperty(value = "机构二维码", example = "模块1")
    private String qrcode;
    /**
	作废标识，1正常，0作废	*/
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
	@ApiModelProperty(value = "saas化配置", example = "模块1")
    public String getSaasid() {
        return saasid;
    }
@@ -87,7 +143,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.saasid = saasid;
    }
	@ApiModelProperty(value = "省份标识", example = "模块1")
    public String getProvinceCode() {
        return provinceCode;
    }
@@ -95,7 +150,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.provinceCode = provinceCode;
    }
	@ApiModelProperty(value = "城市标识", example = "模块1")
    public String getCityCode() {
        return cityCode;
    }
@@ -103,7 +157,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.cityCode = cityCode;
    }
	@ApiModelProperty(value = "区县标识", example = "模块1")
    public String getTownCode() {
        return townCode;
    }
@@ -111,7 +164,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.townCode = townCode;
    }
	@ApiModelProperty(value = "机构名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -119,7 +171,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.name = name;
    }
	@ApiModelProperty(value = "机构别名", example = "模块1")
    public String getAlias() {
        return alias;
    }
@@ -127,7 +178,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.alias = alias;
    }
	@ApiModelProperty(value = "机构名称拼音首字母", example = "模块1")
    public String getSpell() {
        return spell;
    }
@@ -135,7 +185,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.spell = spell;
    }
	@ApiModelProperty(value = "机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构", example = "模块1")
    public String getType() {
        return type;
    }
@@ -143,7 +192,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.type = type;
    }
	@ApiModelProperty(value = "机构简介", example = "模块1")
    public String getBrief() {
        return brief;
    }
@@ -151,7 +199,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.brief = brief;
    }
	@ApiModelProperty(value = "机构详细地址", example = "模块1")
    public String getAddress() {
        return address;
    }
@@ -159,7 +206,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.address = address;
    }
	@ApiModelProperty(value = "机构图片", example = "模块1")
    public String getPhoto() {
        return photo;
    }
@@ -167,7 +213,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.photo = photo;
    }
	@ApiModelProperty(value = "经度", example = "模块1")
    public String getLongitude() {
        return longitude;
    }
@@ -175,7 +220,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.longitude = longitude;
    }
	@ApiModelProperty(value = "纬度", example = "模块1")
    public String getLatitude() {
        return latitude;
    }
@@ -183,7 +227,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.latitude = latitude;
    }
	@ApiModelProperty(value = "法人", example = "模块1")
    public String getLegalperson() {
        return legalperson;
    }
@@ -191,7 +234,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.legalperson = legalperson;
    }
	@ApiModelProperty(value = "机构管理员", example = "模块1")
    public String getOrgAdmin() {
        return orgAdmin;
    }
@@ -199,7 +241,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.orgAdmin = orgAdmin;
    }
	@ApiModelProperty(value = "机构网址", example = "模块1")
    public String getOrgUrl() {
        return orgUrl;
    }
@@ -207,7 +248,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.orgUrl = orgUrl;
    }
	@ApiModelProperty(value = "机构简介", example = "模块1")
    public String getIntro() {
        return intro;
    }
@@ -215,7 +255,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.intro = intro;
    }
	@ApiModelProperty(value = "机构二维码", example = "模块1")
    public String getQrcode() {
        return qrcode;
    }
@@ -223,7 +262,6 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
        this.qrcode = qrcode;
    }
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    public String getDel() {
        return del;
    }
@@ -232,5 +270,4 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BasePatientVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.patient;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,126 +9,233 @@ import java.util.Date;
/**
 * 
 * 居民信息vo
 * 居民信息（居民就是患者）vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BasePatientVO", description = "居民信息")
@ApiModel(value = "BasePatientVO", description = "居民信息（居民就是患者）")
public class BasePatientVO extends UuidIdentityVOWithOperator {
    /**
	saas配置id	*/
	 * saas配置id
	 */
	@ApiModelProperty(value = "saas配置id", example = "模块1")
    private String saasId;
    /**
	身份证号	*/
	 * 身份证号
	 */
	@ApiModelProperty(value = "身份证号", example = "模块1")
    private String idcard;
    /**
	登录密码	*/
	 * 登录密码
	 */
	@ApiModelProperty(value = "登录密码", example = "模块1")
    private String password;
    /**
		*/
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String salt;
    /**
	姓名	*/
	 * 姓名
	 */
	@ApiModelProperty(value = "姓名", example = "模块1")
    private String name;
    /**
	生日	*/
	 * 生日
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "生日", example = "模块1")
    private Date birthday;
    /**
	性别，1男，2女	*/
    private String sex;
	 * 性别，1男，2女
	 */
	@ApiModelProperty(value = "性别，1男，2女", example = "模块1")
    private Integer sex;
    /**
	手机号	*/
	 * 手机号
	 */
	@ApiModelProperty(value = "手机号", example = "模块1")
    private String mobile;
    /**
	联系电话	*/
	 * 联系电话
	 */
	@ApiModelProperty(value = "联系电话", example = "模块1")
    private String phone;
    /**
	社保卡号	*/
	 * 社保卡号
	 */
	@ApiModelProperty(value = "社保卡号", example = "模块1")
    private String ssc;
    /**
	头像http地址	*/
	 * 头像http地址
	 */
	@ApiModelProperty(value = "头像http地址", example = "模块1")
    private String photo;
    /**
	省编码	*/
	 * 省编码
	 */
	@ApiModelProperty(value = "省编码", example = "模块1")
    private String provinceCode;
    /**
	市编码	*/
	 * 市编码
	 */
	@ApiModelProperty(value = "市编码", example = "模块1")
    private String cityCode;
    /**
	区县编码	*/
	 * 区县编码
	 */
	@ApiModelProperty(value = "区县编码", example = "模块1")
    private String townCode;
    /**
	街道编码	*/
	 * 街道编码
	 */
	@ApiModelProperty(value = "街道编码", example = "模块1")
    private String streetCode;
    /**
	具体详细地址	*/
	 * 具体详细地址
	 */
	@ApiModelProperty(value = "具体详细地址", example = "模块1")
    private String address;
    /**
	疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病	*/
	 * 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
	 */
	@ApiModelProperty(value = "疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病", example = "模块1")
    private String disease;
    /**
	病情：0绿标，1黄标，2红标，3重点关注,	*/
	 * 病情：0绿标，1黄标，2红标，3重点关注,
	 */
	@ApiModelProperty(value = "病情：0绿标，1黄标，2红标，3重点关注,", example = "模块1")
    private String diseaseCondition;
    /**
	总积分	*/
	 * 总积分
	 */
	@ApiModelProperty(value = "总积分", example = "模块1")
    private String points;
    /**
	病历总数	*/
	 * 病历总数
	 */
	@ApiModelProperty(value = "病历总数", example = "模块1")
    private String recordAmount;
    /**
	微信编号	*/
	 * 微信编号
	 */
	@ApiModelProperty(value = "微信编号", example = "模块1")
    private String openid;
    /**
	用户状态：1正常，0禁用，-1恶意注册，2审核中	*/
	 * 用户状态：1正常，0禁用，-1恶意注册，2审核中
	 */
	@ApiModelProperty(value = "用户状态：1正常，0禁用，-1恶意注册，2审核中", example = "模块1")
    private String patientStatus;
    /**
	联系方式备注【基卫】	*/
	 * 联系方式备注【基卫】
	 */
	@ApiModelProperty(value = "联系方式备注【基卫】", example = "模块1")
    private String mobileRemarks;
    /**
	第一次添加open的时间	*/
	 * 第一次添加open的时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "第一次添加open的时间", example = "模块1")
    private Date openidTime;
    /**
	居委会代码	*/
	 * 居委会代码
	 */
	@ApiModelProperty(value = "居委会代码", example = "模块1")
    private String sickVillage;
    /**
		*/
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
    private String sickVillageName;
    /**
	绑定电子社保卡主体（共济为操作人code）	*/
	 * 绑定电子社保卡主体（共济为操作人code）
	 */
	@ApiModelProperty(value = "绑定电子社保卡主体（共济为操作人code）", example = "模块1")
    private String principalCode;
    /**
	是否绑定电子社保卡 （0否 1是）	*/
	 * 是否绑定电子社保卡 （0否 1是）
	 */
	@ApiModelProperty(value = "是否绑定电子社保卡 （0否 1是）", example = "模块1")
    private String sicardStatus;
    /**
	电子社保卡绑定时间	*/
	 * 电子社保卡绑定时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "电子社保卡绑定时间", example = "模块1")
    private Date sicardTime;
    /**
	是否分配过微信标签	*/
	 * 是否分配过微信标签
	 */
	@ApiModelProperty(value = "是否分配过微信标签", example = "模块1")
    private Integer isWxtag;
    /**
	微信tagId	*/
	 * 微信tagId
	 */
	@ApiModelProperty(value = "微信tagId", example = "模块1")
    private String wxtagid;
    /**
	居民预警状态：0为标准，1为预警状态	*/
	 * 居民预警状态：0为标准，1为预警状态
	 */
	@ApiModelProperty(value = "居民预警状态：0为标准，1为预警状态", example = "模块1")
    private Integer standardStatus;
    /**
	医疗保险号	*/
	 * 医疗保险号
	 */
	@ApiModelProperty(value = "医疗保险号", example = "模块1")
    private String medicareNumber;
    /**
	unionId 开发平台唯一标识	*/
	 * unionId 开发平台唯一标识
	 */
	@ApiModelProperty(value = "unionId 开发平台唯一标识", example = "模块1")
    private String unionid;
    /**
	作废标识，1正常，0作废	*/
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
	@ApiModelProperty(value = "saas配置id", example = "模块1")
    public String getSaasId() {
        return saasId;
    }
@@ -135,7 +243,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.saasId = saasId;
    }
	@ApiModelProperty(value = "身份证号", example = "模块1")
    public String getIdcard() {
        return idcard;
    }
@@ -143,7 +250,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.idcard = idcard;
    }
	@ApiModelProperty(value = "登录密码", example = "模块1")
    public String getPassword() {
        return password;
    }
@@ -151,7 +257,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.password = password;
    }
	@ApiModelProperty(value = "", example = "模块1")
    public String getSalt() {
        return salt;
    }
@@ -159,7 +264,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.salt = salt;
    }
	@ApiModelProperty(value = "姓名", example = "模块1")
    public String getName() {
        return name;
    }
@@ -167,7 +271,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.name = name;
    }
	@ApiModelProperty(value = "生日", example = "模块1")
    public Date getBirthday() {
        return birthday;
    }
@@ -175,15 +278,13 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.birthday = birthday;
    }
	@ApiModelProperty(value = "性别，1男，2女", example = "模块1")
    public String getSex() {
    public Integer getSex() {
        return sex;
    }
    public void setSex(String sex) {
    public void setSex(Integer sex) {
        this.sex = sex;
    }
	@ApiModelProperty(value = "手机号", example = "模块1")
    public String getMobile() {
        return mobile;
    }
@@ -191,7 +292,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.mobile = mobile;
    }
	@ApiModelProperty(value = "联系电话", example = "模块1")
    public String getPhone() {
        return phone;
    }
@@ -199,7 +299,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.phone = phone;
    }
	@ApiModelProperty(value = "社保卡号", example = "模块1")
    public String getSsc() {
        return ssc;
    }
@@ -207,7 +306,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.ssc = ssc;
    }
	@ApiModelProperty(value = "头像http地址", example = "模块1")
    public String getPhoto() {
        return photo;
    }
@@ -215,7 +313,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.photo = photo;
    }
	@ApiModelProperty(value = "省编码", example = "模块1")
    public String getProvinceCode() {
        return provinceCode;
    }
@@ -223,7 +320,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.provinceCode = provinceCode;
    }
	@ApiModelProperty(value = "市编码", example = "模块1")
    public String getCityCode() {
        return cityCode;
    }
@@ -231,7 +327,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.cityCode = cityCode;
    }
	@ApiModelProperty(value = "区县编码", example = "模块1")
    public String getTownCode() {
        return townCode;
    }
@@ -239,7 +334,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.townCode = townCode;
    }
	@ApiModelProperty(value = "街道编码", example = "模块1")
    public String getStreetCode() {
        return streetCode;
    }
@@ -247,7 +341,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.streetCode = streetCode;
    }
	@ApiModelProperty(value = "具体详细地址", example = "模块1")
    public String getAddress() {
        return address;
    }
@@ -255,7 +348,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.address = address;
    }
	@ApiModelProperty(value = "疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病", example = "模块1")
    public String getDisease() {
        return disease;
    }
@@ -263,7 +355,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.disease = disease;
    }
	@ApiModelProperty(value = "病情：0绿标，1黄标，2红标，3重点关注,", example = "模块1")
    public String getDiseaseCondition() {
        return diseaseCondition;
    }
@@ -271,7 +362,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.diseaseCondition = diseaseCondition;
    }
	@ApiModelProperty(value = "总积分", example = "模块1")
    public String getPoints() {
        return points;
    }
@@ -279,7 +369,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.points = points;
    }
	@ApiModelProperty(value = "病历总数", example = "模块1")
    public String getRecordAmount() {
        return recordAmount;
    }
@@ -287,7 +376,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.recordAmount = recordAmount;
    }
	@ApiModelProperty(value = "微信编号", example = "模块1")
    public String getOpenid() {
        return openid;
    }
@@ -295,7 +383,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.openid = openid;
    }
	@ApiModelProperty(value = "用户状态：1正常，0禁用，-1恶意注册，2审核中", example = "模块1")
    public String getPatientStatus() {
        return patientStatus;
    }
@@ -303,7 +390,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.patientStatus = patientStatus;
    }
	@ApiModelProperty(value = "联系方式备注【基卫】", example = "模块1")
    public String getMobileRemarks() {
        return mobileRemarks;
    }
@@ -311,7 +397,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.mobileRemarks = mobileRemarks;
    }
	@ApiModelProperty(value = "第一次添加open的时间", example = "模块1")
    public Date getOpenidTime() {
        return openidTime;
    }
@@ -319,7 +404,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.openidTime = openidTime;
    }
	@ApiModelProperty(value = "居委会代码", example = "模块1")
    public String getSickVillage() {
        return sickVillage;
    }
@@ -327,7 +411,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.sickVillage = sickVillage;
    }
	@ApiModelProperty(value = "", example = "模块1")
    public String getSickVillageName() {
        return sickVillageName;
    }
@@ -335,7 +418,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.sickVillageName = sickVillageName;
    }
	@ApiModelProperty(value = "绑定电子社保卡主体（共济为操作人code）", example = "模块1")
    public String getPrincipalCode() {
        return principalCode;
    }
@@ -343,7 +425,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.principalCode = principalCode;
    }
	@ApiModelProperty(value = "是否绑定电子社保卡 （0否 1是）", example = "模块1")
    public String getSicardStatus() {
        return sicardStatus;
    }
@@ -351,7 +432,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.sicardStatus = sicardStatus;
    }
	@ApiModelProperty(value = "电子社保卡绑定时间", example = "模块1")
    public Date getSicardTime() {
        return sicardTime;
    }
@@ -359,7 +439,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.sicardTime = sicardTime;
    }
	@ApiModelProperty(value = "是否分配过微信标签", example = "模块1")
    public Integer getIsWxtag() {
        return isWxtag;
    }
@@ -367,7 +446,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.isWxtag = isWxtag;
    }
	@ApiModelProperty(value = "微信tagId", example = "模块1")
    public String getWxtagid() {
        return wxtagid;
    }
@@ -375,7 +453,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.wxtagid = wxtagid;
    }
	@ApiModelProperty(value = "居民预警状态：0为标准，1为预警状态", example = "模块1")
    public Integer getStandardStatus() {
        return standardStatus;
    }
@@ -383,7 +460,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.standardStatus = standardStatus;
    }
	@ApiModelProperty(value = "医疗保险号", example = "模块1")
    public String getMedicareNumber() {
        return medicareNumber;
    }
@@ -391,7 +467,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.medicareNumber = medicareNumber;
    }
	@ApiModelProperty(value = "unionId 开发平台唯一标识", example = "模块1")
    public String getUnionid() {
        return unionid;
    }
@@ -399,7 +474,6 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.unionid = unionid;
    }
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    public String getDel() {
        return del;
    }
@@ -408,5 +482,4 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/patient/PatientFamilyMemberVO.java

@@ -0,0 +1,61 @@
package com.yihu.jw.restmodel.base.patient;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by Trick on 2018/8/31.
 */
@ApiModel(value = "PatientFamilyMemberVO", description = "家庭成员")
public class PatientFamilyMemberVO {
    @ApiModelProperty(value = "id")
    private String id;//主键id
    @ApiModelProperty(value = "居民code")
    private String patient;//居民code',
    @ApiModelProperty(value = "家庭成员code")
    private String familyMember;//家庭成员code',
    @ApiModelProperty(value = "家庭关系 1父亲 2母亲 3老公 4老婆 5儿子 6女儿 7其他")
    private String familyRelation;//家庭关系',
    @ApiModelProperty(value = "是否授权0")
    private Integer isAuthorize;//是否授权0:未授权,1:已授权，默认为1',
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getFamilyMember() {
        return familyMember;
    }
    public void setFamilyMember(String familyMember) {
        this.familyMember = familyMember;
    }
    public String getFamilyRelation() {
        return familyRelation;
    }
    public void setFamilyRelation(String familyRelation) {
        this.familyRelation = familyRelation;
    }
    public Integer getIsAuthorize() {
        return isAuthorize;
    }
    public void setIsAuthorize(Integer isAuthorize) {
        this.isAuthorize = isAuthorize;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/people_num/BasePeopleNumVO.java

@@ -0,0 +1,236 @@
package com.yihu.jw.restmodel.base.people_num;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
 * 
 * 基础人口基数信息vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "BasePeopleNumVO", description = "基础人口基数信息")
public class BasePeopleNumVO extends UuidIdentityVOWithOperator {
    /**
	 * saas化的id
	 */
	@ApiModelProperty(value = "saas化的id", example = "模块1")
    private String saasId;
    /**
	 * 所属省代码
	 */
	@ApiModelProperty(value = "所属省代码", example = "模块1")
    private String provinceCode;
    /**
	 * 所属市代码
	 */
	@ApiModelProperty(value = "所属市代码", example = "模块1")
    private String cityCode;
    /**
	 * 所属区代码
	 */
	@ApiModelProperty(value = "所属区代码", example = "模块1")
    private String districtCode;
    /**
	 * 所属具体名称
	 */
	@ApiModelProperty(value = "所属具体名称", example = "模块1")
    private String name;
    /**
	 * 人口数
	 */
	@ApiModelProperty(value = "人口数", example = "模块1")
    private Integer num;
    /**
	 * 类别 0是省，1是市，2是区，3是机构
	 */
	@ApiModelProperty(value = "类别 0是省，1是市，2是区，3是机构", example = "模块1")
    private String type;
    /**
	 * 每年的人口数
	 */
	@ApiModelProperty(value = "每年的人口数", example = "模块1")
    private Integer year;
    /**
	 * 高血压发病数
	 */
	@ApiModelProperty(value = "高血压发病数", example = "模块1")
    private Integer gxyNum;
    /**
	 * 糖尿病发病数
	 */
	@ApiModelProperty(value = "糖尿病发病数", example = "模块1")
    private Integer tnbNum;
    /**
	 * 65岁以上老年人口数
	 */
	@ApiModelProperty(value = "65岁以上老年人口数", example = "模块1")
    private Integer sixFiveNum;
    /**
	 * 高血压任务数
	 */
	@ApiModelProperty(value = "高血压任务数", example = "模块1")
    private Integer gxyTaskNum;
    /**
	 * 糖尿病任务数
	 */
	@ApiModelProperty(value = "糖尿病任务数", example = "模块1")
    private Integer tnbTaskNum;
    /**
	 * 65岁以上老年人口任务数
	 */
	@ApiModelProperty(value = "65岁以上老年人口任务数", example = "模块1")
    private Integer sixFiveTaskNum;
    /**
	 * 户籍人口任务数
	 */
	@ApiModelProperty(value = "户籍人口任务数", example = "模块1")
    private Integer taskNum;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getProvinceCode() {
        return provinceCode;
    }
    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
    public String getDistrictCode() {
        return districtCode;
    }
    public void setDistrictCode(String districtCode) {
        this.districtCode = districtCode;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public Integer getYear() {
        return year;
    }
    public void setYear(Integer year) {
        this.year = year;
    }
    public Integer getGxyNum() {
        return gxyNum;
    }
    public void setGxyNum(Integer gxyNum) {
        this.gxyNum = gxyNum;
    }
    public Integer getTnbNum() {
        return tnbNum;
    }
    public void setTnbNum(Integer tnbNum) {
        this.tnbNum = tnbNum;
    }
    public Integer getSixFiveNum() {
        return sixFiveNum;
    }
    public void setSixFiveNum(Integer sixFiveNum) {
        this.sixFiveNum = sixFiveNum;
    }
    public Integer getGxyTaskNum() {
        return gxyTaskNum;
    }
    public void setGxyTaskNum(Integer gxyTaskNum) {
        this.gxyTaskNum = gxyTaskNum;
    }
    public Integer getTnbTaskNum() {
        return tnbTaskNum;
    }
    public void setTnbTaskNum(Integer tnbTaskNum) {
        this.tnbTaskNum = tnbTaskNum;
    }
    public Integer getSixFiveTaskNum() {
        return sixFiveTaskNum;
    }
    public void setSixFiveTaskNum(Integer sixFiveTaskNum) {
        this.sixFiveTaskNum = sixFiveTaskNum;
    }
    public Integer getTaskNum() {
        return taskNum;
    }
    public void setTaskNum(Integer taskNum) {
        this.taskNum = taskNum;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/sms/SmsVO.java

@@ -27,7 +27,7 @@ public class SmsVO extends UuidIdentityVO {
    private String requestIp;
    //短信接收号码
    @ApiModelProperty(value = "短信接收号码", example = "18888888888")
    private String to;
    private String mobile;
    //短信内容
    @ApiModelProperty(value = "短信内容", example = "【i健康综合管理平台】您使用的是i健康综合管理平台短信模板，您的验证码是826612，请于10分钟内正确输入！")
    private String content;
@@ -35,6 +35,7 @@ public class SmsVO extends UuidIdentityVO {
    @ApiModelProperty(value = "过期时间", example = "2018-09-03 15:34:34")
    private Date deadline;
    //验证码
    @ApiModelProperty(value = "验证码", example = "651187")
    private String captcha;
    @ApiModelProperty(value = "标签", example = "login")
    private SmsTemplateDO.Type type;
@@ -63,12 +64,12 @@ public class SmsVO extends UuidIdentityVO {
        this.requestIp = requestIp;
    }
    public String getTo() {
        return to;
    public String getMobile() {
        return mobile;
    }
    public void setTo(String to) {
        this.to = to;
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getContent() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseTeamMemberVO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.team;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
@@ -13,7 +13,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,19 +22,30 @@ import java.util.Date;
public class BaseTeamMemberVO extends UuidIdentityVOWithOperator {
    /**
	团队ID	*/
	 * 团队ID
	 */
	@ApiModelProperty(value = "团队ID", example = "模块1")
    private String teamId;
    /**
	机构标识	*/
	 * 机构标识
	 */
	@ApiModelProperty(value = "机构标识", example = "模块1")
    private String orgId;
    /**
	医生标识，多个医生以逗号分开	*/
	 * 医生标识，多个医生以逗号分开
	 */
	@ApiModelProperty(value = "医生标识，多个医生以逗号分开", example = "模块1")
    private String doctorId;
    /**
	作废标识，1正常，0作废	*/
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
	@ApiModelProperty(value = "团队ID", example = "模块1")
    public String getTeamId() {
        return teamId;
    }
@@ -42,7 +53,6 @@ public class BaseTeamMemberVO extends UuidIdentityVOWithOperator {
        this.teamId = teamId;
    }
	@ApiModelProperty(value = "机构标识", example = "模块1")
    public String getOrgId() {
        return orgId;
    }
@@ -50,7 +60,6 @@ public class BaseTeamMemberVO extends UuidIdentityVOWithOperator {
        this.orgId = orgId;
    }
	@ApiModelProperty(value = "医生标识，多个医生以逗号分开", example = "模块1")
    public String getDoctorId() {
        return doctorId;
    }
@@ -58,7 +67,6 @@ public class BaseTeamMemberVO extends UuidIdentityVOWithOperator {
        this.doctorId = doctorId;
    }
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    public String getDel() {
        return del;
    }
@@ -67,5 +75,4 @@ public class BaseTeamMemberVO extends UuidIdentityVOWithOperator {
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/BaseTeamVO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.restmodel.base.dict;
package com.yihu.jw.restmodel.base.team;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
@@ -13,7 +13,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年08月31日 Created
 * Administrator 	1.0  2018年09月05日 Created
 *
 * </pre>
 * @since 1.
@@ -22,25 +22,42 @@ import java.util.Date;
public class BaseTeamVO extends UuidIdentityVOWithOperator {
    /**
	机构id	*/
	 * 机构id
	 */
	@ApiModelProperty(value = "机构id", example = "模块1")
    private String orgId;
    /**
	团队名称	*/
	 * 团队名称
	 */
	@ApiModelProperty(value = "团队名称", example = "模块1")
    private String name;
    /**
	领导医生标识	*/
	 * 领导医生标识
	 */
	@ApiModelProperty(value = "领导医生标识", example = "模块1")
    private String leaderId;
    /**
	团队人数	*/
	 * 团队人数
	 */
	@ApiModelProperty(value = "团队人数", example = "模块1")
    private String teamNum;
    /**
	团队二维码	*/
	 * 团队二维码
	 */
	@ApiModelProperty(value = "团队二维码", example = "模块1")
    private String qrcode;
    /**
	作废标识，1正常，0作废	*/
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
	@ApiModelProperty(value = "机构id", example = "模块1")
    public String getOrgId() {
        return orgId;
    }
@@ -48,7 +65,6 @@ public class BaseTeamVO extends UuidIdentityVOWithOperator {
        this.orgId = orgId;
    }
	@ApiModelProperty(value = "团队名称", example = "模块1")
    public String getName() {
        return name;
    }
@@ -56,7 +72,6 @@ public class BaseTeamVO extends UuidIdentityVOWithOperator {
        this.name = name;
    }
	@ApiModelProperty(value = "领导医生标识", example = "模块1")
    public String getLeaderId() {
        return leaderId;
    }
@@ -64,7 +79,6 @@ public class BaseTeamVO extends UuidIdentityVOWithOperator {
        this.leaderId = leaderId;
    }
	@ApiModelProperty(value = "团队人数", example = "模块1")
    public String getTeamNum() {
        return teamNum;
    }
@@ -72,7 +86,6 @@ public class BaseTeamVO extends UuidIdentityVOWithOperator {
        this.teamNum = teamNum;
    }
	@ApiModelProperty(value = "团队二维码", example = "模块1")
    public String getQrcode() {
        return qrcode;
    }
@@ -80,7 +93,6 @@ public class BaseTeamVO extends UuidIdentityVOWithOperator {
        this.qrcode = qrcode;
    }
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    public String getDel() {
        return del;
    }
@@ -89,5 +101,4 @@ public class BaseTeamVO extends UuidIdentityVOWithOperator {
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/team/TeamMemberVO.java

@@ -0,0 +1,62 @@
package com.yihu.jw.restmodel.base.team;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by Trick on 2018/8/31.
 */
@ApiModel(value = "TeamMemberVO", description = "团队成员")
public class TeamMemberVO {
    @ApiModelProperty(value = "id")
    private String id;
    @ApiModelProperty(value = "团队ID")
    private String teamId;//团队ID',
    @ApiModelProperty(value = "机构标识")
    private String orgId;//机构标识',
    @ApiModelProperty(value = "医生标识，多个医生以逗号分开")
    private String doctorId;//医生标识，多个医生以逗号分开',
    @ApiModelProperty(value = "作废标识，1正常，0作废'")
    private String del;//作废标识，1正常，0作废',
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getTeamId() {
        return teamId;
    }
    public void setTeamId(String teamId) {
        this.teamId = teamId;
    }
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    public String getDoctorId() {
        return doctorId;
    }
    public void setDoctorId(String doctorId) {
        this.doctorId = doctorId;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/team/TeamVO.java

@@ -0,0 +1,80 @@
package com.yihu.jw.restmodel.base.team;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by Trick on 2018/8/31.
 */
public class TeamVO {
    @ApiModelProperty(value = "id")
    private String id;
    @ApiModelProperty(value = "saas化")
    private String saasid;//saas化',
    @ApiModelProperty(value = "团队名称")
    private String name;//团队名称',
    @ApiModelProperty(value = "领导医生标识")
    private String leaderId;//领导医生标识',
    @ApiModelProperty(value = "团队人数")
    private String teamNum;//团队人数',
    @ApiModelProperty(value = "团队二维码")
    private String qrcode;//团队二维码',
    @ApiModelProperty(value = "作废标识，1正常，0作废',")
    private String del;//作废标识，1正常，0作废',
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasid() {
        return saasid;
    }
    public void setSaasid(String saasid) {
        this.saasid = saasid;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getLeaderId() {
        return leaderId;
    }
    public void setLeaderId(String leaderId) {
        this.leaderId = leaderId;
    }
    public String getTeamNum() {
        return teamNum;
    }
    public void setTeamNum(String teamNum) {
        this.teamNum = teamNum;
    }
    public String getQrcode() {
        return qrcode;
    }
    public void setQrcode(String qrcode) {
        this.qrcode = qrcode;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/PatientDisseaseInfoVO.java

@@ -21,6 +21,8 @@ public class PatientDisseaseInfoVO {
    private String patient;
    @ApiModelProperty("居民姓名")
    private String patientName;
    @ApiModelProperty("专科医生签约团队")
    private String teamCode;
    @ApiModelProperty("年龄")
    private String age;
    @ApiModelProperty("性别")
@@ -28,7 +30,9 @@ public class PatientDisseaseInfoVO {
    @ApiModelProperty("身份证")
    private String idcard;
    @ApiModelProperty("生日")
    private String  birthday;
    private String birthday;
    @ApiModelProperty("头像")
    private String photo;
    public String getDisease() {
        return disease;
@@ -93,4 +97,20 @@ public class PatientDisseaseInfoVO {
    public void setBirthday(String birthday) {
        this.birthday = birthday;
    }
    public String getTeamCode() {
        return teamCode;
    }
    public void setTeamCode(String teamCode) {
        this.teamCode = teamCode;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
}

common/common-util/src/main/java/com/yihu/jw/util/idcard/IdCardUtil.java

@@ -0,0 +1,182 @@
package com.yihu.jw.util.idcard;
import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
/**
 * Created by Trick on 2018/9/3.
 */
public class IdCardUtil {
    public static String level_sex_1="1";
    public static String level_sex_2="2";
    public static String level_sex_3="3";
//    public static String level_sex_1_name="男";
//    public static String level_sex_2_name="女";
//    public static String level_sex_3_name="未知";
    /**
     * 根据身份证的号码算出当前身份证持有者的年龄
     *
     * @param
     * @throws Exception
     */
    public static int getAgeForIdcard(String idcard) {
        try {
            int age = 0;
            if (StringUtils.isEmpty(idcard)) {
                return age;
            }
            String birth = "";
            if (idcard.length() == 18) {
                birth = idcard.substring(6, 14);
            } else if (idcard.length() == 15) {
                birth = "19" + idcard.substring(6, 12);
            }
            int year = Integer.valueOf(birth.substring(0, 4));
            int month = Integer.valueOf(birth.substring(4, 6));
            int day = Integer.valueOf(birth.substring(6));
            Calendar cal = Calendar.getInstance();
            age = cal.get(Calendar.YEAR) - year;
            //周岁计算
            if (cal.get(Calendar.MONTH) < (month - 1) || (cal.get(Calendar.MONTH) == (month - 1) && cal.get(Calendar.DATE) < day)) {
                age--;
            }
            return age;
        } catch (Exception e) {
        }
        return -1;
    }
    /**
     * 身份证提取出身日期
     *
     * @param card
     * @return
     * @throws Exception
     */
    public static Date getBirthdayForIdcard(String card)
            throws Exception {
        Date b = null;
        if (card.length() == 18) {
            String year = card.substring(6).substring(0, 4);// 得到年份
            String yue = card.substring(10).substring(0, 2);// 得到月份
            String ri = card.substring(12).substring(0, 2);// 得到日
            // String day=CardCode.substring(12).substring(0,2);//得到日
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
            b = format.parse(year + "-" + yue + "-" + ri);
        } else if (card.length() == 15) {
            String uyear = "19" + card.substring(6, 8);// 年份
            String uyue = card.substring(8, 10);// 月份
            String uri = card.substring(10, 12);// 得到日
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
            b = format.parse(uyear + "-" + uyue + "-" + uri);
        }
        return b;
    }
    /**
     * 身份证提取出身日期
     *
     * @param card
     * @return
     * @throws Exception
     */
    public static String getBirthdayForIdcardStr(String card)
            throws Exception {
        if (card.length() == 18) {
            String year = card.substring(6).substring(0, 4);// 得到年份
            String yue = card.substring(10).substring(0, 2);// 得到月份
            String ri = card.substring(12).substring(0, 2);// 得到日
            // String day=CardCode.substring(12).substring(0,2);//得到日
            return year + yue + ri;
        } else if (card.length() == 15) {
            String uyear = "19" + card.substring(6, 8);// 年份
            String uyue = card.substring(8, 10);// 月份
            String uri = card.substring(10, 12);// 得到日
            return uyear + uyue + uri;
        }
        return null;
    }
    /**
     * 根据身份证的号码算出当前身份证持有者的性别
     * 1 女 2 男 3未知
     *
     * @return
     * @throws Exception
     */
    public static String getSexForIdcard(String CardCode)
            throws Exception {
        String sex = level_sex_3;
        if (CardCode.length() == 18) {
            if (Integer.parseInt(CardCode.substring(16).substring(0, 1)) % 2 == 0) {// 判断性别
                // modifid by lyr 2016-09-29
                // sex =  Constant.level_sex_2;
                sex =level_sex_1;
                // modifid by lyr 2016-09-29
            } else {
                // modifid by lyr 2016-09-29
                // sex =  Constant.level_sex_1;
                sex = level_sex_2;
                // modifid by lyr 2016-09-29
            }
        } else if (CardCode.length() == 15) {
            String usex = CardCode.substring(14, 15);// 用户的性别
            if (Integer.parseInt(usex) % 2 == 0) {
                // sex =  Constant.level_sex_2;
                sex = level_sex_1;
            } else {
                // sex =  Constant.level_sex_1;
                sex = level_sex_2;
            }
        }
        return sex;
    }
    /**
     * 根据身份证的号码算出当前身份证持有者的性别
     * 1 男 2 女 3未知
     *
     * @return
     * @throws Exception
     */
    public static String getSexForIdcard_new(String CardCode)
            throws Exception {
        String sex = level_sex_3;
        try {
            if (CardCode.length() == 18) {
                if (Integer.parseInt(CardCode.substring(16).substring(0, 1)) % 2 == 0) {// 判断性别
                    // modifid by lyr 2016-09-29
                    sex = level_sex_2;
                    // modifid by lyr 2016-09-29
                } else {
                    // modifid by lyr 2016-09-29
                    sex = level_sex_1;
                    // modifid by lyr 2016-09-29
                }
            } else if (CardCode.length() == 15) {
                String usex = CardCode.substring(14, 15);// 用户的性别
                if (Integer.parseInt(usex) % 2 == 0) {
                    sex = level_sex_2;
                } else {
                    sex = level_sex_1;
                }
            }
            return sex;
        } catch (Exception e) {
            e.printStackTrace();
        }
        return sex;
    }
}

gateway/ag-basic/src/main/resources/application.yml

@@ -1,20 +1,5 @@
server:
  port: 10001
zuul:
  config-priority: false
  ignored-services: '*'
  sensitive-headers:
  routes:
    svr-iot:
      path: /iot/**
      serviceId: svr-iot
    svr-base:
      path: /base/**
      serviceId: svr-base-sxy
    demo:
      path: /baidu/**
      url: https://www.baidu.com
  port: ${server.ag-basic-port}
spring:
  datasource:
@@ -34,7 +19,24 @@ spring:
    test-while-idle: true #指明连接是否被空闲连接回收器(如果有)进行检验，如果检测失败，则连接将被从池中去除
    min-evictable-idle-time-millis: 3600000 #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
#  sleuth:
#    sampler:
#      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
zuul:
  config-priority: false
  ignored-services: '*'
  sensitive-headers:
  routes:
    svr-iot:
      path: /iot/**
      serviceId: svr-iot
    svr-base:
      path: /base/**
      serviceId: svr-base
    demo:
      path: /baidu/**
      url: https://www.baidu.com
---
spring:
@@ -45,10 +47,6 @@ spring:
    password: 123456
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
#  sleuth:
#    sampler:
#      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
---
spring:
@@ -59,6 +57,13 @@ spring:
    password: 123456
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址
#  sleuth:
#    sampler:
#      percentage: 1.0 #采用需要的请求的百分比 默认是0.1 即 10%
---
spring:
  profiles: jwprod
  datasource:
    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
#  zipkin:
#    base-url: http://localhost:9411 #日志追踪的地址

server/svr-authentication/src/main/java/com/yihu/jw/security/config/WlyyWebSecurityConfigurerAdapter.java

@@ -31,6 +31,7 @@ public class WlyyWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapt
    @Override
    public void configure(WebSecurity web) throws Exception {
        web.ignoring().antMatchers("/oauth/**");
        web.ignoring().antMatchers("/health");
    }
    @Override
@@ -63,6 +64,7 @@ public class WlyyWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapt
        reflectionSaltSource.setUserPropertyToUse("salt");
        authenticationProvider.setSaltSource(reflectionSaltSource);
        authenticationProvider.setSaltSource(reflectionSaltSource);
        authenticationProvider.setHideUserNotFoundExceptions(false);
        return authenticationProvider;
    }

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/SaltUser.java

@@ -31,6 +31,10 @@ public class SaltUser implements UserDetails, CredentialsContainer {
        this(username, password, salt, true, true, true, true, authorities);
    }
    public SaltUser(String username, String password, String salt, boolean enabled, boolean locked, Collection<? extends GrantedAuthority> authorities) {
        this(username, password, salt, enabled, true, true, !locked, authorities);
    }
    public SaltUser(String username, String password, String salt, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
        if(username != null && !"".equals(username) && password != null) {
            this.username = username;

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/jdbc/WlyyUserDetailsService.java

@@ -3,6 +3,8 @@ package com.yihu.jw.security.core.userdetails.jdbc;
import com.yihu.jw.security.core.userdetails.SaltUser;
import com.yihu.jw.security.model.WlyyUserDetails;
import com.yihu.jw.security.model.WlyyUserSimple;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.support.JdbcDaoSupport;
import org.springframework.security.core.GrantedAuthority;
@@ -10,7 +12,10 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.Collection;
@@ -18,12 +23,17 @@ import java.util.Date;
import java.util.List;
/**
 * Service - 用户加载
 * Service - 用户信息
 * Created by progr1mmer on 2018/8/29.
 */
public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetailsService {
    private static final String DEFAULT_USER_DETAILS_STATEMENT = "SELECT * FROM base_user u WHERE u.username = ? OR u.mobile = ? OR u.idcard = ?";
    private static final String DEFAULT_USER_DETAILS_STATEMENT = "select * from base_user u where u.username = ? or u.mobile = ? or u.idcard = ?";
    private static final String DEFAULT_DOCTOR_DETAILS_STATEMENT = "SELECT * FROM base_doctor d WHERE d.mobile = ? OR d.idcard = ?";
    private static final String DEFAULT_PATIENT_DETAILS_STATEMENT = "SELECT * FROM base_patient p WHERE p.mobile = ? OR p.idcard = ?";
    public WlyyUserDetailsService(DataSource dataSource) {
        this.setDataSource(dataSource);
@@ -31,35 +41,204 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
    /**
     * 用户登录判读接口
     *
     * 判断loginType查找用户信息
     * 用户类型 1或默认为user，2：医生登录，3：患者登录
     * @param username
     * @return
     * @throws UsernameNotFoundException
     */
    @Override
    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
        List<WlyyUserDetails> users = this.getJdbcTemplate().query(DEFAULT_USER_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserDetails.class), username, username, username);
        List<WlyyUserDetails> users = getWlyyUserDetails(username);
        if (users == null || users.size() == 0) {
            throw new UsernameNotFoundException(username);
        }
        return new SaltUser(username, users.get(0).getPassword(), users.get(0).getSalt(), getGrantedAuthorities(username));
        if (users.get(0).isLocked()) {
            Date date = users.get(0).getLockedDate();
            if (new Date().after(DateUtils.addMinutes(date, 5))) {
                //解除锁定
                unlocked(username);
                users.get(0).setLocked(false);
            }
        }
        return new SaltUser(username, users.get(0).getPassword(), users.get(0).getSalt(), users.get(0).isEnabled(), users.get(0).isLocked(), getGrantedAuthorities(username));
    }
    private Collection<? extends GrantedAuthority> getGrantedAuthorities(String username) {
        Collection<GrantedAuthority> authorities = new ArrayList<>(1);
        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
        return authorities;
    public void unlocked(String username){
        String loginType = getLogintype();
        if(StringUtils.isBlank(loginType)||"1".equals(loginType)){ //1或默认查找user表，为平台管理员账号
            //解除锁定
            this.getJdbcTemplate().update("update base_user u set login_failure_count = 0, u.locked = 0 where u.username = ? or u.mobile = ? or u.idcard = ?", username, username, username);
        }else if("2".equals(loginType)){//2.为医生账号
            //解除锁定
            this.getJdbcTemplate().update("update base_doctor d set d.login_failure_count = 0, d.locked = 0 where d.mobile = ? or d.idcard = ?",username, username);
        }else if("3".equals(loginType)){ //3.患者账号
            //解除锁定
            this.getJdbcTemplate().update("update base_patient p set p.login_failure_count = 5, p.locked = 0 where p.mobile = ? or p.idcard = ?",username, username);
        } //...
    }
    /**
     * 用户登录判读接口
     * 判断loginType查找用户信息
     * 用户类型 1或默认为user，2：医生登录，3：患者登录
     * @param username
     * @return
     */
    public  List<WlyyUserDetails> getWlyyUserDetails(String username){
        String loginType = getLogintype();
        List<WlyyUserDetails> users = null;
        //1或默认查找user表，为平台管理员账号
        if(StringUtils.isBlank(loginType)||"1".equals(loginType)){
            users = this.getJdbcTemplate().query(DEFAULT_USER_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserDetails.class), username, username, username);
            //2.为医生登录账号
        }else if("2".equals(loginType)){
            users = this.getJdbcTemplate().query(DEFAULT_DOCTOR_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserDetails.class), username, username);
            //3.患者登录
        }else if("3".equals(loginType)){
            users = this.getJdbcTemplate().query(DEFAULT_PATIENT_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserDetails.class), username, username);
        }//..
        return users;
    }
    /**
     * 设置用户登录时间，返回登录信息
     * 判断loginType，用户类型 1或默认为user，2：医生登录，3：患者登录
     * @param username
     * @return
     * @throws UsernameNotFoundException
     */
    public WlyyUserSimple authSuccess (String username) throws UsernameNotFoundException {
        //更新登陆时间
        this.getJdbcTemplate().update("update base_user u set u.login_date = ? where u.username = ? or u.mobile = ? or u.idcard = ?", new Date(), username, username, username);
        //加载用户简略信息
        List<WlyyUserSimple> users = this.getJdbcTemplate().query(DEFAULT_USER_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserSimple.class), username, username, username);
        List<WlyyUserSimple> users = getWlyyUserSimple(username);
        if (users == null || users.size() == 0) {
            throw new UsernameNotFoundException(username);
        }
        return users.get(0);
    }
    public String authFailure () throws UsernameNotFoundException {
        //获取失败次数
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String username = request.getParameter("username");
        Integer loginFailureCount = getLoginFailureCount(username);
        loginFailureCount ++;
        if (loginFailureCount >= 5) {
            locked(username);
            return "账号已被锁定,请5分钟后重试!";
        } else {
            addFailureCount(username,loginFailureCount);
            return "密码错误,还可以再试" + (5 - loginFailureCount) + "次!";
        }
    }
    /**
     * 获取失败次数
     * @param username
     * @return
     */
    public Integer getLoginFailureCount(String username){
        String loginType = getLogintype();
        Integer loginFailureCount = 0;
        if(StringUtils.isBlank(loginType)||"1".equals(loginType)){ //1或默认查找user表，为平台管理员账号
            loginFailureCount = this.getJdbcTemplate().queryForObject("select u.login_failure_count from base_user u where u.username = ? or u.mobile = ? or u.idcard = ?", Integer.class, username, username, username);
        }else if("2".equals(loginType)){//2.为医生账号
            loginFailureCount = this.getJdbcTemplate().queryForObject("select d.login_failure_count from base_doctor d where d.mobile = ? or d.idcard = ?", Integer.class, username, username);
        }else if("3".equals(loginType)){ //3.患者账号
            loginFailureCount = this.getJdbcTemplate().queryForObject("select p.login_failure_count from base_patient p where p.mobile = ? or p.idcard = ?", Integer.class, username, username);
        } //...
        return loginFailureCount;
    }
    /**
     * 锁定账号
     * @param username
     */
    public void locked(String username){
        String loginType = getLogintype();
        if(StringUtils.isBlank(loginType)||"1".equals(loginType)){ //1或默认查找user表，为平台管理员账号
            //账号锁定
            this.getJdbcTemplate().update("update base_user u set u.login_failure_count = 5, u.locked = 1, u.locked_date = ? where u.username = ? or u.mobile = ? or u.idcard = ?", new Date(), username, username, username);
        }else if("2".equals(loginType)){//2.为医生账号
            //账号锁定
            this.getJdbcTemplate().update("update base_doctor d set d.login_failure_count = 5, d.locked = 1, d.locked_date = ? where d.mobile = ? or d.idcard = ?", new Date(), username, username);
        }else if("3".equals(loginType)){ //3.患者账号
            //账号锁定
            this.getJdbcTemplate().update("update base_patient p set p.login_failure_count = 5, p.locked = 1, p.locked_date = ?  where p.mobile = ? or p.idcard = ?", new Date(), username, username);
        } //...
    }
    /**
     * 更新登录失败次数
     * @param username
     * @param loginFailureCount
     */
    public void addFailureCount(String username,Integer loginFailureCount){
        String loginType = getLogintype();
        if(StringUtils.isBlank(loginType)||"1".equals(loginType)){ //1或默认查找user表，为平台管理员账号
            //更新失败次数
            this.getJdbcTemplate().update("update base_user u set u.login_failure_count = ? where u.username = ? or u.mobile = ? or u.idcard = ?", loginFailureCount, username, username, username);
        }else if("2".equals(loginType)){//2.为医生账号
            //更新失败次数
            this.getJdbcTemplate().update("update base_doctor d set d.login_failure_count = ? where d.mobile = ? or d.idcard = ?", loginFailureCount, username, username);
        }else if("3".equals(loginType)){ //3.患者账号
            //更新失败次数
            this.getJdbcTemplate().update("update base_patient p set p.login_failure_count = ? where p.mobile = ? or p.idcard = ?", loginFailureCount, username, username);
        } //...
    }
    private Collection<? extends GrantedAuthority> getGrantedAuthorities(String username) {
        Collection<GrantedAuthority> authorities = new ArrayList<>(1);
        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
        return authorities;
    }
    /**
     * 设置用户登录时间，返回登录信息
     * 判断loginType，用户类型 1或默认为user，2：医生登录，3：患者登录
     * @param username
     * @return
     */
    public List<WlyyUserSimple> getWlyyUserSimple(String username){
        String loginType = getLogintype();
        List<WlyyUserSimple> users = null;
        //1或默认查找user表，为平台管理员账号
        if(StringUtils.isBlank(loginType)||"1".equals(loginType)){
            //更新登录时间
            this.getJdbcTemplate().update("update base_user u set u.login_failure_count = 0, u.login_date = ? where u.username = ? or u.mobile = ? or u.idcard = ?", new Date(), username, username, username);
            users = this.getJdbcTemplate().query(DEFAULT_USER_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserSimple.class), username, username, username);
            //2.为医生登录账号
        }else if("2".equals(loginType)){
            //更新登录时间
            this.getJdbcTemplate().update("update base_doctor d set d.login_failure_count = 0, d.login_date = ? where d.mobile = ? or d.idcard = ?", new Date(), username, username);
            users = this.getJdbcTemplate().query(DEFAULT_DOCTOR_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserSimple.class), username, username);
            //3.患者登录
        }else if("3".equals(loginType)){
            //更新登录时间
            this.getJdbcTemplate().update("update base_patient p set p.login_failure_count = 0, p.login_date = ? where p.mobile = ? or p.idcard = ?", new Date(), username, username);
            users = this.getJdbcTemplate().query(DEFAULT_PATIENT_DETAILS_STATEMENT, new BeanPropertyRowMapper(WlyyUserSimple.class), username, username);
        } //...
        return users;
    }
    /**
     * 获取用户登录类型
     * @return
     */
    public String getLogintype(){
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String loginType = request.getParameter("login_type");
        return loginType;
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/model/WlyyUserSimple.java

@@ -10,7 +10,8 @@ import java.util.Date;
 * Model - 认证用户简略信息
 * Created by progr1mmer on 2018/8/29.
 */
public class WlyyUserSimple implements Serializable {
public class
WlyyUserSimple implements Serializable {
    /**
     * 性别

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/config/WlyyAuthorizationServerConfigurerAdapter.java

@@ -11,6 +11,7 @@ import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
@@ -62,14 +63,16 @@ public class WlyyAuthorizationServerConfigurerAdapter extends AuthorizationServe
    @Primary
    WlyyTokenGranter wlyyTokenGranter (
            AuthenticationManager authenticationManager,
            AuthorizationServerTokenServices authorizationServerTokenServices) {
            AuthorizationServerTokenServices authorizationServerTokenServices,
            UserDetailsService userDetailsService) {
        WlyyTokenGranter tokenGranter = new WlyyTokenGranter(
                authenticationManager,
                authorizationServerTokenServices,
                authorizationCodeServices(),
                clientDetailsService(),
                new DefaultOAuth2RequestFactory(clientDetailsService()),
                wlyyRedisVerifyCodeService());
                wlyyRedisVerifyCodeService(),
                userDetailsService);
        return tokenGranter;
    }

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/WlyyTokenGranter.java

@@ -1,11 +1,11 @@
package com.yihu.jw.security.oauth2.provider;
import com.yihu.jw.security.core.userdetails.SaltUser;
import com.yihu.jw.security.oauth2.core.redis.WlyyRedisVerifyCodeService;
import org.springframework.security.authentication.*;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
@@ -35,7 +35,8 @@ public class WlyyTokenGranter implements TokenGranter {
                            AuthorizationCodeServices authorizationCodeServices,
                            ClientDetailsService clientDetailsService,
                            OAuth2RequestFactory requestFactory,
                            WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService) {
                            WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService,
                            UserDetailsService userDetailsService) {
        tokenGranters.put(WlyyAuthorizationCodeGranter.GRANT_TYPE,
                new WlyyAuthorizationCodeGranter(
@@ -73,7 +74,8 @@ public class WlyyTokenGranter implements TokenGranter {
                        tokenServices,
                        clientDetailsService,
                        requestFactory,
                        wlyyRedisVerifyCodeService
                        wlyyRedisVerifyCodeService,
                        userDetailsService
                ));
    }
@@ -237,7 +239,7 @@ public class WlyyTokenGranter implements TokenGranter {
    }
    /**
     * Implicit模式Token授权器。
     * implicit模式Token授权器。
     */
    public static class WlyyImplicitTokenGranter extends AbstractTokenGranter {
        private static final String GRANT_TYPE = "implicit";
@@ -272,32 +274,37 @@ public class WlyyTokenGranter implements TokenGranter {
    }
    /**
     * verify_code模式Token授权器。
     * captcha模式Token授权器。
     */
    public static class WlyyCaptchaTokenGranter extends AbstractTokenGranter {
        private static final String GRANT_TYPE = "captcha";
        private final AuthenticationManager authenticationManager;
        // Ehr Properties
        // Customize Properties
        private final WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService;
        private final UserDetailsService userDetailsService;
        public WlyyCaptchaTokenGranter(AuthenticationManager authenticationManager,
                                         AuthorizationServerTokenServices tokenServices,
                                         ClientDetailsService clientDetailsService,
                                         OAuth2RequestFactory requestFactory,
                                         WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService) {
            this(authenticationManager, tokenServices, clientDetailsService, requestFactory, GRANT_TYPE, wlyyRedisVerifyCodeService);
                                       AuthorizationServerTokenServices tokenServices,
                                       ClientDetailsService clientDetailsService,
                                       OAuth2RequestFactory requestFactory,
                                       WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService,
                                       UserDetailsService userDetailsService) {
            this(authenticationManager, tokenServices, clientDetailsService, requestFactory, wlyyRedisVerifyCodeService, userDetailsService, GRANT_TYPE);
        }
        protected WlyyCaptchaTokenGranter(AuthenticationManager authenticationManager,
                                            AuthorizationServerTokenServices tokenServices,
                                            ClientDetailsService clientDetailsService,
                                            OAuth2RequestFactory requestFactory,
                                            String grantType,
                                            WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService) {
                                          AuthorizationServerTokenServices tokenServices,
                                          ClientDetailsService clientDetailsService,
                                          OAuth2RequestFactory requestFactory,
                                          WlyyRedisVerifyCodeService wlyyRedisVerifyCodeService,
                                          UserDetailsService userDetailsService,
                                          String grantType) {
            super(tokenServices, clientDetailsService, requestFactory, grantType);
            this.authenticationManager = authenticationManager;
            this.wlyyRedisVerifyCodeService = wlyyRedisVerifyCodeService;
            this.userDetailsService = userDetailsService;
        }
        @Override
@@ -306,22 +313,25 @@ public class WlyyTokenGranter implements TokenGranter {
            Map<String, String> parameters = new LinkedHashMap<String, String>(tokenRequest.getRequestParameters());
            String client_id = parameters.get("client_id");
            String username = parameters.get("username");
            String verify_code = parameters.get("captcha");
            String captcha = parameters.get("captcha");
            if (!wlyyRedisVerifyCodeService.verification(client_id, username, verify_code)){
            if (!wlyyRedisVerifyCodeService.verification(client_id, username, captcha)){
                throw new InvalidGrantException("Invalid captcha");
            }
            Authentication userAuth = new UsernamePasswordAuthenticationToken(username, verify_code, getGrantedAuthorities(username));
            SaltUser userDetails = (SaltUser)userDetailsService.loadUserByUsername(username);
            if (!userDetails.isEnabled()) {
                throw new InvalidGrantException("User is disabled");
            }
            if (!userDetails.isAccountNonLocked()) {
                throw new InvalidGrantException("User account is locked");
            }
            Authentication userAuth = new UsernamePasswordAuthenticationToken(userDetails.getUsername(), captcha, userDetails.getAuthorities());
            ((AbstractAuthenticationToken) userAuth).setDetails(parameters);
            OAuth2Request storedOAuth2Request = getRequestFactory().createOAuth2Request(client, tokenRequest);
            return new OAuth2Authentication(storedOAuth2Request, userAuth);
        }
        private Collection<? extends GrantedAuthority> getGrantedAuthorities(String username) {
            Collection<GrantedAuthority> authorities = new ArrayList<>(1);
            authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
            return authorities;
        }
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -89,22 +89,32 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
    /**
     * 登陆
     * @param parameters
     * 不定入参：
     * client_id 应用标识
     * captcha 验证码
     * password 密码
     * username 用户名/手机/身份证号
     * login_type 用户类型 1或默认为user，2：医生登录，3：患者登录
     * @param httpSession
     * @return
     * @throws Exception
     */
    @RequestMapping(value = "/oauth/login", method = RequestMethod.POST)
    public ResponseEntity<Oauth2Envelop<WlyyUserSimple>> login(@RequestParam Map<String, String> parameters, HttpSession httpSession) throws Exception {
        String username = parameters.get("username");
        if (StringUtils.isEmpty(username)) {
            throw new InvalidRequestException("username");
        }
        String client_id = parameters.get("client_id");
        if (StringUtils.isEmpty(client_id)) {
            throw new InvalidRequestException("client_id");
        }
        if (StringUtils.isEmpty(parameters.get("captcha"))) {
            parameters.put("grant_type", "password");
            if (parameters.get("password") != null) {
                RSAPrivateKey rsaPrivateKey = (RSAPrivateKey)httpSession.getAttribute("privateKey");
                parameters.put("password", RSAUtils.decryptByPrivateKey(new String(Base64.decodeBase64(parameters.get("password"))), rsaPrivateKey));
            }
//            if (parameters.get("password") != null) {
//                RSAPrivateKey rsaPrivateKey = (RSAPrivateKey)httpSession.getAttribute("privateKey");
//                parameters.put("password", RSAUtils.decryptByPrivateKey(new String(Base64.decodeBase64(parameters.get("password"))), rsaPrivateKey));
//            }
        } else {
            parameters.put("grant_type", "captcha");
        }
@@ -353,16 +363,13 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
   @ExceptionHandler(Exception.class)
    public ResponseEntity<Oauth2Envelop> handleException(Exception e) throws Exception {
        LOG.info(e.getMessage(), e);
        LOG.debug(e.getMessage(), e);
        if (e instanceof UsernameNotFoundException) {
            return handleOAuth2Exception(new Oauth2Envelop("用户未注册!", HttpStatus.UNAUTHORIZED.value()), e);
            return handleOAuth2Exception(new Oauth2Envelop("用户不存在!", HttpStatus.UNAUTHORIZED.value()), e);
        } else if (e instanceof NoSuchClientException) {
            return handleOAuth2Exception(new Oauth2Envelop("应用未注册!", HttpStatus.UNAUTHORIZED.value()), e);
        } else if (e instanceof InvalidGrantException) {
            if (e.getMessage().contains("captcha")) {
                return handleOAuth2Exception(new Oauth2Envelop("验证码有误!", HttpStatus.UNAUTHORIZED.value()), e);
            }
            return handleOAuth2Exception(new Oauth2Envelop("密码有误!", HttpStatus.UNAUTHORIZED.value()), e);
            return handleOAuth2Exception(new Oauth2Envelop(invalidGrantMessage((InvalidGrantException)e), HttpStatus.UNAUTHORIZED.value()), e);
        } else if (e instanceof InvalidTokenException) {
            return handleOAuth2Exception(new Oauth2Envelop("Token有误!", HttpStatus.UNAUTHORIZED.value()), e);
        } else if (e instanceof InvalidRequestException) {
@@ -375,6 +382,19 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        return handleOAuth2Exception(new Oauth2Envelop(e.getMessage(), -1), e);
    }
    private String invalidGrantMessage(InvalidGrantException e) {
        if (e.getMessage().equals("User is disabled")) {
            return "账号不可用!";
        } else if (e.getMessage().equals("User account is locked")) {
            return "账号已被锁定,请稍后重试!";
        } else if (e.getMessage().equals("Bad credentials")) {
            return userDetailsService.authFailure();
        } else if (e.getMessage().equals("Invalid captcha")) {
            return "验证码错误!";
        }
        return e.getMessage();
    }
    private ResponseEntity<Oauth2Envelop> handleOAuth2Exception(Oauth2Envelop authenticationFailed, Exception e) throws IOException {
        HttpHeaders headers = new HttpHeaders();
        headers.set("Cache-Control", "no-store");

server/svr-authentication/src/main/resources/application.yml

@@ -18,11 +18,11 @@ spring:
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
logging:
  level:
    org:
      springframework:
        security: DEBUG
#logging:
#  level:
#    org:
#      springframework:
#        security: DEBUG
---
spring:

server/svr-zipkin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 9411
  port: ${server.svr-zipkin-port}
---
@@ -19,7 +19,27 @@ zipkin:
---
spring:
  profiles: jwtest
#分布式日志存在es里面
zipkin:
  storage:
    type: elasticsearch
    elasticsearch:
      hosts: 172.19.103.68:9300
      cluster:  jkzl
      index: jwlog
      index-shards: 5
      index-replicas: 0
---
spring:
  profiles: jwprod
#分布式日志存在es里面
zipkin:
  storage:
    type: elasticsearch
    elasticsearch:
      hosts: 172.19.103.68:9300
      cluster:  jkzl
      index: jwlog
      index-shards: 5
      index-replicas: 0

server/svr-zipkin/src/main/resources/bootstrap.yml

@@ -1,11 +1,9 @@
##优先读取 boostarap配置 然后在读取application。yml的配置
spring:
  application:
    name: svr-zipkin
  #从发现服务里面取配置服务的信息
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      failFast: true
      username: jw
      password: jkzl
@@ -24,3 +22,11 @@ spring:
    config:
      uri: ${wlyy.pring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwprod
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwprod}

sql/init.sql

@@ -62,7 +62,7 @@ CREATE TABLE `base_doctor` (
  `spell` varchar(10) DEFAULT NULL COMMENT '名称拼音首字母',
  `certified_overtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT 'CA证书过期时间',
  `certificate_num` varchar(100) DEFAULT NULL COMMENT 'CA证书编号',
  `openid` varchar(50) DEFAULT NULL,
  `openid` varchar(50) DEFAULT NULL  COMMENT '用户微信openid',
  `del` varchar(1) DEFAULT '1' COMMENT '作废标识，1正常，0作废',
  `create_user` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '创建人',
  `create_user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '创建人名',
@@ -280,7 +280,20 @@ CREATE TABLE `base_street` (
  KEY `idx_dm_street` (`code`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='街道字典';
-- 居委会
drop table IF EXISTS `base_committee`;
CREATE TABLE `base_committee` (
  `id` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT '业务无关主键',
  `province` varchar(50) DEFAULT NULL COMMENT '省标识',
  `city` varchar(50) DEFAULT NULL COMMENT '市标识',
  `town` varchar(50) DEFAULT NULL COMMENT '区县标识',
  `street` varchar(50) DEFAULT NULL COMMENT '街道标识',
  `code` varchar(50) DEFAULT NULL COMMENT '居委会标识',
  `name` varchar(100) DEFAULT NULL COMMENT '居委会名称',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4 COMMENT '居委会';
-- 行政区划数据  5个表 ---end----
-- 职称表
@@ -341,6 +354,18 @@ CREATE TABLE `dict_health_problem` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='健康问题字典';
-- 病种字典表
drop table IF EXISTS `dict_disease`;
CREATE TABLE `dict_disease` (
  `id` int(11) NOT NULL AUTO_INCREMENT  COMMENT '表id，自增长，字典型',
  `saas_id` varchar(100) DEFAULT NULL COMMENT 'saas配置id，null标识公共字典',
  `code` varchar(50) CHARACTER SET utf8 DEFAULT NULL COMMENT '疾病编码',
  `name` varchar(200) CHARACTER SET utf8 DEFAULT NULL COMMENT '疾病名称',
  key `idx_hea_problem_code` (`code`),
  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='病种字典';
-- 标准科室
drop table IF EXISTS `dict_hospital_dept`;
create table `dict_hospital_dept`

svr/svr-base/pom.xml

@@ -109,6 +109,12 @@
            <artifactId>elasticsearch-starter</artifactId>
            <version>2.0.0</version>
        </dependency>
        <!-- 文件服务器 -->
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>
            <version>2.0.0</version>
        </dependency>
    </dependencies>

svr/svr-base/src/main/java/com/yihu/SvrBaseApplication.java

@@ -12,7 +12,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 */
@SpringBootApplication
@EnableJpaAuditing
public class SvrBaseApplication  extends SpringBootServletInitializer  {
public class SvrBaseApplication extends SpringBootServletInitializer {
    public static void main(String[] args)  {
        SpringApplication.run(SvrBaseApplication.class, args);

svr/svr-base/src/main/java/com/yihu/jw/base/activemq/ConsumerRunner.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.activemq;
import com.yihu.utils.context.SpringContext;
import com.yihu.utils.context.SpringContextUtils;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +36,7 @@ public class ConsumerRunner implements Runnable, ExceptionListener {
    private void init() {
        try {
            ActiveMQConnectionFactory connectionFactory = SpringContext.getService(ActiveMQConnectionFactory.class);
            ActiveMQConnectionFactory connectionFactory = SpringContextUtils.getService(ActiveMQConnectionFactory.class);
            // Create a Connection
            connection = connectionFactory.createQueueConnection();
            connection.start();
@@ -54,7 +54,7 @@ public class ConsumerRunner implements Runnable, ExceptionListener {
    }
    private void recover() throws JMSException {
        ActiveMQConnectionFactory connectionFactory = SpringContext.getService(ActiveMQConnectionFactory.class);
        ActiveMQConnectionFactory connectionFactory = SpringContextUtils.getService(ActiveMQConnectionFactory.class);
        // Create a Connection
        connection = connectionFactory.createQueueConnection();
        connection.start();

svr/svr-base/src/main/java/com/yihu/jw/base/config/BaseJpa.java

@@ -1,57 +0,0 @@
//package com.yihu.jw.base.config;
//
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Qualifier;
//import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
//import org.springframework.boot.context.properties.ConfigurationProperties;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.context.annotation.Primary;
//import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
//import org.springframework.orm.jpa.JpaTransactionManager;
//import org.springframework.orm.jpa.JpaVendorAdapter;
//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
//import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
//import org.springframework.transaction.annotation.EnableTransactionManagement;
//
//import javax.persistence.EntityManagerFactory;
//import javax.sql.DataSource;
//
///**
// * Created by chenweida on 2017/4/6.
// */
//@Configuration
//@EnableTransactionManagement
//@EnableJpaRepositories(
//        entityManagerFactoryRef = "baseEntityManagerFactory",
//        transactionManagerRef = "baseTransactionManager",
//        basePackages = {"com.yihu.jw.business"})   //设置Repository所在位置
//public class BaseJpa {
//
//    @Autowired
//    private HibernateProperties hibernateProperties;
//
//    @Bean(name = "baseEntityManagerFactory")
//    @Primary
//    public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary(DataSource dataSource) {
//
//        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
//        emfb.setDataSource(dataSource);
//        emfb.setPackagesToScan("com.yihu.jw.base");
//        emfb.setPersistenceUnitName("base");
//        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
//        emfb.setJpaVendorAdapter(vendorAdapter);
//        emfb.setJpaProperties(hibernateProperties.hibProperties());
//
//        return emfb;
//    }
//
//
//    @Bean(name = "baseTransactionManager")
//    @Primary
//    JpaTransactionManager transactionManagerSecondary(
//            @Qualifier("baseEntityManagerFactory") EntityManagerFactory builder) {
//        return new JpaTransactionManager(builder);
//    }
//}

svr/svr-base/src/main/java/com/yihu/jw/base/config/HibernateProperties.java

@@ -1,43 +0,0 @@
//package com.yihu.jw.base.config;
//
//import org.hibernate.EmptyInterceptor;
//import org.hibernate.Interceptor;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.cloud.context.config.annotation.RefreshScope;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.stereotype.Component;
//
//import java.util.List;
//import java.util.Properties;
//
///**
// * Created by chenweida on 2017/4/6.
// */
//@Configuration
//@Component
//public class HibernateProperties {
//    @Value("${hibernate.dialect}")
//    private String dialect;
//    @Value("${hibernate.show_sql}")
//    private String show_sql;
////    @Value("${hibernate.ejb.naming_strategy}")
////    private String naming_strategy;
//
//    @Value("${hibernate.physical_naming_strategy}")
//    private String physical_naming_strategy;
//    @Value("${hibernate.implicit_naming_strategy}")
//    private String implicit_naming_strategy;
////    @Autowired
////    private List<Interceptor> interceptors;
//
//    public Properties hibProperties() {
//        Properties properties = new Properties();
//        properties.put("hibernate.dialect", dialect);
//        properties.put("hibernate.show_sql", show_sql);
//        properties.put("hibernate.physical_naming_strategy", physical_naming_strategy);
//        properties.put("hibernate.implicit_naming_strategy", implicit_naming_strategy);
//        //properties.put("hibernate.ejb.interceptor", interceptors.get(0));
//        return properties;
//    }
//}

svr/svr-base/src/main/java/com/yihu/jw/base/config/SwaggerDocs.java

@@ -1,5 +1,12 @@
package com.yihu.jw.base.config;
import io.github.swagger2markup.GroupBy;
import io.github.swagger2markup.Language;
import io.github.swagger2markup.Swagger2MarkupConfig;
import io.github.swagger2markup.Swagger2MarkupConverter;
import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
import io.github.swagger2markup.markup.builder.MarkupLanguage;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -17,19 +24,19 @@ public class SwaggerDocs {
        String prefix = Thread.currentThread().getContextClassLoader().getResource("").getPath();
        Path outputFile = Paths.get(prefix.substring(prefix.lastIndexOf(":") + 1, prefix.indexOf("target") - 1) + "/build/" + group); //文档输出地址
//        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
//                .withMarkupLanguage(MarkupLanguage.ASCIIDOC)
//                .withOutputLanguage(Language.ZH)
//                .withPathsGroupedBy(GroupBy.TAGS)
//                .withGeneratedExamples()
//                .withoutInlineSchema()
//                //.withBasePathPrefix()
//                .build();
//
//        Swagger2MarkupConverter converter = Swagger2MarkupConverter.from(remoteSwaggerFile)
//                .withConfig(config)
//                .build();
//
//        converter.toFile(outputFile);
        Swagger2MarkupConfig config = new Swagger2MarkupConfigBuilder()
                .withMarkupLanguage(MarkupLanguage.ASCIIDOC)
                .withOutputLanguage(Language.ZH)
                .withPathsGroupedBy(GroupBy.TAGS)
                .withGeneratedExamples()
                .withoutInlineSchema()
                //.withBasePathPrefix()
                .build();
        Swagger2MarkupConverter converter = Swagger2MarkupConverter.from(remoteSwaggerFile)
                .withConfig(config)
                .build();
        converter.toFile(outputFile);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseCityDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.area;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/area/BaseCommitteeDao.java

@@ -0,0 +1,20 @@
package com.yihu.jw.base.dao.area;
import com.yihu.jw.entity.base.area.BaseCommitteeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 区县居委会 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月04日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BaseCommitteeDao extends PagingAndSortingRepository<BaseCommitteeDO, Integer>, JpaSpecificationExecutor<BaseCommitteeDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseProvinceDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.area;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseStreetDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.area;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseTownDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.area;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictDiseaseDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictDiseaseDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 病种字典 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月05日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface DictDiseaseDao extends PagingAndSortingRepository<DictDiseaseDO, Integer>, JpaSpecificationExecutor<DictDiseaseDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/DictHealthProblemDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.dict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/DictHospitalDeptDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.dict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/DictIcd10Dao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.dict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/DictJobTitleDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.dict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/DictMedicineDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.dict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseDoctorDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.doctor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseDoctorHospitalDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.doctor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseDoctorRoleDictDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.doctor;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseOrgDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.org;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BasePatientDao.java

@@ -1,21 +1,13 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.patient;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.patient.BasePatientDO;
/**
 * 
 * 居民信息 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 *
 * </pre>
 * @since 1.
 * Created by Trick on 2018/8/31.
 */
public interface BasePatientDao extends PagingAndSortingRepository<BasePatientDO, String>, JpaSpecificationExecutor<BasePatientDO>  {
}
public interface BasePatientDao extends PagingAndSortingRepository<BasePatientDO, String>, JpaSpecificationExecutor<BasePatientDO> {
    BasePatientDO findByIdAndDel(String id,String del);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/patient/BasePatientFamilyMemberDao.java

@@ -0,0 +1,13 @@
package com.yihu.jw.base.dao.patient;
import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BasePatientFamilyMemberDao extends PagingAndSortingRepository<BasePatientFamilyMemberDO, String>, JpaSpecificationExecutor<BasePatientFamilyMemberDO> {
    public BasePatientFamilyMemberDO findByPatientAndFamilyMember(String patient,String member);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/people_num/BasePeopleNumDao.java

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.people_num;
import com.yihu.jw.entity.base.peopel_num.BasePeopleNumDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * 基础人口基数信息 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月05日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface BasePeopleNumDao extends PagingAndSortingRepository<BasePeopleNumDO, String>, JpaSpecificationExecutor<BasePeopleNumDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/score/BaseEvaluateDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.base.dao.score;
import com.yihu.jw.entity.base.score.BaseEvaluateDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BaseEvaluateDao extends PagingAndSortingRepository<BaseEvaluateDO, String>, JpaSpecificationExecutor<BaseEvaluateDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/score/BaseEvaluateScoreDao.java

@@ -0,0 +1,11 @@
package com.yihu.jw.base.dao.score;
import com.yihu.jw.entity.base.score.BaseEvaluateScoreDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BaseEvaluateScoreDao extends PagingAndSortingRepository<BaseEvaluateScoreDO, String>, JpaSpecificationExecutor<BaseEvaluateScoreDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseTeamDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.team;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/BaseTeamMemberDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao;
package com.yihu.jw.base.dao.team;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WechatDao.java

@@ -0,0 +1,29 @@
package com.yihu.jw.base.dao.wx;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2017/5/20 0020.
 */
public interface WechatDao extends PagingAndSortingRepository<WxWechatDO, String>, JpaSpecificationExecutor<WxWechatDO> {
    @Query("from WxWechatDO w where w.appId = ?1 and w.status!=-1")
    WxWechatDO findByAppId(String appId);
    @Query("from WxWechatDO w where w.appId = ?1 and w.id!= ?2 and w.status!=-1")
    WxWechatDO findByAppIdExcludeId(String appId, String id);
    @Query("from WxWechatDO w where w.id = ?1 and w.status!=-1")
    WxWechatDO findById(String id);
    @Query("from WxWechatDO w where w.status!=-1")
    List<WxWechatDO> findAll();
    @Query("from WxWechatDO w where w.appOriginId = ?1 and w.status!=-1")
    WxWechatDO findByAppOriginId(String appOriginId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxAccessTokenDao.java

@@ -0,0 +1,17 @@
package com.yihu.jw.base.dao.wx;
import com.yihu.jw.entity.base.wx.WxAccessTokenDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2017/5/18 0018.
 */
public interface WxAccessTokenDao extends PagingAndSortingRepository<WxAccessTokenDO, String>, JpaSpecificationExecutor<WxAccessTokenDO> {
    @Query("from WxAccessTokenDO w where w.wechatId =?1 order by w.addTimestamp desc")
    List<WxAccessTokenDO> getWxAccessTokenById(String wechatId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxGraphicMessageDao.java

@@ -0,0 +1,15 @@
package com.yihu.jw.base.dao.wx;//package com.yihu.jw.business.wx.dao;
//
//import com.yihu.jw.base.wx.WxGraphicMessageDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
//import org.springframework.data.jpa.repository.Query;
//import org.springframework.data.repository.PagingAndSortingRepository;
//
///**
// * Created by Administrator on 2017/5/20 0020.
// */
//public interface WxGraphicMessageDao extends PagingAndSortingRepository<WxGraphicMessageDO, String>, JpaSpecificationExecutor<WxGraphicMessageDO> {
//
//    @Query("from WxGraphicMessageDO w where w.id =?1 and w.status!=-1")
//    WxGraphicMessageDO findById(String id);
//}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxGraphicSceneGroupDao.java

@@ -0,0 +1,15 @@
package com.yihu.jw.base.dao.wx;
import com.yihu.jw.entity.base.wx.WxGraphicSceneGroupDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2018/8/16.
 */
public interface WxGraphicSceneGroupDao extends PagingAndSortingRepository<WxGraphicSceneGroupDO, String>, JpaSpecificationExecutor<WxGraphicSceneGroupDO> {
    List<WxGraphicSceneGroupDO> findByWechatIdAndScene(String wechatId, String scene);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxMenuDao.java

@@ -0,0 +1,20 @@
package com.yihu.jw.base.dao.wx;
import com.yihu.jw.entity.base.wx.WxMenuDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2017/5/19 0019.
 */
public interface WxMenuDao  extends PagingAndSortingRepository<WxMenuDO, String>, JpaSpecificationExecutor<WxMenuDO> {
    @Query("FROM WxMenuDO w WHERE w.wechatId =?1 AND w.status ='1' AND w.supMenuid IS NULL ORDER BY w.sort ASC")
    List<WxMenuDO> findParentRootByWechatId(String wechatId);
    @Query("FROM WxMenuDO w WHERE w.wechatId =?1 AND w.status ='1' AND w.supMenuid IS NOT NULL ORDER BY w.sort ASC")
    List<WxMenuDO> findChilrenByWechatId(String wechatId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxMenuJsonDao.java

@@ -0,0 +1,13 @@
package com.yihu.jw.base.dao.wx;
import com.yihu.jw.entity.base.wx.WxMenuJsonDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/13.
 */
public interface WxMenuJsonDao extends PagingAndSortingRepository<WxMenuJsonDO, String>, JpaSpecificationExecutor<WxMenuJsonDO> {
    WxMenuJsonDO findByWechatIdAndStatus(String wechatId, Integer status);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxReplySceneDao.java

@@ -0,0 +1,18 @@
package com.yihu.jw.base.dao.wx;
import com.yihu.jw.entity.base.wx.WxReplySceneDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Trick on 2018/8/16.
 */
public interface WxReplySceneDao extends PagingAndSortingRepository<WxReplySceneDO, String>, JpaSpecificationExecutor<WxReplySceneDO> {
    List<WxReplySceneDO> findByAppOriginIdAndMsgTypeAndStatus(String appOriginId, String msgType, Integer status);
    List<WxReplySceneDO> findByAppOriginIdAndMsgTypeAndEventAndStatus(String appOriginId, String msgType, String event, Integer status);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxTemplateConfigDao.java

@@ -0,0 +1,15 @@
package com.yihu.jw.base.dao.wx;
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Trick on 2018/8/21.
 */
public interface WxTemplateConfigDao extends PagingAndSortingRepository<WxTemplateConfigDO, String>, JpaSpecificationExecutor<WxTemplateConfigDO> {
    WxTemplateConfigDO findByWechatIdAndTemplateNameAndScene(String wechatId, String templateName, String scene);
}