统计修改

.gitignore

@@ -0,0 +1,81 @@
*~
*.#*
*#*#
*.swp
*.ipr
*.iml
*.iws
*.pyc
*.pyo
.idea/
.idea_modules/
build/*.jar
.settings
.cache
cache
.generated-mima*
work/
out/
.DS_Store
third_party/libmesos.so
third_party/libmesos.dylib
build/apache-maven*
build/zinc*
build/scala*
conf/java-opts
conf/*.sh
conf/*.cmd
conf/*.properties
conf/*.conf
conf/*.xml
conf/slaves
docs/_site
docs/api
target/
reports/
.project
.classpath
.scala_dependencies
lib_managed/
src_managed/
project/boot/
project/plugins/project/build.properties
project/build/target/
project/plugins/target/
project/plugins/lib_managed/
project/plugins/src_managed/
logs/
log/
spark-tests.log
streaming-tests.log
dependency-reduced-pom.xml
.ensime
.ensime_cache/
.ensime_lucene
checkpoint
derby.log
dist/
dev/create-release/*txt
dev/create-release/*final
spark-*-bin-*.tgz
unit-tests.log
/lib/
ec2/lib/
rat-results.txt
scalastyle.txt
scalastyle-output.xml
R-unit-tests.log
R/unit-tests.out
python/lib/pyspark.zip
lint-r-report.log
# For Hive
metastore_db/
metastore/
warehouse/
TempStatsStore/
sql/hive-thriftserver/test_warehouses
# For R session data
.RHistory
.RData

src/main/java/com/yihu/wlyy/aop/UserFilterAOP.java

@@ -4,7 +4,7 @@ import org.aspectj.lang.annotation.Aspect;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.yihu.wlyy.repository.TokenDao;
import com.yihu.wlyy.repository.security.TokenDao;
@Component
@Aspect

src/main/java/com/yihu/wlyy/entity/AccessToken.java

@@ -1,63 +0,0 @@
package com.yihu.wlyy.entity;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
@Entity
@Table(name = "wx_access_token")
public class AccessToken extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -3297644428262254694L;
	
	private String access_token;
	private Long add_timestamp;
	private Long expires_in;
	
	private Date czrq;
	public String getAccess_token() {
		return access_token;
	}
	public void setAccess_token(String access_token) {
		this.access_token = access_token;
	}
	public Long getAdd_timestamp() {
		return add_timestamp;
	}
	public void setAdd_timestamp(Long add_timestamp) {
		this.add_timestamp = add_timestamp;
	}
	public Long getExpires_in() {
		return expires_in;
	}
	public void setExpires_in(Long expires_in) {
		this.expires_in = expires_in;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
   
}

src/main/java/com/yihu/wlyy/entity/IdEntity.java

@@ -23,13 +23,9 @@ import javax.persistence.MappedSuperclass;
// JPA 基类的标识
@MappedSuperclass
public abstract class IdEntity implements Serializable {
	/**
	 * 
	 */
	private static final long serialVersionUID = 3673803562328635206L;
	
	// 非业务主键
	protected Long id;
	protected Long id;  // 非业务主键
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -40,5 +36,4 @@ public abstract class IdEntity implements Serializable {
	public void setId(Long id) {
		this.id = id;
	}
}

src/main/java/com/yihu/wlyy/entity/JsapiTicket.java

@@ -1,63 +0,0 @@
package com.yihu.wlyy.entity;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
@Entity
@Table(name = "wx_jsapi_ticket")
public class JsapiTicket extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -3297644428262254694L;
	
	private String jsapi_ticket;
	
	private Long add_timestamp;
	private Long expires_in;
	
	private Date czrq;
	public String getJsapi_ticket() {
		return jsapi_ticket;
	}
	public void setJsapi_ticket(String jsapi_ticket) {
		this.jsapi_ticket = jsapi_ticket;
	}
	
	public Long getAdd_timestamp() {
		return add_timestamp;
	}
	public void setAdd_timestamp(Long add_timestamp) {
		this.add_timestamp = add_timestamp;
	}
	public Long getExpires_in() {
		return expires_in;
	}
	public void setExpires_in(Long expires_in) {
		this.expires_in = expires_in;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
   
}

src/main/java/com/yihu/wlyy/entity/SMS.java

@@ -1,106 +0,0 @@
package com.yihu.wlyy.entity;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 手机短信信息对象
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_sms")
public class SMS extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -1438212901585781994L;
	// 手机号
	private String mobile;
	// ip地址
	private String ip;
	// 消息类型：1微信端注册，2微信端找回密码，3医生端找回密码，4患者登录，5医生登录
	private Integer type;
	// 验证码
	private String captcha;
	// 消息内容
	private String content;
	// 过期时间
	private Date deadline;
	// 状态，0未发送，1已发送
	private Integer status;
	private Date czrq;
	public SMS() {
	}
	public String getMobile() {
		return mobile;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
	public String getIp() {
		return ip;
	}
	public void setIp(String ip) {
		this.ip = ip;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	public String getCaptcha() {
		return captcha;
	}
	public void setCaptcha(String captcha) {
		this.captcha = captcha;
	}
	public String getContent() {
		return content;
	}
	public void setContent(String content) {
		this.content = content;
	}
	public Date getDeadline() {
		return deadline;
	}
	public void setDeadline(Date deadline) {
		this.deadline = deadline;
	}
	public Integer getStatus() {
		return status;
	}
	public void setStatus(Integer status) {
		this.status = status;
	}
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
}

src/main/java/com/yihu/wlyy/entity/TblFamily.java

@@ -1,312 +0,0 @@
package com.yihu.wlyy.entity;
import java.sql.Timestamp;
import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
 * TblFamily entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "tbl_family")
public class TblFamily implements java.io.Serializable {
	// Fields
	private Integer id;//记录编码
	private String village;//居委会编码
	private String team;//组编码
	private String familyno;//家庭编号
	private String doornumb;//分户编号
	private String familyadd;//家庭地址
	private String doorno;//门牌号
	private String zipcode;//家庭邮编
	private String doorman;//房东姓名
	private String doormantel;//房东联系电话
	private Integer operatorid;//录入操作员
	private String checkunit;//登记单位
	private Timestamp checkdate;//登记日期
	private Timestamp intime;//入库时间
	private String cancelcau;//注销原因
	private Timestamp canceldate;//注销日期
	private String memo;//备注
	private Timestamp lastmodifydate;//末次修改时间
	private String ftype;//住房类型
	private Timestamp updatedate;//
	private Integer upoperater;//
	private String doorcardid;//房东身份证
	private Integer doorpersonid;//房东关联id
	private String persontype;//人口类型
	private String mzdzm;//
	// Constructors
	/** default constructor */
	public TblFamily() {
	}
	/** full constructor */
	public TblFamily(String village, String team, String familyno,
			String doornumb, String familyadd, String doorno, String zipcode,
			String doorman, String doormantel, Integer operatorid,
			String checkunit, Timestamp checkdate, Timestamp intime,
			String cancelcau, Timestamp canceldate, String memo,
			Timestamp lastmodifydate, String ftype, Timestamp updatedate,
			Integer upoperater, String doorcardid, Integer doorpersonid,
			String persontype, String mzdzm) {
		this.village = village;
		this.team = team;
		this.familyno = familyno;
		this.doornumb = doornumb;
		this.familyadd = familyadd;
		this.doorno = doorno;
		this.zipcode = zipcode;
		this.doorman = doorman;
		this.doormantel = doormantel;
		this.operatorid = operatorid;
		this.checkunit = checkunit;
		this.checkdate = checkdate;
		this.intime = intime;
		this.cancelcau = cancelcau;
		this.canceldate = canceldate;
		this.memo = memo;
		this.lastmodifydate = lastmodifydate;
		this.ftype = ftype;
		this.updatedate = updatedate;
		this.upoperater = upoperater;
		this.doorcardid = doorcardid;
		this.doorpersonid = doorpersonid;
		this.persontype = persontype;
		this.mzdzm = mzdzm;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "ID", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "VILLAGE", length = 12)
	public String getVillage() {
		return this.village;
	}
	public void setVillage(String village) {
		this.village = village;
	}
	@Column(name = "TEAM", length = 4)
	public String getTeam() {
		return this.team;
	}
	public void setTeam(String team) {
		this.team = team;
	}
	@Column(name = "FAMILYNO", length = 6)
	public String getFamilyno() {
		return this.familyno;
	}
	public void setFamilyno(String familyno) {
		this.familyno = familyno;
	}
	@Column(name = "DOORNUMB", length = 4)
	public String getDoornumb() {
		return this.doornumb;
	}
	public void setDoornumb(String doornumb) {
		this.doornumb = doornumb;
	}
	@Column(name = "FAMILYADD", length = 80)
	public String getFamilyadd() {
		return this.familyadd;
	}
	public void setFamilyadd(String familyadd) {
		this.familyadd = familyadd;
	}
	@Column(name = "DOORNO", length = 20)
	public String getDoorno() {
		return this.doorno;
	}
	public void setDoorno(String doorno) {
		this.doorno = doorno;
	}
	@Column(name = "ZIPCODE", length = 6)
	public String getZipcode() {
		return this.zipcode;
	}
	public void setZipcode(String zipcode) {
		this.zipcode = zipcode;
	}
	@Column(name = "DOORMAN", length = 50)
	public String getDoorman() {
		return this.doorman;
	}
	public void setDoorman(String doorman) {
		this.doorman = doorman;
	}
	@Column(name = "DOORMANTEL", length = 60)
	public String getDoormantel() {
		return this.doormantel;
	}
	public void setDoormantel(String doormantel) {
		this.doormantel = doormantel;
	}
	@Column(name = "OPERATORID")
	public Integer getOperatorid() {
		return this.operatorid;
	}
	public void setOperatorid(Integer operatorid) {
		this.operatorid = operatorid;
	}
	@Column(name = "CHECKUNIT", length = 12)
	public String getCheckunit() {
		return this.checkunit;
	}
	public void setCheckunit(String checkunit) {
		this.checkunit = checkunit;
	}
	@Column(name = "CHECKDATE", length = 0)
	public Timestamp getCheckdate() {
		return this.checkdate;
	}
	public void setCheckdate(Timestamp checkdate) {
		this.checkdate = checkdate;
	}
	@Column(name = "INTIME", length = 0)
	public Timestamp getIntime() {
		return this.intime;
	}
	public void setIntime(Timestamp intime) {
		this.intime = intime;
	}
	@Column(name = "CANCELCAU", length = 1)
	public String getCancelcau() {
		return this.cancelcau;
	}
	public void setCancelcau(String cancelcau) {
		this.cancelcau = cancelcau;
	}
	@Column(name = "CANCELDATE", length = 0)
	public Timestamp getCanceldate() {
		return this.canceldate;
	}
	public void setCanceldate(Timestamp canceldate) {
		this.canceldate = canceldate;
	}
	@Column(name = "MEMO", length = 210)
	public String getMemo() {
		return this.memo;
	}
	public void setMemo(String memo) {
		this.memo = memo;
	}
	@Column(name = "LASTMODIFYDATE", length = 0)
	public Timestamp getLastmodifydate() {
		return this.lastmodifydate;
	}
	public void setLastmodifydate(Timestamp lastmodifydate) {
		this.lastmodifydate = lastmodifydate;
	}
	@Column(name = "FTYPE", length = 1)
	public String getFtype() {
		return this.ftype;
	}
	public void setFtype(String ftype) {
		this.ftype = ftype;
	}
	@Column(name = "UPDATEDATE", length = 0)
	public Timestamp getUpdatedate() {
		return this.updatedate;
	}
	public void setUpdatedate(Timestamp updatedate) {
		this.updatedate = updatedate;
	}
	@Column(name = "UPOPERATER")
	public Integer getUpoperater() {
		return this.upoperater;
	}
	public void setUpoperater(Integer upoperater) {
		this.upoperater = upoperater;
	}
	@Column(name = "DOORCARDID", length = 18)
	public String getDoorcardid() {
		return this.doorcardid;
	}
	public void setDoorcardid(String doorcardid) {
		this.doorcardid = doorcardid;
	}
	@Column(name = "DOORPERSONID")
	public Integer getDoorpersonid() {
		return this.doorpersonid;
	}
	public void setDoorpersonid(Integer doorpersonid) {
		this.doorpersonid = doorpersonid;
	}
	@Column(name = "PERSONTYPE", length = 1)
	public String getPersontype() {
		return this.persontype;
	}
	public void setPersontype(String persontype) {
		this.persontype = persontype;
	}
	@Column(name = "MZDZM", length = 12)
	public String getMzdzm() {
		return this.mzdzm;
	}
	public void setMzdzm(String mzdzm) {
		this.mzdzm = mzdzm;
	}
}

src/main/java/com/yihu/wlyy/entity/Versions.java

