From 2b6720d75bb1171d6c074ed2f2dbc8121179c604 Mon Sep 17 00:00:00 2001 From: "Zhang.WH" Date: Sat, 22 Feb 2025 17:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=8Edb=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=80=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../administration/domain/Account.java | 4 ++-- .../administration/domain/ChargeItem.java | 8 +++---- .../openhis/administration/domain/Device.java | 6 ++--- .../domain/DeviceDefinition.java | 14 +++++------ .../administration/domain/Encounter.java | 2 +- .../domain/EncounterDiagnosis.java | 3 --- .../domain/HealthcareService.java | 2 +- .../administration/domain/Location.java | 6 ++--- .../administration/domain/Organization.java | 8 +++---- .../administration/domain/Patient.java | 8 +++---- .../administration/domain/Practitioner.java | 8 +++---- .../domain/PractitionerRole.java | 4 ++-- .../administration/domain/Supplier.java | 6 ++--- .../openhis/clinical/domain/Condition.java | 6 ++--- .../clinical/domain/ConditionDefinition.java | 8 +++---- .../openhis/clinical/domain/Procedure.java | 6 ++--- .../com/openhis/financial/domain/Claim.java | 2 +- .../openhis/financial/domain/Contract.java | 2 +- .../financial/domain/PaymentNotice.java | 6 ++--- .../financial/domain/PaymentRecDetail.java | 12 +++++----- .../domain/PaymentReconciliation.java | 12 +++++----- .../openhis/medication/domain/Medication.java | 2 +- .../domain/MedicationDefinition.java | 12 +++++----- .../medication/domain/MedicationDispense.java | 4 ++-- .../medication/domain/MedicationRequest.java | 10 ++++---- .../workflow/domain/ActivityDefinition.java | 14 +++++------ .../workflow/domain/DeviceDispense.java | 2 +- .../workflow/domain/DeviceRequest.java | 6 ++--- .../workflow/domain/InventoryItem.java | 10 ++++---- .../workflow/domain/ServiceRequest.java | 8 +++---- .../workflow/domain/SupplyDelivery.java | 24 +++---------------- .../workflow/domain/SupplyRequest.java | 6 ++--- 32 files changed, 105 insertions(+), 126 deletions(-) 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 bca9c433..d5848f8b 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 @@ -50,10 +50,10 @@ public class Account extends HisBaseEntity { private BigDecimal balanceAmount; /** 医保区域编码 */ - private String ybAreaCode; + private String ybAreaNo; /** 合同编码 */ - private String contractCode; + private String contractNo; /** 欠费限制额度 */ private BigDecimal limitAccount; 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 b6519152..d7852d48 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 @@ -32,13 +32,13 @@ public class ChargeItem extends HisBaseEntity { private Integer statusEnum; /** 层级 */ - private String code; + private String busNo; /** 患者ID */ private Long patientId; /** 类别 */ - private Integer context; + private Integer contextEnum; /** 就诊ID */ private Long encounterId; @@ -47,7 +47,7 @@ public class ChargeItem extends HisBaseEntity { private Date occurrenceTime; /** 执行人Id */ - private Long performer; + private Long performerId; /** 执行科室 */ private Long performingOrgId; @@ -110,7 +110,7 @@ public class ChargeItem extends HisBaseEntity { private Long accountId; /** 机构 */ - private String orgCode; + private Integer orgId; } \ 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 fea94f85..389d2453 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 @@ -29,16 +29,16 @@ public class Device extends HisBaseEntity { private Long id; /** 器材编码 */ - private String deviceCode; + private String busNo; /** 器材定义编号 */ - private Long defId; + private Long deviceDefId; /** 器材状态 */ private Integer statusEnum; /** 器材可用状态 */ - private Integer availabilityStatus; + private Integer availabilityEnum; /** 厂家 */ private String manufacturer; 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 98446f80..18c895ff 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 @@ -29,19 +29,19 @@ public class DeviceDefinition extends HisBaseEntity { private Long id; /** 编码 */ - private String code; + private String busNo; /** 器材名称 */ private String name; /** 器材名称拼音 */ - private String pyCode; + private String pyStr; /** 器材五笔拼音 */ - private String wbCode; + private String wbStr; /** 器材分类 */ - private String deviceClass; + private String deviceCode; /** 器材种类 */ private String deviceTypeCode; @@ -74,13 +74,13 @@ public class DeviceDefinition extends HisBaseEntity { private Integer ybFlag; /** 医保编码 */ - private String ybCode; + private String ybNo; /** 医保对码标记 */ private Integer ybMatchFlag; /** 状态 */ - private Integer status; + private Integer statusEnum; /** 生产厂家 */ private Long manufacturerId; @@ -92,7 +92,7 @@ public class DeviceDefinition extends HisBaseEntity { private String description; /** 适用范围 */ - private Long jurisdiction; + private String jurisdiction; /** 执行科室 */ private Long ruleId; 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 99742116..a28eeaea 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 @@ -35,7 +35,7 @@ public class Encounter extends HisBaseEntity { private Long groupId; /** 就诊编码 */ - private String code; + private String busNo; /** 状态编码 */ private String statusCode; 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 cbe2dd2e..6c515eae 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 @@ -34,9 +34,6 @@ public class EncounterDiagnosis extends HisBaseEntity { /** 诊断_id */ private Long conditionId; - /** 诊断编码 */ - private String code; - /** 住院患者疾病诊 */ private Integer iptDiseCrsp; 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 a0d266f8..2076efff 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 @@ -29,7 +29,7 @@ public class HealthcareService extends HisBaseEntity { private Long id; /** 活动标记 */ - private Integer active; + private Integer activeFlag; /** 提供部门ID */ private Long offeredOrgId; 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 8a495796..a0f8f565 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 @@ -29,7 +29,7 @@ public class Location extends HisBaseEntity { private Long id; /** 编码 */ - private String code; + private String busNo; /** 名称 */ private String name; @@ -47,10 +47,10 @@ public class Location extends HisBaseEntity { private String typeJson; /** 拼音码 */ - private String spellCode; + private String pyStr; /** 五笔码 */ - private String wbCode; + private String wbStr; /** 物理形式枚举 */ private String formEnum; 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 aa7a7d6a..0dfb31f5 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 @@ -29,7 +29,7 @@ public class Organization extends HisBaseEntity { private Long id; /** 编码 */ - private String code; + private String bus_no; /** 名称 */ private String name; @@ -44,13 +44,13 @@ public class Organization extends HisBaseEntity { private Integer classEnum; /** 拼音码 */ - private String spellCode; + private String pyStr; /** 五笔码 */ - private String wbCode; + private String wbStr; /** 医保码 */ - private String ybCode; + private String ybNo; /** 医保名称 */ private String ybName; 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 2058abc3..0025d404 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 @@ -41,7 +41,7 @@ public class Patient extends HisBaseEntity { private String nameJson; /** 患者院内编码/病历号 */ - private String code; + private String busNo; /** 性别编码 */ private Integer genderEnum; @@ -80,16 +80,16 @@ public class Patient extends HisBaseEntity { private String addressJson; /** 民族 */ - private String nationality; + private String nationalityCode; /** 身份证号 */ private String idCard; /** 拼音码 */ - private String spellCode; + private String pyStr; /** 五笔码 */ - private String wbCode; + private String wbStr; /** 血型ABO */ private String bloodAbo; 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 e4dc803f..29163acc 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 @@ -68,16 +68,16 @@ public class Practitioner extends HisBaseEntity { private String addressJson; /** 拼音码 */ - private String spellCode; + private String pyStr; /** 五笔码 */ - private String wbCode; + private String wbStr; /** 患者院内编码/病历号 */ - private String code; + private String busNo; /** 医保码 */ - private String ybCode; + private String ybNo; /** 系统用户id */ private Long userId; 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 d61b7154..cd9d1997 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 @@ -31,8 +31,8 @@ public class PractitionerRole extends HisBaseEntity { /** 名称 */ private String name; - /** 编码 */ - private String code; + /** 角色编码 */ + private String role_code; /** 活动标识 */ private Integer activeFlag; 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 949403be..7bf37aa1 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 @@ -29,7 +29,7 @@ public class Supplier extends HisBaseEntity { private Long id; /** 编号 */ - private String code; + private String busNo; /** 名称 */ private String name; @@ -41,10 +41,10 @@ public class Supplier extends HisBaseEntity { private String address; /** 拼音码 */ - private String pyCode; + private String pyStr; /** 五笔码 */ - private String wbCode; + private String wbStr; /** 联系人电话 */ private String phone; 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 f0ba713a..1eb13d2d 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 @@ -41,7 +41,7 @@ public class Condition extends HisBaseEntity { private Integer severityEnum; /** 疾病或诊断编码 */ - private String code; + private String busNo; /** 身体部位 */ private String bodySiteJson; @@ -77,7 +77,7 @@ public class Condition extends HisBaseEntity { private Date recordedDatetime; /** 记录人 */ - private Long recorder; + private Long recorderId; /** 阶段总结 */ private String stageSummaryText; @@ -86,7 +86,7 @@ public class Condition extends HisBaseEntity { private String evidence; /** 医保编码 */ - private String ybCode; + private String ybNo; } \ 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 569d12c7..848f4ae5 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 @@ -32,16 +32,16 @@ public class ConditionDefinition extends HisBaseEntity { private Integer sourceEnum; /** 编码 */ - private String code; + private String condition_code; /** 诊断名称 */ private String name; /** 诊断名称拼音 */ - private String pyCode; + private String pyStr; /** 诊断名称五笔拼音 */ - private String wbCode; + private String wbStr; /** 类型 */ private String typeCode; @@ -53,7 +53,7 @@ public class ConditionDefinition extends HisBaseEntity { private Integer ybFlag; /** 医保编码 */ - private String ybCode; + private String ybNo; /** 医保对码标记 */ private Integer ybMatchFlag; 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 8fcfda1f..0e6bb320 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 @@ -43,8 +43,8 @@ public class Procedure extends HisBaseEntity { /** 分类 */ private Integer categoryEnum; - /** 编码 */ - private String code; + /** 手术编码 */ + private String procedureCode; /** 患者Id */ private Long patientId; @@ -65,7 +65,7 @@ public class Procedure extends HisBaseEntity { private Date recordedTime; /** 记录人 */ - private Long recorder; + private Long recorderId; /** 是否有报告 */ private Integer reportFlag; 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 0d75e0c5..686326cc 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 @@ -44,7 +44,7 @@ public class Claim extends HisBaseEntity { private Integer useEnum; /** 索赔指向 */ - private Integer insurer; + private Integer insurerEnum; /** condition_dis */ private String conditionDis; 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 7be0560d..805e3377 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 @@ -38,7 +38,7 @@ public class Contract extends HisBaseEntity { private Integer categoryEnum; /** 合同编码 */ - private String code; + private String busNo; /** 机构 */ private Long orgId; 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 98fa1ad0..948dfc06 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 @@ -38,13 +38,13 @@ public class PaymentNotice extends HisBaseEntity { private Long paypmentReconciliationId; /** 被支付方 */ - private Long payee; + private Long payeeId; /** 通知方式 */ private String wayCode; /** 通知内容 */ - private String content; + private String contentText; /** 被通知方 */ private String recipient; @@ -56,7 +56,7 @@ public class PaymentNotice extends HisBaseEntity { private Integer payStatus; /** 机构 */ - private String orgCode; + private Integer orgId; } \ 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 8c25efc6..14a4f64c 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 @@ -28,8 +28,8 @@ public class PaymentRecDetail extends HisBaseEntity { @TableId(type = IdType.ASSIGN_ID) private Long id; - /** recId */ - private Long predecessor; + /** 先前支付明细id */ + private Long predecessorId; /** 付款类型 */ private Integer targetEnum; @@ -38,13 +38,13 @@ public class PaymentRecDetail extends HisBaseEntity { private Long accountId; /** 账户类型 */ - private Integer accountType; + private Integer accountEnum; /** 支付类型 */ - private Integer payType; + private Integer payEnum; /** 支付类型等级 */ - private Integer payTypeClass; + private Integer payLevelEnum; /** 金额 */ private BigDecimal amount; @@ -56,7 +56,7 @@ public class PaymentRecDetail extends HisBaseEntity { private BigDecimal chargeAmount; /** 支付平台返回交易号 */ - private String payTransId; + private String payTransNo; /** 支付平台返回交易信息 */ private String payTransText; 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 63194a8e..f1a3c6cc 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 @@ -35,10 +35,10 @@ public class PaymentReconciliation extends HisBaseEntity { private Long relationId; /** 支付的业务标识符 */ - private String paymentIdentifier; + private String paymentNo; /** 付款类别 */ - private Integer type; + private Integer paymentEnum; /** 付款实体ID */ private Long paypmentReconciliationId; @@ -47,10 +47,10 @@ public class PaymentReconciliation extends HisBaseEntity { private Integer kindEnum; /** 收款员 */ - private Long enterer; + private Long entererId; /** 支付发起人类型 */ - private Integer issuerType; + private Integer issuerEnum; /** 支付的患者ID */ private Long patientId; @@ -80,13 +80,13 @@ public class PaymentReconciliation extends HisBaseEntity { private Integer printCount; /** 合同编码 */ - private String contractCode; + private String contractNo; /** 处方号集合 */ private String chargeItemJson; /** 就诊ID */ - private Long encoutnerId; + private Long encounterId; } \ 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 a718daa5..26c9b5b8 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 @@ -29,7 +29,7 @@ public class Medication extends HisBaseEntity { private Long id; /** 药品编码 */ - private Long medicationProductId; + private Long medicationDefId; /** 药品状态 */ private Integer statusEnum; 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 23a7a05e..97962d89 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 @@ -29,7 +29,7 @@ public class MedicationDefinition extends HisBaseEntity { private Long id; /** 药品编号 */ - private Long code; + private String busNo; /** 药品名称 */ private String name; @@ -44,10 +44,10 @@ public class MedicationDefinition extends HisBaseEntity { private String nameEn; /** 药品名称拼音码 */ - private String pyCode; + private String pyStr; /** 药品五笔码 */ - private String wbCode; + private String wbStr; /** 药品分类 */ private String categoryCode; @@ -56,10 +56,10 @@ public class MedicationDefinition extends HisBaseEntity { private String merchandiseName; /** 商品名称拼音码 */ - private String merchandisePyCode; + private String merchandisePyStr; /** 商品五笔码 */ - private String merchandiseWbCode; + private String merchandiseWbStr; /** 药品单位 */ private String unitCode; @@ -86,7 +86,7 @@ public class MedicationDefinition extends HisBaseEntity { private Integer ybMatchFlag; /** 医保编码 */ - private String ybCode; + private String ybNo; /** 药理作用分类 */ private String pharmacologyCategoryCode; 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 34d8cd2b..ed23db70 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 @@ -29,7 +29,7 @@ public class MedicationDispense extends HisBaseEntity { private Long id; /** 药品发放id */ - private String code; + private String busNo; /** 药品发放状态 */ private Integer statusEnum; @@ -41,7 +41,7 @@ public class MedicationDispense extends HisBaseEntity { private Date statusChangedTime; /** 发药类型 */ - private Integer dispenseCategory; + private Integer dispenseEnum; /** 药品编码 */ private Long medicationId; 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 be435151..6773b4cd 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 @@ -29,10 +29,10 @@ public class MedicationRequest extends HisBaseEntity { private Long id; /** 药品请求编码 */ - private String code; + private String bus_no; /** 处方号 */ - private String prescriptionCode; + private String prescriptionNo; /** 分组id */ private Long groupId; @@ -116,7 +116,7 @@ public class MedicationRequest extends HisBaseEntity { private String reasonJson; /** 治疗类型 */ - private Integer therapyType; + private Integer therapyEnum; /** 服药时间(开始) */ private Date effectiveDoseStart; @@ -128,7 +128,7 @@ public class MedicationRequest extends HisBaseEntity { private Integer skinTestFlag; /** 合同Id */ - private String contractCode; + private String contractNo; /** 输液标志 */ private Integer infusionFlag; @@ -167,7 +167,7 @@ public class MedicationRequest extends HisBaseEntity { private Integer dispensePerDuration; /** 发药人 */ - private Long dispenser; + private Long dispenserId; } \ 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 79503e52..914afb54 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 @@ -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; } \ 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 2322be93..ed365ab0 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 @@ -29,7 +29,7 @@ public class DeviceDispense extends HisBaseEntity { private Long id; /** 器材发放id */ - private String code; + private String busNo; /** 器材请求id */ private String deviceReqId; 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 3ad718bf..54be6ab0 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 @@ -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; 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 d0e7f359..ad596fe7 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 @@ -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; 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 e342d24a..c7029161 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 @@ -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; } \ 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 7565fcac..1869ac98 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 @@ -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; 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 7e3596ab..1a61898d 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 @@ -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;