Merge branch 'dev' of huangwenjie/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/device/entity/DevicePatientHealthIndex.java

@@ -51,7 +51,7 @@ public class DevicePatientHealthIndex extends IdEntity {
	//设备编号
	private String deviceSn;
	private int status;//状态：0为标准，1为异常
	private Short status;//状态：0为标准，1为异常
	public String getUser() {
		return user;
@@ -188,11 +188,11 @@ public class DevicePatientHealthIndex extends IdEntity {
		this.deviceSn = deviceSn;
	}
	public int getStatus() {
	public Short getStatus() {
		return status;
	}
	public void setStatus(int status) {
	public void setStatus(Short status) {
		this.status = status;
	}
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/doctor/scheme/DoctorSchemeBloodSugger.java

@@ -17,7 +17,7 @@ public class DoctorSchemeBloodSugger extends IdEntity {
    private String name;
    private String code;
    private String doctorcode;
    private short dayofweek;
    private Short dayofweek;
    private Short beforeBreakfast;
    private Time beforeBreakfastTime;
    private Short afterBreakfast;
@@ -30,7 +30,7 @@ public class DoctorSchemeBloodSugger extends IdEntity {
    private Time beforeDinnerTime;
    private Short afterDinner;
    private Time afterDinnerTime;
    private Byte beforeSleep;
    private Short beforeSleep;
    private Time beforeSleepTime;
    private Timestamp createTime;
    private Short alertTag;
@@ -68,11 +68,11 @@ public class DoctorSchemeBloodSugger extends IdEntity {
    @Basic
    @Column(name = "dayofweek")
    public short getDayofweek() {
    public Short getDayofweek() {
        return dayofweek;
    }
    public void setDayofweek(short dayofweek) {
    public void setDayofweek(Short dayofweek) {
        this.dayofweek = dayofweek;
    }
@@ -198,11 +198,11 @@ public class DoctorSchemeBloodSugger extends IdEntity {
    @Basic
    @Column(name = "before_sleep")
    public Byte getBeforeSleep() {
    public Short getBeforeSleep() {
        return beforeSleep;
    }
    public void setBeforeSleep(Byte beforeSleep) {
    public void setBeforeSleep(Short beforeSleep) {
        this.beforeSleep = beforeSleep;
    }

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

@@ -13,7 +13,6 @@ import java.sql.Timestamp;
@Entity
@Table(name = "wlyy_patient_aim_blood_pressure")
public class PatientAimBloodPressure extends IdEntity {
    private int id;
    private String code;
    private String patientcode;
    private String sbp;

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

@@ -13,7 +13,6 @@ import java.sql.Timestamp;
@Entity
@Table(name = "wlyy_patient_aim_sports")
public class PatientAimSports extends IdEntity {
    private int id;
    private String code;
    private String patientcode;
    private Integer dailyStepCount;

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

@@ -16,7 +16,7 @@ public class PatientSchemeList extends IdEntity {
    private String code;
    private String patientcode;
    private String schemecode;
    private byte type;
    private Short type;
    private String doctorcode;
    private Timestamp createTime;
@@ -53,11 +53,11 @@ public class PatientSchemeList extends IdEntity {
    @Basic
    @Column(name = "type")
    public byte getType() {
    public Short getType() {
        return type;
    }
    public void setType(byte type) {
    public void setType(Short type) {
        this.type = type;
    }