From 519a87f05bd981ae4fcb56fb4cbe56cd119e24b0 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 20 Apr 2020 17:32:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
index 6a9967e..32bea0f 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
@@ -8,6 +8,8 @@
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
*
@@ -31,9 +33,9 @@
@NotEmpty(message = "医院名称 同组织名字不能为空")
private String hospitalName;
/**
- * 组织ID
+ * 组织ID-
*/
- @NotEmpty(message = "组织ID不能为空")
+ @NotNull(message = "组织ID不能为空")
private Long orgId;
/**
* 医院简称
@@ -46,27 +48,30 @@
/**
* 医院类型ID 从字典表关联 社区/儿保等等之类
*/
- @NotEmpty(message = "医院类型ID 从字典表关联 社区/儿保等等之类不能为空")
- private Long hospitalTypeId;
+ private String hospitalTypeId;
/**
* 医院类型 社区/儿保等等之类
*/
- @NotEmpty(message = "医院类型 社区/儿保等等之类不能为空")
private String hospitalTypeName;
/**
* 医院电话
*/
- @NotEmpty(message = "医院电话不能为空")
private String hospitalTel;
/**
- * 医院所在地区行政编码
+ * 医院所在省
*/
- @NotEmpty(message = "医院所在地区行政编码不能为空")
+ private String hospitalProvince;
+ /**
+ * 医院所在城
+ */
+ private String hospitalCity;
+ /**
+ * 医院所在地区
+ */
private String hospitalArea;
/**
* 区号
*/
- @NotEmpty(message = "区号不能为空")
private String areaCode;
/**
* 医院地址
@@ -83,7 +88,7 @@
/**
* 资质ID
*/
- private Long hospitalQualifiedId;
+ private String hospitalQualifiedId;
/**
* 资质（三甲医院）
*/
@@ -109,19 +114,8 @@
*/
private Boolean isScreen;
/**
- * 负责的销售代表
- */
- @NotEmpty(message = "负责的销售代表不能为空")
- private Long serverUserId;
- /**
- * 销售代表的名字
- */
- @NotEmpty(message = "销售代表的名字不能为空")
- private String serverUserName;
- /**
* 服务状态 0试用 1正式
*/
- @NotEmpty(message = "服务状态 0试用 1正式不能为空")
private Integer hospitalState;
/**
* 状态，1启用，0停用
--
Gitblit v1.8.0