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

实体与db字段规范性修改

Browse Source
This commit is contained in:
Zhang.WH
2025-02-22 17:07:09 +08:00
parent 91e3433ca7
commit 2b6720d75b
32 changed files with 105 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
View File

@@ -32,34 +32,34 @@ public class ActivityDefinition extends HisBaseEntity {
private Integer categoryEnum;
/** 编码 */
private String code;
private String busNo;
/** 项目名称 */
private String name;
/** 项目名称拼音 */
private String pyCode;
private String pyStr;
/** 五笔拼音 */
private String wbCode;
private String wbStr;
/** 类型 */
private Integer typeEnum;
/** 使用单位 */
private String permittedUnit;
private String permittedUnitCode;
/** 医保标记 */
private Integer ybFlag;
/** 医保编码 */
private String ybCode;
private String ybNo;
/** 医保对码标记 */
private Integer ybMatchFlag;
/** 状态 */
private String statusCode;
private Integer statusEnum;
/** 身体部位 */
private String bodySiteCode;
@@ -71,7 +71,7 @@ public class ActivityDefinition extends HisBaseEntity {
private String description;
/** 规则id */
private String ruleId;
private Integer ruleId;
}

2
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java
View File

@@ -29,7 +29,7 @@ public class DeviceDispense extends HisBaseEntity {
private Long id;
/** 器材发放id */
private String code;
private String busNo;
/** 器材请求id */
private String deviceReqId;

6
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java
View File

@@ -29,13 +29,13 @@ public class DeviceRequest extends HisBaseEntity {
private Long id;
/** 器材请求编码 */
private String code;
private String busNo;
/** 处方号 */
private String prescriptionCode;
private String prescriptionNo;
/** 相关诊疗项目 */
private String activityId;
private Integer activityId;
/** 组套id */
private Long packageId;

10
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java
View File

@@ -32,19 +32,19 @@ public class InventoryItem extends HisBaseEntity {
private Integer categoryEnum;
/** 编码 */
private String code;
private String busNo;
/** 名称 */
private String name;
/** 拼音码 */
private String pyCode;
private String pyStr;
/** 五笔码 */
private String wbCode;
private String wbStr;
/** 库存状态 */
private Integer inventoryStatus;
private Integer inventoryStatusEnum;
/** 供应商id */
private Long supplierId;
@@ -92,7 +92,7 @@ public class InventoryItem extends HisBaseEntity {
private Long locationId;
/** 追溯码 */
private String traceCode;
private String traceNo;
/** 追溯码包装层级 */
private Integer packagingLevels;

8
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java
View File

@@ -29,7 +29,7 @@ public class ServiceRequest extends HisBaseEntity {
private Long id;
/** 处方号 */
private String prescriptionCode;
private String prescriptionNo;
/** 请求基于什么 */
private String basedOnTable;
@@ -56,7 +56,7 @@ public class ServiceRequest extends HisBaseEntity {
private Integer performFlag;
/** 请求code */
private Long code;
private Long activityId;
/** 数量 */
private BigDecimal quantity;
@@ -77,7 +77,7 @@ public class ServiceRequest extends HisBaseEntity {
private Long requesterId;
/** 执行者类型 */
private String performerType;
private String performerTypeCode;
/** 执行人 */
private Long performerId;
@@ -98,7 +98,7 @@ public class ServiceRequest extends HisBaseEntity {
private Date occurrenceEndTime;
/** 历史请求 */
private Long relevantHistory;
private Long relevantHistoryId;
}

24
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java
View File

@@ -35,13 +35,13 @@ public class SupplyDelivery extends HisBaseEntity {
private Long summaryId;
/** 状态 */
private Integer status;
private Integer statusEnum;
/** 患者id */
private Long patientId;
/** 类型 */
private Integer type;
private Integer typeEnum;
/** 发放项目所属表 */
private String itemTable;
@@ -62,7 +62,7 @@ public class SupplyDelivery extends HisBaseEntity {
private String lotNumber;
/** 追溯码 */
private String traceCode;
private String traceNo;
/** 供应商 */
private Long supplierId;
@@ -82,24 +82,6 @@ public class SupplyDelivery extends HisBaseEntity {
/** 发放周期时间 */
private String occurrenceTiming;
/** 源仓库类型 */
private Integer sourceType;
/** 源仓库 */
private Long sourceLocationId;
/** 源仓位 */
private Long sourceLocationStoreId;
/** 目的仓库类型 */
private Integer purposeType;
/** 目的仓库 */
private Long purposeLocationId;
/** 目的仓位 */
private Long purposeLocationStoreId;
/** 接收人 */
private Long receiverId;

6
openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java
View File

@@ -65,7 +65,7 @@ public class SupplyRequest extends HisBaseEntity {
private Integer itemQuantity;
/** 物品编码 */
private Long code;
private Long itemId;
/** 物品计量单位 */
private String unitIdCode;
@@ -89,7 +89,7 @@ public class SupplyRequest extends HisBaseEntity {
private String reason;
/** 源仓库类型 */
private Integer sourceType;
private Integer sourceTypeEnum;
/** 源仓库 */
private Long sourceLocationId;
@@ -98,7 +98,7 @@ public class SupplyRequest extends HisBaseEntity {
private Long sourceLocationStoreId;
/** 目的类型 */
private Integer purposeType;
private Integer purposeTypeEnum;
/** 目的仓库 */
private Long purposeLocationId;