diff --git a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java index e10636ff..0a09c627 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java +++ b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java @@ -44,7 +44,7 @@ public class HisBaseEntity implements Serializable { private Integer tenantId; /** 删除标识 */ - private Integer delFlag; + private Integer deleteFlag; /** 测试标识 */ private Integer testFlag; diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java index b265047f..a9235d98 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/dto/SaveInventoryReceiptDto.java @@ -111,9 +111,6 @@ public class SaveInventoryReceiptDto { /** 申请时间 */ private Date applyTime; - /** 删除状态 */ - private Integer deleteFlag; - // =======chargeItem实体============ /** ID */ diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java index 6d6071fd..bca9c433 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java @@ -58,7 +58,5 @@ public class Account extends HisBaseEntity { /** 欠费限制额度 */ private BigDecimal limitAccount; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java index 59feda42..b6519152 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java @@ -112,7 +112,5 @@ public class ChargeItem extends HisBaseEntity { /** 机构 */ private String orgCode; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java index 72ee2787..e5fbdeb0 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefApp.java @@ -55,7 +55,5 @@ public class ChargeItemDefApp extends HisBaseEntity { /** 价格 */ private BigDecimal amount; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java index ddb6d0ea..59eb01d1 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java @@ -67,7 +67,5 @@ public class ChargeItemDefinition extends HisBaseEntity { /** 基础价格 */ private BigDecimal price; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java index 5b90561c..fea94f85 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java @@ -91,7 +91,5 @@ public class Device extends HisBaseEntity { /** 器材安全 */ private Integer safetyEnum; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java index ab645e8c..98446f80 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java @@ -106,7 +106,5 @@ public class DeviceDefinition extends HisBaseEntity { /** 过敏标记 */ private Integer allergenFlag; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java index 29a9b509..99742116 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java @@ -73,7 +73,4 @@ public class Encounter extends HisBaseEntity { /** 就诊序号 */ private Integer displayOrder; - /** 删除状态 */ - private Integer deleteFlag; - } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java index ea226c5c..cbe2dd2e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java @@ -55,7 +55,5 @@ public class EncounterDiagnosis extends HisBaseEntity { /** 最高诊断依据标记 */ private Integer highDiseEvidFlag; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java index 9b76c0a2..f92e20a7 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java @@ -46,7 +46,5 @@ public class EncounterLocation extends HisBaseEntity { /** 结束时间 */ private Date endTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java index 6e57a411..25c157b1 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java @@ -43,7 +43,5 @@ public class EncounterParticipant extends HisBaseEntity { /** 参与者ID */ private Long practitionerId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java index 54a7583a..91b19489 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java @@ -43,7 +43,5 @@ public class EncounterReason extends HisBaseEntity { /** 原因描述 */ private String note; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java index 53397cad..a0d266f8 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java @@ -61,7 +61,5 @@ public class HealthcareService extends HisBaseEntity { /** 预约要求 */ private Integer appointmentRequiredFlag; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java index 77555bdc..925c5ad6 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java @@ -64,7 +64,5 @@ public class Invoice extends HisBaseEntity { /** 图片路径 */ private String pictureUrl; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java index 1cd64330..8a495796 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java @@ -61,7 +61,5 @@ public class Location extends HisBaseEntity { /** 显示顺序 */ private Integer displayOrder; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java index 87366b12..aa7a7d6a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java @@ -58,7 +58,5 @@ public class Organization extends HisBaseEntity { /** 显示顺序 */ private Integer displayOrder; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java index e076c651..2058abc3 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java @@ -121,7 +121,5 @@ public class Patient extends HisBaseEntity { /** 机构Id */ private Long organizationId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java index 857c30b7..b9f7db4d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java @@ -43,7 +43,5 @@ public class PatientIdentifier extends HisBaseEntity { /** 有效时间end */ private Date endTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java index 1caa6862..e4dc803f 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java @@ -82,7 +82,5 @@ public class Practitioner extends HisBaseEntity { /** 系统用户id */ private Long userId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java index 7afbb4d8..d61b7154 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java @@ -58,7 +58,5 @@ public class PractitionerRole extends HisBaseEntity { /** 有效时间 */ private String availabilityJson; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java index 38a6edb7..949403be 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java @@ -58,7 +58,5 @@ public class Supplier extends HisBaseEntity { /** 机构编号 */ private Long orgId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java index f8651afe..f0ba713a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java @@ -88,7 +88,5 @@ public class Condition extends HisBaseEntity { /** 医保编码 */ private String ybCode; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java index 4e5b264d..569d12c7 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java @@ -61,7 +61,5 @@ public class ConditionDefinition extends HisBaseEntity { /** 状态 */ private Integer statusEnum; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java index 910bf33f..8fcfda1f 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java @@ -97,7 +97,5 @@ public class Procedure extends HisBaseEntity { /** 跟进指南 */ private String followUpJson; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java index 70808fde..77ab2741 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ProcedurePerformer.java @@ -46,7 +46,5 @@ public class ProcedurePerformer extends HisBaseEntity { /** 飞刀机构 */ private String orgFromId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java index d1c763c7..0d75e0c5 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java @@ -61,7 +61,5 @@ public class Claim extends HisBaseEntity { /** 索赔涵盖时间 */ private Date billablePeriodEnd; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java index 48673701..2ef17034 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java @@ -58,7 +58,5 @@ public class ClaimResponse extends HisBaseEntity { /** 索赔金额 */ private BigDecimal total; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java index 0b898eae..7be0560d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Contract.java @@ -43,7 +43,5 @@ public class Contract extends HisBaseEntity { /** 机构 */ private Long orgId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java index 57cb93e4..98fa1ad0 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java @@ -58,7 +58,5 @@ public class PaymentNotice extends HisBaseEntity { /** 机构 */ private String orgCode; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java index b87e953b..8c25efc6 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java @@ -73,7 +73,5 @@ public class PaymentRecDetail extends HisBaseEntity { /** 单笔交易结果 */ private Integer resultEnum; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java index 70767c93..63194a8e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java @@ -88,7 +88,5 @@ public class PaymentReconciliation extends HisBaseEntity { /** 就诊ID */ private Long encoutnerId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java index 1a6af8b1..f5fbbb8c 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/Medication.java @@ -76,8 +76,6 @@ public class Medication extends HisBaseEntity { /** 药品定义 */ private String definition; - /** 删除状态 */ - private Integer deleteFlag; /** 药品编号 */ private Long code; diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java index 6a286966..57654969 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java @@ -118,7 +118,5 @@ public class MedicationDefinition extends HisBaseEntity { /** 产品特性 */ private Integer characteristic; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java index a2848191..51ff0fb5 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java @@ -77,6 +77,4 @@ public class MedicationDetail extends HisBaseEntity { /** 药品定义 */ private String definition; - /** 删除状态 */ - private Integer deleteFlag; } diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java index 363c0366..34d8cd2b 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDispense.java @@ -106,7 +106,5 @@ public class MedicationDispense extends HisBaseEntity { /** 单次最大剂量 */ private BigDecimal maxUnit; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java index b302448c..be435151 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationRequest.java @@ -169,7 +169,5 @@ public class MedicationRequest extends HisBaseEntity { /** 发药人 */ private Long dispenser; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java index e2a55639..79503e52 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java @@ -73,7 +73,5 @@ public class ActivityDefinition extends HisBaseEntity { /** 规则id */ private String ruleId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java index 704038bf..2322be93 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java @@ -88,7 +88,5 @@ public class DeviceDispense extends HisBaseEntity { /** 使用说明 */ private String usageInstruction; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java index 9d9c275d..3ad718bf 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java @@ -130,7 +130,5 @@ public class DeviceRequest extends HisBaseEntity { /** 发放编号 */ private Long dispenseId; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java index 178b9c66..d0e7f359 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/InventoryItem.java @@ -97,7 +97,5 @@ public class InventoryItem extends HisBaseEntity { /** 追溯码包装层级 */ private Integer packagingLevels; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java index 478e350c..e342d24a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java @@ -100,7 +100,5 @@ public class ServiceRequest extends HisBaseEntity { /** 历史请求 */ private Long relevantHistory; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java index 56886ec2..884bad9d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequestDetail.java @@ -40,7 +40,5 @@ public class ServiceRequestDetail extends HisBaseEntity { /** 订单详情 */ private String detailJson; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java index 8d47eaf7..7565fcac 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyDelivery.java @@ -106,7 +106,5 @@ public class SupplyDelivery extends HisBaseEntity { /** 接收时间 */ private Date receiveDateTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java index 773c315a..7e3596ab 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/workflow/domain/SupplyRequest.java @@ -118,7 +118,5 @@ public class SupplyRequest extends HisBaseEntity { /** 申请时间 */ private Date applyTime; - /** 删除状态 */ - private Integer deleteFlag; } \ No newline at end of file