Merge branch 'dev' of LiTaohong/wlyy2.0 into dev

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

@@ -32,6 +32,15 @@ public class DictHealthProblemDO extends IntegerIdentityEntity {
	 * 字典名称
	 */
	private String name;
    /**
     * 是否慢病 1-是，0-否
     */
    private String chronicFlag;
    /**
     * 是否传染病 1-是，0-否
     */
    private String infectiousFlag;
    /**
	 * 描述
@@ -69,7 +78,15 @@ public class DictHealthProblemDO extends IntegerIdentityEntity {
        this.name = name;
    }
	@Column(name = "description")
    @Column(name = "chronic_flag")
    public String getChronicFlag() {
        return chronicFlag;
    }
    public void setChronicFlag(String chronicFlag) {
        this.chronicFlag = chronicFlag;
    }
    @Column(name = "description")
    public String getDescription() {
        return description;
    }

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

@@ -33,21 +33,6 @@ public class DictIcd10DO extends IntegerIdentityEntity {
	 */
	private String name;
    /**
	 * 字典名称拼音首字母
	 */
	private String phoneticCode;
    /**
	 * 是否慢病
	 */
	private String chronicFlag;
    /**
	 * 是否传染病
	 */
	private String infectiousFlag;
    /**
	 * 描述
	 */
@@ -84,30 +69,6 @@ public class DictIcd10DO extends IntegerIdentityEntity {
        this.name = name;
    }
	@Column(name = "phonetic_code")
    public String getPhoneticCode() {
        return phoneticCode;
    }
    public void setPhoneticCode(String phoneticCode) {
        this.phoneticCode = phoneticCode;
    }
	@Column(name = "chronic_flag")
    public String getChronicFlag() {
        return chronicFlag;
    }
    public void setChronicFlag(String chronicFlag) {
        this.chronicFlag = chronicFlag;
    }
	@Column(name = "infectious_flag")
    public String getInfectiousFlag() {
        return infectiousFlag;
    }
    public void setInfectiousFlag(String infectiousFlag) {
        this.infectiousFlag = infectiousFlag;
    }
	@Column(name = "description")
    public String getDescription() {
        return description;

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

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

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

@@ -75,29 +75,44 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
	private String photo;
    /**
	 * 省编码
	 */
	private String provinceCode;
     * 省代码
     */
    private String provinceCode;
    /**
	 * 市编码
	 */
	private String cityCode;
     * 省名称
     */
    private String provinceName;
    /**
	 * 区县编码
	 */
	private String townCode;
     * 市代码
     */
    private String cityCode;
    /**
	 * 街道编码
	 */
	private String streetCode;
     * 市名称
     */
    private String cityName;
    /**
	 * 具体详细地址
	 */
	private String address;
     * 区县代码
     */
    private String townCode;
    /**
     * 区县名称
     */
    private String townName;
    /**
     * 街道代码
     */
    private String streetCode;
    /**
     * 街道名称
     */
    private String streetName;
    /**
	 * 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
@@ -285,7 +300,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.photo = photo;
    }
	@Column(name = "province_code")
    @Column(name = "province_code")
    public String getProvinceCode() {
        return provinceCode;
    }
@@ -293,7 +308,15 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.provinceCode = provinceCode;
    }
	@Column(name = "city_code")
    @Column(name = "province_name")
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    @Column(name = "city_code")
    public String getCityCode() {
        return cityCode;
    }
@@ -301,7 +324,15 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.cityCode = cityCode;
    }
	@Column(name = "town_code")
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    @Column(name = "town_code")
    public String getTownCode() {
        return townCode;
    }
@@ -309,7 +340,15 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.townCode = townCode;
    }
	@Column(name = "street_code")
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    @Column(name = "street_code")
    public String getStreetCode() {
        return streetCode;
    }
@@ -317,12 +356,12 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.streetCode = streetCode;
    }
	@Column(name = "address")
    public String getAddress() {
        return address;
    @Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setAddress(String address) {
        this.address = address;
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
	@Column(name = "disease")

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

@@ -25,26 +25,26 @@ public class BaseCityVO extends IntegerIdentityVO{
    /**
	 * 省编码
	 */
	@ApiModelProperty(value = "省编码", example = "模块1")
	@ApiModelProperty(value = "省编码", example = "350000")
    private String province;
    /**
	 * 城市编码
	 */
	@ApiModelProperty(value = "城市编码", example = "模块1")
	@ApiModelProperty(value = "城市编码", example = "350200")
    private String code;
    /**
	 * 城市名称
	 */
	@ApiModelProperty(value = "城市名称", example = "模块1")
	@ApiModelProperty(value = "城市名称", example = "厦门市")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -23,37 +23,37 @@ public class BaseCommitteeVO extends UuidIdentityVOWithOperator {
    /**
	 * 省标识
	 */
	@ApiModelProperty(value = "省标识", example = "模块1")
	@ApiModelProperty(value = "省标识", example = "350000")
    private String province;
    /**
	 * 市标识
	 */
	@ApiModelProperty(value = "市标识", example = "模块1")
	@ApiModelProperty(value = "市标识", example = "350200")
    private String city;
    /**
	 * 区县标识
	 */
	@ApiModelProperty(value = "区县标识", example = "模块1")
	@ApiModelProperty(value = "区县标识", example = "350203")
    private String town;
    /**
	 * 街道标识
	 */
	@ApiModelProperty(value = "街道标识", example = "模块1")
	@ApiModelProperty(value = "街道标识", example = "350203006")
    private String street;
    /**
	 * 居委会标识
	 */
	@ApiModelProperty(value = "居委会标识", example = "模块1")
	@ApiModelProperty(value = "居委会标识", example = "350203006001")
    private String code;
    /**
	 * 居委会名称
	 */
	@ApiModelProperty(value = "居委会名称", example = "模块1")
	@ApiModelProperty(value = "居委会名称", example = "厦禾社区居民委员会")
    private String name;

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

@@ -25,20 +25,20 @@ public class BaseProvinceVO extends IntegerIdentityVO{
    /**
	 * 省份编码
	 */
	@ApiModelProperty(value = "省份编码", example = "模块1")
	@ApiModelProperty(value = "省份编码", example = "350000")
    private String code;
    /**
	 * 省份名称
	 */
	@ApiModelProperty(value = "省份名称", example = "模块1")
	@ApiModelProperty(value = "省份名称", example = "福建省")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -25,38 +25,38 @@ public class BaseStreetVO extends IntegerIdentityVO{
    /**
	 * 省标识
	 */
	@ApiModelProperty(value = "省标识", example = "模块1")
	@ApiModelProperty(value = "省标识", example = "350000")
    private String province;
    /**
	 * 市标识
	 */
	@ApiModelProperty(value = "市标识", example = "模块1")
	@ApiModelProperty(value = "市标识", example = "350200")
    private String city;
    /**
	 * 区县标识
	 */
	@ApiModelProperty(value = "区县标识", example = "模块1")
	@ApiModelProperty(value = "区县标识", example = "350206")
    private String town;
    /**
	 * 街道标识
	 */
	@ApiModelProperty(value = "街道标识", example = "模块1")
	@ApiModelProperty(value = "街道标识", example = "350206001")
    private String code;
    /**
	 * 街道名称
	 */
	@ApiModelProperty(value = "街道名称", example = "模块1")
	@ApiModelProperty(value = "街道名称", example = "湖里街道")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -25,32 +25,32 @@ public class BaseTownVO extends IntegerIdentityVO{
    /**
	 * 省编码
	 */
	@ApiModelProperty(value = "省编码", example = "模块1")
	@ApiModelProperty(value = "省编码", example = "110000")
    private String province;
    /**
	 * 城市编码
	 */
	@ApiModelProperty(value = "城市编码", example = "模块1")
	@ApiModelProperty(value = "城市编码", example = "110100")
    private String city;
    /**
	 * 区县编码
	 */
	@ApiModelProperty(value = "区县编码", example = "模块1")
	@ApiModelProperty(value = "区县编码", example = "110101")
    private String code;
    /**
	 * 区县名称
	 */
	@ApiModelProperty(value = "区县名称", example = "模块1")
	@ApiModelProperty(value = "区县名称", example = "东城区")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -25,26 +25,26 @@ public class DictDiseaseVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * 疾病编码
	 */
	@ApiModelProperty(value = "疾病编码", example = "模块1")
	@ApiModelProperty(value = "疾病编码", example = "2")
    private String code;
    /**
	 * 疾病名称
	 */
	@ApiModelProperty(value = "疾病名称", example = "模块1")
	@ApiModelProperty(value = "疾病名称", example = "糖尿病")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -25,32 +25,44 @@ public class DictHealthProblemVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * 字典编码
	 */
	@ApiModelProperty(value = "字典编码", example = "模块1")
	@ApiModelProperty(value = "字典编码", example = "HP0001")
    private String code;
    /**
	 * 字典名称
	 */
	@ApiModelProperty(value = "字典名称", example = "模块1")
	@ApiModelProperty(value = "字典名称", example = "肠道传染病")
    private String name;
    /**
	 * 描述
	 */
	@ApiModelProperty(value = "描述", example = "模块1")
	@ApiModelProperty(value = "描述", example = "肠道疾病")
    private String description;
    /**
     * 是否慢病
     */
    @ApiModelProperty(value = "是否慢病", example = "1-是，0-否")
    private String chronicFlag;
    /**
     * 是否传染病
     */
    @ApiModelProperty(value = "是否传染病", example = "1-是，0-否")
    private String infectiousFlag;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;
@@ -89,5 +101,18 @@ public class DictHealthProblemVO extends IntegerIdentityVO{
        this.createTime = createTime;
    }
    public String getChronicFlag() {
        return chronicFlag;
    }
    public void setChronicFlag(String chronicFlag) {
        this.chronicFlag = chronicFlag;
    }
    public String getInfectiousFlag() {
        return infectiousFlag;
    }
    public void setInfectiousFlag(String infectiousFlag) {
        this.infectiousFlag = infectiousFlag;
    }
}

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

@@ -25,26 +25,26 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * 科室标识
	 */
	@ApiModelProperty(value = "科室标识", example = "模块1")
	@ApiModelProperty(value = "科室标识", example = "")
    private String code;
    /**
	 * 科室名称
	 */
	@ApiModelProperty(value = "科室名称", example = "模块1")
	@ApiModelProperty(value = "科室名称", example = "神经内科")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -25,50 +25,32 @@ public class DictIcd10VO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * icd10字典编码
	 */
	@ApiModelProperty(value = "icd10字典编码", example = "模块1")
	@ApiModelProperty(value = "icd10字典编码", example = "A00.000")
    private String code;
    /**
	 * icd10字典名称
	 */
	@ApiModelProperty(value = "icd10字典名称", example = "模块1")
	@ApiModelProperty(value = "icd10字典名称", example = "古典生物型霍乱")
    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")
	@ApiModelProperty(value = "描述", example = "")
    private String description;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;
@@ -93,27 +75,6 @@ public class DictIcd10VO extends IntegerIdentityVO{
        this.name = name;
    }
    public String getPhoneticCode() {
        return phoneticCode;
    }
    public void setPhoneticCode(String phoneticCode) {
        this.phoneticCode = phoneticCode;
    }
    public String getChronicFlag() {
        return chronicFlag;
    }
    public void setChronicFlag(String chronicFlag) {
        this.chronicFlag = chronicFlag;
    }
    public String getInfectiousFlag() {
        return infectiousFlag;
    }
    public void setInfectiousFlag(String infectiousFlag) {
        this.infectiousFlag = infectiousFlag;
    }
    public String getDescription() {
        return description;
    }

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

@@ -25,26 +25,26 @@ public class DictJobTitleVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * 职称标识
	 */
	@ApiModelProperty(value = "职称标识", example = "模块1")
	@ApiModelProperty(value = "职称标识", example = "String")
    private String code;
    /**
	 * 职称名
	 */
	@ApiModelProperty(value = "职称名", example = "模块1")
	@ApiModelProperty(value = "职称名", example = "全科医师")
    private String name;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -25,32 +25,32 @@ public class DictMedicineVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * 药品编码
	 */
	@ApiModelProperty(value = "药品编码", example = "模块1")
	@ApiModelProperty(value = "药品编码", example = "A011")
    private String code;
    /**
	 * 药品名称
	 */
	@ApiModelProperty(value = "药品名称", example = "模块1")
	@ApiModelProperty(value = "药品名称", example = "基础胰岛素")
    private String name;
    /**
	 * 药品类型：1健康记录
	 */
	@ApiModelProperty(value = "药品类型：1健康记录", example = "模块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")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss/该字段可不填")
    private Date createTime;

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

@@ -25,50 +25,50 @@ public class BaseDoctorHospitalVO extends IntegerIdentityVO{
    /**
	 * 医院标识
	 */
	@ApiModelProperty(value = "医院标识", example = "模块1")
	@ApiModelProperty(value = "医院标识", example = "")
    private String hospCode;
    /**
	 * 医院名称
	 */
	@ApiModelProperty(value = "医院名称", example = "模块1")
	@ApiModelProperty(value = "医院名称", example = "")
    private String hospName;
    /**
	 * 医生角色标识
	 */
	@ApiModelProperty(value = "医生角色标识", example = "模块1")
	@ApiModelProperty(value = "医生角色标识", example = "")
    private String roleCode;
    /**
	 * 医院角色名称
	 */
	@ApiModelProperty(value = "医院角色名称", example = "模块1")
	@ApiModelProperty(value = "医院角色名称", example = "")
    private String roleName;
    /**
	 * 职称代码
	 */
	@ApiModelProperty(value = "职称代码", example = "模块1")
	@ApiModelProperty(value = "职称代码", example = "")
    private String jobTitleCode;
    /**
	 * 职称名称
	 */
	@ApiModelProperty(value = "职称名称", example = "模块1")
	@ApiModelProperty(value = "职称名称", example = "")
    private String jobTitleName;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@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")
	@ApiModelProperty(value = "", example = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

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

@@ -24,19 +24,19 @@ public class BaseDoctorRoleDictVO extends IntegerIdentityVO{
    /**
	 * 角色code
	 */
	@ApiModelProperty(value = "角色code", example = "模块1")
	@ApiModelProperty(value = "角色code", example = "")
    private String code;
    /**
	 * 角色名称：全科医生、专科医生、健康管理师、管理员等
	 */
	@ApiModelProperty(value = "角色名称：全科医生、专科医生、健康管理师、管理员等", example = "模块1")
	@ApiModelProperty(value = "角色名称：全科医生、专科医生、健康管理师、管理员等", example = "")
    private String name;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "1")
    private String del;

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

@@ -25,171 +25,171 @@ public class BaseDoctorVO extends UuidIdentityVOWithOperator {
    /**
	 * 机构id
	 */
	@ApiModelProperty(value = "机构id", example = "模块1")
	@ApiModelProperty(value = "机构id", example = "q8q39888jojuuasdnfadf8j8h736ljv")
    private String orgId;
    /**
	 * 密码
	 */
	@ApiModelProperty(value = "密码", example = "模块1")
	@ApiModelProperty(value = "密码", example = "s9i8ujjhy7gtgf5e455asddddda33eedbbfsq")
    private String password;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
	@ApiModelProperty(value = "", example = "")
    private String salt;
    /**
	 * 姓名
	 */
	@ApiModelProperty(value = "姓名", example = "模块1")
	@ApiModelProperty(value = "姓名", example = "张三")
    private String name;
    /**
	 * 性别（1男，2女） 用国家标准字典
	 */
	@ApiModelProperty(value = "性别（1男，2女） 用国家标准字典", example = "模块1")
	@ApiModelProperty(value = "性别（1男，2女） 用国家标准字典", example = "1")
    private String sex;
    /**
	 * 医生专长
	 */
	@ApiModelProperty(value = "医生专长", example = "模块1")
	@ApiModelProperty(value = "医生专长", example = "擅长....")
    private String expertise;
    /**
	 * 医生介绍
	 */
	@ApiModelProperty(value = "医生介绍", example = "模块1")
	@ApiModelProperty(value = "医生介绍", example = "....")
    private String introduce;
    /**
	 *  身份证
	 */
	@ApiModelProperty(value = " 身份证", example = "模块1")
	@ApiModelProperty(value = " 身份证", example = "350.....")
    private String idcard;
    /**
	 * 生日
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "生日", example = "模块1")
	@ApiModelProperty(value = "生日", example = "yyyy-MM-dd HH:mm:ss")
    private Date birthday;
    /**
	 * 头像http地址
	 */
	@ApiModelProperty(value = "头像http地址", example = "模块1")
	@ApiModelProperty(value = "头像http地址", example = "")
    private String photo;
    /**
	 * 手机号
	 */
	@ApiModelProperty(value = "手机号", example = "模块1")
	@ApiModelProperty(value = "手机号", example = "")
    private String mobile;
    /**
	 * 医生二维码
	 */
	@ApiModelProperty(value = "医生二维码", example = "模块1")
	@ApiModelProperty(value = "医生二维码", example = "")
    private String qrcode;
    /**
	 * 省代码
	 */
	@ApiModelProperty(value = "省代码", example = "模块1")
	@ApiModelProperty(value = "省代码", example = "参考省代码")
    private String provinceCode;
    /**
	 * 省名称
	 */
	@ApiModelProperty(value = "省名称", example = "模块1")
	@ApiModelProperty(value = "省名称", example = "某某省")
    private String provinceName;
    /**
	 * 市代码
	 */
	@ApiModelProperty(value = "市代码", example = "模块1")
	@ApiModelProperty(value = "市代码", example = "参考市代码")
    private String cityCode;
    /**
	 * 市名称
	 */
	@ApiModelProperty(value = "市名称", example = "模块1")
	@ApiModelProperty(value = "市名称", example = "某某市")
    private String cityName;
    /**
	 * 区县代码
	 */
	@ApiModelProperty(value = "区县代码", example = "模块1")
	@ApiModelProperty(value = "区县代码", example = "参考区县代码")
    private String townCode;
    /**
	 * 区县名称
	 */
	@ApiModelProperty(value = "区县名称", example = "模块1")
	@ApiModelProperty(value = "区县名称", example = "某某区县")
    private String townName;
    /**
	 * 街道代码
	 */
	@ApiModelProperty(value = "街道代码", example = "模块1")
	@ApiModelProperty(value = "街道代码", example = "参考街道代码")
    private String streetCode;
    /**
	 * 街道名称
	 */
	@ApiModelProperty(value = "街道名称", example = "模块1")
	@ApiModelProperty(value = "街道名称", example = "某某街道")
    private String streetName;
    /**
	 * 资格是否认证通过，1是，0否
	 */
	@ApiModelProperty(value = "资格是否认证通过，1是，0否", example = "模块1")
	@ApiModelProperty(value = "资格是否认证通过，1是，0否", example = "1")
    private String iscertified;
    /**
	 * 是否是名医，1是，0否
	 */
	@ApiModelProperty(value = "是否是名医，1是，0否", example = "模块1")
	@ApiModelProperty(value = "是否是名医，1是，0否", example = "0")
    private String isFamous;
    /**
	 * 是否提示设置密码  1 提示过 0未提示
	 */
	@ApiModelProperty(value = "是否提示设置密码  1 提示过 0未提示", example = "模块1")
	@ApiModelProperty(value = "是否提示设置密码  1 提示过 0未提示", example = "0")
    private String isPasswordPrompt;
    /**
	 * 名称拼音首字母
	 */
	@ApiModelProperty(value = "名称拼音首字母", example = "模块1")
	@ApiModelProperty(value = "名称拼音首字母", example = "")
    private String spell;
    /**
	 * CA证书过期时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "CA证书过期时间", example = "模块1")
	@ApiModelProperty(value = "CA证书过期时间", example = "yyyy-MM-dd HH:mm:ss")
    private Date certifiedOvertime;
    /**
	 * CA证书编号
	 */
	@ApiModelProperty(value = "CA证书编号", example = "模块1")
	@ApiModelProperty(value = "CA证书编号", example = "实际证书编号")
    private String certificateNum;
    /**
	 * 用户微信openid
	 */
	@ApiModelProperty(value = "用户微信openid", example = "模块1")
	@ApiModelProperty(value = "用户微信openid", example = "填上微信那边分配给用户的")
    private String openid;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "1")
    private String del;

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

@@ -24,115 +24,115 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
    /**
	 * saas化配置
	 */
	@ApiModelProperty(value = "saas化配置", example = "模块1")
	@ApiModelProperty(value = "saas化配置", example = "402803ee656498890165649ad2da1112")
    private String saasid;
    /**
	 * 省份标识
	 */
	@ApiModelProperty(value = "省份标识", example = "模块1")
	@ApiModelProperty(value = "省份标识", example = "参考省代码")
    private String provinceCode;
    /**
	 * 城市标识
	 */
	@ApiModelProperty(value = "城市标识", example = "模块1")
	@ApiModelProperty(value = "城市标识", example = "参考城市代码")
    private String cityCode;
    /**
	 * 区县标识
	 */
	@ApiModelProperty(value = "区县标识", example = "模块1")
	@ApiModelProperty(value = "区县标识", example = "参考区县代码")
    private String townCode;
    /**
	 * 机构名称
	 */
	@ApiModelProperty(value = "机构名称", example = "模块1")
	@ApiModelProperty(value = "机构名称", example = "")
    private String name;
    /**
	 * 机构别名
	 */
	@ApiModelProperty(value = "机构别名", example = "模块1")
	@ApiModelProperty(value = "机构别名", example = "")
    private String alias;
    /**
	 * 机构名称拼音首字母
	 */
	@ApiModelProperty(value = "机构名称拼音首字母", example = "模块1")
	@ApiModelProperty(value = "机构名称拼音首字母", example = "")
    private String spell;
    /**
	 * 机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构
	 */
	@ApiModelProperty(value = "机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构", example = "模块1")
	@ApiModelProperty(value = "机构类型: 1.  医疗机构2.  企事业单位3.  政府机关4.  社会团体 5.药店 0.  部门 6.单位或者独立子公司7.基层机构 8.专业公共机构", example = "1")
    private String type;
    /**
	 * 机构简介
	 */
	@ApiModelProperty(value = "机构简介", example = "模块1")
	@ApiModelProperty(value = "机构简介", example = "")
    private String brief;
    /**
	 * 机构详细地址
	 */
	@ApiModelProperty(value = "机构详细地址", example = "模块1")
	@ApiModelProperty(value = "机构详细地址", example = "")
    private String address;
    /**
	 * 机构图片
	 */
	@ApiModelProperty(value = "机构图片", example = "模块1")
	@ApiModelProperty(value = "机构图片", example = "")
    private String photo;
    /**
	 * 经度
	 */
	@ApiModelProperty(value = "经度", example = "模块1")
	@ApiModelProperty(value = "经度", example = "")
    private String longitude;
    /**
	 * 纬度
	 */
	@ApiModelProperty(value = "纬度", example = "模块1")
	@ApiModelProperty(value = "纬度", example = "")
    private String latitude;
    /**
	 * 法人
	 */
	@ApiModelProperty(value = "法人", example = "模块1")
	@ApiModelProperty(value = "法人", example = "")
    private String legalperson;
    /**
	 * 机构管理员
	 */
	@ApiModelProperty(value = "机构管理员", example = "模块1")
	@ApiModelProperty(value = "机构管理员", example = "")
    private String orgAdmin;
    /**
	 * 机构网址
	 */
	@ApiModelProperty(value = "机构网址", example = "模块1")
	@ApiModelProperty(value = "机构网址", example = "")
    private String orgUrl;
    /**
	 * 机构简介
	 */
	@ApiModelProperty(value = "机构简介", example = "模块1")
	@ApiModelProperty(value = "机构简介", example = "")
    private String intro;
    /**
	 * 机构二维码
	 */
	@ApiModelProperty(value = "机构二维码", example = "模块1")
	@ApiModelProperty(value = "机构二维码", example = "")
    private String qrcode;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "1")
    private String del;

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

@@ -25,134 +25,152 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
    /**
	 * saas配置id
	 */
	@ApiModelProperty(value = "saas配置id", example = "模块1")
	@ApiModelProperty(value = "saas配置id", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * 身份证号
	 */
	@ApiModelProperty(value = "身份证号", example = "模块1")
	@ApiModelProperty(value = "身份证号", example = "18位身份证号")
    private String idcard;
    /**
	 * 登录密码
	 */
	@ApiModelProperty(value = "登录密码", example = "模块1")
	@ApiModelProperty(value = "登录密码", example = "dfsvgre23223dec343434")
    private String password;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
	@ApiModelProperty(value = "", example = "")
    private String salt;
    /**
	 * 姓名
	 */
	@ApiModelProperty(value = "姓名", example = "模块1")
	@ApiModelProperty(value = "姓名", example = "张三")
    private String name;
    /**
	 * 生日
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "生日", example = "模块1")
	@ApiModelProperty(value = "生日", example = "yyyy-MM-dd HH:mm:ss")
    private Date birthday;
    /**
	 * 性别，1男，2女
	 */
	@ApiModelProperty(value = "性别，1男，2女", example = "模块1")
	@ApiModelProperty(value = "性别，1男，2女", example = "1")
    private Integer sex;
    /**
	 * 手机号
	 */
	@ApiModelProperty(value = "手机号", example = "模块1")
	@ApiModelProperty(value = "手机号", example = "")
    private String mobile;
    /**
	 * 联系电话
	 */
	@ApiModelProperty(value = "联系电话", example = "模块1")
	@ApiModelProperty(value = "联系电话", example = "")
    private String phone;
    /**
	 * 社保卡号
	 */
	@ApiModelProperty(value = "社保卡号", example = "模块1")
	@ApiModelProperty(value = "社保卡号", example = "")
    private String ssc;
    /**
	 * 头像http地址
	 */
	@ApiModelProperty(value = "头像http地址", example = "模块1")
	@ApiModelProperty(value = "头像http地址", example = "")
    private String photo;
    /**
	 * 省编码
	 */
	@ApiModelProperty(value = "省编码", example = "模块1")
     * 省代码
     */
    @ApiModelProperty(value = "省代码", example = "参考省代码")
    private String provinceCode;
    /**
	 * 市编码
	 */
	@ApiModelProperty(value = "市编码", example = "模块1")
     * 省名称
     */
    @ApiModelProperty(value = "省名称", example = "某某省")
    private String provinceName;
    /**
     * 市代码
     */
    @ApiModelProperty(value = "市代码", example = "参考市代码")
    private String cityCode;
    /**
	 * 区县编码
	 */
	@ApiModelProperty(value = "区县编码", example = "模块1")
     * 市名称
     */
    @ApiModelProperty(value = "市名称", example = "某某市")
    private String cityName;
    /**
     * 区县代码
     */
    @ApiModelProperty(value = "区县代码", example = "参考区县代码")
    private String townCode;
    /**
	 * 街道编码
	 */
	@ApiModelProperty(value = "街道编码", example = "模块1")
     * 区县名称
     */
    @ApiModelProperty(value = "区县名称", example = "某某区县")
    private String townName;
    /**
     * 街道代码
     */
    @ApiModelProperty(value = "街道代码", example = "参考街道代码")
    private String streetCode;
    /**
	 * 具体详细地址
	 */
	@ApiModelProperty(value = "具体详细地址", example = "模块1")
    private String address;
     * 街道名称
     */
    @ApiModelProperty(value = "街道名称", example = "某某街道")
    private String streetName;
    /**
	 * 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
	 */
	@ApiModelProperty(value = "疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病", example = "模块1")
	@ApiModelProperty(value = "疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病", example = "0")
    private String disease;
    /**
	 * 病情：0绿标，1黄标，2红标，3重点关注,
	 */
	@ApiModelProperty(value = "病情：0绿标，1黄标，2红标，3重点关注,", example = "模块1")
	@ApiModelProperty(value = "病情：0绿标，1黄标，2红标，3重点关注,", example = "0")
    private String diseaseCondition;
    /**
	 * 总积分
	 */
	@ApiModelProperty(value = "总积分", example = "模块1")
	@ApiModelProperty(value = "总积分", example = "")
    private String points;
    /**
	 * 病历总数
	 */
	@ApiModelProperty(value = "病历总数", example = "模块1")
	@ApiModelProperty(value = "病历总数", example = "")
    private String recordAmount;
    /**
	 * 微信编号
	 */
	@ApiModelProperty(value = "微信编号", example = "模块1")
	@ApiModelProperty(value = "微信编号", example = "")
    private String openid;
    /**
	 * 用户状态：1正常，0禁用，-1恶意注册，2审核中
	 */
	@ApiModelProperty(value = "用户状态：1正常，0禁用，-1恶意注册，2审核中", example = "模块1")
	@ApiModelProperty(value = "用户状态：1正常，0禁用，-1恶意注册，2审核中", example = "1")
    private String patientStatus;
    /**
@@ -165,74 +183,74 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
	 * 第一次添加open的时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "第一次添加open的时间", example = "模块1")
	@ApiModelProperty(value = "第一次添加open的时间", example = "yyyy-MM-dd HH:mm:ss")
    private Date openidTime;
    /**
	 * 居委会代码
	 */
	@ApiModelProperty(value = "居委会代码", example = "模块1")
	@ApiModelProperty(value = "居委会代码", example = "")
    private String sickVillage;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "模块1")
	@ApiModelProperty(value = "", example = "")
    private String sickVillageName;
    /**
	 * 绑定电子社保卡主体（共济为操作人code）
	 */
	@ApiModelProperty(value = "绑定电子社保卡主体（共济为操作人code）", example = "模块1")
	@ApiModelProperty(value = "绑定电子社保卡主体（共济为操作人code）", example = "")
    private String principalCode;
    /**
	 * 是否绑定电子社保卡 （0否 1是）
	 */
	@ApiModelProperty(value = "是否绑定电子社保卡 （0否 1是）", example = "模块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")
	@ApiModelProperty(value = "电子社保卡绑定时间", example = "yyyy-MM-dd HH:mm:ss")
    private Date sicardTime;
    /**
	 * 是否分配过微信标签
	 */
	@ApiModelProperty(value = "是否分配过微信标签", example = "模块1")
	@ApiModelProperty(value = "是否分配过微信标签", example = "")
    private Integer isWxtag;
    /**
	 * 微信tagId
	 */
	@ApiModelProperty(value = "微信tagId", example = "模块1")
	@ApiModelProperty(value = "微信tagId", example = "")
    private String wxtagid;
    /**
	 * 居民预警状态：0为标准，1为预警状态
	 */
	@ApiModelProperty(value = "居民预警状态：0为标准，1为预警状态", example = "模块1")
	@ApiModelProperty(value = "居民预警状态：0为标准，1为预警状态", example = "0")
    private Integer standardStatus;
    /**
	 * 医疗保险号
	 */
	@ApiModelProperty(value = "医疗保险号", example = "模块1")
	@ApiModelProperty(value = "医疗保险号", example = "医保号码")
    private String medicareNumber;
    /**
	 * unionId 开发平台唯一标识
	 */
	@ApiModelProperty(value = "unionId 开发平台唯一标识", example = "模块1")
	@ApiModelProperty(value = "unionId 开发平台唯一标识", example = "")
    private String unionid;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "1")
    private String del;
@@ -341,11 +359,36 @@ public class BasePatientVO extends UuidIdentityVOWithOperator {
        this.streetCode = streetCode;
    }
    public String getAddress() {
        return address;
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    public void setAddress(String address) {
        this.address = address;
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
    public String getDisease() {

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

@@ -25,98 +25,98 @@ public class BasePeopleNumVO extends UuidIdentityVOWithOperator {
    /**
	 * saas化的id
	 */
	@ApiModelProperty(value = "saas化的id", example = "模块1")
	@ApiModelProperty(value = "saas化的id", example = "402803ee656498890165649ad2da1112")
    private String saasId;
    /**
	 * 所属省代码
	 */
	@ApiModelProperty(value = "所属省代码", example = "模块1")
	@ApiModelProperty(value = "所属省代码", example = "参考省代码")
    private String provinceCode;
    /**
	 * 所属市代码
	 */
	@ApiModelProperty(value = "所属市代码", example = "模块1")
	@ApiModelProperty(value = "所属市代码", example = "参考市代码")
    private String cityCode;
    /**
	 * 所属区代码
	 */
	@ApiModelProperty(value = "所属区代码", example = "模块1")
	@ApiModelProperty(value = "所属区代码", example = "参考区代码")
    private String districtCode;
    /**
	 * 所属具体名称
	 */
	@ApiModelProperty(value = "所属具体名称", example = "模块1")
	@ApiModelProperty(value = "所属具体名称", example = "自然数")
    private String name;
    /**
	 * 人口数
	 */
	@ApiModelProperty(value = "人口数", example = "模块1")
	@ApiModelProperty(value = "人口数", example = "自然数")
    private Integer num;
    /**
	 * 类别 0是省，1是市，2是区，3是机构
	 */
	@ApiModelProperty(value = "类别 0是省，1是市，2是区，3是机构", example = "模块1")
	@ApiModelProperty(value = "类别 0是省，1是市，2是区，3是机构", example = "0")
    private String type;
    /**
	 * 每年的人口数
	 */
	@ApiModelProperty(value = "每年的人口数", example = "模块1")
	@ApiModelProperty(value = "每年的人口数", example = "自然数")
    private Integer year;
    /**
	 * 高血压发病数
	 */
	@ApiModelProperty(value = "高血压发病数", example = "模块1")
	@ApiModelProperty(value = "高血压发病数", example = "自然数")
    private Integer gxyNum;
    /**
	 * 糖尿病发病数
	 */
	@ApiModelProperty(value = "糖尿病发病数", example = "模块1")
	@ApiModelProperty(value = "糖尿病发病数", example = "自然数")
    private Integer tnbNum;
    /**
	 * 65岁以上老年人口数
	 */
	@ApiModelProperty(value = "65岁以上老年人口数", example = "模块1")
	@ApiModelProperty(value = "65岁以上老年人口数", example = "自然数")
    private Integer sixFiveNum;
    /**
	 * 高血压任务数
	 */
	@ApiModelProperty(value = "高血压任务数", example = "模块1")
	@ApiModelProperty(value = "高血压任务数", example = "自然数")
    private Integer gxyTaskNum;
    /**
	 * 糖尿病任务数
	 */
	@ApiModelProperty(value = "糖尿病任务数", example = "模块1")
	@ApiModelProperty(value = "糖尿病任务数", example = "自然数")
    private Integer tnbTaskNum;
    /**
	 * 65岁以上老年人口任务数
	 */
	@ApiModelProperty(value = "65岁以上老年人口任务数", example = "模块1")
	@ApiModelProperty(value = "65岁以上老年人口任务数", example = "自然数")
    private Integer sixFiveTaskNum;
    /**
	 * 户籍人口任务数
	 */
	@ApiModelProperty(value = "户籍人口任务数", example = "模块1")
	@ApiModelProperty(value = "户籍人口任务数", example = "自然数")
    private Integer taskNum;
    /**
	 * 创建时间
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
	@ApiModelProperty(value = "创建时间", example = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

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

@@ -24,25 +24,25 @@ public class BaseTeamMemberVO extends UuidIdentityVOWithOperator {
    /**
	 * 团队ID
	 */
	@ApiModelProperty(value = "团队ID", example = "模块1")
	@ApiModelProperty(value = "团队ID", example = "")
    private String teamId;
    /**
	 * 机构标识
	 */
	@ApiModelProperty(value = "机构标识", example = "模块1")
	@ApiModelProperty(value = "机构标识", example = "")
    private String orgId;
    /**
	 * 医生标识，多个医生以逗号分开
	 */
	@ApiModelProperty(value = "医生标识，多个医生以逗号分开", example = "模块1")
	@ApiModelProperty(value = "医生标识，多个医生以逗号分开", example = "")
    private String doctorId;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "1")
    private String del;

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

@@ -24,37 +24,37 @@ public class BaseTeamVO extends UuidIdentityVOWithOperator {
    /**
	 * 机构id
	 */
	@ApiModelProperty(value = "机构id", example = "模块1")
	@ApiModelProperty(value = "机构id", example = "")
    private String orgId;
    /**
	 * 团队名称
	 */
	@ApiModelProperty(value = "团队名称", example = "模块1")
	@ApiModelProperty(value = "团队名称", example = "")
    private String name;
    /**
	 * 领导医生标识
	 */
	@ApiModelProperty(value = "领导医生标识", example = "模块1")
	@ApiModelProperty(value = "领导医生标识", example = "")
    private String leaderId;
    /**
	 * 团队人数
	 */
	@ApiModelProperty(value = "团队人数", example = "模块1")
	@ApiModelProperty(value = "团队人数", example = "自然数")
    private String teamNum;
    /**
	 * 团队二维码
	 */
	@ApiModelProperty(value = "团队二维码", example = "模块1")
	@ApiModelProperty(value = "团队二维码", example = "")
    private String qrcode;
    /**
	 * 作废标识，1正常，0作废
	 */
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "1")
    private String del;

sql/init.sql

@@ -4,9 +4,14 @@ drop table IF EXISTS `base_org`;
CREATE TABLE `base_org` (
  `id` varchar(50) NOT NULL COMMENT 'uuid,uuid唯一标识,也是机构code',
  `saasid` varchar(50) NOT NULL COMMENT 'saas化配置',
  `province_code` varchar(50) DEFAULT NULL COMMENT '省份标识',
  `city_code` varchar(50) DEFAULT NULL COMMENT '城市标识',
  `town_code` varchar(50) DEFAULT NULL COMMENT '区县标识',
  `province_code` varchar(50) DEFAULT NULL COMMENT '省代码',
  `province_name` varchar(50) DEFAULT NULL COMMENT '省名称',
  `city_code` varchar(50) DEFAULT NULL COMMENT '市代码',
  `city_name` varchar(50) DEFAULT NULL COMMENT '市名称',
  `town_code` varchar(50) DEFAULT NULL COMMENT '区县代码',
  `town_name` varchar(50) DEFAULT NULL COMMENT '区县名称',
  `street_code` varchar(50) DEFAULT NULL COMMENT '街道代码',
  `street_name` varchar(50) DEFAULT NULL COMMENT '街道名称',
  `name` varchar(100) DEFAULT NULL COMMENT '机构名称',
  `alias` varchar(10) DEFAULT NULL COMMENT '机构别名',
  `spell` varchar(20) DEFAULT NULL COMMENT '机构名称拼音首字母',
@@ -132,11 +137,14 @@ CREATE TABLE `base_patient` (
  `phone` varchar(200) DEFAULT NULL COMMENT '联系电话',
  `ssc` varchar(50) DEFAULT NULL COMMENT '社保卡号',
  `photo` varchar(100) DEFAULT NULL COMMENT '头像http地址',
  `province_code` varchar(50) DEFAULT NULL COMMENT '省编码',
  `city_code` varchar(50) DEFAULT NULL COMMENT '市编码',
  `town_code` varchar(50) DEFAULT NULL COMMENT '区县编码',
  `street_code` varchar(50) DEFAULT NULL COMMENT '街道编码',
  `address` varchar(200) DEFAULT NULL COMMENT '具体详细地址',
  `province_code` varchar(50) DEFAULT NULL COMMENT '省代码',
  `province_name` varchar(50) DEFAULT NULL COMMENT '省名称',
  `city_code` varchar(50) DEFAULT NULL COMMENT '市代码',
  `city_name` varchar(50) DEFAULT NULL COMMENT '市名称',
  `town_code` varchar(50) DEFAULT NULL COMMENT '区县代码',
  `town_name` varchar(50) DEFAULT NULL COMMENT '区县名称',
  `street_code` varchar(50) DEFAULT NULL COMMENT '街道代码',
  `street_name` varchar(50) DEFAULT NULL COMMENT '街道名称',
  `disease` varchar(100) DEFAULT NULL COMMENT '疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病',
  `disease_condition` varchar(100) DEFAULT NULL COMMENT '病情：0绿标，1黄标，2红标，3重点关注,',
  `points` varchar(100) DEFAULT NULL COMMENT '总积分',
@@ -309,19 +317,40 @@ primary key (id)
)
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='职称字典';
-- 机构药品分发
CREATE TABLE `zy_iv_org_physic_allot_dict` (
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `org_id` varchar(50) DEFAULT NULL COMMENT '机构编码',
  `physic_code` varchar(50) DEFAULT NULL COMMENT '药品代码',
  `disp_quantity_untuck_flag` int(10) DEFAULT NULL,
  `disp_pack_untuck_flag` int(10) DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='机构药品分发字典';
-- 药品字典
drop table IF EXISTS `dict_medicine`;
create table `dict_medicine`(
`id` int(11) NOT NULL AUTO_INCREMENT  COMMENT '表id，自增长，字典型',
`saas_id` varchar(100) DEFAULT NULL COMMENT 'saas配置id，null标识公共字典',
`code` varchar(100) not null COMMENT '药品编码',
`name` varchar(50) not null COMMENT '药品名称',
`type` char(1) default NULL COMMENT '药品类型：1健康记录',
`create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
primary key (id),
key `idx_medicine_code` (`code`)
)
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='药品字典';
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `physic_code` varchar(50) DEFAULT NULL COMMENT '药品代码',
  `physic_name` varchar(2000) DEFAULT NULL COMMENT '药品名称',
  `physic_spec` varchar(2000) DEFAULT NULL COMMENT '药品规格',
  `subject_class` varchar(200) DEFAULT NULL COMMENT '药品科目  科目类别字典中定义',
  `dose_unit` varchar(50) DEFAULT NULL COMMENT '剂量单位 计量单位字典中定义',
  `quantity_unit` varchar(50) DEFAULT NULL COMMENT '数量单位  计量单位字典中定义',
  `pack_unit` varchar(250) DEFAULT NULL COMMENT '包装单位   计量单位字典中定义',
  `min_dose` double(20,6) DEFAULT NULL COMMENT '最小剂量',
  `pack_spec` double(20,6) DEFAULT NULL,
  `retail_price` double(20,6) DEFAULT NULL COMMENT '零售价',
  `physic_form` varchar(50) DEFAULT NULL,
  `toxicology_type` varchar(250) DEFAULT NULL COMMENT '毒理分类  药品毒理分类字典中定义',
  `basic_flag` varchar(50) DEFAULT NULL COMMENT '基本药物标志  0：否；1：是',
  `valid_flag` varchar(50) DEFAULT NULL COMMENT '有效标志 0：无效；1：有效',
  `spell_code` varchar(200) DEFAULT NULL COMMENT '拼音首码',
  `wbzx_code` varchar(200) DEFAULT NULL COMMENT '五笔首码',
  `sequence` int(10) DEFAULT NULL COMMENT '排序号',
  `storage_conditions` varchar(50) DEFAULT NULL COMMENT '2表示需要冷藏，其他表示不需要冷藏',
  PRIMARY KEY (`id`)
)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='药品字典';
-- ICD10表
drop table IF EXISTS `dict_icd10`;
@@ -330,9 +359,6 @@ CREATE TABLE `dict_icd10` (
  `saas_id` varchar(100) DEFAULT NULL COMMENT 'saas配置id，null标识公共字典',
  `code` varchar(50) CHARACTER SET utf8 DEFAULT NULL COMMENT 'icd10字典编码',
  `name` varchar(200) CHARACTER SET utf8 DEFAULT NULL COMMENT 'icd10字典名称',
  `phonetic_code` varchar(50) CHARACTER SET utf8 DEFAULT NULL COMMENT '字典名称拼音首字母',
  `chronic_flag` varchar(1) CHARACTER SET utf8 DEFAULT NULL COMMENT '是否慢病',
  `infectious_flag` varchar(1) CHARACTER SET utf8 DEFAULT NULL COMMENT '是否传染病',
  `description` varchar(200) CHARACTER SET utf8 DEFAULT NULL COMMENT '描述',
  `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
  PRIMARY KEY (`id`),
@@ -347,6 +373,8 @@ CREATE TABLE `dict_health_problem` (
  `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 '字典名称',
  `chronic_flag` varchar(1) CHARACTER SET utf8 DEFAULT NULL COMMENT '是否慢病,1-是，0-否',
  `infectious_flag` varchar(1) CHARACTER SET utf8 DEFAULT NULL COMMENT '是否传染病,1-是，0-否',
  `description` 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 '创建时间',