From 0cef025527ceb1d9086c8ac87046208285c312f7 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 09:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=5Fcode=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/openhis/administration/domain/Account.java | 2 +- .../src/main/java/com/openhis/administration/domain/Device.java | 2 +- .../main/java/com/openhis/administration/domain/Encounter.java | 2 +- .../com/openhis/administration/domain/EncounterParticipant.java | 2 +- .../java/com/openhis/administration/domain/EncounterReason.java | 2 +- .../com/openhis/administration/domain/HealthcareService.java | 2 +- .../main/java/com/openhis/administration/domain/Invoice.java | 2 +- .../com/openhis/administration/domain/PatientIdentifier.java | 2 +- .../main/java/com/openhis/financial/domain/PaymentNotice.java | 2 +- .../com/openhis/medication/domain/MedicationDefinition.java | 2 +- 10 files changed, 10 insertions(+), 10 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 5b085316..6d6071fd 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 @@ -35,7 +35,7 @@ public class Account extends HisBaseEntity { private Integer billingStatusEnum; /** 账户类型编码 */ - private Integer typeCode; + private String typeCode; /** 名称 */ private String name; 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 5dcfc56b..5b90561c 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,7 +29,7 @@ public class Device extends HisBaseEntity { private Long id; /** 器材编码 */ - private Long deviceCode; + private String deviceCode; /** 器材定义编号 */ private Long defId; 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 d7e45e3d..29a9b509 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 @@ -38,7 +38,7 @@ public class Encounter extends HisBaseEntity { private String code; /** 状态编码 */ - private Integer statusCode; + private String statusCode; /** 类别编码 */ private Integer classEnum; 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 c7d3657a..6e57a411 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 @@ -32,7 +32,7 @@ public class EncounterParticipant extends HisBaseEntity { private Long encounterId; /** 参与者类型 */ - private Integer typeCode; + private String typeCode; /** 开始时间 */ private Date startTiem; 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 6659d0f7..54a7583a 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 @@ -32,7 +32,7 @@ public class EncounterReason extends HisBaseEntity { private Long encounterId; /** 原因编码 */ - private Integer useCode; + private String useCode; /** 具体原因类型 */ private String valueTable; 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 08d6a68d..53397cad 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 @@ -35,7 +35,7 @@ public class HealthcareService extends HisBaseEntity { private Long offeredOrgId; /** 服务分类 */ - private Integer categoryCode; + private String categoryCode; /** 服务类型 */ private String typeCode; 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 367d04b0..77555bdc 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 @@ -53,7 +53,7 @@ public class Invoice extends HisBaseEntity { private String paymentTerms; /** 账单批次号 */ - private BigDecimal batchCode; + private String batchCode; /** 结算批次号 */ private String qrCode; 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 c53609a2..857c30b7 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 @@ -29,7 +29,7 @@ public class PatientIdentifier extends HisBaseEntity { private Long id; /** 标识类型编码 */ - private Integer typeCode; + private String typeCode; /** 标识号 */ private String identifierNo; 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 d85c0e04..57cb93e4 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 @@ -41,7 +41,7 @@ public class PaymentNotice extends HisBaseEntity { private Long payee; /** 通知方式 */ - private Integer wayCode; + private String wayCode; /** 通知内容 */ private String content; 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 90e0306c..6a286966 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 @@ -50,7 +50,7 @@ public class MedicationDefinition extends HisBaseEntity { private String wbCode; /** 药品分类 */ - private Integer categoryCode; + private String categoryCode; /** 商品名称 */ private String merchandiseName;