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

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

@@ -29,7 +29,7 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
    @Column(name = "payment")
    private Integer payment;//支付方式（1立即支付，2按服务支付）
    @Column(name = "total_expense")
    private Float totalExpense;//套餐总金额
    private Integer totalExpense;//套餐总金额
    @Column(name = "plan_type")
    private Integer planType;//安排类型（1康复计划，2转社区医院，3转家庭病床）
    @Column(name = "service_package_id")
@@ -71,11 +71,11 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
        this.payment = payment;
    }
    public Float getTotalExpense() {
    public Integer getTotalExpense() {
        return totalExpense;
    }
    public void setTotalExpense(Float totalExpense) {
    public void setTotalExpense(Integer totalExpense) {
        this.totalExpense = totalExpense;
    }

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

@@ -20,8 +20,8 @@ public class RehabilitationDetailDO extends UuidIdentityEntityWithOperator imple
    private String saasId;
    @Column(name = "plan_id")
    private String planId;//居民康复套餐code
    @Column(name = "service_item_id")
    private String serviceItemId;//服务项目id
    @Column(name = "hospital_service_item_id")
    private String hospitalServiceItemId;//机构服务项目id
    @Column(name = "hospital")
    private String hospital;//医院code
    @Column(name = "hospital_name")
@@ -36,6 +36,8 @@ public class RehabilitationDetailDO extends UuidIdentityEntityWithOperator imple
    private Date executeTime;//服务项目执行时间
    @Column(name = "status")
    private Integer status;//状态（0未完成，1已完成，2已预约）
    @Column(name = "expense")
    private Integer expense;
    public String getSaasId() {
        return saasId;
@@ -53,12 +55,12 @@ public class RehabilitationDetailDO extends UuidIdentityEntityWithOperator imple
        this.planId = planId;
    }
    public String getServiceItemId() {
        return serviceItemId;
    public String getHospitalServiceItemId() {
        return hospitalServiceItemId;
    }
    public void setServiceItemId(String serviceItemId) {
        this.serviceItemId = serviceItemId;
    public void setHospitalServiceItemId(String hospitalServiceItemId) {
        this.hospitalServiceItemId = hospitalServiceItemId;
    }
    public String getHospital() {
@@ -116,4 +118,12 @@ public class RehabilitationDetailDO extends UuidIdentityEntityWithOperator imple
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public Integer getExpense() {
        return expense;
    }
    public void setExpense(Integer expense) {
        this.expense = expense;
    }
}

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

@@ -18,8 +18,8 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
    private String saasId;
    @Column(name = "template_id")
    private String templateId;//康复套餐模板id
    @Column(name = "service_item_id")
    private String serviceItemId;//服务项目id
    @Column(name = "hospital_service_item_id")
    private String hospitalServiceItemId;//机构服务项目id
    public String getSaasId() {
        return saasId;
@@ -37,11 +37,11 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
        this.templateId = templateId;
    }
    public String getServiceItemId() {
        return serviceItemId;
    public String getHospitalServiceItemId() {
        return hospitalServiceItemId;
    }
    public void setServiceItemId(String serviceItemId) {
        this.serviceItemId = serviceItemId;
    public void setHospitalServiceItemId(String hospitalServiceItemId) {
        this.hospitalServiceItemId = hospitalServiceItemId;
    }
}