@@ -5,33 +5,21 @@ import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 版本号表
 * 版本号
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_version")
public class Versions extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 7549164317186300400L;
	// 版本编码
	private String code;
	// 版本名称
	private String name;
	// 数字版本号
	private Double versionInt;
	// 字符串版本号
	private String versionStr;
	// 更新链接地址
	private String url;
	// 版本信息描述
	private String info;
	// 版本包大小，单位M
	private Double size;
	private String code;// 版本编码
	private String name;// 版本名称
	private Double versionInt;// 数字版本号
	private String versionStr;// 字符串版本号
	private String url;// 更新链接地址
	private String info;// 版本信息描述
	private Double size;// 版本包大小，单位M
	public String getCode() {
		return code;
@@ -90,5 +78,4 @@ public class Versions extends IdEntity {
	public void setSize(Double size) {
		this.size = size;
	}
}

src/main/java/com/yihu/wlyy/entity/WlyyPeopleNum.java

@@ -1,120 +0,0 @@
package com.yihu.wlyy.entity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by lyr on 2016/08/18.
 */
@Entity
@Table(name = "wlyy_people_num")
public class WlyyPeopleNum extends IdEntity implements java.io.Serializable{
    // 行政区划代码
    private String code;
    // 行政区划名称
    private String name;
    // 人口数
    private Integer num;
    // 类别 1市 2区
    private String type;
    // 年份
    private Integer year;
    // 高血压发病数
    private Integer gxyNum;
    // 糖尿病发布数
    private Integer tnbNum;
    // 65岁以上老年人口数
    private Integer sixFiveNum;
    // 高血压任务数
    private Integer gxyTaskNum;
    // 糖尿病任务数
    private Integer tnbTaskNum;
    // 65岁以上老年人口任务数
    private Integer sixFiveTaskNum;
    // 户籍人口任务数
    private Integer taskNum;
    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 Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public Integer getYear() {
        return year;
    }
    public void setYear(Integer year) {
        this.year = year;
    }
    public Integer getGxyNum() {
        return gxyNum;
    }
    public void setGxyNum(Integer gxyNum) {
        this.gxyNum = gxyNum;
    }
    public Integer getTnbNum() {
        return tnbNum;
    }
    public void setTnbNum(Integer tnbNum) {
        this.tnbNum = tnbNum;
    }
    public Integer getSixFiveNum() {
        return sixFiveNum;
    }
    public void setSixFiveNum(Integer sixFiveNum) {
        this.sixFiveNum = sixFiveNum;
    }
    public Integer getGxyTaskNum() {
        return gxyTaskNum;
    }
    public void setGxyTaskNum(Integer gxyTaskNum) {
        this.gxyTaskNum = gxyTaskNum;
    }
    public Integer getTnbTaskNum() {
        return tnbTaskNum;
    }
    public void setTnbTaskNum(Integer tnbTaskNum) {
        this.tnbTaskNum = tnbTaskNum;
    }
    public Integer getSixFiveTaskNum() {
        return sixFiveTaskNum;
    }
    public void setSixFiveTaskNum(Integer sixFiveTaskNum) {
        this.sixFiveTaskNum = sixFiveTaskNum;
    }
    public Integer getTaskNum() {
        return taskNum;
    }
    public void setTaskNum(Integer taskNum) {
        this.taskNum = taskNum;
    }
}

src/main/java/com/yihu/wlyy/entity/WlyyRole.java

@@ -1,64 +0,0 @@
package com.yihu.wlyy.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 医生角色
 */
@Entity
@Table(name = "wlyy_role")
public class WlyyRole extends IdEntity {
	
	// 角色编码
	private String code;
	// 角色名称
	private String name;	
	// 操作员
	private String czy;
	// 操作日期
	private Date czrq;
	@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="czy")
	public String getCzy() {
		return czy;
	}
	public void setCzy(String czy) {
		this.czy = czy;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name="czrq")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
}

src/main/java/com/yihu/wlyy/entity/WlyyUserRole.java

@@ -1,65 +0,0 @@
package com.yihu.wlyy.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.security.Timestamp;
import java.util.Date;
/**
 * 医生角色
 */
@Entity
@Table(name = "wlyy_user_role")
public class WlyyUserRole extends IdEntity {
	
