Index: forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java =================================================================== diff -u -r15615 -r16188 --- forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java (.../CssdServiceDepts.java) (revision 15615) +++ forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java (.../CssdServiceDepts.java) (revision 16188) @@ -4,6 +4,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Index; +import javax.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -16,6 +18,9 @@ * @since 2016-03-19 */ @Entity +@Table(indexes={@Index(columnList="cssdOrgUnitCode",name="cssdOrgUnitCode_index") +,@Index(columnList="cssdOrgUnitName",name="cssdOrgUnitName_index"),@Index(columnList="clinicOrgUnitCode",name="clinicOrgUnitCode_index") +,@Index(columnList="clinicOrgUnitName",name="clinicOrgUnitName_index"),@Index(columnList="tousseType",name="tousseType_index")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @JsonFilter("fieldFilter") public class CssdServiceDepts { @@ -26,11 +31,6 @@ private Long id; /** - * 供应室科室ID - */ - private Long cssdOrgUnitId; - - /** * 供应室科室编码 */ private String cssdOrgUnitCode; @@ -41,11 +41,6 @@ private String cssdOrgUnitName; /** - * 临床科室ID - */ - private Long clinicOrgUnitId; - - /** * 临床科室编码 */ private String clinicOrgUnitCode; @@ -90,14 +85,6 @@ this.id = id; } - public Long getCssdOrgUnitId() { - return cssdOrgUnitId; - } - - public void setCssdOrgUnitId(Long cssdOrgUnitId) { - this.cssdOrgUnitId = cssdOrgUnitId; - } - public String getCssdOrgUnitCode() { return cssdOrgUnitCode; } @@ -114,14 +101,6 @@ this.cssdOrgUnitName = cssdOrgUnitName; } - public Long getClinicOrgUnitId() { - return clinicOrgUnitId; - } - - public void setClinicOrgUnitId(Long clinicOrgUnitId) { - this.clinicOrgUnitId = clinicOrgUnitId; - } - public String getClinicOrgUnitCode() { return clinicOrgUnitCode; } Index: forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java =================================================================== diff -u -r15614 -r16188 --- forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java (.../CssdHandleTousses.java) (revision 15614) +++ forgon-core/src/main/java/com/forgon/directory/model/CssdHandleTousses.java (.../CssdHandleTousses.java) (revision 16188) @@ -4,6 +4,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Index; +import javax.persistence.Table; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -16,6 +18,9 @@ * @since 2016-03-19 */ @Entity +@Table(indexes={@Index(columnList="tousseDefinitionId",name="tousseDefinitionId_index") +,@Index(columnList="tousseName",name="tousseName_index"),@Index(columnList="orgUnitCode",name="orgUnitCode_index") +,@Index(columnList="orgUnitName",name="orgUnitName_index"),@Index(columnList="taskGroup",name="taskGroup_index")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @JsonFilter("fieldFilter") public class CssdHandleTousses { @@ -36,11 +41,6 @@ private String tousseName; /** - * 科室id - */ - private Long orgUnitId; - - /** * 科室编码 */ private String orgUnitCode; @@ -83,14 +83,6 @@ this.tousseDefinitionId = tousseDefinitionId; } - public Long getOrgUnitId() { - return orgUnitId; - } - - public void setOrgUnitId(Long orgUnitId) { - this.orgUnitId = orgUnitId; - } - public String getTousseName() { return tousseName; }