Jelajahi Sumber

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

叶仕杰 4 tahun lalu
induk
melakukan
47197dac2b

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

@ -1,7 +1,6 @@
package com.yihu.jw.entity.specialist.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
@ -9,7 +8,6 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by humingfen on 2018/8/15.
@ -26,7 +24,7 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
    private String hospitalServiceItemId;//机构服务项目id
    private Integer type;//执行者类型(1家医,2行政团队)
    private Date executeTime;//服务项目执行时间
    private String executeTimes;//服务项目执行时间
    private String frequencyCode;//频次
    private Integer timeType;//时间类型
    private String remark;//备注
@ -60,14 +58,13 @@ public class RehabilitationTemplateDetailDO extends UuidIdentityEntityWithOperat
        this.hospitalServiceItemId = hospitalServiceItemId;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "execute_time", nullable = true, length = 0,updatable = false)
    public Date getExecuteTime() {
        return executeTime;
    @Column(name = "execute_times")
    public String getExecuteTimes() {
        return executeTimes;
    }
    public void setExecuteTime(Date executeTime) {
        this.executeTime = executeTime;
    public void setExecuteTimes(String executeTimes) {
        this.executeTimes = executeTimes;
    }
    @Column(name = "type")