From f14deee7baaf82e7aad6fc81a2509ba88e869afd Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 02 Nov 2020 15:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
index 1927292..14edf52 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDoctor.java
@@ -1,12 +1,18 @@
package com.kidgrow.usercenter.model;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -28,11 +34,13 @@
/**
* 关联的登录帐号ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 所属医院ID
*/
- @NotEmpty(message = "所属医院ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotNull(message = "所属医院ID不能为空")
private Long hospitalId;
/**
* 医院名称
@@ -42,12 +50,11 @@
/**
* 科室ID
*/
- @NotEmpty(message = "科室ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
/**
* 科室名称
*/
- @NotEmpty(message = "科室名称不能为空")
private String departmentName;
/**
* 医生姓名
@@ -66,6 +73,7 @@
/**
* 职称ID
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long doctorRankId;
/**
* 职称
@@ -100,12 +108,40 @@
*/
private Boolean isDel;
/**
+ * 是否管理员 0否 1是
+ */
+ private Boolean isAdminUser;
+ /**
* 医生状态 1正常 0试用
*/
- @NotEmpty(message = "医生状态 1正常 0试用不能为空")
+ @NotNull(message = "医生状态不能为空")
private Boolean doctorState;
+ /**
+ * 医生类型 0H+C端都可用 1H端 2C端 默认2
+ */
+ @NotNull(message = "医生类型不能为空")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private Integer doctorType;
/**
* 启用禁用状态，1启用，0停用
*/
private Boolean enabled;
+
+ /**
+ * 销售代表的id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serverUserId;
+ /**
+ * 销售代表名称
+ */
+ private String serverUserName;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
+ /**
+ * 医生资质证书
+ */
+ private String doctorCcie;
}
--
Gitblit v1.8.0