Zhang.WH 56a68f78a3 Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis ...

# Conflicts:
#	openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
#	openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java

2025-03-07 17:48:55 +08:00

..

AccountBillingStatus.java

门诊挂号

2025-03-07 11:18:07 +08:00

AccountStatus.java

reName

2025-03-03 14:58:50 +08:00

ActivityDefCategory.java

诊疗目录更新

2025-02-27 11:41:11 +08:00

ActPriority.java

添加了枚举类

2025-02-24 09:08:59 +08:00

AdministrativeGender.java

reName

2025-03-03 14:58:50 +08:00

BloodTypeABO.java

reName

2025-03-03 14:58:50 +08:00

BloodTypeRH.java

reName

2025-03-03 14:58:50 +08:00

ChargeItemStatus.java

门诊挂号

2025-03-07 11:18:07 +08:00

ClaimType.java

添加了枚举类

2025-02-24 12:45:33 +08:00

ClaimUse.java

添加了枚举类

2025-02-24 12:45:33 +08:00

ClinicalStatus.java

新增过敏与不耐受

2025-03-07 09:31:22 +08:00

ConditionCategory.java

添加了枚举类

2025-02-24 12:45:33 +08:00

ConditionClinicalStatus.java

添加了枚举类

2025-02-24 12:45:33 +08:00

ConditionDefinitionSource.java

疾病目录种类增加

2025-02-26 18:38:56 +08:00

ConditionSeverity.java

添加了枚举类

2025-02-24 12:45:33 +08:00

ConditionVerificationStatus.java

添加了枚举类

2025-02-24 12:45:33 +08:00

DelFlag.java

demo作成

2025-02-20 19:00:51 +08:00

DeviceCategory.java

添加了枚举类

2025-02-24 09:08:59 +08:00

DeviceSafety.java

添加了枚举类

2025-02-24 09:08:59 +08:00

DeviceStatus.java

添加了枚举类

2025-02-24 09:08:59 +08:00

EncounterClass.java

部分枚举调整

2025-03-04 19:18:54 +08:00

EncounterLocationStatus.java

就诊-元数据

2025-03-06 15:03:22 +08:00

EncounterStatus.java

部分枚举调整

2025-03-04 19:18:54 +08:00

EncounterSubjectStatus.java

部分枚举调整

2025-03-04 19:18:54 +08:00

EncounterType.java

门诊挂号

2025-03-07 11:18:07 +08:00

EncounterYbClass.java

部分枚举调整

2025-03-04 19:18:54 +08:00

EventStatus.java

采购入库

2025-03-07 17:44:46 +08:00

FamilyRelationshipType.java

reName

2025-03-03 14:58:50 +08:00

FinancialResourceStatus.java

添加了枚举类

2025-02-24 12:45:33 +08:00

HisEnumInterface.java

就诊-元数据

2025-03-06 15:03:22 +08:00

InvoiceStatus.java

添加了枚举类

2025-02-24 09:08:59 +08:00

LocationBedStatus.java

practitioner相关

2025-03-07 16:38:08 +08:00

LocationForm.java

Location的tree

2025-03-06 10:59:03 +08:00

LocationMode.java

practitioner相关

2025-03-07 16:38:08 +08:00

LocationStatus.java

practitioner相关

2025-03-07 16:38:08 +08:00

MaritalStatus.java

reName

2025-03-03 14:58:50 +08:00

OccupationType.java

reName

2025-03-03 14:58:50 +08:00

OrganizationClass.java

添加了枚举类

2025-02-24 09:08:59 +08:00

OrganizationType.java

添加了枚举类

2025-02-24 09:08:59 +08:00

OutpatientClass.java

服务管理必填项校验

2025-03-04 16:11:25 +08:00

ParticipantType.java

就诊-元数据

2025-03-06 15:03:22 +08:00

PractitionerRole.java

就诊-元数据

2025-03-06 15:03:22 +08:00

PriorityLevel.java

服务管理必填项校验

2025-03-04 16:11:25 +08:00

ProcedureCategory.java

添加了枚举类

2025-02-24 12:45:33 +08:00

PublicationStatus.java

就诊-元数据

2025-03-06 09:34:29 +08:00

SupplierType.java

添加了枚举类

2025-02-24 12:45:33 +08:00

SupplyCategory.java

采购入库

2025-03-07 17:44:46 +08:00

SupplyStatus.java

采购入库

2025-03-07 17:44:46 +08:00

SupplyType.java

采购入库

2025-03-07 17:44:46 +08:00

VerificationStatus.java

新增过敏与不耐受

2025-03-07 09:31:22 +08:00

Whether.java

采购入库

2025-03-07 17:44:46 +08:00

WhetherContainUnknown.java

诊疗器材枚举增加

2025-03-03 16:02:09 +08:00