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/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/dict/DictMedicineDO.java

@@ -1,17 +1,15 @@
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日
 * @author Administrator on  2018年09月07日
 *
 */
@Entity
@@ -19,12 +17,7 @@ import java.util.Date;
public class DictMedicineDO extends IntegerIdentityEntity {
    /**
	 * saas配置id，null标识公共字典
	 */
	private String saasId;
    /**
	 * 药品编码
	 * 药品代码
	 */
	private String code;
@@ -34,24 +27,85 @@ public class DictMedicineDO extends IntegerIdentityEntity {
	private String name;
    /**
	 * 药品类型：1健康记录
	 * 药品规格
	 */
	private String type;
	private String physicSpec;
    /**
	 * 创建时间
	 * 药品科目  科目类别字典中定义
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
	private String subjectClass;
    /**
	 * 剂量单位 计量单位字典中定义
	 */
	private String doseUnit;
    /**
	 * 数量单位  计量单位字典中定义
	 */
	private String quantityUnit;
    /**
	 * 包装单位   计量单位字典中定义
	 */
	private String packUnit;
    /**
	 * 最小剂量
	 */
	private double minDose;
    /**
	 * 
	 */
	private double packSpec;
    /**
	 * 零售价
	 */
	private double retailPrice;
    /**
	 * 
	 */
	private String physicForm;
    /**
	 * 毒理分类  药品毒理分类字典中定义
	 */
	private String toxicologyType;
    /**
	 * 基本药物标志  0：否；1：是
	 */
	private String basicFlag;
    /**
	 * 有效标志 0：无效；1：有效
	 */
	private String validFlag;
    /**
	 * 拼音首码
	 */
	private String spellCode;
    /**
	 * 五笔首码
	 */
	private String wbzxCode;
    /**
	 * 排序号
	 */
	private Integer sequence;
    /**
	 * 2表示需要冷藏，其他表示不需要冷藏
	 */
	private String storageConditions;
	@Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
	@Column(name = "code")
    public String getCode() {
@@ -69,20 +123,132 @@ public class DictMedicineDO extends IntegerIdentityEntity {
        this.name = name;
    }
	@Column(name = "type")
    public String getType() {
        return type;
	@Column(name = "physic_spec")
    public String getPhysicSpec() {
        return physicSpec;
    }
    public void setPhysicSpec(String physicSpec) {
        this.physicSpec = physicSpec;
    }
	@Column(name = "subject_class")
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
	@Column(name = "dose_unit")
    public String getDoseUnit() {
        return doseUnit;
    }
    public void setDoseUnit(String doseUnit) {
        this.doseUnit = doseUnit;
    }
	@Column(name = "quantity_unit")
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
	@Column(name = "pack_unit")
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
	@Column(name = "min_dose")
    public double getMinDose() {
        return minDose;
    }
    public void setMinDose(double minDose) {
        this.minDose = minDose;
    }
	@Column(name = "pack_spec")
    public double getPackSpec() {
        return packSpec;
    }
    public void setPackSpec(double packSpec) {
        this.packSpec = packSpec;
    }
	@Column(name = "retail_price")
    public double getRetailPrice() {
        return retailPrice;
    }
    public void setRetailPrice(double retailPrice) {
        this.retailPrice = retailPrice;
    }
	@Column(name = "physic_form")
    public String getPhysicForm() {
        return physicForm;
    }
    public void setPhysicForm(String physicForm) {
        this.physicForm = physicForm;
    }
	@Column(name = "toxicology_type")
    public String getToxicologyType() {
        return toxicologyType;
    }
    public void setToxicologyType(String toxicologyType) {
        this.toxicologyType = toxicologyType;
    }
	@Column(name = "basic_flag")
    public String getBasicFlag() {
        return basicFlag;
    }
    public void setBasicFlag(String basicFlag) {
        this.basicFlag = basicFlag;
    }
	@Column(name = "valid_flag")
    public String getValidFlag() {
        return validFlag;
    }
    public void setValidFlag(String validFlag) {
        this.validFlag = validFlag;
    }
	@Column(name = "spell_code")
    public String getSpellCode() {
        return spellCode;
    }
    public void setSpellCode(String spellCode) {
        this.spellCode = spellCode;
    }
	@Column(name = "wbzx_code")
    public String getWbzxCode() {
        return wbzxCode;
    }
    public void setWbzxCode(String wbzxCode) {
        this.wbzxCode = wbzxCode;
    }
	@Column(name = "sequence")
    public Integer getSequence() {
        return sequence;
    }
    public void setType(String type) {
        this.type = type;
    public void setSequence(Integer sequence) {
        this.sequence = sequence;
    }
	@Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
	@Column(name = "storage_conditions")
    public String getStorageConditions() {
        return storageConditions;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    public void setStorageConditions(String storageConditions) {
        this.storageConditions = storageConditions;
    }

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

@@ -0,0 +1,45 @@
package com.yihu.jw.entity.base.dict;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 机构药品分发字典实体
 * 
 * @author Administrator on  2018年09月07日
 *
 */
@Entity
@Table(name = "dict_medicine_distribute_org")
public class DictMedicineDistributeOrgDO extends IntegerIdentityEntity {
    /**
	 * 机构编码
	 */
	private String orgId;
    /**
	 * 药品代码
	 */
	private String medicineCode;
	@Column(name = "org_id")
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
	@Column(name = "medicine_code")
    public String getMedicineCode() {
        return medicineCode;
    }
    public void setMedicineCode(String medicineCode) {
        this.medicineCode = medicineCode;
    }
}

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-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasBusinessCardDO.java

@@ -0,0 +1,56 @@
package com.yihu.jw.entity.base.saas;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Entity - SAAS名片
 * Created by progr1mmer on 2018/9/7.
 */
@Entity
@Table(name = "base_saas_business_card")
public class SaasBusinessCardDO extends IntegerIdentityEntity {
    public enum Type {
        doctor,
        patient
    }
    //SAAS ID
    private String saasId;
    //字段
    private String field;
    //类型
    private Type type;
    @Column(name = "saas_id", nullable = false)
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "field", nullable = false)
    public String getField() {
        return field;
    }
    public void setField(String field) {
        this.field = field;
    }
    @Column(name = "type", nullable = false)
    public Type getType() {
        return type;
    }
    public void setType(Type type) {
        this.type = type;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/team/BaseTeamDO.java

@@ -0,0 +1,106 @@
package com.yihu.jw.entity.base.team;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 团队信息实体
 *
 * @author litaohong on  2018年08月31日
 */
@Entity
@Table(name = "base_team")
public class BaseTeamDO extends UuidIdentityEntityWithOperator {
    /**
     * 机构id
     */
    private String orgId;
    /**
     * 团队名称
     */
    private String name;
    /**
     * 领导医生标识
     */
    private String leaderId;
    /**
     * 团队人数
     */
    private String teamNum;
    /**
     * 团队二维码
     */
    private String qrcode;
    /**
     * 作废标识，1正常，0作废
     */
    private String del;
    @Column(name = "org_id")
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "leader_id")
    public String getLeaderId() {
        return leaderId;
    }
    public void setLeaderId(String leaderId) {
        this.leaderId = leaderId;
    }
    @Column(name = "team_num")
    public String getTeamNum() {
        return teamNum;
    }
    public void setTeamNum(String teamNum) {
        this.teamNum = teamNum;
    }
    @Column(name = "qrcode")
    public String getQrcode() {
        return qrcode;
    }
    public void setQrcode(String qrcode) {
        this.qrcode = qrcode;
    }
    @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/version/AppVersionDO.java

@@ -0,0 +1,113 @@
package com.yihu.jw.entity.base.version;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * app版本号表实体
 * 
 * @author litaohong on  2018年09月07日
 *
 */
@Entity
@Table(name = "app_version")
public class AppVersionDO extends IntegerIdentityEntity {
    /**
	 * 版本编码
	 */
	private String code;
    /**
	 * 版本名称
	 */
	private String name;
    /**
	 * 数字版本号
	 */
	private double versionInt;
    /**
	 * 字符串版本号
	 */
	private String versionStr;
    /**
	 * 更新链接地址
	 */
	private String url;
    /**
	 * 版本信息
	 */
	private String info;
    /**
	 * 升级包大小，单位M
	 */
	private double size;
	@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 = "version_int")
    public double getVersionInt() {
        return versionInt;
    }
    public void setVersionInt(double versionInt) {
        this.versionInt = versionInt;
    }
	@Column(name = "version_str")
    public String getVersionStr() {
        return versionStr;
    }
    public void setVersionStr(String versionStr) {
        this.versionStr = versionStr;
    }
	@Column(name = "url")
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
	@Column(name = "info")
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
	@Column(name = "size")
    public double getSize() {
        return size;
    }
    public void setSize(double size) {
        this.size = size;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/version/WlyyVersionDO.java

@@ -1,118 +0,0 @@
package com.yihu.jw.entity.base.version;// default package
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * WlyyVersion entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "wlyy_version")
public class WlyyVersionDO  extends UuidIdentityEntityWithOperator implements java.io.Serializable {
	// Fields
	private String saasId;
	private String code;
	private String name;
	private Double versionInt;
	private String versionStr;
	private String url;
	private String info;
	private Double size;
	private Integer status;
	// Constructors
	/** default constructor */
	public WlyyVersionDO() {
	}
	@Column(name = "saas_id", length = 100)
	public String getSaasId() {
		return this.saasId;
	}
	public void setSaasId(String saasId) {
		this.saasId = saasId;
	}
	@Column(name = "code", nullable = false, length = 50)
	public String getCode() {
		return this.code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "name", nullable = false, length = 10)
	public String getName() {
		return this.name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(name = "version_int", precision = 22, scale = 0)
	public Double getVersionInt() {
		return this.versionInt;
	}
	public void setVersionInt(Double versionInt) {
		this.versionInt = versionInt;
	}
	@Column(name = "version_str", length = 10)
	public String getVersionStr() {
		return this.versionStr;
	}
	public void setVersionStr(String versionStr) {
		this.versionStr = versionStr;
	}
	@Column(name = "url", length = 300)
	public String getUrl() {
		return this.url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	@Column(name = "info", length = 1000)
	public String getInfo() {
		return this.info;
	}
	public void setInfo(String info) {
		this.info = info;
	}
	@Column(name = "size", precision = 22, scale = 0)
	public Double getSize() {
		return this.size;
	}
	public void setSize(Double size) {
		this.size = size;
	}
	@Column(name = "status")
	public Integer getStatus() {
		return this.status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
}

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

@@ -35,6 +35,14 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/saas_default_module_function";
    }
    /**
     * SAAS名片
     */
    public static class SaasBusinessCard extends Basic {
        public static final String PREFIX  = "/saas_business_card";
        public static final String GENERATE = "/generate";
    }
    /**
     * 模块
     */
@@ -151,6 +159,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/service_package";
    }
    /**
     * 服务包类目
     */
    public static class ServicePackageNormcat extends Basic{
        public static final String PREFIX  = "/service_package_normcat";
    }
    /**
     * 康复计划
     */
@@ -349,6 +364,13 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/dictMedicine";
    }
    /**
     * app版本升级
     */
    public static class AppVersion extends Basic {
        public static final String PREFIX  = "/appVersion";
    }
    /**
     * 基于MQ的消息推送
     */

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/DictMedicineDistributeOrgVO.java

@@ -0,0 +1,50 @@
package com.yihu.jw.restmodel.base.dict;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * 
 * 机构药品分发字典vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "DictMedicineDistributeOrgVO", description = "机构药品分发字典")
public class DictMedicineDistributeOrgVO extends IntegerIdentityVO{
    /**
	 * 机构编码
	 */
	@ApiModelProperty(value = "机构编码", example = "")
    private String orgId;
    /**
	 * 药品代码
	 */
	@ApiModelProperty(value = "药品代码", example = "")
    private String medicineCode;
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    public String getMedicineCode() {
        return medicineCode;
    }
    public void setMedicineCode(String medicineCode) {
        this.medicineCode = medicineCode;
    }
}

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

@@ -1,10 +1,8 @@
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;
/**
@@ -14,7 +12,7 @@ import java.util.Date;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  2018年09月05日 Created
 * Administrator 	1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
@@ -23,43 +21,119 @@ import java.util.Date;
public class DictMedicineVO extends IntegerIdentityVO{
    /**
	 * saas配置id，null标识公共字典
	 */
	@ApiModelProperty(value = "saas配置id，null标识公共字典", example = "模块1")
    private String saasId;
     * 药品代码
     */
    @ApiModelProperty(value = "分发药品的机构名称", example = "")
    private String orgName;
    /**
	 * 药品编码
	 * 药品代码
	 */
	@ApiModelProperty(value = "药品编码", example = "模块1")
	@ApiModelProperty(value = "药品代码", example = "")
    private String code;
    /**
	 * 药品名称
	 */
	@ApiModelProperty(value = "药品名称", example = "模块1")
	@ApiModelProperty(value = "药品名称", example = "")
    private String name;
    /**
	 * 药品类型：1健康记录
	 * 药品规格
	 */
	@ApiModelProperty(value = "药品类型：1健康记录", example = "模块1")
    private String type;
	@ApiModelProperty(value = "药品规格", example = "")
    private String physicSpec;
    /**
	 * 创建时间
	 * 药品科目  科目类别字典中定义
	 */
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@ApiModelProperty(value = "创建时间", example = "模块1")
    private Date createTime;
	@ApiModelProperty(value = "药品科目  科目类别字典中定义", example = "")
    private String subjectClass;
    /**
	 * 剂量单位 计量单位字典中定义
	 */
	@ApiModelProperty(value = "剂量单位 计量单位字典中定义", example = "")
    private String doseUnit;
    /**
	 * 数量单位  计量单位字典中定义
	 */
	@ApiModelProperty(value = "数量单位  计量单位字典中定义", example = "")
    private String quantityUnit;
    /**
	 * 包装单位   计量单位字典中定义
	 */
	@ApiModelProperty(value = "包装单位   计量单位字典中定义", example = "")
    private String packUnit;
    /**
	 * 最小剂量
	 */
	@ApiModelProperty(value = "最小剂量", example = "")
    private double minDose;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "")
    private double packSpec;
    /**
	 * 零售价
	 */
	@ApiModelProperty(value = "零售价", example = "")
    private double retailPrice;
    /**
	 * 
	 */
	@ApiModelProperty(value = "", example = "")
    private String physicForm;
    /**
	 * 毒理分类  药品毒理分类字典中定义
	 */
	@ApiModelProperty(value = "毒理分类  药品毒理分类字典中定义", example = "")
    private String toxicologyType;
    /**
	 * 基本药物标志  0：否；1：是
	 */
	@ApiModelProperty(value = "基本药物标志  0：否；1：是", example = "1")
    private String basicFlag;
    /**
	 * 有效标志 0：无效；1：有效
	 */
	@ApiModelProperty(value = "有效标志 0：无效；1：有效", example = "0")
    private String validFlag;
    /**
	 * 拼音首码
	 */
	@ApiModelProperty(value = "拼音首码", example = "")
    private String spellCode;
    /**
	 * 五笔首码
	 */
	@ApiModelProperty(value = "五笔首码", example = "")
    private String wbzxCode;
    /**
	 * 排序号
	 */
	@ApiModelProperty(value = "排序号", example = "")
    private Integer sequence;
    /**
	 * 2表示需要冷藏，其他表示不需要冷藏
	 */
	@ApiModelProperty(value = "2表示需要冷藏，其他表示不需要冷藏", example = "2")
    private String storageConditions;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getCode() {
        return code;
@@ -75,18 +149,116 @@ public class DictMedicineVO extends IntegerIdentityVO{
        this.name = name;
    }
    public String getType() {
        return type;
    public String getPhysicSpec() {
        return physicSpec;
    }
    public void setPhysicSpec(String physicSpec) {
        this.physicSpec = physicSpec;
    }
    public String getSubjectClass() {
        return subjectClass;
    }
    public void setSubjectClass(String subjectClass) {
        this.subjectClass = subjectClass;
    }
    public String getDoseUnit() {
        return doseUnit;
    }
    public void setDoseUnit(String doseUnit) {
        this.doseUnit = doseUnit;
    }
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
    public double getMinDose() {
        return minDose;
    }
    public void setMinDose(double minDose) {
        this.minDose = minDose;
    }
    public double getPackSpec() {
        return packSpec;
    }
    public void setPackSpec(double packSpec) {
        this.packSpec = packSpec;
    }
    public double getRetailPrice() {
        return retailPrice;
    }
    public void setRetailPrice(double retailPrice) {
        this.retailPrice = retailPrice;
    }
    public String getPhysicForm() {
        return physicForm;
    }
    public void setPhysicForm(String physicForm) {
        this.physicForm = physicForm;
    }
    public String getToxicologyType() {
        return toxicologyType;
    }
    public void setToxicologyType(String toxicologyType) {
        this.toxicologyType = toxicologyType;
    }
    public String getBasicFlag() {
        return basicFlag;
    }
    public void setBasicFlag(String basicFlag) {
        this.basicFlag = basicFlag;
    }
    public String getValidFlag() {
        return validFlag;
    }
    public void setValidFlag(String validFlag) {
        this.validFlag = validFlag;
    }
    public String getSpellCode() {
        return spellCode;
    }
    public void setSpellCode(String spellCode) {
        this.spellCode = spellCode;
    }
    public String getWbzxCode() {
        return wbzxCode;
    }
    public void setWbzxCode(String wbzxCode) {
        this.wbzxCode = wbzxCode;
    }
    public Integer getSequence() {
        return sequence;
    }
    public void setType(String type) {
        this.type = type;
    public void setSequence(Integer sequence) {
        this.sequence = sequence;
    }
    public Date getCreateTime() {
        return createTime;
    public String getStorageConditions() {
        return storageConditions;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    public void setStorageConditions(String storageConditions) {
        this.storageConditions = storageConditions;
    }

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/saas/SaasBusinessCardVO.java

@@ -0,0 +1,50 @@
package com.yihu.jw.restmodel.base.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * VO - SAAS名片
 * Created by progr1mmer on 2018/9/7.
 */
@ApiModel(value = "SaasBusinessCardVO", description = "SAAS名片")
public class SaasBusinessCardVO extends IntegerIdentityVO {
    //SAAS ID
    @ApiModelProperty(value = "Saas ID", example = "402303ee65634dfs0234sf9ad2wa00d2")
    private String saasId;
    //字段
    @ApiModelProperty(value = "实体字段", example = "name")
    private String field;
    //类型
    @ApiModelProperty(value = "名片类型", example = "doctor")
    private SaasDO.Type type;
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getField() {
        return field;
    }
    public void setField(String field) {
        this.field = field;
    }
    public SaasDO.Type getType() {
        return type;
    }
    public void setType(SaasDO.Type type) {
        this.type = type;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/servicePackage/ServicePackagePropvalueVO.java

@@ -10,7 +10,7 @@ import java.util.Date;
 * 服务包属性值表
 * @author yeshijie on 2018/8/29.
 */
@ApiModel(value = "ServicePackagePropvalueDO", description = "服务包属性值表")
@ApiModel(value = "ServicePackagePropvalueVO", description = "服务包属性值表")
public class ServicePackagePropvalueVO extends UuidIdentityVO {
    @ApiModelProperty(value = "saasId")

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;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/AppVersionVO.java

@@ -0,0 +1,116 @@
package com.yihu.jw.restmodel.base.version;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * 
 * app版本号表vo
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@ApiModel(value = "AppVersionVO", description = "app版本号表")
public class AppVersionVO extends IntegerIdentityVO{
    /**
	 * 版本编码
	 */
	@ApiModelProperty(value = "版本编码", example = "app_doc1")
    private String code;
    /**
	 * 版本名称
	 */
	@ApiModelProperty(value = "版本名称", example = "医生端版本号")
    private String name;
    /**
	 * 数字版本号
	 */
	@ApiModelProperty(value = "数字版本号", example = "5")
    private double versionInt;
    /**
	 * 字符串版本号
	 */
	@ApiModelProperty(value = "字符串版本号", example = "1.4.8.1")
    private String versionStr;
    /**
	 * 更新链接地址
	 */
	@ApiModelProperty(value = "更新链接地址", example = "http://ehr.yihu.com/wlyy/app/ssgg_doctor.apk")
    private String url;
    /**
	 * 版本信息
	 */
	@ApiModelProperty(value = "版本信息", example = "1.新增若干功能<br>2.界面优化<br>3.修复已知Bug")
    private String info;
    /**
	 * 升级包大小，单位M
	 */
	@ApiModelProperty(value = "升级包大小，单位M", example = "5")
    private double size;
    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 double getVersionInt() {
        return versionInt;
    }
    public void setVersionInt(double versionInt) {
        this.versionInt = versionInt;
    }
    public String getVersionStr() {
        return versionStr;
    }
    public void setVersionStr(String versionStr) {
        this.versionStr = versionStr;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
    public double getSize() {
        return size;
    }
    public void setSize(double size) {
        this.size = size;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/version/WlyyVersionVO.java

@@ -1,153 +0,0 @@
package com.yihu.jw.restmodel.base.version;
import java.util.Date;
/**
 * Created by chenweida on 2017/6/16.
 */
public class WlyyVersionVO {
    private String id;
    private String saasId; //saas code
    private String code;
    private String name;
    private Double versionInt;
    private String versionStr;
    private String url;//app下载的路径
    private String info;//app更新的信息
    private Double size;//大小 MB
    private Date createTime;
    private String createUser;
    private String createUserName;
    private Date updateTime;
    private String updateUser;
    private String updateUserName;
    private Integer status;////-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 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 Double getVersionInt() {
        return versionInt;
    }
    public void setVersionInt(Double versionInt) {
        this.versionInt = versionInt;
    }
    public String getVersionStr() {
        return versionStr;
    }
    public void setVersionStr(String versionStr) {
        this.versionStr = versionStr;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getInfo() {
        return info;
    }
    public void setInfo(String info) {
        this.info = info;
    }
    public Double getSize() {
        return size;
    }
    public void setSize(Double size) {
        this.size = size;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/web/endpoint/EnvelopRestEndpoint.java

@@ -29,6 +29,10 @@ public abstract class EnvelopRestEndpoint {
    @Autowired
    protected ObjectMapper objectMapper;
    protected Envelop success() {
        return success("success");
    }
    protected Envelop success(String message) {
        return success(message, 200);
    }
@@ -45,8 +49,8 @@ public abstract class EnvelopRestEndpoint {
    }
    protected <J, _J> ObjEnvelop<_J> success(J obj, Class<_J> target){
        _J _target = convertToModel(obj, target);
        return success(_target);
        _J _obj = convertToModel(obj, target);
        return success("success", _obj);
    }
    protected <J> ObjEnvelop<J> success(String message, J obj){
@@ -54,8 +58,8 @@ public abstract class EnvelopRestEndpoint {
    }
    protected <J, _J> ObjEnvelop<_J> success(String message, J obj, Class<_J> target){
        _J _target = convertToModel(obj, target);
        return success(message, _target);
        _J _obj = convertToModel(obj, target);
        return success(message, 200, _obj);
    }
    protected <J> ObjEnvelop<J> success(String message, int status, J obj){
@@ -67,8 +71,8 @@ public abstract class EnvelopRestEndpoint {
    }
    protected <J, _J> ObjEnvelop<_J> success(String message, int status, J obj, Class<_J> target){
        _J _target = convertToModel(obj, target);
        return success(message, status, _target);
        _J _obj = convertToModel(obj, target);
        return success(message, status, _obj);
    }
    protected <T> ListEnvelop<T> success(List<T> contents){
@@ -77,7 +81,7 @@ public abstract class EnvelopRestEndpoint {
    protected <T, _T> ListEnvelop<_T> success(List<T> contents, Class<_T> target){
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), target);
        return success(_contents);
        return success("success", _contents);
    }
    protected <T> ListEnvelop<T> success(String message, List<T> contents){
@@ -86,7 +90,7 @@ public abstract class EnvelopRestEndpoint {
    protected <T, _T> ListEnvelop<_T> success(String message, List<T> contents, Class<_T> target){
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), target);
        return success(message, _contents);
        return success(message, 200, _contents);
    }
    protected <T> ListEnvelop<T> success(String message, int status, List<T> contents){
@@ -108,7 +112,7 @@ public abstract class EnvelopRestEndpoint {
    protected <T, _T> PageEnvelop<_T> success(List<T> contents, int totalCount, int currPage, int pageSize, Class<_T> target){
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), target);
        return success(_contents, totalCount, currPage, pageSize);
        return success("success", _contents, totalCount, currPage, pageSize);
    }
    protected <T> PageEnvelop<T> success(String message, List<T> contents, int totalCount, int currPage, int pageSize) {
@@ -117,7 +121,7 @@ public abstract class EnvelopRestEndpoint {
    protected <T, _T> PageEnvelop<_T> success(String message, List<T> contents, int totalCount, int currPage, int pageSize, Class<_T> target){
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), target);
        return success(message, _contents, totalCount, currPage, pageSize);
        return success(message, 200, _contents, totalCount, currPage, pageSize);
    }
    protected <T> PageEnvelop<T> success(String message, int status,  List<T> contents, int totalCount, int currPage, int pageSize) {
@@ -140,16 +144,34 @@ public abstract class EnvelopRestEndpoint {
        return success("success", contents, obj);
    }
    protected <T, J, _T, _J> MixEnvelop<_T, _J> success(List<T> contents, J obj, Class<_T> targetContents, Class<_J> targetObj) {
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), targetContents);
        _J _obj = convertToModel(obj, targetObj);
        return success("success", _contents, _obj);
    }
    protected <T, J> MixEnvelop<T, J> success(String message, List<T> contents, J obj) {
        return success(message, 200, contents, obj);
    }
    protected <T, J, _T, _J> MixEnvelop<_T, _J>  success(String message, List<T> contents, J obj, Class<_T> targetContents, Class<_J> targetObj) {
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), targetContents);
        _J _obj = convertToModel(obj, targetObj);
        return success(message, 200, _contents, _obj);
    }
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J obj) {
        return success(message, status, contents, obj, contents.size(), 1, contents.size());
    }
    protected <T, J, _T, _J> MixEnvelop<_T, _J> success(String message, int status, List<T> contents, J obj, Class<_T> targetContents, Class<_J> targetObj) {
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), targetContents);
        _J _obj = convertToModel(obj, targetObj);
        return success(message, status, _contents, _obj, _contents.size(), 1, _contents.size());
    }
    protected <T, J> MixEnvelop<T, J> success(String message, int status, List<T> contents, J obj, int totalCount, int currPage, int pageSize) {
        MixEnvelop<T, J> mixEnvelop = new MixEnvelop();
        MixEnvelop<T, J> mixEnvelop = new MixEnvelop<>();
        mixEnvelop.setMessage(message);
        mixEnvelop.setStatus(status);
        mixEnvelop.setCurrPage(currPage);
@@ -160,6 +182,12 @@ public abstract class EnvelopRestEndpoint {
        return mixEnvelop;
    }
    protected <T, J, _T, _J> MixEnvelop<_T, _J> success(String message, int status, List<T> contents, J obj, int totalCount, int currPage, int pageSize, Class<_T> targetContents, Class<_J> targetObj) {
        List<_T> _contents = convertToModels(contents, new ArrayList<>(contents.size()), targetContents);
        _J _obj = convertToModel(obj, targetObj);
        return success(message, status, _contents, _obj, totalCount, currPage, pageSize);
    }
    protected Envelop failed (String message) {
        return failed(message, -10000);
    }

readme.MD

@@ -2,7 +2,7 @@
     common     公共依赖包
     svr     业务微服务  
        svr-base 基础微服务
        svr-quota 统计微服务
        svr-statistics 统计微服务
     server
         svr-configuration    配置服务 
            涉及主要技术 git(存储配置文件) 
@@ -12,9 +12,9 @@
            涉及主要技术 hystrix,hystrix-dashboard
         svr-logServer 分布式追踪
            涉及主要技术 zipkin 
     common-lib-parent-pom    common公共工程的maven父pom
     jw-lib-parent-pom   jw业务公共工程的maven父pom 
     web-gateway 对外的接口网关
     wlyy-lib-parent-pom    common公共工程的maven父pom
     wlyy-parent-pom   jw业务公共工程的maven父pom
     ag-basic 对外的接口网关
     manage-gateway 基卫后台管理系统的接口网关
     .gitignore   项目提交忽略配置文件
     

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,41 @@ primary key (id)
)
ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='职称字典';
-- 机构药品分发
drop table IF EXISTS `dict_medicine_distribute_org`;
CREATE TABLE `dict_medicine_distribute_org` (
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
  `org_id` varchar(50) DEFAULT NULL COMMENT '机构编码',
  `medicine_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 '主键',
  `code` varchar(50) DEFAULT NULL COMMENT '药品代码',
  `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 +360,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 +374,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 '创建时间',

svr/svr-base/pom.xml

@@ -92,7 +92,12 @@
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-web</artifactId>
        </dependency>
        <!-- 文件服务器 -->
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>
            <version>2.0.0</version>
        </dependency>
        <!-- Jzkl Starter -->
        <dependency>
            <groupId>com.yihu</groupId>
@@ -109,11 +114,11 @@
            <artifactId>elasticsearch-starter</artifactId>
            <version>2.0.0</version>
        </dependency>
        <!-- 文件服务器 -->
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>fastdfs-starter</artifactId>
            <version>2.0.0</version>
            <groupId>io.github.swagger2markup</groupId>
            <artifactId>swagger2markup</artifactId>
            <version>1.3.2</version>
        </dependency>
    </dependencies>

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

@@ -1,9 +1,9 @@
package com.yihu.jw.base.dao.dict;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
/**
 * 
@@ -12,7 +12,7 @@ import com.yihu.jw.entity.base.dict.DictMedicineDO;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 * Administrator 	1.0  		2018年09月07日 	Created
 *
 * </pre>
 * @since 1.

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

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

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

@@ -0,0 +1,13 @@
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasBusinessCardDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Dao - SAAS名片
 * Created by progr1mmer on 2018/9/7.
 */
public interface SaasBusinessCardDao extends PagingAndSortingRepository<SaasBusinessCardDO, Integer>, JpaSpecificationExecutor<SaasBusinessCardDO> {
}

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

@@ -0,0 +1,21 @@
package com.yihu.jw.base.dao.version;
import com.yihu.jw.entity.base.version.AppVersionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * 
 * app版本号表 数据库访问层
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月07日 	Created
 *
 * </pre>
 * @since 1.
 */
public interface AppVersionDao extends PagingAndSortingRepository<AppVersionDO, Integer>, JpaSpecificationExecutor<AppVersionDO>  {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineDistributeOrgEndpoint.java

@@ -0,0 +1,108 @@
/*
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.DictMedicineDistributeOrgService;
import com.yihu.jw.entity.base.dict.DictMedicineDistributeOrgDO;
import com.yihu.jw.restmodel.base.dict.DictMedicineDistributeOrgVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
*/
/**
*
* 机构药品分发字典控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年09月07日 	Created
 *
 * </pre>
* @since 1.
*//*
@RestController
@RequestMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.PREFIX)
@Api(value = "机构药品分发字典管理", description = "机构药品分发字典管理服务接口", tags = {"wlyy基础服务 - 机构药品分发字典管理服务接口"})
public class DictMedicineDistributeOrgEndpoint extends EnvelopRestEndpoint {
@Autowired
private DictMedicineDistributeOrgService dictMedicineDistributeOrgService;
@PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<DictMedicineDistributeOrgVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    DictMedicineDistributeOrgDO dictMedicineDistributeOrg = toEntity(jsonData, DictMedicineDistributeOrgDO.class);
    dictMedicineDistributeOrg = dictMedicineDistributeOrgService.save(dictMedicineDistributeOrg);
    return success(dictMedicineDistributeOrg, DictMedicineDistributeOrgVO.class);
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    dictMedicineDistributeOrgService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<DictMedicineDistributeOrgVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        DictMedicineDistributeOrgDO dictMedicineDistributeOrg = toEntity(jsonData, DictMedicineDistributeOrgDO.class);
        if (null == dictMedicineDistributeOrg.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        dictMedicineDistributeOrg = dictMedicineDistributeOrgService.save(dictMedicineDistributeOrg);
        return success(dictMedicineDistributeOrg, DictMedicineDistributeOrgVO.class);
        }
        @GetMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<DictMedicineDistributeOrgVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<DictMedicineDistributeOrgDO> dictMedicineDistributeOrgs = dictMedicineDistributeOrgService.search(fields, filters, sorts, page, size);
                int count = (int)dictMedicineDistributeOrgService.getCount(filters);
                return success(dictMedicineDistributeOrgs, count, page, size, DictMedicineDistributeOrgVO.class);
         }
         @GetMapping(value = BaseRequestMapping.DictMedicineDistributeOrg.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<DictMedicineDistributeOrgVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<DictMedicineDistributeOrgDO> dictMedicineDistributeOrgs = dictMedicineDistributeOrgService.search(fields, filters, sorts);
                  return success(dictMedicineDistributeOrgs, DictMedicineDistributeOrgVO.class);
         }
 }
*/

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/DictMedicineEndpoint.java

@@ -1,6 +1,8 @@
package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.DictMedicineDistributeOrgService;
import com.yihu.jw.base.service.dict.DictMedicineService;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
import com.yihu.jw.restmodel.base.dict.DictMedicineVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -17,14 +19,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
/**
 * 药品字典控制器
 *
 * @version <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年08月31日 	Created
 * Administrator 	1.0  		2018年09月07日 	Created
 *
 * </pre>
 * @since 1.
@@ -36,6 +36,8 @@ public class DictMedicineEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DictMedicineService dictMedicineService;
    @Autowired
    private DictMedicineDistributeOrgService dictMedicineDistributeOrgService;
    @PostMapping(value = BaseRequestMapping.DictMedicine.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasBusinessCardEndpoint.java

@@ -0,0 +1,111 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.saas.SaasBusinessCardService;
import com.yihu.jw.entity.base.saas.SaasBusinessCardDO;
import com.yihu.jw.restmodel.base.saas.SaasBusinessCardVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
 * Endpoint - SAAS名片
 * Created by progr1mmer on 2018/8/14.
 * @author progr1mmer
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SaasBusinessCard.PREFIX)
@Api(value = "SAAS名片管理", description = "SAAS名片管理服务接口", tags = {"wlyy基础服务 - SAAS名片管理服务接口"})
public class SaasBusinessCardEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SaasBusinessCardService saasBusinessCardService;
    @PostMapping(value = BaseRequestMapping.SaasBusinessCard.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SaasBusinessCardVO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SaasBusinessCardDO saasBusinessCardDO = toEntity(jsonData, SaasBusinessCardDO.class);
        saasBusinessCardDO = saasBusinessCardService.save(saasBusinessCardDO);
        return success(saasBusinessCardDO, SaasBusinessCardVO.class);
    }
    @PostMapping(value = BaseRequestMapping.SaasBusinessCard.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        saasBusinessCardService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.SaasBusinessCard.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SaasBusinessCardDO saasBusinessCardDO = toEntity(jsonData, SaasBusinessCardDO.class);
        if (null == saasBusinessCardDO.getId()) {
            return failed("ID不能为空", Envelop.class);
        }
        saasBusinessCardDO = saasBusinessCardService.save(saasBusinessCardDO);
        return success(saasBusinessCardDO);
    }
    @GetMapping(value = BaseRequestMapping.SaasBusinessCard.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<SaasBusinessCardVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<SaasBusinessCardDO> saasBusinessCardDOS = saasBusinessCardService.search(fields, filters, sorts, page, size);
        int count = (int)saasBusinessCardService.getCount(filters);
        return success(saasBusinessCardDOS, count, page, size, SaasBusinessCardVO.class);
    }
    @GetMapping(value = BaseRequestMapping.SaasBusinessCard.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<SaasBusinessCardVO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<SaasBusinessCardDO> saasBusinessCardDOS = saasBusinessCardService.search(fields, filters, sorts);
        return success(saasBusinessCardDOS, SaasBusinessCardVO.class);
    }
    @GetMapping(value = BaseRequestMapping.SaasBusinessCard.GENERATE)
    @ApiOperation(value = "生成名片")
    public ObjEnvelop<Map> generate (
            @ApiParam(name = "type", value = "名片类型", required = true)
            @RequestParam(value = "type") SaasBusinessCardDO.Type type,
            @ApiParam(name = "saasId", value = "SAAS ID", required = true)
            @RequestParam(value = "saasId") String saasId,
            @ApiParam(name = "sourceId", value = "实体对象ID，如医生、居民", required = true)
            @RequestParam(value = "sourceId") String sourceId) throws Exception {
        Map<String, Object> card = saasBusinessCardService.generateBusinessCard(type, saasId, sourceId);
        return success(card);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/RehabilitationEndpoint.java

@@ -6,7 +6,7 @@ import com.yihu.jw.entity.base.servicePackage.ServicePackageSignRecordDO;
import com.yihu.jw.restmodel.base.servicePackage.RehabilitationVO;
import com.yihu.jw.restmodel.base.servicePackage.ServicePackageLogVO;
import com.yihu.jw.restmodel.base.servicePackage.ServicePackageVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
@@ -29,7 +29,7 @@ public class RehabilitationEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseRehabilitation.CREATE)
    @ApiOperation(value = "创建")
    public Envelop create (
    public ObjEnvelop<ServicePackageVO> create (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception{
        RehabilitationVO rehabilitationVO = toDateEntity(jsonData, RehabilitationVO.class);
@@ -40,15 +40,15 @@ public class RehabilitationEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseRehabilitation.CREATELOG)
    @ApiOperation(value = "新增服务包日志")
    public Envelop addRehabilitationLog(@ApiParam(name = "jsonData", value = "Json数据", required = true)
    public ObjEnvelop<ServicePackageLogVO> addRehabilitationLog(@ApiParam(name = "jsonData", value = "Json数据", required = true)
                          @RequestBody String jsonData) throws Exception{
        ServicePackageLogVO logVO = toEntity(jsonData,ServicePackageLogVO.class);
        return success(servicePackageService.addRehabilitationLog(logVO));
    }
    @GetMapping(value = BaseRequestMapping.BaseRehabilitation.FINDBYID)
    @ApiOperation(value = "查找完成度")
    public Envelop getFinish(@ApiParam(name = "servicePackId", value = "服务包id", required = true)
    @ApiOperation(value = "查找完成度",notes = "返回值中的obj=完成数")
    public ObjEnvelop getFinish(@ApiParam(name = "servicePackId", value = "服务包id", required = true)
                             @RequestParam(value = "servicePackId") String servicePackId) throws Exception{
        return success(servicePackageService.getFinish(servicePackId));
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageNormcatEndpoint.java

@@ -0,0 +1,94 @@
package com.yihu.jw.base.endpoint.servicePackage;
import com.yihu.jw.base.service.servicePackage.ServicePackageNormcatService;
import com.yihu.jw.entity.base.servicePackage.ServicePackageNormcatDO;
import com.yihu.jw.restmodel.base.servicePackage.ServicePackageNormcatVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * @author yeshijie on 2018/9/7.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.ServicePackageNormcat.PREFIX, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(value = "服务包类目管理", description = "服务包类目管理服务接口", tags = {"wlyy基础服务 - 服务包类目管理服务接口"})
public class ServicePackageNormcatEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ServicePackageNormcatService servicePackageNormcatService;
    @PostMapping(value = BaseRequestMapping.ServicePackageNormcat.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<ServicePackageNormcatVO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        ServicePackageNormcatDO normcatDO = toEntity(jsonData, ServicePackageNormcatDO.class);
        normcatDO = servicePackageNormcatService.save(normcatDO);
        return success(convertToModel(normcatDO, ServicePackageNormcatVO.class));
    }
    @PostMapping(value = BaseRequestMapping.ServicePackageNormcat.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) throws Exception{
        servicePackageNormcatService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.ServicePackageNormcat.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<ServicePackageNormcatVO> update (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        ServicePackageNormcatDO normcatDO = toEntity(jsonData, ServicePackageNormcatDO.class);
        if (null == normcatDO.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        normcatDO = servicePackageNormcatService.save(normcatDO);
        return success(normcatDO, ServicePackageNormcatVO.class);
    }
    @GetMapping(value = BaseRequestMapping.ServicePackageNormcat.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<ServicePackageNormcatVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<ServicePackageNormcatDO> normcatDOS = servicePackageNormcatService.search(fields, filters, sorts, page, size);
        int count = (int)servicePackageNormcatService.getCount(filters);
        return success(normcatDOS, count, page, size, ServicePackageNormcatVO.class);
    }
    @GetMapping(value = BaseRequestMapping.ServicePackageNormcat.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<ServicePackageNormcatVO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<ServicePackageNormcatDO> normcatDOS = servicePackageNormcatService.search(fields, filters, sorts);
        return success(normcatDOS, ServicePackageNormcatVO.class);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/version/AppVersionEndpoint.java

@@ -0,0 +1,104 @@
package com.yihu.jw.base.endpoint.version;
import com.yihu.jw.base.service.version.AppVersionService;
import com.yihu.jw.entity.base.version.AppVersionDO;
import com.yihu.jw.restmodel.base.version.AppVersionVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* app版本号表控制器
*
* @version
* <pre>
 * Author	Version		Date		Changes
 * litaohong 	1.0  		2018年09月07日 	Created
 *
 * </pre>
* @since 1.
*/
@RestController
@RequestMapping(value = BaseRequestMapping.AppVersion.PREFIX)
@Api(value = "app版本号表管理", description = "app版本号表管理服务接口", tags = {"wlyy基础服务 - app版本号表管理服务接口"})
public class AppVersionEndpoint extends EnvelopRestEndpoint {
@Autowired
private AppVersionService appVersionService;
@PostMapping(value = BaseRequestMapping.AppVersion.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ApiOperation(value = "创建")
public ObjEnvelop<AppVersionVO> create (
    @ApiParam(name = "json_data", value = "Json数据", required = true)
    @RequestBody String jsonData) throws Exception {
    AppVersionDO appVersion = toEntity(jsonData, AppVersionDO.class);
    appVersion = appVersionService.save(appVersion);
    return success(appVersion, AppVersionVO.class);
    }
    @PostMapping(value = BaseRequestMapping.AppVersion.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    appVersionService.delete(ids.split(","));
    return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.AppVersion.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<AppVersionVO> update (
        @ApiParam(name = "json_data", value = "Json数据", required = true)
        @RequestBody String jsonData) throws Exception {
        AppVersionDO appVersion = toEntity(jsonData, AppVersionDO.class);
        if (null == appVersion.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
        }
        appVersion = appVersionService.save(appVersion);
        return success(appVersion, AppVersionVO.class);
        }
        @GetMapping(value = BaseRequestMapping.AppVersion.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<AppVersionVO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<AppVersionDO> appVersions = appVersionService.search(fields, filters, sorts, page, size);
                int count = (int)appVersionService.getCount(filters);
                return success(appVersions, count, page, size, AppVersionVO.class);
         }
         @GetMapping(value = BaseRequestMapping.AppVersion.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<AppVersionVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<AppVersionDO> appVersions = appVersionService.search(fields, filters, sorts);
                  return success(appVersions, AppVersionVO.class);
         }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/wx/WeChatQrcodeController.java

@@ -26,7 +26,7 @@ public class WeChatQrcodeController extends EnvelopRestEndpoint {
    @Autowired
    private WeChatQrcodeService weChatQrcodeService;
    @PostMapping(value = WechatRequestMapping.WxMenu.api_create, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @PostMapping(value = WechatRequestMapping.WxQrcode.api_getQrcode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "生成微信二维码", notes = "生成微信二维码")
    public Envelop getQrcode(@ApiParam(name = "wxId", value = "微信id")
                             @RequestParam(value = "wxId", required = true)String wxId,

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictMedicineDistributeOrgService.java

@@ -0,0 +1,22 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.dict.DictMedicineDistributeOrgDao;
import com.yihu.jw.entity.base.dict.DictMedicineDistributeOrgDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * 机构药品分发字典服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * Administrator    1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class DictMedicineDistributeOrgService extends BaseJpaService<DictMedicineDistributeOrgDO, DictMedicineDistributeOrgDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictMedicineService.java

@@ -1,9 +1,11 @@
package com.yihu.jw.base.service.dict;
import com.yihu.jw.base.dao.dict.DictMedicineDao;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
import com.yihu.jw.entity.base.dict.DictMedicineDistributeOrgDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yihu.jw.entity.base.dict.DictMedicineDO;
/**
 * 
@@ -12,11 +14,12 @@ import com.yihu.jw.entity.base.dict.DictMedicineDO;
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年08月31日 Created
 * Administrator    1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class DictMedicineService extends BaseJpaService<DictMedicineDO, DictMedicineDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasBusinessCardService.java

@@ -0,0 +1,41 @@
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.saas.SaasBusinessCardDao;
import com.yihu.jw.base.service.doctor.BaseDoctorService;
import com.yihu.jw.entity.base.saas.SaasBusinessCardDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Service - SAAS名片
 * Created by progr1mmer on 2018/9/7.
 */
@Service
public class SaasBusinessCardService extends BaseJpaService<SaasBusinessCardDO, SaasBusinessCardDao> {
    @Autowired
    private BaseDoctorService doctorService;
    public Map<String, Object> generateBusinessCard(SaasBusinessCardDO.Type type, String saasId, String id) throws Exception {
        List<SaasBusinessCardDO> saasBusinessCardDO = search("type=" + type  + ";saasId=" + saasId);
        Map<String, Object> card = new HashMap<>();
        if (type == SaasBusinessCardDO.Type.doctor) {
            //模拟加载医生数据
            Map<String, Object> source = new HashMap<>();
            saasBusinessCardDO.forEach(item -> card.put(item.getField(), source.get(item.getField())));
            return card;
        } else if (type == SaasBusinessCardDO.Type.patient) {
            //模拟加载居民数据
            Map<String, Object> source = new HashMap<>();
            saasBusinessCardDO.forEach(item -> card.put(item.getField(), source.get(item.getField())));
            return card;
        }
        return card;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/sms/SmsGatewayService.java

@@ -60,7 +60,8 @@ public class SmsGatewayService extends BaseJpaService<SmsGatewayDO, SmsGatewayDa
         * 1 - 过期时间（分钟）
         */
        String [] contentDatas = new String[] {
                randomInt(6),
//                randomInt(6), 找不到该方法，先用空字符串替代，此类作者自己再纠正回来
                "",
                smsGatewayDO.getExpireMin().toString()
        };
        Matcher contentMatcher = PATTERN.matcher(rawContent);

svr/svr-base/src/main/java/com/yihu/jw/base/service/version/AppVersionService.java

@@ -0,0 +1,22 @@
package com.yihu.jw.base.service.version;
import com.yihu.jw.base.dao.version.AppVersionDao;
import com.yihu.jw.entity.base.version.AppVersionDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * 
 * app版本号表服务service
 * 
 * @version 
 * <pre>
 * Author	Version		Date		Changes
 * litaohong    1.0  2018年09月07日 Created
 *
 * </pre>
 * @since 1.
 */
@Service
public class AppVersionService extends BaseJpaService<AppVersionDO, AppVersionDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WeChatQrcodeService.java

@@ -26,8 +26,10 @@ public class WeChatQrcodeService {
    private WxAccessTokenService wxAccessTokenService;
    public String getQrcode(String wechatId,String scene) throws Exception{
        String token_url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + wxAccessTokenService.getWxAccessTokenById(wechatId);
        String token_url = "https://api.weixin.qq.com/cgi-bin/qrcode/create?access_token=" + wxAccessTokenService.getWxAccessTokenById(wechatId).getAccessToken();
        String params = "{\"action_name\": \"QR_LIMIT_STR_SCENE\", \"action_info\": {\"scene\": {\"scene_str\": \"" + scene + "\"}}}";
        //服务号必须是通过腾讯认证，每年是300元，如果没有认证而导致的错误提示，那就去认证
        //微信登录提示48001,{"errcode":48001,"errmsg":"api unauthorized, hints: [ req_id: 1QoCla0699ns81 ]"}
        String result = HttpUtil.sendPost(token_url, params);
        if (!StringUtils.isEmpty(result)) {
@@ -46,6 +48,6 @@ public class WeChatQrcodeService {
            }
        }
        return null;
        return "";
    }
}

svr/svr-base/src/main/resources/application.yml

@@ -30,6 +30,19 @@ es:
  type:
    servicePackLog: base_service_package_log
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码
  http:
    tracker-http-port: 80
    anti-steal-token: no
    secret-key: FastDFS1234567890
  pool: #连接池大小
    init-size: 5
    max-size: 20
    wait-time: 500
---
spring:
  profiles: jwdev
@@ -51,6 +64,8 @@ spring:
    password: admin
  zipkin:
    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
@@ -73,6 +88,8 @@ spring:
    password: admin
  zipkin:
    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
@@ -94,4 +111,6 @@ spring:
    user: admin
    password: admin
  zipkin:
    base-url: http://localhost:9411 #日志追踪的地址
    base-url: http://localhost:9411 #日志追踪的地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/

svr/svr-statistics/doc/es/QuartzJobConfig.java

@@ -2,8 +2,6 @@ package com.yihu.wlyy.entity.job;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
/**
 * 计划任务
 */

svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/save/SaveHelper.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.statistics.etl.save;
import com.yihu.wlyy.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.wlyy.statistics.etl.save.es.ElasticSearchSave;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.springframework.context.annotation.Scope;
@@ -16,13 +16,13 @@ import java.util.List;
public class SaveHelper {
    public Boolean save(List<SaveModel> sms) {
        return SpringUtil.getBean(ElastricSearchSave.class).save(sms);
        return SpringUtil.getBean(ElasticSearchSave.class).save(sms);
    }
    public Boolean update(List<SaveModel> sms) {
        return SpringUtil.getBean(ElastricSearchSave.class).update(sms);
        return SpringUtil.getBean(ElasticSearchSave.class).update(sms);
    }

wlyy-parent-pom/pom.xml

@@ -66,7 +66,7 @@
        <module>../svr/svr-iot</module><!--物联网平台-->
        <!--<module>../svr/svr-wlyy</module>-->  <!-- i健康微服务 -->
        <module>../svr/svr-wlyy-health-bank</module> <!-- 健康银行 -->
        <module>../svr/svr-wlyy-specialist</module> <!-- 啥玩意？ -->
        <module>../svr/svr-wlyy-specialist</module> <!-- 专科医生 -->
        <!--<module>../svr/svr-manage</module>--> <!-- 后台管理系统 -->
        <module>../svr/svr-rehabilitation</module> <!--专科医生康复计划-->