|
@@ -2,6 +2,7 @@ package com.diagbot.entity;
|
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.IdType;
|
|
|
import com.baomidou.mybatisplus.annotation.TableId;
|
|
|
+
|
|
|
import java.io.Serializable;
|
|
|
|
|
|
/**
|
|
@@ -9,8 +10,8 @@ import java.io.Serializable;
|
|
|
*
|
|
|
* </p>
|
|
|
*
|
|
|
- * @author Weixuan Huang
|
|
|
- * @since 2019-01-31
|
|
|
+ * @author gaodm
|
|
|
+ * @since 2019-02-20
|
|
|
*/
|
|
|
public class Medical implements Serializable {
|
|
|
|
|
@@ -20,24 +21,24 @@ public class Medical implements Serializable {
|
|
|
private Integer id;
|
|
|
|
|
|
/**
|
|
|
- * 术语名称
|
|
|
+ * 术语概念id
|
|
|
*/
|
|
|
- private String name;
|
|
|
+ private Integer conceptId;
|
|
|
|
|
|
/**
|
|
|
- * 术语概念id
|
|
|
+ * 术语名称
|
|
|
*/
|
|
|
- private Integer concept_id;
|
|
|
+ private String name;
|
|
|
|
|
|
/**
|
|
|
* 术语类型编号,对应类型库
|
|
|
*/
|
|
|
- private Integer typeId;
|
|
|
+// private Integer typeId;
|
|
|
|
|
|
/**
|
|
|
* 术语类型
|
|
|
*/
|
|
|
- private String type;
|
|
|
+// private String type;
|
|
|
|
|
|
/**
|
|
|
* 术语标准名
|
|
@@ -52,7 +53,7 @@ public class Medical implements Serializable {
|
|
|
/**
|
|
|
* 术语类组
|
|
|
*/
|
|
|
-// private String group;
|
|
|
+ private String grp;
|
|
|
|
|
|
/**
|
|
|
* 性别:1:男, 2:女, 3:通用
|
|
@@ -106,6 +107,13 @@ public class Medical implements Serializable {
|
|
|
public void setId(Integer id) {
|
|
|
this.id = id;
|
|
|
}
|
|
|
+ public Integer getConceptId() {
|
|
|
+ return conceptId;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setConceptId(Integer conceptId) {
|
|
|
+ this.conceptId = conceptId;
|
|
|
+ }
|
|
|
public String getName() {
|
|
|
return name;
|
|
|
}
|
|
@@ -113,13 +121,7 @@ public class Medical implements Serializable {
|
|
|
public void setName(String name) {
|
|
|
this.name = name;
|
|
|
}
|
|
|
- public Integer getConcept_id() {
|
|
|
- return concept_id;
|
|
|
- }
|
|
|
-
|
|
|
- public void setConcept_id(Integer concept_id) {
|
|
|
- this.concept_id = concept_id;
|
|
|
- }
|
|
|
+ /*
|
|
|
public Integer getTypeId() {
|
|
|
return typeId;
|
|
|
}
|
|
@@ -134,6 +136,7 @@ public class Medical implements Serializable {
|
|
|
public void setType(String type) {
|
|
|
this.type = type;
|
|
|
}
|
|
|
+ */
|
|
|
public String getStdName() {
|
|
|
return stdName;
|
|
|
}
|
|
@@ -148,13 +151,13 @@ public class Medical implements Serializable {
|
|
|
public void setCateName(String cateName) {
|
|
|
this.cateName = cateName;
|
|
|
}
|
|
|
-// public String getGroup() {
|
|
|
-// return group;
|
|
|
-// }
|
|
|
-//
|
|
|
-// public void setGroup(String group) {
|
|
|
-// this.group = group;
|
|
|
-// }
|
|
|
+ public String getGrp() {
|
|
|
+ return grp;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setGrp(String grp) {
|
|
|
+ this.grp = grp;
|
|
|
+ }
|
|
|
public String getGender() {
|
|
|
return gender;
|
|
|
}
|
|
@@ -223,12 +226,13 @@ public class Medical implements Serializable {
|
|
|
public String toString() {
|
|
|
return "Medical{" +
|
|
|
"id=" + id +
|
|
|
+ ", conceptId=" + conceptId +
|
|
|
", name=" + name +
|
|
|
- ", typeId=" + typeId +
|
|
|
- ", type=" + type +
|
|
|
+// ", typeId=" + typeId +
|
|
|
+// ", type=" + type +
|
|
|
", stdName=" + stdName +
|
|
|
", cateName=" + cateName +
|
|
|
-// ", group=" + group +
|
|
|
+ ", grp=" + grp +
|
|
|
", gender=" + gender +
|
|
|
", minAge=" + minAge +
|
|
|
", maxAge=" + maxAge +
|