wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加了枚举类

Browse Source
This commit is contained in:
FayneLi
2025-02-24 12:45:33 +08:00
parent 006c4ec6d8
commit ade11cb2a6
17 changed files with 245 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java
View File

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.AdministrativeGender;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -38,7 +39,7 @@ public class Practitioner extends HisBaseEntity {
private String nameJson;
/** 性别编码 */
private Integer genderEnum;
private AdministrativeGender genderEnum;
/** 生日 */
private Date birthDate;
@@ -83,4 +84,4 @@ public class Practitioner extends HisBaseEntity {
private Long userId;
}
}

3
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java
View File

@@ -58,5 +58,4 @@ public class Supplier extends HisBaseEntity {
/** 机构编号 */
private Long orgId;
}
}

14
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java
View File

@@ -8,6 +8,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.ConditionCategory;
import com.openhis.common.enums.ConditionClinicalStatus;
import com.openhis.common.enums.ConditionSeverity;
import com.openhis.common.enums.ConditionVerificationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -29,16 +33,16 @@ public class Condition extends HisBaseEntity {
private Long id;
/** 验证状态 */
private Integer verificationStatusEnum;
private ConditionVerificationStatus verificationStatusEnum;
/** 临床特征 */
private Integer clinicalStatusEnum;
private ConditionClinicalStatus clinicalStatusEnum;
/** 分类 */
private Integer categoryEnum;
private ConditionCategory categoryEnum;
/** 严重程度 */
private Integer severityEnum;
private ConditionSeverity severityEnum;
/** 疾病或诊断编码 */
private String busNo;
@@ -89,4 +93,4 @@ public class Condition extends HisBaseEntity {
private String ybNo;
}
}

8
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
View File

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.ConditionDefinitionSource;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -29,7 +31,7 @@ public class ConditionDefinition extends HisBaseEntity {
private Long id;
/** 所属分类 */
private Integer sourceEnum;
private ConditionDefinitionSource sourceEnum;
/** 编码 */
private String condition_code;
@@ -59,7 +61,7 @@ public class ConditionDefinition extends HisBaseEntity {
private Integer ybMatchFlag;
/** 状态 */
private Integer statusEnum;
private PublicationStatus statusEnum;
}
}

8
openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java
View File

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.EventStatus;
import com.openhis.common.enums.ProcedureCategory;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -35,13 +37,13 @@ public class Procedure extends HisBaseEntity {
private Long baseMedReqId;
/** 当前状态 */
private Integer statusEnum;
private EventStatus statusEnum;
/** 当前状态原因 */
private String statusReasonText;
/** 分类 */
private Integer categoryEnum;
private ProcedureCategory categoryEnum;
/** 手术编码 */
private String procedureCode;
@@ -98,4 +100,4 @@ public class Procedure extends HisBaseEntity {
private String followUpJson;
}
}

5
openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
View File

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.ClaimUse;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -41,7 +42,7 @@ public class Claim extends HisBaseEntity {
private String subtypeCode;
/** 用途 */
private Integer useEnum;
private ClaimUse useEnum;
/** 索赔指向 */
private Integer insurerEnum;
@@ -62,4 +63,4 @@ public class Claim extends HisBaseEntity {
private Date billablePeriodEnd;
}
}