	// 用户编码
	private String user;
	// 角色编码
	private String role;
	// 操作员
	private String czy;
	// 操作日期
	private Date czrq;
	@Column(name="user")
	public String getUser() {
		return user;
	}
	public void setUser(String user) {
		this.user = user;
	}
	@Column(name="role")
	public String getRole() {
		return role;
	}
	public void setRole(String role) {
		this.role = role;
	}
	public String getCzy() {
		return czy;
	}
	@Column(name="czy")
	public void setCzy(String czy) {
		this.czy = czy;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	@Column(name="czrq")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
}

src/main/java/com/yihu/wlyy/entity/Advert.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.advert;
import java.util.Date;
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 广告对象

src/main/java/com/yihu/wlyy/entity/consult/ConsultMoVi.java

@@ -12,7 +12,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.doctor.DoctorComment;
import com.yihu.wlyy.entity.doctor.profile.DoctorComment;
import com.yihu.wlyy.entity.IdEntity;
/**

src/main/java/com/yihu/wlyy/entity/TblBasic.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.demographic;
import java.sql.Timestamp;
import javax.persistence.*;
@@ -6,18 +6,11 @@ import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
 * TblBasic entity. @author MyEclipse Persistence Tools
 * 人口学信息。所有数据均从基卫数据库导出，数据库的表名与基卫一致。
 */
@Entity
@Table(name = "tbl_basic")
public class TblBasic implements java.io.Serializable {
	// Fields
	/**
	 *
	 *
	 */
public class DemographicInfo implements java.io.Serializable {
	private Integer personid;//人员编码
	private String persontype;//人员类型c2n(Persontype)
	private String name;//姓名
@@ -98,37 +91,30 @@ public class TblBasic implements java.io.Serializable {
	private String mothercode;//
	private String familyhtype;//
	// Constructors
	/** default constructor */
	public TblBasic() {
	}
	/** full constructor */
	public TblBasic(String persontype, String name, String oldname,
			String aliasname, String sex, Timestamp birth, Timestamp doorbirth,
			String cardid, String nation, String edudegree, String work,
			String party, String doorprop, String farmer, String aviso,
			String publicize, String hortation, String checktype,
			String single, Integer workid, String dooraddress,
			String dooraddressinfo, String nowaddress, String nowaddressinfo,
			String doortel, String marrytype, Timestamp marrychangedate,
			Integer mateid, String matename, String matecardid,
			Timestamp matebrith, Integer fatherid, String fathername,
			Integer materid, String matername, Integer girlcount,
			Integer boycount, Integer operatorid, String checkunit,
			Timestamp checkdate, Integer uoperatorid, String updateunit,
			Timestamp updatedate, Timestamp indate, Integer cancel,
			String memo, String persontel, Timestamp arrivedate,
			Timestamp leavedate, String conclass, String munitid, String state,
			String health, String relaparents, String matebwork,
			String workaddress, String mateaddtel, Integer nowchilden,
			Timestamp schildbirth, Timestamp singlenodate, String isviolate,
			String ismatefarmer, String workaddressid, String workname,
			Timestamp condate, String contramemo, String matedooradd,
			String matedooraddinfo, Timestamp fmarrydate, String unitname,
			String addtype, String zjlxdm, String qtzjhm, String fathercode,
			String gjdm, Timestamp dbdate, String mothercode, String familyhtype) {
	public DemographicInfo(String persontype, String name, String oldname,
                           String aliasname, String sex, Timestamp birth, Timestamp doorbirth,
                           String cardid, String nation, String edudegree, String work,
                           String party, String doorprop, String farmer, String aviso,
                           String publicize, String hortation, String checktype,
                           String single, Integer workid, String dooraddress,
                           String dooraddressinfo, String nowaddress, String nowaddressinfo,
                           String doortel, String marrytype, Timestamp marrychangedate,
                           Integer mateid, String matename, String matecardid,
                           Timestamp matebrith, Integer fatherid, String fathername,
                           Integer materid, String matername, Integer girlcount,
                           Integer boycount, Integer operatorid, String checkunit,
                           Timestamp checkdate, Integer uoperatorid, String updateunit,
                           Timestamp updatedate, Timestamp indate, Integer cancel,
                           String memo, String persontel, Timestamp arrivedate,
                           Timestamp leavedate, String conclass, String munitid, String state,
                           String health, String relaparents, String matebwork,
                           String workaddress, String mateaddtel, Integer nowchilden,
                           Timestamp schildbirth, Timestamp singlenodate, String isviolate,
                           String ismatefarmer, String workaddressid, String workname,
                           Timestamp condate, String contramemo, String matedooradd,
                           String matedooraddinfo, Timestamp fmarrydate, String unitname,
                           String addtype, String zjlxdm, String qtzjhm, String fathercode,
                           String gjdm, Timestamp dbdate, String mothercode, String familyhtype) {
		this.persontype = persontype;
		this.name = name;
		this.oldname = oldname;
@@ -209,7 +195,6 @@ public class TblBasic implements java.io.Serializable {
		this.familyhtype = familyhtype;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "PERSONID", unique = true, nullable = false)

src/main/java/com/yihu/wlyy/entity/demographic/FamilyInfo.java

@@ -0,0 +1,299 @@
package com.yihu.wlyy.entity.demographic;
import javax.persistence.*;
import java.sql.Timestamp;
/**
 * 人口学之家庭信息。此信息从基卫导出，表名与基卫一致。
 */
@Entity
@Table(name = "tbl_family")
public class FamilyInfo implements java.io.Serializable {
    private Integer id;//记录编码
    private String village;//居委会编码
    private String team;//组编码
    private String familyno;//家庭编号
    private String doornumb;//分户编号
    private String familyadd;//家庭地址
    private String doorno;//门牌号
    private String zipcode;//家庭邮编
    private String doorman;//房东姓名
    private String doormantel;//房东联系电话
    private Integer operatorid;//录入操作员
    private String checkunit;//登记单位
    private Timestamp checkdate;//登记日期
    private Timestamp intime;//入库时间
    private String cancelcau;//注销原因
    private Timestamp canceldate;//注销日期
    private String memo;//备注
    private Timestamp lastmodifydate;//末次修改时间
    private String ftype;//住房类型
    private Timestamp updatedate;//
    private Integer upoperater;//
    private String doorcardid;//房东身份证
    private Integer doorpersonid;//房东关联id
    private String persontype;//人口类型
    private String mzdzm;
    public FamilyInfo(String village, String team, String familyno,
                      String doornumb, String familyadd, String doorno, String zipcode,
                      String doorman, String doormantel, Integer operatorid,
                      String checkunit, Timestamp checkdate, Timestamp intime,
                      String cancelcau, Timestamp canceldate, String memo,
                      Timestamp lastmodifydate, String ftype, Timestamp updatedate,
                      Integer upoperater, String doorcardid, Integer doorpersonid,
                      String persontype, String mzdzm) {
        this.village = village;
        this.team = team;
        this.familyno = familyno;
        this.doornumb = doornumb;
        this.familyadd = familyadd;
        this.doorno = doorno;
        this.zipcode = zipcode;
        this.doorman = doorman;
        this.doormantel = doormantel;
        this.operatorid = operatorid;
        this.checkunit = checkunit;
        this.checkdate = checkdate;
        this.intime = intime;
        this.cancelcau = cancelcau;
        this.canceldate = canceldate;
        this.memo = memo;
        this.lastmodifydate = lastmodifydate;
        this.ftype = ftype;
        this.updatedate = updatedate;
        this.upoperater = upoperater;
        this.doorcardid = doorcardid;
        this.doorpersonid = doorpersonid;
        this.persontype = persontype;
        this.mzdzm = mzdzm;
    }
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Column(name = "ID", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "VILLAGE", length = 12)
    public String getVillage() {
        return this.village;
    }
    public void setVillage(String village) {
        this.village = village;
    }
    @Column(name = "TEAM", length = 4)
    public String getTeam() {
        return this.team;
    }
    public void setTeam(String team) {
        this.team = team;
    }
    @Column(name = "FAMILYNO", length = 6)
    public String getFamilyno() {
        return this.familyno;
    }
    public void setFamilyno(String familyno) {
        this.familyno = familyno;
    }
    @Column(name = "DOORNUMB", length = 4)
    public String getDoornumb() {
        return this.doornumb;
    }
    public void setDoornumb(String doornumb) {
        this.doornumb = doornumb;
    }
    @Column(name = "FAMILYADD", length = 80)
    public String getFamilyadd() {
        return this.familyadd;
    }
    public void setFamilyadd(String familyadd) {
        this.familyadd = familyadd;
    }
    @Column(name = "DOORNO", length = 20)
    public String getDoorno() {
        return this.doorno;
    }
    public void setDoorno(String doorno) {
        this.doorno = doorno;
    }
    @Column(name = "ZIPCODE", length = 6)
    public String getZipcode() {
        return this.zipcode;
    }
    public void setZipcode(String zipcode) {
        this.zipcode = zipcode;
    }
    @Column(name = "DOORMAN", length = 50)
    public String getDoorman() {
        return this.doorman;
    }
    public void setDoorman(String doorman) {
        this.doorman = doorman;
    }
    @Column(name = "DOORMANTEL", length = 60)
    public String getDoormantel() {
        return this.doormantel;
    }
    public void setDoormantel(String doormantel) {
        this.doormantel = doormantel;
    }
    @Column(name = "OPERATORID")
    public Integer getOperatorid() {
        return this.operatorid;
    }
    public void setOperatorid(Integer operatorid) {
        this.operatorid = operatorid;
    }
    @Column(name = "CHECKUNIT", length = 12)
    public String getCheckunit() {
        return this.checkunit;
    }
    public void setCheckunit(String checkunit) {
        this.checkunit = checkunit;
    }
    @Column(name = "CHECKDATE", length = 0)
    public Timestamp getCheckdate() {
        return this.checkdate;
    }
    public void setCheckdate(Timestamp checkdate) {
        this.checkdate = checkdate;
    }
    @Column(name = "INTIME", length = 0)
    public Timestamp getIntime() {
        return this.intime;
    }
    public void setIntime(Timestamp intime) {
        this.intime = intime;
    }
    @Column(name = "CANCELCAU", length = 1)
    public String getCancelcau() {
        return this.cancelcau;
    }
    public void setCancelcau(String cancelcau) {
        this.cancelcau = cancelcau;
    }
    @Column(name = "CANCELDATE", length = 0)
    public Timestamp getCanceldate() {
        return this.canceldate;
    }
    public void setCanceldate(Timestamp canceldate) {
        this.canceldate = canceldate;
    }
    @Column(name = "MEMO", length = 210)
    public String getMemo() {
        return this.memo;
    }
    public void setMemo(String memo) {
        this.memo = memo;
    }
    @Column(name = "LASTMODIFYDATE", length = 0)
    public Timestamp getLastmodifydate() {
        return this.lastmodifydate;
    }
    public void setLastmodifydate(Timestamp lastmodifydate) {
        this.lastmodifydate = lastmodifydate;
    }
    @Column(name = "FTYPE", length = 1)
    public String getFtype() {
        return this.ftype;
    }
    public void setFtype(String ftype) {
        this.ftype = ftype;
    }
    @Column(name = "UPDATEDATE", length = 0)
    public Timestamp getUpdatedate() {
        return this.updatedate;
    }
    public void setUpdatedate(Timestamp updatedate) {
        this.updatedate = updatedate;
    }
    @Column(name = "UPOPERATER")
    public Integer getUpoperater() {
        return this.upoperater;
    }
    public void setUpoperater(Integer upoperater) {
        this.upoperater = upoperater;
    }
    @Column(name = "DOORCARDID", length = 18)
    public String getDoorcardid() {
        return this.doorcardid;
    }
    public void setDoorcardid(String doorcardid) {
        this.doorcardid = doorcardid;
    }
    @Column(name = "DOORPERSONID")
    public Integer getDoorpersonid() {
        return this.doorpersonid;
    }
    public void setDoorpersonid(Integer doorpersonid) {
        this.doorpersonid = doorpersonid;
    }
    @Column(name = "PERSONTYPE", length = 1)
    public String getPersontype() {
        return this.persontype;
    }
    public void setPersontype(String persontype) {
        this.persontype = persontype;
    }
    @Column(name = "MZDZM", length = 12)
    public String getMzdzm() {
        return this.mzdzm;
    }
    public void setMzdzm(String mzdzm) {
        this.mzdzm = mzdzm;
    }
}

src/main/java/com/yihu/wlyy/entity/TblPersonjoinfamilymid.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.demographic;
import java.sql.Timestamp;
import javax.persistence.*;
@@ -6,14 +6,11 @@ import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
 * TblPersonjoinfamilymid entity. @author MyEclipse Persistence Tools
 * 户口信息。数据来自基卫，表名与基卫一致。
 */
@Entity
@Table(name = "tbl_personjoinfamilymid")
public class TblPersonjoinfamilymid implements java.io.Serializable {
	// Fields
public class ResidenceInfo implements java.io.Serializable {
	private Integer id;//记录编码
	private Integer familystateid;//家庭户对应id
	private Integer personid;//人员编码
@@ -44,22 +41,15 @@ public class TblPersonjoinfamilymid implements java.io.Serializable {
	private Integer cancelid;//出户ID对应tblreg_move或tblreg_cancel表
	private String canceltype;//出户类型（03对应死亡，04对应迁出）
	// Constructors
	/** default constructor */
	public TblPersonjoinfamilymid() {
	}
	/** full constructor */
	public TblPersonjoinfamilymid(Integer familystateid, Integer personid,
			String property, String relaholder, String personstate,
			Integer operatorid, String checkunit, Timestamp checkdate,
			String leavecau, Timestamp canceldate, String memo,
			Integer familyinfoid, Timestamp indate, String state, String sn,
			String team, String familyno, String doornumb, String addno,
			String persontype, String munittype, Integer manid,
			Timestamp startdate, Timestamp enddate, Integer jionid,
			String jiontype, Integer cancelid, String canceltype) {
	public ResidenceInfo(Integer familystateid, Integer personid,
                         String property, String relaholder, String personstate,
                         Integer operatorid, String checkunit, Timestamp checkdate,
                         String leavecau, Timestamp canceldate, String memo,
                         Integer familyinfoid, Timestamp indate, String state, String sn,
                         String team, String familyno, String doornumb, String addno,
                         String persontype, String munittype, Integer manid,
                         Timestamp startdate, Timestamp enddate, Integer jionid,
                         String jiontype, Integer cancelid, String canceltype) {
		this.familystateid = familystateid;
		this.personid = personid;
		this.property = property;
@@ -90,7 +80,6 @@ public class TblPersonjoinfamilymid implements java.io.Serializable {
		this.canceltype = canceltype;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "ID", unique = true, nullable = false)

src/main/java/com/yihu/wlyy/entity/Disease.java

@@ -1,28 +1,23 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.dict;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 疾病类型表
 * @author George
 * 疾病字典项
 *
 * @author George
 */
@Entity
@Table(name = "wlyy_disease")
public class Disease extends IdEntity {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = 7011816488798083794L;
	
	// 疾病标识
	private String code;
	// 疾病名称
	private String name;
	// 作废标识，1正常，0删除
	private String del;
	private String code;// 疾病标识
	private String name;// 疾病名称
	private String del;// 作废标识，1正常，0删除
	public String getCode() {
		return code;

src/main/java/com/yihu/wlyy/entity/TblsysParam.java

@@ -1,18 +1,15 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.dict;
import javax.persistence.*;
import org.hibernate.annotations.GenericGenerator;
/**
 * TblsysParam entity. @author MyEclipse Persistence Tools
 * 基卫字典与系统参数，数据取自基卫
 */
@Entity
@Table(name = "tblsys_param")
public class TblsysParam implements java.io.Serializable {
	// Fields
public class FoundationMedicalSystemParam implements java.io.Serializable {
	private Integer codeid; //参数自动编码
	private String paramname;//参数英文名称
	private String code;//代码
@@ -27,17 +24,10 @@ public class TblsysParam implements java.io.Serializable {
	private String bmlevel;//表码级别(1国家，2省，3市，4自定义)
	private String description;//描述
	// Constructors
	/** default constructor */
	public TblsysParam() {
	}
	/** full constructor */
	public TblsysParam(String paramname, String code, Integer ord,
			String paramchina, String namespell, String iscustom,
			String cancel, String paramdesc, String canceldate,
			String classname, String bmlevel, String description) {
	public FoundationMedicalSystemParam(String paramname, String code, Integer ord,
                                        String paramchina, String namespell, String iscustom,
                                        String cancel, String paramdesc, String canceldate,
                                        String classname, String bmlevel, String description) {
		this.paramname = paramname;
		this.code = code;
		this.ord = ord;
@@ -52,7 +42,6 @@ public class TblsysParam implements java.io.Serializable {
		this.description = description;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	@Column(name = "CODEID", unique = true, nullable = false)
@@ -171,5 +160,4 @@ public class TblsysParam implements java.io.Serializable {
	public void setDescription(String description) {
		this.description = description;
	}
}

src/main/java/com/yihu/wlyy/entity/Medicines.java

@@ -1,30 +1,24 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.dict;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 药品信息
 * 药品字典项目
 * @author George
 *
 */
@Entity
@Table(name = "dm_medicines")
public class Medicines extends IdEntity {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = -6408087441099619157L;
	
	// 药品标识
	private String code;
	// 药品名称
	private String name;
	// 药品类型：1健康记录
	private Integer type;
	// 作废标识，1正常，0作废
	private String del;
	private String code;// 药品标识
	private String name;// 药品名称
	private Integer type;// 药品类型：1健康记录
	private String del;// 作废标识，1正常，0作废
	public String getCode() {
		return code;

src/main/java/com/yihu/wlyy/entity/WlyyTalkGroup.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.discussion;
import java.util.Date;
@@ -6,10 +6,11 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_talk_group")
public class WlyyTalkGroup  extends  IdEntity{
public class WlyyTalkGroup  extends IdEntity {
    // 讨论组标识
	private String code;
	// 讨论组名称

src/main/java/com/yihu/wlyy/entity/WlyyTalkGroupMember.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.discussion;
import java.util.Date;
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_talk_group_member")

src/main/java/com/yihu/wlyy/entity/doctor/DoctorMedicalRecordsPart.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.emr;
import java.util.Date;
@@ -16,22 +16,13 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_medical_records_part")
public class DoctorMedicalRecordsPart extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 4626755759476144536L;
	
	// 片段标识
	private String code;
	// 医生标识，空表示是系统片段
	private String doctor;
	// 片段名称
	private String name;
	// 添加时间
	private Date czrq;
	// 作废标识：1正常，0作废
	private String del;
	private String code;        // 片段标识
	private String doctor;      // 医生标识，空表示是系统片段
	private String name;        // 片段名称
	private Date czrq;          // 添加时间
	private String del;         // 作废标识：1正常，0作废
	public String getCode() {
		return code;

src/main/java/com/yihu/wlyy/entity/doctor/DoctorMedicalRecordsPartItem.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.emr;
import java.util.Date;
@@ -17,10 +17,6 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_medical_records_part_item")
public class DoctorMedicalRecordsPartItem extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 3369050786556456338L;
	// 医生标识

src/main/java/com/yihu/wlyy/entity/doctor/Doctor.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.profile;
import java.util.Date;

src/main/java/com/yihu/wlyy/entity/doctor/DoctorComment.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.profile;
import java.util.Date;
@@ -11,10 +11,6 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_comment")
public class DoctorComment extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -1397356305726645651L;
	private String code;

src/main/java/com/yihu/wlyy/entity/doctor/profile/DoctorRole.java

@@ -0,0 +1,58 @@
package com.yihu.wlyy.entity.doctor.profile;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 医生角色
 */
@Entity
@Table(name = "wlyy_role")
public class DoctorRole extends IdEntity {
    private String code;        // 角色编码
    private String name;        // 角色名称
    private String czy;       // 操作员
    private Date czrq;       // 操作日期
    @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 = "czy")
    public String getCzy() {
        return czy;
    }
    public void setCzy(String czy) {
        this.czy = czy;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "czrq")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

src/main/java/com/yihu/wlyy/entity/WlyyRoleRealm.java

@@ -1,4 +1,6 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.doctor.profile;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,7 +11,7 @@ import javax.persistence.Table;
 **/
@Entity
@Table(name = "wlyy_role_area")
public class WlyyRoleRealm extends IdEntity {
public class DoctorRoleRealm extends IdEntity {
    // 角色编码

src/main/java/com/yihu/wlyy/entity/doctor/DoctorService.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.profile;
import java.util.Date;
@@ -16,10 +16,6 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_service")
public class DoctorService extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -8214391612459440406L;
	// 服务标识（关联dm_service的code）

src/main/java/com/yihu/wlyy/entity/Job.java

@@ -1,4 +1,6 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.doctor.profile;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -6,24 +8,15 @@ import javax.persistence.Table;
/**
 * 医生职称
 * @author George
 *
 */
@Entity
@Table(name = "dm_job")
public class Job extends IdEntity {
	
	/**
	 * 
	 */
public class JobTitle extends IdEntity {
	private static final long serialVersionUID = 8971105514160586278L;
	
	// 城市編碼
	private String code;
	// 城市名稱
	private String name;	
	// 城市名稱
	private String del;
	private String code;        // 城市編碼
	private String name;	    // 城市名稱
	private String del;         // 城市名稱
	public String getDel() {
		return del;

src/main/java/com/yihu/wlyy/entity/doctor/profile/WlyyUserRole.java

@@ -0,0 +1,60 @@
package com.yihu.wlyy.entity.doctor.profile;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.security.Timestamp;
import java.util.Date;
/**
 * 医生角色
 */
@Entity
@Table(name = "wlyy_user_role")
public class WlyyUserRole extends IdEntity {
    private String user;    // 用户编码
    private String role;    // 角色编码
    private String czy;     // 操作员
    private Date czrq;      // 操作日期
    @Column(name = "user")
    public String getUser() {
        return user;
    }
    public void setUser(String user) {
        this.user = user;
    }
    @Column(name = "role")
    public String getRole() {
        return role;
    }
    public void setRole(String role) {
        this.role = role;
    }
    public String getCzy() {
        return czy;
    }
    @Column(name = "czy")
    public void setCzy(String czy) {
        this.czy = czy;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "czrq")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

src/main/java/com/yihu/wlyy/entity/doctor/DoctorScheduling.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.schedule;
import java.sql.Time;
import java.util.Date;
@@ -18,30 +18,17 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_scheduling")
public class DoctorScheduling extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -5779461632115871369L;
	
	// 排班标识
	private String code;
	// 医生标识
	private String doctor;
	// 星期几（1~7）
	private Integer week;
	// 排班开始时间
	private Time hourBegin;
	// 排班结束时间
	private Time hourEnd;
	// 可预约次数
	private Integer times;
	// 排班类型：1视频预约
	private Integer type;
	// 排班操作时间
	private Date czrq;
	// 作废标识，1正常，0作废
	private String del;
	private String code;        // 排班标识
	private String doctor;      // 医生标识
	private Integer week;       // 星期几（1~7）
	private Time hourBegin;     // 排班开始时间
	private Time hourEnd;       // 排班结束时间
	private Integer times;      // 可预约次数
	private Integer type;       // 排班类型：1视频预约
	private Date czrq;          // 排班操作时间
	private String del;         // 作废标识，1正常，0作废
	public String getCode() {
		return code;

src/main/java/com/yihu/wlyy/entity/doctor/DoctorSchedulingTimes.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.schedule;
import java.util.Date;
@@ -17,10 +17,6 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_scheduling_times")
public class DoctorSchedulingTimes extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 3079894901386133515L;
	// 排班标识

src/main/java/com/yihu/wlyy/entity/WlyyDoctorWorkTime.java

@@ -1,6 +1,7 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.doctor.schedule;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.*;
import java.util.Date;
@@ -10,7 +11,7 @@ import java.util.Date;
 */
@Entity
@Table(name = "wlyy_doctor_work_time")
public class WlyyDoctorWorkTime extends IdEntity{
public class WlyyDoctorWorkTime extends IdEntity {
    // 医生标识
    private String doctor;
    // 医生姓名

src/main/java/com/yihu/wlyy/entity/WlyyDoctorWorkWeek.java

@@ -1,4 +1,6 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.doctor.schedule;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;

src/main/java/com/yihu/wlyy/entity/doctor/team/admin/AdminTeam.java

@@ -15,12 +15,13 @@ import java.util.Date;
 * @author Sand
 */
@Entity
@Table(name = "wlyy_doctor_admin_team")
@Table(name = "wlyy_admin_team")
public class AdminTeam extends IdEntity {
    private String name;
    private Date createTime;
    private boolean available;
    private String leaderCode;
    private String orgCode;
    private boolean available;
    public String getName() {
        return name;
@@ -41,15 +42,6 @@ public class AdminTeam extends IdEntity {
        this.createTime = createTime;
    }
    public boolean isAvailable() {
        return available;
    }
    @Column(name = "available")
    public void setAvailable(boolean available) {
        this.available = available;
    }
    public String getOrgCode() {
        return orgCode;
    }
@@ -63,4 +55,22 @@ public class AdminTeam extends IdEntity {
    public String toString() {
        return ToStringBuilder.reflectionToString(this);
    }
    public String getLeaderCode() {
        return leaderCode;
    }
    @Column(name = "leader_id")
    public void setLeaderCode(String leaderCode) {
        this.leaderCode = leaderCode;
    }
    public boolean isAvailable() {
        return available;
    }
    @Column(name = "available")
    public void setAvailable(boolean available) {
        this.available = available;
    }
}

src/main/java/com/yihu/wlyy/entity/doctor/team/admin/AdminTeamMember.java

@@ -14,12 +14,11 @@ import java.util.Date;
 * @author Sand
 */
@Entity
@Table(name = "wlyy_doctor_admin_team_member")
@Table(name = "wlyy_admin_team_member")
public class AdminTeamMember extends IdEntity {
    private long teamId;
    private long doctorId;
    private String doctorCode;
    private Date joinTime;
    private boolean isLeader;
    public long getTeamId() {
        return teamId;
@@ -30,13 +29,13 @@ public class AdminTeamMember extends IdEntity {
        this.teamId = teamId;
    }
    public long getDoctorId() {
        return doctorId;
    public String getDoctorCode() {
        return doctorCode;
    }
    @Column(name = "doctor_id")
    public void setDoctorId(long doctorId) {
        this.doctorId = doctorId;
    public void setDoctorCode(String doctorCode) {
        this.doctorCode = doctorCode;
    }
    @JsonFormat(pattern = "yyyy-MM-dd hh:mm", timezone = "GMT+08:00")
@@ -48,13 +47,4 @@ public class AdminTeamMember extends IdEntity {
    public void setJoinTime(Date joinTime) {
        this.joinTime = joinTime;
    }
    public boolean isLeader() {
        return isLeader;
    }
    @Column(name = "is_leader")
    public void setLeader(boolean leader) {
        isLeader = leader;
    }
}

src/main/java/com/yihu/wlyy/entity/doctor/DoctorPatient.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.team.sign;
import java.util.Date;
@@ -17,10 +17,6 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_patient")
public class DoctorPatient extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -2260152237953602081L;
	// 医生标识

src/main/java/com/yihu/wlyy/entity/doctor/DoctorPatientGroup.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.team.sign;
import java.util.Date;
@@ -16,9 +16,6 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_patient_group")
public class DoctorPatientGroup extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 2055055862188986760L;
	
	// 业务主键

src/main/java/com/yihu/wlyy/entity/doctor/DoctorPatientGroupInfo.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.team.sign;
import java.util.Date;
@@ -17,9 +17,6 @@ import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_doctor_patient_group_info")
public class DoctorPatientGroupInfo extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 5559656428707106920L;
	// 医生标识

src/main/java/com/yihu/wlyy/entity/doctor/DoctorTeam.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.team.sign;
import java.util.Date;
@@ -10,33 +10,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 三师团队/医生工作组信息对象
 * 三师团队/医生签约团队
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_doctor_team")
public class DoctorTeam extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 715817516721723210L;
	// 组标识
	private String code;
	// 组名
	private String name;
	// 更新时间
	private Date czrq;
	// 是否作废，1正常，0作废
	private String del;
	private String code;    // 组标识
	private String name;    // 组名
	private Date czrq;      // 更新时间
	private String del;     // 是否作废，1正常，0作废
	private String signType;//签约类型（1表示三师签约，2表示家庭签约）
	public DoctorTeam() {
	}
	public String getCode() {
		return code;
	}
@@ -69,6 +57,7 @@ public class DoctorTeam extends IdEntity {
	public void setDel(String del) {
		this.del = del;
	}
	@Column(name = "sign_type")
	public String getSignType() {
		return signType;

src/main/java/com/yihu/wlyy/entity/doctor/DoctorTeamInfo.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.doctor.team.sign;
import java.util.Date;
@@ -9,36 +9,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 三师团队/医生工作组成员对象
 * 三师团队/医生签约团队信息
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_doctor_team_info")
public class DoctorTeamInfo extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -1842055458720630738L;
	// 团队编码，关联wlyy_doctor_team表
	private String team;
	// 医生标识，关联wlyy_doctor表
	private String doctor;
	// 医生姓名
	private String name;
	// 医生类型：1专科医生，2全科医生，3健康管理师，4营养师 5.患者
	private Integer type;
	// 更新时间
	private Date czrq;
	// 是否作废，1正常，0作废
	private String del;
	public DoctorTeamInfo() {
	}
	private String team;    // 团队编码，关联wlyy_doctor_team表
	private String doctor;  // 医生标识，关联wlyy_doctor表
	private String name;    // 医生姓名
	private Integer type;   // 医生类型：1专科医生，2全科医生，3健康管理师，4营养师 5.患者
	private Date czrq;      // 更新时间
	private String del;     // 是否作废，1正常，0作废
	public String getTeam() {
		return team;

src/main/java/com/yihu/wlyy/entity/DrHealthTeamMember.java

@@ -1,4 +1,6 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.doctor.team.sign;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -7,13 +9,13 @@ import java.sql.Timestamp;
import java.util.Date;
/**
 * WlyyDoctorTeamDoctor entity.
 * 医生签约团队成员。
 *
 * @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "wlyy_doctor_team_member")
public class DrHealthTeamMember extends IdEntity {
public class DoctorTeamMember extends IdEntity {
    // Fields
    private String team;
@@ -28,14 +30,14 @@ public class DrHealthTeamMember extends IdEntity {
    /**
     * default constructor
     */
    public DrHealthTeamMember() {
    public DoctorTeamMember() {
    }
    /**
     * minimal constructor
     */
    public DrHealthTeamMember(String team, String doctor, Integer type,
                              Timestamp czrq) {
    public DoctorTeamMember(String team, String doctor, Integer type,
                            Timestamp czrq) {
        this.team = team;
        this.type = type;
        this.czrq = czrq;
@@ -44,8 +46,8 @@ public class DrHealthTeamMember extends IdEntity {
    /**
     * full constructor
     */
    public DrHealthTeamMember(String team, String doctor, String name,
                              Integer type, Timestamp czrq, String del) {
    public DoctorTeamMember(String team, String doctor, String name,
                            Integer type, Timestamp czrq, String del) {
        this.team = team;
        this.name = name;
        this.type = type;

src/main/java/com/yihu/wlyy/entity/health_guide/HealthEduArticle.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.health_guide;
package com.yihu.wlyy.entity.education;
import java.util.Date;

src/main/java/com/yihu/wlyy/entity/health_guide/HealthEduArticlePatient.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.health_guide;
package com.yihu.wlyy.entity.education;
import java.util.Date;

src/main/java/com/yihu/wlyy/entity/health_guide/HealthNews.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.health_guide;
package com.yihu.wlyy.entity.education;
import java.util.Date;

src/main/java/com/yihu/wlyy/entity/health_guide/Sports.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.health_guide;
package com.yihu.wlyy.entity.education;
import com.yihu.wlyy.entity.IdEntity;

src/main/java/com/yihu/wlyy/entity/health_guide/SportsType.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.health_guide;
package com.yihu.wlyy.entity.education;
import com.yihu.wlyy.entity.IdEntity;

src/main/java/com/yihu/wlyy/entity/WlyyJobConfig.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.job;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -8,13 +8,11 @@ import javax.persistence.Table;
import org.hibernate.annotations.GenericGenerator;
/**
 * WlyyJobConfig entity. @author MyEclipse Persistence Tools
 * 计划任务
 */
@Entity
@Table(name = "wlyy_job_config")
public class WlyyJobConfig implements java.io.Serializable {
	// Fields
public class QuartzJobConfig implements java.io.Serializable {
	private String id;
	private String quotaId;//指标id
@@ -26,20 +24,14 @@ public class WlyyJobConfig implements java.io.Serializable {
	private String status;//1 启动 0停止
	private String del;//是否删除 1正常 0删除
	// Constructors
	/** default constructor */
	public WlyyJobConfig() {
	}
	/** minimal constructor */
	public WlyyJobConfig(String jobName) {
	public QuartzJobConfig(String jobName) {
		this.jobName = jobName;
	}
	/** full constructor */
	public WlyyJobConfig(String jobName, String jobInfo, String jobType,
			String jobClass, String quartzCron, String status) {
	public QuartzJobConfig(String jobName, String jobInfo, String jobType,
                           String jobClass, String quartzCron, String status) {
		this.jobName = jobName;
		this.jobInfo = jobInfo;
		this.jobType = jobType;

src/main/java/com/yihu/wlyy/entity/WlyyJobLog.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.job;
import java.sql.Timestamp;
import java.util.Date;
@@ -10,36 +10,28 @@ import javax.persistence.Table;
import org.hibernate.annotations.GenericGenerator;
/**
 * WlyyJobLog entity. @author MyEclipse Persistence Tools
 * QuartzJobLog entity. @author MyEclipse Persistence Tools
 */
@Entity
@Table(name = "wlyy_job_log")
public class WlyyJobLog implements java.io.Serializable {
	// Fields
public class QuartzJobLog implements java.io.Serializable {
	private String id;
	private Date jobStartTime;//任务开始执行时间
	private Date jobEndTime;//任务结束时间
	private String jobId;//任务id
	private String jobName;//任务名称
	private String jobContent;//任务执行情况
	private String jobType;// 1成功 0失败
	// Constructors
	private Date jobStartTime;  //任务开始执行时间
	private Date jobEndTime;    //任务结束时间
	private String jobId;       //任务id
	private String jobName;     //任务名称
	private String jobContent;  //任务执行情况
	private String jobType;     // 1成功 0失败
	/** default constructor */
	public WlyyJobLog() {
	}
    public QuartzJobLog(){}
	/** minimal constructor */
	public WlyyJobLog(String jobId) {
	public QuartzJobLog(String jobId) {
		this.jobId = jobId;
	}
	/** full constructor */
	public WlyyJobLog(Timestamp jobStartTime, Timestamp jobEndTime,
			String jobId, String jobContent, String jobType) {
	public QuartzJobLog(Timestamp jobStartTime, Timestamp jobEndTime,
                        String jobId, String jobContent, String jobType) {
		this.jobStartTime = jobStartTime;
		this.jobEndTime = jobEndTime;
		this.jobId = jobId;
@@ -47,7 +39,6 @@ public class WlyyJobLog implements java.io.Serializable {
		this.jobType = jobType;
	}
	// Property accessors
	@GenericGenerator(name = "generator", strategy = "uuid")
	@Id
	@GeneratedValue(generator = "generator")

src/main/java/com/yihu/wlyy/entity/message/SMS.java

@@ -0,0 +1,93 @@
package com.yihu.wlyy.entity.message;
import com.yihu.wlyy.entity.IdEntity;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 手机短信
 *
 * @author George
 */
@Entity
@Table(name = "wlyy_sms")
public class SMS extends IdEntity {
    private static final long serialVersionUID = -1438212901585781994L;
    private String mobile;// 手机号
    private String ip;// ip地址
    private Integer type;// 消息类型：1微信端注册，2微信端找回密码，3医生端找回密码，4患者登录，5医生登录
    private String captcha;// 验证码
    private String content;// 消息内容
    private Date deadline;// 过期时间
    private Integer status;// 状态，0未发送，1已发送
    private Date czrq;
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getIp() {
        return ip;
    }
    public void setIp(String ip) {
        this.ip = ip;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public String getCaptcha() {
        return captcha;
    }
    public void setCaptcha(String captcha) {
        this.captcha = captcha;
    }
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public Date getDeadline() {
        return deadline;
    }
    public void setDeadline(Date deadline) {
        this.deadline = deadline;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

src/main/java/com/yihu/wlyy/entity/HospitalDept.java

@@ -1,21 +1,19 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.organization;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 城市信息對象
 * 医院科室
 *
 * @author George
 *
 */
@Entity
@Table(name = "dm_hospital_dept")
public class HospitalDept extends IdEntity {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = -5296182461037390028L;
	
	// 城市編碼

src/main/java/com/yihu/wlyy/entity/HospitalMapping.java

@@ -1,10 +1,12 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.organization;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 机构映射表
 * 医院映射表
 * @author hzp
 */

src/main/java/com/yihu/wlyy/entity/patient/PatientDisease.java

@@ -8,24 +8,20 @@ import java.io.Serializable;
import java.util.Date;
/**
 * Created by lyr on 2016/09/09.
 * 患者疾病。
 *
 * @author lyr
 */
@Entity
@Table(name = "wlyy_patient_disease")
public class PatientDisease extends IdEntity implements Serializable {
    // 患者
    private String patient;
    // 疾病代码
    private String disease;
    // 疾病名称
    private String diseaseName;
    // 是否有效 1有效 0无效
    private String del;
    // 签约类型 1:三师 2:家庭
    private String signType;
    // 操作日期
    private Date czrq;
    private String patient;         // 患者
    private String disease;         // 疾病代码
    private String diseaseName;     // 疾病名称
    private String del;              // 是否有效 1有效 0无效
    private String signType;        // 签约类型 1:三师 2:家庭
    private Date czrq;              // 操作日期
    public String getPatient() {
        return patient;

src/main/java/com/yihu/wlyy/entity/SignFamily.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.patient;
import java.util.Date;
@@ -7,20 +7,16 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 家庭签约
 * @author George
 *
 */
@Entity
@Table(name = "wlyy_sign_family")
public class SignFamily extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 364799142991631092L;
	// 签约标识
@@ -83,12 +79,10 @@ public class SignFamily extends IdEntity {
	private String expensesType;//补贴类型（4种类型：01无补贴，02全部贴，03补个人承担部分（20），04补统筹基金（70））
	private String signYear;//签约年度
	private String medicalInsuranceNum;//医保流水号
	private String agentDoctorCode;//代理簽約人code
	private String agentDoctorName;//代理簽約人銘
	private String agentDoctorLevel;//代理簽約人等级
	public String getCode() {
		return code;
	}

src/main/java/com/yihu/wlyy/entity/WlyySignFamilyCode.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.patient;
import java.sql.Timestamp;
import java.util.Date;
@@ -10,14 +10,11 @@ import javax.persistence.Table;
import org.hibernate.annotations.GenericGenerator;
/**
 * WlyySignFamilyCode entity. @author MyEclipse Persistence Tools
 * 签约家庭代码。
 */
@Entity
@Table(name = "wlyy_sign_family_code")
public class WlyySignFamilyCode implements java.io.Serializable {
	// Fields
public class SignFamilyCode implements java.io.Serializable {
	private String id;
	private String orgCode;
	private String orgName;
@@ -25,27 +22,20 @@ public class WlyySignFamilyCode implements java.io.Serializable {
	private Date modifyTime;
	private String year;
	// Constructors
	/** default constructor */
	public WlyySignFamilyCode() {
	}
    public SignFamilyCode(){}
	/** minimal constructor */
	public WlyySignFamilyCode(Timestamp modifyTime) {
	public SignFamilyCode(Timestamp modifyTime) {
		this.modifyTime = modifyTime;
	}
	/** full constructor */
	public WlyySignFamilyCode(String orgCode, String orgName, Integer sequence,
			Timestamp modifyTime) {
	public SignFamilyCode(String orgCode, String orgName, Integer sequence,
                          Timestamp modifyTime) {
		this.orgCode = orgCode;
		this.orgName = orgName;
		this.sequence = sequence;
		this.modifyTime = modifyTime;
	}
	// Property accessors
	@GenericGenerator(name = "generator", strategy = "uuid")
	@Id
	@GeneratedValue(generator = "generator")

src/main/java/com/yihu/wlyy/entity/SignWeb.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.patient;
import java.util.Date;
@@ -7,20 +7,15 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 签约医生
 * 签约医生？这实体到底是干嘛的？
 * @author AndyCai
 *
 */
@Entity
@Table(name = "wlyy_sign_web")
public class SignWeb extends IdEntity {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = -6688234997241132373L;
	
	//签约标识
@@ -43,7 +38,6 @@ public class SignWeb extends IdEntity {
	private Date applyDate;
	
	private String releaseSpeak;
	
	public String getCode() {
		return code;

src/main/java/com/yihu/wlyy/entity/SbInfo.java

@@ -1,13 +1,15 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.patient;
import javax.persistence.*;
/**
 * Created by lyr on 2016/8/8.
 * 社保信息
 *
 * @author lyr
 */
@Entity
@Table(name = "sb_info")
public class SbInfo {
public class SocialSecurityInfo {
    private String id;
    private String xming0;

src/main/java/com/yihu/wlyy/entity/WlyyPatientSick.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.patient;
import java.sql.Timestamp;
import java.util.Date;
@@ -7,16 +7,16 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.yihu.wlyy.entity.IdEntity;
import org.hibernate.annotations.GenericGenerator;
/**
 * WlyyPatientSick entity. @author MyEclipse Persistence Tools
 * 患者疾病。
 */
@Entity
@Table(name = "wlyy_patient_sick")
public class WlyyPatientSick extends IdEntity implements java.io.Serializable {
	// Fields
	private String code;
	private String patientCode;
	private String sickCode;
@@ -26,18 +26,12 @@ public class WlyyPatientSick extends IdEntity implements java.io.Serializable {
	private String doctorCode;
	private String del;
	// Constructors
	/** default constructor */
	public WlyyPatientSick() {
	}
	public WlyyPatientSick(){}
	/** minimal constructor */
	public WlyyPatientSick(String code) {
		this.code = code;
	}
	/** full constructor */
	public WlyyPatientSick(String code, String patientCode, String sickCode,
			String sickName, Timestamp czrq, String signType, String doctorCode) {
		this.code = code;

src/main/java/com/yihu/wlyy/entity/WlyyPatientInviteLog.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.patient.invitation;
import java.sql.Timestamp;
import java.util.Date;
@@ -11,13 +11,11 @@ import javax.persistence.Table;
import org.hibernate.annotations.GenericGenerator;
/**
 * WlyyPatientInviteLog entity. @author MyEclipse Persistence Tools
 * 患者邀请记录
 */
@Entity
@Table(name = "wlyy_patient_invite_log")
public class WlyyPatientInviteLog implements java.io.Serializable {
    // Fields
public class PatientInvitationLog implements java.io.Serializable {
    private String id;
    private String invitePatientCode;//被邀请人code
@@ -33,26 +31,14 @@ public class WlyyPatientInviteLog implements java.io.Serializable {
    private String wxPush;// 是否微信推送 1 否 0是
    private Date wxPushTime;//推送时间
    // Constructors
    /**
     * default constructor
     */
    public WlyyPatientInviteLog() {
    }
    public PatientInvitationLog(){}
    /**
     * minimal constructor
     */
    public WlyyPatientInviteLog(Timestamp inviteTime, Timestamp dealTime) {
    public PatientInvitationLog(Timestamp inviteTime, Timestamp dealTime) {
        this.inviteTime = inviteTime;
        this.dealTime = dealTime;
    }
    /**
     * full constructor
     */
    public WlyyPatientInviteLog(String invitePatientCode,
    public PatientInvitationLog(String invitePatientCode,
                                String invitePatientName, String dealPatientCode,
                                String dealPatientName, String inviteDoctorCode,
                                String inviteDoctorName, Timestamp inviteTime, Timestamp dealTime,
@@ -68,7 +54,6 @@ public class WlyyPatientInviteLog implements java.io.Serializable {
        this.dealType = dealType;
    }
    // Property accessors
    @Id
    @Column(name = "id", unique = true, nullable = false, length = 50)
    public String getId() {

src/main/java/com/yihu/wlyy/entity/security/AccessToken.java

@@ -0,0 +1,55 @@
package com.yihu.wlyy.entity.security;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "wx_access_token")
public class AccessToken extends IdEntity {
    private static final long serialVersionUID = -3297644428262254694L;
    private String access_token;
    private Long add_timestamp;
    private Long expires_in;
    private Date czrq;
    public String getAccess_token() {
        return access_token;
    }
    public void setAccess_token(String access_token) {
        this.access_token = access_token;
    }
    public Long getAdd_timestamp() {
        return add_timestamp;
    }
    public void setAdd_timestamp(Long add_timestamp) {
        this.add_timestamp = add_timestamp;
    }
    public Long getExpires_in() {
        return expires_in;
    }
    public void setExpires_in(Long expires_in) {
        this.expires_in = expires_in;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

src/main/java/com/yihu/wlyy/entity/security/JsApiTicket.java

@@ -0,0 +1,61 @@
package com.yihu.wlyy.entity.security;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * JavaScript API访问所需要的凭据
 */
@Entity
@Table(name = "wx_jsapi_ticket")
public class JsApiTicket extends IdEntity {
    private static final long serialVersionUID = -3297644428262254694L;
    private String jsapi_ticket;
    private Long add_timestamp;
    private Long expires_in;
    private Date czrq;
    public String getJsapi_ticket() {
        return jsapi_ticket;
    }
    public void setJsapi_ticket(String jsapi_ticket) {
        this.jsapi_ticket = jsapi_ticket;
    }
    public Long getAdd_timestamp() {
        return add_timestamp;
    }
    public void setAdd_timestamp(Long add_timestamp) {
        this.add_timestamp = add_timestamp;
    }
    public Long getExpires_in() {
        return expires_in;
    }
    public void setExpires_in(Long expires_in) {
        this.expires_in = expires_in;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

src/main/java/com/yihu/wlyy/entity/RSA.java

@@ -1,4 +1,6 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.security;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Lob;
@@ -12,10 +14,6 @@ import javax.persistence.Table;
@Entity
@Table(name = "dm_rsa")
public class RSA extends IdEntity {
	
	/**
	 * 
	 */
	private static final long serialVersionUID = 7832717679571844202L;
	
	private byte[] data;

src/main/java/com/yihu/wlyy/entity/Token.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.security;
import java.util.Date;
@@ -6,19 +6,15 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
@Entity
@Table(name = "wlyy_token")
public class Token extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -3297644428262254694L;
	private String user;
	// 1患者端，2医生端，3微信公众号
	private Integer platform;
	private Integer platform;   // 1患者端，2医生端，3微信公众号
	private Date timeout;
	private String imei;
	private String token;

src/main/java/com/yihu/wlyy/entity/doctor/DoctorStatisticsComment.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.statistics;
import com.yihu.wlyy.entity.IdEntity;
@@ -14,10 +14,6 @@ import javax.persistence.Table;
@Entity
@Table(name = "wlyy_doctor_statistics_comment")
public class DoctorStatisticsComment extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = -3555122300232736527L;
	
	// 医生标识

src/main/java/com/yihu/wlyy/entity/doctor/DoctorStatisticsConsult.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity.doctor;
package com.yihu.wlyy.entity.statistics;
import com.yihu.wlyy.entity.IdEntity;
@@ -14,10 +14,6 @@ import javax.persistence.Table;
@Entity
@Table(name = "wlyy_doctor_statistics_consult")
public class DoctorStatisticsConsult extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 5226765714197688045L;
	// 医生标识

src/main/java/com/yihu/wlyy/entity/WlyyQuota.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.statistics;
import java.util.Date;
import javax.persistence.Column;
@@ -15,9 +15,6 @@ import org.springframework.data.jpa.repository.Temporal;
@Entity
@Table(name = "wlyy_quota")
public class WlyyQuota implements java.io.Serializable {
	// Fields
	private String id;
	private String name;//指标名称
	private String level1;//指标维度(1:机构维度)
@@ -29,15 +26,6 @@ public class WlyyQuota implements java.io.Serializable {
	private Date modifyTime;//修改时间
	private String del;//1: 正常 0： 删除
	// Constructors
	/** default constructor */
	public WlyyQuota() {
	}
	// Property accessors
	@GenericGenerator(name = "generator", strategy = "uuid")
	@Id
	@GeneratedValue(generator = "generator")
@@ -68,7 +56,6 @@ public class WlyyQuota implements java.io.Serializable {
		this.level2 = level2;
	}
	@Column(name = "level_1", length = 2)
	public String getLevel1() {
		return this.level1;

src/main/java/com/yihu/wlyy/entity/WlyyQuotaResult.java

@@ -1,4 +1,4 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.statistics;
import java.util.Date;
import javax.persistence.Column;
@@ -15,9 +15,6 @@ import org.hibernate.annotations.GenericGenerator;
@Entity
@Table(name = "wlyy_quota_result")
public class WlyyQuotaResult implements java.io.Serializable {
    // Fields
    private String id;
    private String quotaDate;//统计时间
    private String quatoCode;//指标code
@@ -40,18 +37,8 @@ public class WlyyQuotaResult implements java.io.Serializable {
    private String qkdoctorCode;//全科医生code
    private Date createTime;//创建时间
    // Constructors
    /**
     * default constructor
     */
    public WlyyQuotaResult() {
    }
    // Property accessors
    @GenericGenerator(name = "generator", strategy = "uuid")
    @Id
    @GenericGenerator(name = "generator", strategy = "uuid")
    @GeneratedValue(generator = "generator")
    @Column(name = "id", unique = true, nullable = false, length = 100)
    public String getId() {

src/main/java/com/yihu/wlyy/entity/WxTemplate.java

@@ -1,18 +1,15 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.wechat;
import com.yihu.wlyy.entity.IdEntity;
import java.util.Map;
/**
 * 微信消息模板推送内容
 * @author George
 *
 */
public class WechatTemplate extends IdEntity {
public class WxTemplate extends IdEntity {
	/**
	 * 
	 */
	private static final long serialVersionUID = 3877107913397496785L;
	/**
     * 模板消息id
@@ -33,7 +30,7 @@ public class WxTemplate extends IdEntity {
    /**
     * 详细内容
     */
    private Map<String,WxTemplateData> data;
    private Map<String,WechatTemplateData> data;
    
    public String getTemplate_id() {
        return template_id;
@@ -59,10 +56,10 @@ public class WxTemplate extends IdEntity {
    public void setTopcolor(String topcolor) {
        this.topcolor = topcolor;
    }
    public Map<String, WxTemplateData> getData() {
    public Map<String, WechatTemplateData> getData() {
        return data;
    }
    public void setData(Map<String, WxTemplateData> data) {
    public void setData(Map<String, WechatTemplateData> data) {
        this.data = data;
    }
    

src/main/java/com/yihu/wlyy/entity/WxTemplateData.java

@@ -1,16 +1,12 @@
package com.yihu.wlyy.entity;
package com.yihu.wlyy.entity.wechat;
import com.yihu.wlyy.entity.IdEntity;
/**
 * 微信消息模板
 * @author George
 *
 */
public class WxTemplateData extends IdEntity {
	/**
	 * 
	 */
public class WechatTemplateData extends IdEntity {
	private static final long serialVersionUID = -7399054549159698617L;
	private String value; 
    private String color;

src/main/java/com/yihu/wlyy/interceptors/BaseInterceptor.java

@@ -7,7 +7,7 @@ import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.servlet.HandlerInterceptor;
import com.yihu.wlyy.repository.TokenDao;
import com.yihu.wlyy.repository.security.TokenDao;
abstract public class BaseInterceptor implements HandlerInterceptor {

src/main/java/com/yihu/wlyy/interceptors/DoctorInterceptor.java

@@ -1,19 +1,10 @@
package com.yihu.wlyy.interceptors;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.web.servlet.ModelAndView;
import com.yihu.wlyy.entity.Token;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.util.SystemData;
/**
 * 医生权限校验
 * @author George

src/main/java/com/yihu/wlyy/interceptors/PatientInterceptor.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.web.servlet.ModelAndView;
import com.yihu.wlyy.entity.Token;
import com.yihu.wlyy.entity.security.Token;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.util.SystemData;

src/main/java/com/yihu/wlyy/interceptors/UserInterceptor.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.web.servlet.ModelAndView;
import com.yihu.wlyy.entity.Token;
import com.yihu.wlyy.entity.security.Token;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.util.SystemData;

src/main/java/com/yihu/wlyy/job/ChangeSignJob.java

@@ -1,10 +1,17 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
import org.quartz.Job;
@@ -18,7 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -32,7 +38,7 @@ public class ChangeSignJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private SignFamilyDao signFamilyDao;
    @Autowired
@@ -72,10 +78,10 @@ public class ChangeSignJob implements Job {
        jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+10+"'");
        //新建任务日志对象
        WlyyJobLog wlyyJobLog = new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        wlyyJobLog.setJobId(wlyyJobConfig.getId());
        wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
        QuartzJobLog quartzJobLog = new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        quartzJobLog.setJobId(wlyyJobConfig.getId());
        quartzJobLog.setJobName(wlyyJobConfig.getJobName());
        //查找出系统全部的全科医生
        List<Doctor> doctors = doctorDao.findAllQKDoctot();
@@ -224,10 +230,10 @@ public class ChangeSignJob implements Job {
            wlyyQuotaResultDao.save(wlyyQuotaResult);
        }
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLog.setJobContent("统计"+getYesterday()+" 的已改簽数据完成 ");
        wlyyJobLog.setJobType("1");
        wlyyJobLogDao.save(wlyyJobLog);
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLog.setJobContent("统计"+getYesterday()+" 的已改簽数据完成 ");
        quartzJobLog.setJobType("1");
        quartzJobLogDao.save(quartzJobLog);
    }
    public String getYesterday() {

src/main/java/com/yihu/wlyy/job/ConsultJob.java

@@ -1,11 +1,17 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.consult.ConsultTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
import org.quartz.Job;
@@ -19,8 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -34,7 +38,7 @@ public class ConsultJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private DoctorDao doctorDao;
    @Autowired
@@ -68,10 +72,10 @@ public class ConsultJob implements Job {
        jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+3+"'");
        //新建任务日志对象
        WlyyJobLog wlyyJobLog = new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        wlyyJobLog.setJobId(wlyyJobConfig.getId());
        wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
        QuartzJobLog quartzJobLog = new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        quartzJobLog.setJobId(wlyyJobConfig.getId());
        quartzJobLog.setJobName(wlyyJobConfig.getJobName());
        //查找出系统全部的健康医生
        List<Doctor> doctors = doctorDao.findAllZKDoctot();
@@ -223,10 +227,10 @@ public class ConsultJob implements Job {
            wlyyQuotaResultDao.save(wlyyQuotaResult);
        }
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLog.setJobContent("统计"+getYesterday()+" 的咨询数据完成 ");
        wlyyJobLog.setJobType("1");
        wlyyJobLogDao.save(wlyyJobLog);
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLog.setJobContent("统计"+getYesterday()+" 的咨询数据完成 ");
        quartzJobLog.setJobType("1");
        quartzJobLogDao.save(quartzJobLog);
    }
    public String getYesterday() {
        return yesterday;

src/main/java/com/yihu/wlyy/job/CurrentDayAllQuotaJob.java

@@ -1,14 +1,23 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.entity.doctor.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientHealthGuidance;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.consult.ConsultTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorPatientGroupInfoDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.PatientHealthGuidanceDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.IdCardUtil;
import org.json.JSONArray;
@@ -29,7 +38,6 @@ import java.text.SimpleDateFormat;
import java.util.*;
/**
 * Created by Administrator on 2016.08.23.
 * 实时统计今天的数据
 */
@Component
@@ -53,7 +61,7 @@ public class CurrentDayAllQuotaJob implements Job {
    @Autowired
    private PatientDao patientDao;
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    private org.apache.tomcat.jdbc.pool.DataSource fvdataSource = new org.apache.tomcat.jdbc.pool.DataSource();//随访数据源
@@ -71,7 +79,6 @@ public class CurrentDayAllQuotaJob implements Job {
    @Override
    public void execute(JobExecutionContext context)
            throws JobExecutionException {
        try {
            SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
            getSystemProperties();
@@ -106,9 +113,8 @@ public class CurrentDayAllQuotaJob implements Job {
    //统计
    private void computequota() throws Exception {
        WlyyJobLog wlyyJobLog=new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        QuartzJobLog quartzJobLog =new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        computequota_1(); //统计今天的签约
        computequota_2(); //统计今天的解约
@@ -120,13 +126,13 @@ public class CurrentDayAllQuotaJob implements Job {
        computequota_8();//统计今天的签约患者年龄
        computequota_9();//统计今天的待签约
        computequota_10();//统计今天的改签
        computequota_12();//统计今天的签约下按年龄分组后再按疾病统计
        wlyyJobLog.setJobContent("开始实时统计查询");
        wlyyJobLog.setJobName("实时统计");
        wlyyJobLog.setJobId("11");
        wlyyJobLog.setJobType("1");
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLogDao.save(wlyyJobLog);
        computequota_12();//统计今天的签约下按年龄分组后再
        quartzJobLog.setJobContent("开始实时统计查询");
        quartzJobLog.setJobName("实时统计");
        quartzJobLog.setJobId("11");
        quartzJobLog.setJobType("1");
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLogDao.save(quartzJobLog);
    }
    private void computequota_12() throws Exception{

src/main/java/com/yihu/wlyy/job/FollowUpJob.java

@@ -1,10 +1,15 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
import org.quartz.Job;
@@ -33,7 +38,7 @@ public class FollowUpJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private DoctorDao doctorDao;
    @Autowired
@@ -79,10 +84,10 @@ public class FollowUpJob implements Job {
        jdbcTemplate_wlyy.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+4+"'");
        //新建任务日志对象
        WlyyJobLog wlyyJobLog = new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        wlyyJobLog.setJobId(wlyyJobConfig.getId());
        wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
        QuartzJobLog quartzJobLog = new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        quartzJobLog.setJobId(wlyyJobConfig.getId());
        quartzJobLog.setJobName(wlyyJobConfig.getJobName());
        //查找出系统全部的医生
        List<Doctor> doctors = doctorDao.findAllCertifiedDoctors();
@@ -231,10 +236,10 @@ public class FollowUpJob implements Job {
            wlyyQuotaResultDao.save(wlyyQuotaResult);
        }
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLog.setJobContent("统计"+getYesterday()+" 的随访数据完成 ");
        wlyyJobLog.setJobType("1");
        wlyyJobLogDao.save(wlyyJobLog);
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLog.setJobContent("统计"+getYesterday()+" 的随访数据完成 ");
        quartzJobLog.setJobType("1");
        quartzJobLogDao.save(quartzJobLog);
    }
    public String getYesterday() {
        return yesterday;

src/main/java/com/yihu/wlyy/job/HealthGuideJob.java

@@ -1,11 +1,17 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.PatientHealthGuidance;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.PatientHealthGuidanceDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
import org.quartz.Job;
@@ -19,8 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -33,7 +37,7 @@ public class HealthGuideJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private DoctorDao doctorDao;
@@ -68,10 +72,10 @@ public class HealthGuideJob implements Job {
        jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+3+"'");
        //新建任务日志对象
        WlyyJobLog wlyyJobLog = new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        wlyyJobLog.setJobId(wlyyJobConfig.getId());
        wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
        QuartzJobLog quartzJobLog = new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        quartzJobLog.setJobId(wlyyJobConfig.getId());
        quartzJobLog.setJobName(wlyyJobConfig.getJobName());
        //查找出系统全部的全科医生和健康管理师
        List<Doctor> doctors = doctorDao.findAllQKDoctotAndJKDoctor();
@@ -220,10 +224,10 @@ public class HealthGuideJob implements Job {
            wlyyQuotaResultDao.save(wlyyQuotaResult);
        }
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLog.setJobContent("统计" + getYesterday() + " 的健康指导数据完成 ");
        wlyyJobLog.setJobType("1");
        wlyyJobLogDao.save(wlyyJobLog);
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLog.setJobContent("统计" + getYesterday() + " 的健康指导数据完成 ");
        quartzJobLog.setJobType("1");
        quartzJobLogDao.save(quartzJobLog);
    }
    public String getYesterday() {

src/main/java/com/yihu/wlyy/job/InstantiationTracingBeanPostProcessor.java

@@ -1,9 +1,9 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.WlyyJobConfig;
import com.yihu.wlyy.entity.WlyyQuota;
import com.yihu.wlyy.repository.JobConfigDao;
import com.yihu.wlyy.repository.QuotaDao;
import com.yihu.wlyy.entity.job.QuartzJobConfig;
import com.yihu.wlyy.entity.statistics.WlyyQuota;
import com.yihu.wlyy.repository.job.JobConfigDao;
import com.yihu.wlyy.repository.statistics.QuotaDao;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
import org.quartz.Scheduler;
@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
@@ -39,19 +38,19 @@ public class InstantiationTracingBeanPostProcessor implements ApplicationListene
        try {
            scheduler = schedulerFactoryBean.getScheduler();
            //查询所有需要开始运行的任务的指标
            List<WlyyJobConfig> jobConfigList=jobConfigDao.findByStatus("1");
            for(WlyyJobConfig wlyyJobConfig:jobConfigList){
                WlyyQuota wlyyQuota=quotaDao.findOne(wlyyJobConfig.getQuotaId());
            List<QuartzJobConfig> jobConfigList=jobConfigDao.findByStatus("1");
            for(QuartzJobConfig quartzJobConfig :jobConfigList){
                WlyyQuota wlyyQuota=quotaDao.findOne(quartzJobConfig.getQuotaId());
                WlyyQuotaVO wlyyQuotaVO= new WlyyQuotaVO();
                WlyyJobConfigVO wlyyJobConfigVO=new WlyyJobConfigVO();
                BeanUtils.copyProperties(wlyyQuota,wlyyQuotaVO);
                BeanUtils.copyProperties(wlyyJobConfig,wlyyJobConfigVO);
                BeanUtils.copyProperties(quartzJobConfig,wlyyJobConfigVO);
                Map<String,Object> params=new HashMap<String,Object>();
                params.put("quota",wlyyQuotaVO);
                params.put("jobConfig",wlyyJobConfigVO);
                quartzHelper.addJob(Class.forName(wlyyJobConfig.getJobClass()),wlyyJobConfig.getQuartzCron(),wlyyJobConfig.getId(),params);
                quartzHelper.addJob(Class.forName(quartzJobConfig.getJobClass()), quartzJobConfig.getQuartzCron(), quartzJobConfig.getId(),params);
            }
        } catch (Exception e) {
            e.printStackTrace();

src/main/java/com/yihu/wlyy/job/SignAgeGroupDiseaseJob.java

@@ -1,11 +1,18 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.SignFamily;
import com.yihu.wlyy.entity.WlyyJobLog;
import com.yihu.wlyy.entity.WlyyQuotaResult;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorPatientGroupInfoDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
@@ -36,7 +43,7 @@ public class SignAgeGroupDiseaseJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private SignFamilyDao signFamilyDao;
    @Autowired
@@ -78,7 +85,7 @@ public class SignAgeGroupDiseaseJob implements Job {
        try {
            jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+12+"'");
            //新建任务日志对象
            WlyyJobLog wlyyJobLog = new WlyyJobLog();
            QuartzJobLog wlyyJobLog = new QuartzJobLog();
            wlyyJobLog.setJobStartTime(new Date());
            wlyyJobLog.setJobId(wlyyJobConfig.getId());
            wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
@@ -95,7 +102,7 @@ public class SignAgeGroupDiseaseJob implements Job {
                townsMap.put(town.getCode(), town);
            }
            //找出今天的签约信息
            List<SignFamily> signFamilys = signFamilyDao.findByJiatingSignYesterday(yesterday, now);
            List<SignFamily> signFamilies = signFamilyDao.findByJiatingSignYesterday(yesterday, now);
            //数组里面第一个是健康人群 第二个是慢病人群 第三个是65岁以上人群
            Map<String, Map<String, Map>> cityAgeMap = new HashMap<String, Map<String, Map>>();//key是市行政代码 目前只有厦门市
            Map<String,Map> temp =new HashMap<String,Map>();
@@ -104,7 +111,7 @@ public class SignAgeGroupDiseaseJob implements Job {
            Map<String, Map<String, Map>> townAgeMap = new HashMap<String, Map<String, Map>>();//key是区行政代码
            Map<String, Map<String, Map>> orgAgeMap = new HashMap<String, Map<String, Map>>();//key是机构代码
            //统计有签约的
            for (SignFamily signFamily : signFamilys) {
            for (SignFamily signFamily : signFamilies) {
                Hospital hospital = hospitalsMap.get(signFamily.getHospital());//得到患者签约的机构
                String town = hospital.getTown();
                int age = IdCardUtil.getAgeForIdcard(signFamily.getIdcard());//根据card解析年龄
@@ -216,7 +223,7 @@ public class SignAgeGroupDiseaseJob implements Job {
            wlyyJobLog.setJobEndTime(new Date());
            wlyyJobLog.setJobContent("统计" + getYesterday() + " 的签约患者年龄数据完成 ");
            wlyyJobLog.setJobType("1");
            wlyyJobLogDao.save(wlyyJobLog);
            quartzJobLogDao.save(wlyyJobLog);
        } catch (Exception e) {
            e.printStackTrace();
        }

src/main/java/com/yihu/wlyy/job/SignJob.java

@@ -1,15 +1,22 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.entity.doctor.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.sign.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.PatientDisease;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorPatientGroupInfoDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.service.app.disease.PatientDiseaseService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
@@ -27,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -41,7 +47,7 @@ public class SignJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private SignFamilyDao signFamilyDao;
    @Autowired
@@ -115,10 +121,10 @@ public class SignJob implements Job {
        try {
            //新建任务日志对象
            WlyyJobLog wlyyJobLog = new WlyyJobLog();
            wlyyJobLog.setJobStartTime(new Date());
            wlyyJobLog.setJobId(wlyyJobConfig.getId());
            wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
            QuartzJobLog quartzJobLog = new QuartzJobLog();
            quartzJobLog.setJobStartTime(new Date());
            quartzJobLog.setJobId(wlyyJobConfig.getId());
            quartzJobLog.setJobName(wlyyJobConfig.getJobName());
            //查找出系统全部的机构
            List<Hospital> hospitals = hospitalDao.findHospitalzxFWZ();
            Map<String, Hospital> hospitalsMap = new HashMap<String, Hospital>();
@@ -390,10 +396,10 @@ public class SignJob implements Job {
                }
                wlyyQuotaResultDao.save(wlyyQuotaResult);
            }
            wlyyJobLog.setJobEndTime(new Date());
            wlyyJobLog.setJobContent("统计" + getYesterday() + " 的签约性别数据完成 ");
            wlyyJobLog.setJobType("1");
            wlyyJobLogDao.save(wlyyJobLog);
            quartzJobLog.setJobEndTime(new Date());
            quartzJobLog.setJobContent("统计" + getYesterday() + " 的签约性别数据完成 ");
            quartzJobLog.setJobType("1");
            quartzJobLogDao.save(quartzJobLog);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -413,10 +419,10 @@ public class SignJob implements Job {
            Map<String, Map<String, Long>> townGroupMap = new HashMap<String, Map<String, Long>>();//key是区行政代码
            Map<String, Map<String, Long>> orgGroupMap = new HashMap<String, Map<String, Long>>();//key是机构代码
            //新建任务日志对象
            WlyyJobLog wlyyJobLog = new WlyyJobLog();
            wlyyJobLog.setJobStartTime(new Date());
            wlyyJobLog.setJobId(wlyyJobConfig.getId());
            wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
            QuartzJobLog quartzJobLog = new QuartzJobLog();
            quartzJobLog.setJobStartTime(new Date());
            quartzJobLog.setJobId(wlyyJobConfig.getId());
            quartzJobLog.setJobName(wlyyJobConfig.getJobName());
            //查找出系统全部的机构
            List<Hospital> hospitals = hospitalDao.findHospital2();
            Map<String, Hospital> hospitalsMap = new HashMap<String, Hospital>();
@@ -978,10 +984,10 @@ public class SignJob implements Job {
                wlyyQuotaResultDao.save(wlyyQuotaResult);
            }
            wlyyJobLog.setJobEndTime(new Date());
            wlyyJobLog.setJobContent("统计" + getYesterday() + " 的签约病人分组数据完成 ");
            wlyyJobLog.setJobType("1");
            wlyyJobLogDao.save(wlyyJobLog);
            quartzJobLog.setJobEndTime(new Date());
            quartzJobLog.setJobContent("统计" + getYesterday() + " 的签约病人分组数据完成 ");
            quartzJobLog.setJobType("1");
            quartzJobLogDao.save(quartzJobLog);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -995,10 +1001,10 @@ public class SignJob implements Job {
        try {
            jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='" + yesterday + "' and quato_code='" + 8 + "'");
            //新建任务日志对象
            WlyyJobLog wlyyJobLog = new WlyyJobLog();
            wlyyJobLog.setJobStartTime(new Date());
            wlyyJobLog.setJobId(wlyyJobConfig.getId());
            wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
            QuartzJobLog quartzJobLog = new QuartzJobLog();
            quartzJobLog.setJobStartTime(new Date());
            quartzJobLog.setJobId(wlyyJobConfig.getId());
            quartzJobLog.setJobName(wlyyJobConfig.getJobName());
            //查找出系统全部的机构
            List<Hospital> hospitals = hospitalDao.findHospital2();
            Map<String, Hospital> hospitalsMap = new HashMap<String, Hospital>();
@@ -1451,10 +1457,10 @@ public class SignJob implements Job {
                wlyyQuotaResultDao.save(wlyyQuotaResult);
            }
            wlyyJobLog.setJobEndTime(new Date());
            wlyyJobLog.setJobContent("统计" + getYesterday() + " 的签约患者年龄数据完成 ");
            wlyyJobLog.setJobType("1");
            wlyyJobLogDao.save(wlyyJobLog);
            quartzJobLog.setJobEndTime(new Date());
            quartzJobLog.setJobContent("统计" + getYesterday() + " 的签约患者年龄数据完成 ");
            quartzJobLog.setJobType("1");
            quartzJobLogDao.save(quartzJobLog);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -1468,10 +1474,10 @@ public class SignJob implements Job {
        jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='" + yesterday + "' and quato_code='" + 1 + "'");
        //新建任务日志对象
        WlyyJobLog wlyyJobLog = new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        wlyyJobLog.setJobId(wlyyJobConfig.getId());
        wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
        QuartzJobLog quartzJobLog = new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        quartzJobLog.setJobId(wlyyJobConfig.getId());
        quartzJobLog.setJobName(wlyyJobConfig.getJobName());
        //查找出系统全部的全科医生
        List<Doctor> doctors = doctorDao.findAllQKDoctot();
@@ -1636,10 +1642,10 @@ public class SignJob implements Job {
            wlyyQuotaResultDao.save(wlyyQuotaResult);
        }
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLog.setJobContent("统计" + getYesterday() + " 的签约数据完成 ");
        wlyyJobLog.setJobType("1");
        wlyyJobLogDao.save(wlyyJobLog);
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLog.setJobContent("统计" + getYesterday() + " 的签约数据完成 ");
        quartzJobLog.setJobType("1");
        quartzJobLogDao.save(quartzJobLog);
    }
    /*

src/main/java/com/yihu/wlyy/job/UnSignJob.java

@@ -1,10 +1,17 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
import org.quartz.Job;
@@ -18,8 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -32,7 +37,7 @@ public class UnSignJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private SignFamilyDao signFamilyDao;
    @Autowired
@@ -70,10 +75,10 @@ public class UnSignJob implements Job {
        jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+2+"'");
        //新建任务日志对象
        WlyyJobLog wlyyJobLog = new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        wlyyJobLog.setJobId(wlyyJobConfig.getId());
        wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
        QuartzJobLog quartzJobLog = new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        quartzJobLog.setJobId(wlyyJobConfig.getId());
        quartzJobLog.setJobName(wlyyJobConfig.getJobName());
        //查找出系统全部的全科医生
        List<Doctor> doctors = doctorDao.findAllQKDoctot();
@@ -235,10 +240,10 @@ public class UnSignJob implements Job {
            wlyyQuotaResultDao.save(wlyyQuotaResult);
        }
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLog.setJobContent("统计"+getYesterday()+" 的解约数据完成 ");
        wlyyJobLog.setJobType("1");
        wlyyJobLogDao.save(wlyyJobLog);
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLog.setJobContent("统计"+getYesterday()+" 的解约数据完成 ");
        quartzJobLog.setJobType("1");
        quartzJobLogDao.save(quartzJobLog);
    }
    public String getYesterday() {

src/main/java/com/yihu/wlyy/job/WaitSignJob.java

@@ -1,10 +1,17 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.address.Hospital;
import com.yihu.wlyy.entity.address.Town;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.job.QuartzJobLog;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.entity.statistics.WlyyQuotaResult;
import com.yihu.wlyy.repository.address.TownDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.job.QuartzJobLogDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.statistics.WlyyQuotaResultDao;
import com.yihu.wlyy.web.quota.WlyyJobConfigVO;
import com.yihu.wlyy.web.quota.WlyyQuotaVO;
import org.quartz.Job;
@@ -18,8 +25,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -32,7 +37,7 @@ public class WaitSignJob implements Job {
    @Autowired
    private WlyyQuotaResultDao wlyyQuotaResultDao;//指标结果Dao
    @Autowired
    private WlyyJobLogDao wlyyJobLogDao;//执行日志Dao
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private SignFamilyDao signFamilyDao;
    @Autowired
@@ -68,10 +73,10 @@ public class WaitSignJob implements Job {
        jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+9+"'");
        //新建任务日志对象
        WlyyJobLog wlyyJobLog = new WlyyJobLog();
        wlyyJobLog.setJobStartTime(new Date());
        wlyyJobLog.setJobId(wlyyJobConfig.getId());
        wlyyJobLog.setJobName(wlyyJobConfig.getJobName());
        QuartzJobLog quartzJobLog = new QuartzJobLog();
        quartzJobLog.setJobStartTime(new Date());
        quartzJobLog.setJobId(wlyyJobConfig.getId());
        quartzJobLog.setJobName(wlyyJobConfig.getJobName());
        //查找出系统全部的全科医生
        List<Doctor> doctors = doctorDao.findAllQKDoctot();
@@ -234,10 +239,10 @@ public class WaitSignJob implements Job {
            wlyyQuotaResultDao.save(wlyyQuotaResult);
        }
        wlyyJobLog.setJobEndTime(new Date());
        wlyyJobLog.setJobContent("统计"+getYesterday()+" 的待签约数据完成 ");
        wlyyJobLog.setJobType("1");
        wlyyJobLogDao.save(wlyyJobLog);
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLog.setJobContent("统计"+getYesterday()+" 的待签约数据完成 ");
        quartzJobLog.setJobType("1");
        quartzJobLogDao.save(quartzJobLog);
    }
    public String getYesterday() {

src/main/java/com/yihu/wlyy/repository/DoctorDao.java

@@ -1,120 +0,0 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.repository;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.wlyy.entity.doctor.Doctor;
import com.yihu.wlyy.entity.doctor.DoctorPatientGroup;
import com.yihu.wlyy.entity.doctor.DoctorPatientGroupInfo;
import com.yihu.wlyy.entity.patient.Patient;
public interface DoctorDao extends PagingAndSortingRepository<Doctor, Long>, JpaSpecificationExecutor<Doctor> {
	Doctor findByName(String name);
	// 按医生标识查询医生信息
	@Query("select p from Doctor p where p.code = ?1")
	Doctor findByCode(String code);
	@Query("select d from Doctor d where d.del = 1")
	List<Doctor> findAllDoctors();
	@Query("select d from Doctor d where d.del = 1 and d.hospital = ?1")
	Iterable<Doctor> findHospitalDoctors(String hospital);
	// 手机号查询医生信息
	@Query("select p from Doctor p where p.mobile = ?1")
	Doctor findByMobile(String mobile);
	// 根据医生分组查询患者信息
	@Query("select a.group, b.code, b.name, b.photo, b.birthday, b.sex, b.diseaseCondition, b.disease, b.recordAmount, a.partAmount, a.qyrq, a.signType,b.idcard from DoctorPatientGroupInfo a, Patient b where a.doctor = ?1 and a.patient = b.code and a.status=1")
	List<Object> findPatientByDoctorSign(String doctor);
	
	// 根据医生分组查询患者信息
	@Query("select distinct a.patient , a.id, b.name, b.photo,b.provinceName,b.cityName,b.townName,b.address, a.begin,b.code,b.mobile,a.signType,b.idcard from SignFamily a, Patient b where (a.doctor = ?1 or a.doctorHealth = ?1) and a.patient = b.code and a.status=1 ORDER BY a.id desc")
	Page<Object> findPatientByDoctorSign(String doctor, Pageable pageRequest);
	
	// 根据医生分组查询患者信息
	@Query("select distinct a.patient ,a.id, b.name, b.photo,b.provinceName,b.cityName,b.townName,b.address, a.begin,b.code,b.mobile,a.signType,b.idcard from SignFamily a, Patient b where (a.doctor = ?1 or a.doctorHealth = ?1) and a.patient = b.code and a.id< ?2 and a.status=1  ORDER BY a.id desc")
	Page<Object> findPatientByDoctorSign(String doctor,long id, Pageable pageRequest);
	// 根据医生分组查询患者信息
	@Query("select distinct a.patient ,a.id, b.name, b.photo,b.provinceName,b.cityName,b.townName,b.address, a.begin,b.code,b.mobile, a.signType,b.idcard  from SignFamily a, Patient b where (a.doctor = ?1 or a.doctorHealth = ?1) and a.patient = b.code and a.status=1 and b.name like ?2 and a.status=1 ORDER BY a.id desc")
	Page<Object> findPatientByDoctorSign(String doctor,String patientName, Pageable pageRequest);
	
	// 根据医生分组查询患者信息
	@Query("select distinct a.patient ,a.id, b.name, b.photo,b.provinceName,b.cityName,b.townName,b.address, a.begin,b.code,b.mobile,a.signType,b.idcard  from SignFamily a, Patient b where (a.doctor = ?1 or a.doctorHealth = ?1) and a.patient = b.code and a.id<?2 and a.status=1 and b.name like ?3 and a.status=1  ORDER BY a.id desc")
	Page<Object> findPatientByDoctorSign(String doctor,long id,String patientName, Pageable pageRequest);
	
	// 查询医生下的患者总数
	@Query("select count(distinct a.patient) from DoctorPatientGroupInfo a where a.doctor = ?1 and a.status=1")
	int amountPatientByDoctorSign(String doctor);
	@Query("select p from DoctorPatientGroup p where p.doctor = ?1  and p.status = 1")
	Iterable<DoctorPatientGroup> findDoctorPatientGroupWithOutNull(String doctor);
	
	@Query("select p from DoctorPatientGroup p where (p.doctor = ?1 or p.doctor is null) and p.status = 1 order by p.id asc")
	Iterable<DoctorPatientGroup> findDoctorPatientGroup(String doctor);
	// 根據患者標識查詢患者信息
	@Query("select p from Patient p where p.code=?1")
	Patient findPatientByCode(String code);
	// 查询患者与医生的签约关系
	@Query("select p from DoctorPatientGroupInfo p where p.patient=?1 and p.doctor = ?2")
	DoctorPatientGroupInfo findGroup(String user, String doctor);
	
	@Query("from Doctor p where p.hospital=?1 and p.level = ?2 and p.iscertified=1 and status=1 ")
	List<Doctor> getDoctorCombobxByHospital(String hospital, int type);
	@Query("from Doctor p where p.level = 1 and p.iscertified=1 and p.status=1 ")
	Page<Doctor> findDoctor1ByParient(Pageable pageRequest);
	@Query("from Doctor p where p.level = 1 and p.iscertified=1 and p.status=1 and p.code != ?1")
	Page<Doctor> findDoctor1ByParient(String code ,Pageable pageRequest);
	@Query("select d from Doctor d ,DrHealthTeamMember dtm where d.code=dtm.memberCode and dtm.signType='1' and dtm.team=?1  and dtm.del='1'")
	List<Doctor> findSanshiDoctorByTeam(String code);
	@Query("select d from Doctor d ,DrHealthTeamMember dtm where d.code=dtm.memberCode and dtm.signType='2' and dtm.team=?1  and dtm.del='1'")
	List<Doctor> findJiatingDoctorByTeam(String code);
	// 手机号查询正常医生信息
	@Query("select p from Doctor p where p.mobile = ?1 and p.del=1")
	Doctor findNormalByMobile(String mobile);
	@Query("select p from Doctor p where p.level=2 and p.del=1 ")
	List<Doctor> findAllQKDoctot();
	@Query("select p from Doctor p where p.level=3 and p.del=1 ")
	List<Doctor> findAllZKDoctot();
	@Query("select p from Doctor p where p.level=1 and p.del=1 ")
	List<Doctor> findAllJKDoctot();
	@Query("select d from Doctor d where d.del = 1 and d.iscertified=1")
	List<Doctor> findAllCertifiedDoctors();
	@Query("select p from Doctor p where p.level in (2,3) and p.del=1 and p.iscertified=1")
	List<Doctor> findAllQKDoctotAndJKDoctor();
	@Query(" select p from Doctor p where p.hospital =?1 and p.level =?2 and p.del=1  ")
	List<Doctor> findDoctorByLevelAndHospital(String hospital, Integer level);
	@Modifying
	@Query("update Doctor set idcard = ?2 where code = ?1")
	int updateIdcard(String doctor,String idcard);
}

src/main/java/com/yihu/wlyy/repository/DrAdminTeamMemberDao.java

@@ -1,23 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeamMember;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * 行政团队成员DAO。
 *
 * @author Sand
 */
public interface DrAdminTeamMemberDao extends
        PagingAndSortingRepository<AdminTeamMember, Long>,
        JpaSpecificationExecutor<AdminTeamMember> {
    AdminTeamMember findByTeamIdAndDoctorIdOrderByDoctorIdAsc(long teamId, long doctorId);
    List<AdminTeamMember> findByTeamId(long teamId);
}

src/main/java/com/yihu/wlyy/repository/DrHealthTeamMemberDao.java

@@ -1,50 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.DrHealthTeamMember;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2016/7/30.
 */
public interface DrHealthTeamMemberDao extends
        PagingAndSortingRepository<DrHealthTeamMember, Long>,
        JpaSpecificationExecutor<DrHealthTeamMember> {
    @Query(" FROM DrHealthTeamMember a WHERE a.team=?1 and a.type=?2 and a.del='1'")
    DrHealthTeamMember findDoctor2ByTeam(String code, int type);
    @Query(" FROM DrHealthTeamMember a WHERE a.team=?1 and a.type=?2 and a.del='1'and signType='1'")
    DrHealthTeamMember findDoctorSanshi2ByTeam(String code, int type);
    @Query(" FROM DrHealthTeamMember a WHERE a.team=?1 and a.type=?2 and a.del='1'and signType='2'")
    DrHealthTeamMember findDoctorJiating2ByTeam(String code, int type);
    @Query(" FROM DrHealthTeamMember a WHERE a.team=?1 and a.memberCode=?2 and a.del='1'")
    DrHealthTeamMember findMemberCodeAndTeam(String code, String doctor);
    @Modifying
    @Query("update DrHealthTeamMember a set a.del = '0' where a.team = ?1 and a.type=1 ")
    void updateType1Del(String code);
    @Modifying
    @Query("update DrHealthTeamMember a set a.del = '0' where a.team = ?1 and signType='2' ")
    void deleteMember(String code);
    @Query("select count(a) FROM DrHealthTeamMember a WHERE a.memberCode =?1 and  a.del='1'")
    Integer teamListByDoctorCode(String doctorCode);
    @Query(" FROM DrHealthTeamMember a WHERE a.team =?1 and  a.del='1' and  a.signType='1'")
    List<DrHealthTeamMember> findBySanshiTeam(String teamCode);
    @Query(" FROM DrHealthTeamMember a WHERE a.team =?1 and  a.del='1' and  a.signType='1' and  a.type=?2 ")
    DrHealthTeamMember findSanshiByTeamAndType(String teamCode, int i);
    List<DrHealthTeamMember> findByTeamAndDel(String team, String del);
}

src/main/java/com/yihu/wlyy/repository/PeopleNumDao.java

@@ -1,17 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.WlyyPeopleNum;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by lyr on 2016/08/18.
 */
public interface PeopleNumDao extends PagingAndSortingRepository<WlyyPeopleNum, String>, JpaSpecificationExecutor<WlyyPeopleNum> {
    @Query("select a.num from WlyyPeopleNum a where a.code = ?1 and a.year = (select max(b.year) from WlyyPeopleNum b where b.code = ?1)")
    int findPeopleNumByCode(String code);
    WlyyPeopleNum findByCodeAndYear(String code,Integer year);
}

src/main/java/com/yihu/wlyy/repository/SbInfoDao.java

@@ -1,21 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.SbInfo;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by lyr on 2016/8/8.
 */
public interface SbInfoDao extends PagingAndSortingRepository<SbInfo, String>, JpaSpecificationExecutor<SbInfo> {
    SbInfo findBySfzh18(String idcard);
    @Query("select a from SbInfo a where a.id = (select max(b.id) from SbInfo b where b.sfzh18 = ?1)")
    SbInfo findBySfzh18Max(String idcard);
    @Query("select a from SbInfo a where a.id = (select max(b.id) from SbInfo b where b.id0000 = ?1)")
    SbInfo findBySfzh15Max(String idcard);
}

src/main/java/com/yihu/wlyy/repository/TblPersonjoinfamilymidDao.java

@@ -1,19 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.TblPersonjoinfamilymid;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2016.08.20.
 */
public interface TblPersonjoinfamilymidDao extends PagingAndSortingRepository<TblPersonjoinfamilymid, Long>, JpaSpecificationExecutor<TblPersonjoinfamilymid> {
    @Query(" FROM TblPersonjoinfamilymid a WHERE a.personid=?1 ")
    List<TblPersonjoinfamilymid> findByPersonId(Integer personid);
    @Query(" FROM TblPersonjoinfamilymid a WHERE a.familystateid=?1 ")
    List<TblPersonjoinfamilymid> findByFamilyId(Integer familyinfoid);
}

src/main/java/com/yihu/wlyy/repository/TblsysParamDao.java

@@ -1,17 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.TblsysParam;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2016.08.20.
 */
public interface TblsysParamDao extends PagingAndSortingRepository<TblsysParam, Long>, JpaSpecificationExecutor<TblsysParam> {
    @Query(" FROM TblsysParam a WHERE a.paramname=?1 ")
    List<TblsysParam> findByParamname(String relaholder);
}

src/main/java/com/yihu/wlyy/repository/WlyyJobConfigDao.java

@@ -1,26 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.WlyyJobConfig;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2016/8/17.
 */
public interface WlyyJobConfigDao extends PagingAndSortingRepository<WlyyJobConfig, String>, JpaSpecificationExecutor<WlyyJobConfig> {
    @Query(" FROM WlyyJobConfig a WHERE a.id=?1 and a.status=?2 and a.del='1'")
    WlyyJobConfig findById(String code, String status);
    @Query(" FROM WlyyJobConfig a WHERE a.status=?1 and a.del='1'")
    List<WlyyJobConfig> findByAll(String s);
    @Query(" FROM WlyyJobConfig a WHERE a.id in (1,2,3,4,5,6,7,8,9,10)  and a.del='1' ")
    List<WlyyJobConfig> findByIds();
    @Query(" FROM WlyyJobConfig a WHERE a.id=?1 and a.del='1'")
    WlyyJobConfig findById(String id);
}

src/main/java/com/yihu/wlyy/repository/WlyyJobLogDao.java

@@ -1,12 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.WlyyJobLog;
import com.yihu.wlyy.entity.WlyyQuotaResult;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2016/8/16.
 */
public interface WlyyJobLogDao  extends PagingAndSortingRepository<WlyyJobLog, String>, JpaSpecificationExecutor<WlyyJobLog> {
}

src/main/java/com/yihu/wlyy/repository/WlyyPatientInviteLogDao.java

@@ -1,20 +0,0 @@
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.WlyyJobLog;
import com.yihu.wlyy.entity.WlyyPatientInviteLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by Administrator on 2016.08.20.
 */
public interface WlyyPatientInviteLogDao extends PagingAndSortingRepository<WlyyPatientInviteLog, String>, JpaSpecificationExecutor<WlyyPatientInviteLog> {
    @Query(" from WlyyPatientInviteLog a  where a.invitePatientCode = ?3 and a.dealPatientCode=?2 and a.inviteDoctorCode=?1 and a.dealType='0' ")
    List<WlyyPatientInviteLog> getPatientInviteLog(String doctorCode, String patientCode, String invitePatientCode);
    @Query(" from WlyyPatientInviteLog a  where  a.dealPatientCode=?1 and  a.dealType='0'and a.wxPush='1' ")
    List<WlyyPatientInviteLog> findByDealPatientAndWXPush_1(String code);
}

src/main/java/com/yihu/wlyy/repository/WlyySignFamilyCodeDao.java

@@ -1,20 +0,0 @@
package com.yihu.wlyy.repository;
/**
 * Created by Administrator on 2016.08.19.
 */
import com.yihu.wlyy.entity.WlyyQuotaResult;
import com.yihu.wlyy.entity.WlyySignFamilyCode;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface WlyySignFamilyCodeDao  extends PagingAndSortingRepository<WlyySignFamilyCode, String>, JpaSpecificationExecutor<WlyySignFamilyCode> {
    @Query(" FROM WlyySignFamilyCode a WHERE a.orgCode =?1 ")
    WlyySignFamilyCode findByOrgCode(String hospital);
    @Query(" FROM WlyySignFamilyCode a WHERE a.orgCode =?1 and a.year=?2 ")
    WlyySignFamilyCode findByOrgCodeAndYear(String hospital, String year);
}

src/main/java/com/yihu/wlyy/repository/CityDao.java

@@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.repository;
package com.yihu.wlyy.repository.address;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

src/main/java/com/yihu/wlyy/repository/ProvinceDao.java

@@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.repository;
package com.yihu.wlyy.repository.address;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

src/main/java/com/yihu/wlyy/repository/StreetDao.java

@@ -3,7 +3,7 @@
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.wlyy.repository;
package com.yihu.wlyy.repository.address;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;