3 Commity e899451f0e ... 8806d22238

Autor SHA1 Wiadomość Data
  zdm 8806d22238 Merge remote-tracking branch 'origin/dev' into dev 5 lat temu
  zdm 95d8d26fd6 处方发药医生、时间追加 5 lat temu
  zdm b5576701bd 追加审方医生、审方时间 5 lat temu

+ 37 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionDO.java

@ -199,6 +199,19 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
     * 处方结算状态,0为未结算,1为结算成功,默认为0
     */
    private Integer payStatus;
    /**
     * 发药医生/审方医生
     */
    private String dispUser;
    /**
     * 发药医生/审方医生 姓名
     */
    private String dispUserName;
    /**
     * 发药时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date dispDate;
    @Column(name = "outpatient_id")
    public String getOutpatientId() {
@ -475,4 +488,28 @@ public class WlyyPrescriptionDO extends UuidIdentityEntity {
    public void setDiseaseImg(String diseaseImg) {
        this.diseaseImg = diseaseImg;
    }
    public String getDispUser() {
        return dispUser;
    }
    public void setDispUser(String dispUser) {
        this.dispUser = dispUser;
    }
    public String getDispUserName() {
        return dispUserName;
    }
    public void setDispUserName(String dispUserName) {
        this.dispUserName = dispUserName;
    }
    public Date getDispDate() {
        return dispDate;
    }
    public void setDispDate(Date dispDate) {
        this.dispDate = dispDate;
    }
}

+ 2 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionInfoVO.java

@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 

+ 34 - 0
common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPrescriptionVO.java

@ -304,6 +304,16 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "关联物流实体", example = "模块1")
    WlyyPrescriptionExpressageVO expressage;
    @ApiModelProperty(value = "发药医生/审方医生", example = "模块1")
    private String dispUser;
    @ApiModelProperty(value = "发药医生/审方医生 姓名", example = "模块1")
    private String dispUserName;
    @ApiModelProperty(value = "发药时间", example = "模块1")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date dispDate;
    public String getOutpatientId() {
        return outpatientId;
    }
@ -645,4 +655,28 @@ public class WlyyPrescriptionVO extends UuidIdentityVOWithOperator {
    public void setExpressage(WlyyPrescriptionExpressageVO expressage) {
        this.expressage = expressage;
    }
    public String getDispUser() {
        return dispUser;
    }
    public void setDispUser(String dispUser) {
        this.dispUser = dispUser;
    }
    public String getDispUserName() {
        return dispUserName;
    }
    public void setDispUserName(String dispUserName) {
        this.dispUserName = dispUserName;
    }
    public Date getDispDate() {
        return dispDate;
    }
    public void setDispDate(Date dispDate) {
        this.dispDate = dispDate;
    }
}