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

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java

@@ -1,13 +1,14 @@
 package com.openhis.administration.domain;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.AccountBillingStatus;
+import com.openhis.common.enums.AccountStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -29,10 +30,10 @@ public class Account extends HisBaseEntity {
     private Long id;
 
     /** 状态枚举 */
-    private Integer statusEnum;
+    private AccountStatus statusEnum;
 
     /** 结账状态枚举 */
-    private Integer billingStatusEnum;
+    private AccountBillingStatus billingStatusEnum;
 
     /** 账户类型编码 */
     private String typeCode;
@@ -59,4 +60,4 @@ public class Account extends HisBaseEntity {
     private BigDecimal limitAccount;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.ChargeItemStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -29,7 +30,7 @@ public class ChargeItem extends HisBaseEntity {
     private Long id;
 
     /** 状态 */
-    private Integer statusEnum;
+    private ChargeItemStatus statusEnum;
 
     /** 层级 */
     private String busNo;
@@ -106,6 +107,9 @@ public class ChargeItem extends HisBaseEntity {
     /** 索赔结果 */
     private Integer claimStateEnum;
 
+    /** 打印次数 */
+    private Integer printCount;
+
     /** 关联账户ID */
     private Long accountId;
 
@@ -113,4 +117,4 @@ public class ChargeItem extends HisBaseEntity {
     private Integer orgId;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.PublicationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -35,7 +36,7 @@ public class ChargeItemDefinition extends HisBaseEntity {
     private String title;
 
     /** 状态 */
-    private Integer statusEnum;
+    private PublicationStatus statusEnum;
 
     /** 机构编码 */
     private String orgCode;
@@ -66,6 +67,4 @@ public class ChargeItemDefinition extends HisBaseEntity {
 
     /** 基础价格 */
     private BigDecimal price;
-
-
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.DeviceCategory;
+import com.openhis.common.enums.DeviceSafety;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -68,10 +70,10 @@ public class Device extends HisBaseEntity {
     private String partNumber;
 
     /** 器材种类 */
-    private Integer categoryEnum;
+    private DeviceCategory categoryEnum;
 
     /** 器材类型 */
-    private Integer typeEnum;
+    private String typeCode;
 
     /** 器材版本 */
     private String version;
@@ -89,7 +91,7 @@ public class Device extends HisBaseEntity {
     private String support;
 
     /** 器材安全 */
-    private Integer safetyEnum;
+    private DeviceSafety safetyEnum;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.DeviceCategory;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -41,10 +42,10 @@ public class DeviceDefinition extends HisBaseEntity {
     private String wbStr;
 
     /** 器材分类 */
-    private String deviceCode;
+    private DeviceCategory categoryEnum;
 
     /** 器材种类 */
-    private String deviceTypeCode;
+    private String typeCode;
 
     /** 包装单位 */
     private String unitCode;
@@ -107,4 +108,4 @@ public class DeviceDefinition extends HisBaseEntity {
     private Integer allergenFlag;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java

@@ -1,6 +1,5 @@
 package com.openhis.administration.domain;
 
-import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -8,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -16,7 +16,6 @@ import lombok.experimental.Accessors;
  * 就诊管理Entity实体
  *
  * @author system
- * @date 2025-02-20
  */
 @Data
 @TableName("adm_encounter")
@@ -38,10 +37,10 @@ public class Encounter extends HisBaseEntity {
     private String busNo;
 
     /** 状态编码 */
-    private String statusCode;
+    private EncounterStatus statusEnum;
 
     /** 类别编码 */
-    private Integer classEnum;
+    private EncounterClass classEnum;
 
     /** 类别医保编码 */
     private Integer ybClassEnum;
@@ -50,16 +49,16 @@ public class Encounter extends HisBaseEntity {
     private String classJson;
 
     /** 优先级编码 */
-    private Integer priorityEnum;
+    private ActPriority priorityEnum;
 
     /** 分类编码 */
-    private Integer typeEnum;
+    private EncounterType typeEnum;
 
     /** 服务ID */
     private Long serviceTypeId;
 
     /** 就诊对象状态 */
-    private Integer subjectStatusEnum;
+    private EncounterSubjectStatus subjectStatusEnum;
 
     /** 开始时间 */
     private Date startTime;
@@ -73,4 +72,4 @@ public class Encounter extends HisBaseEntity {
     /** 就诊序号 */
     private Integer displayOrder;
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.EncounterLocationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -35,7 +36,7 @@ public class EncounterLocation extends HisBaseEntity {
     private Long locationId;
 
     /** 状态枚举 */
-    private Integer statusEnum;
+    private EncounterLocationStatus statusEnum;
 
     /** 物理形式枚举 */
     private Integer formEnum;
@@ -47,4 +48,4 @@ public class EncounterLocation extends HisBaseEntity {
     private Date endTime;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java

@@ -0,0 +1,19 @@
+package com.openhis.administration.domain;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum IdentifierUse {
+    USUAL(1, "USUAL", "Usual item"),
+    OFFICIAL(2, "OFFICIAL", "Official item"),
+    TEMP(3, "TEMP", "Temporary item"),
+    SECONDARY(4, "SECONDARY", "Secondary item"),
+    OLD(5, "OLD", "Old item");
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.InvoiceStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -32,7 +33,7 @@ public class Invoice extends HisBaseEntity {
     private Long patientId;
 
     /** 状态 */
-    private Integer statusEnum;
+    private InvoiceStatus statusEnum;
 
     /** 类别 */
     private String typeCode;
@@ -65,4 +66,4 @@ public class Invoice extends HisBaseEntity {
     private String pictureUrl;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java

@@ -8,6 +8,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.LocationBedStatus;
+import com.openhis.common.enums.LocationForm;
+import com.openhis.common.enums.LocationMode;
+import com.openhis.common.enums.LocationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -35,13 +39,16 @@ public class Location extends HisBaseEntity {
     private String name;
 
     /** 状态编码 */
-    private Integer statusEnum;
+    private LocationStatus statusEnum;
 
     /** 操作状态 */
-    private Integer operationalEnum;
+    private LocationBedStatus operationalEnum;
 
     /** 模式编码 */
-    private Integer modeEnum;
+    private LocationMode modeEnum;
+
+    /** 模式编码 */
+    private String typeCode;
 
     /** 功能编码 */
     private String typeJson;
@@ -53,7 +60,7 @@ public class Location extends HisBaseEntity {
     private String wbStr;
 
     /** 物理形式枚举 */
-    private String formEnum;
+    private LocationForm formEnum;
 
     /** 机构编码 */
     private Long organizationId;
@@ -62,4 +69,4 @@ public class Location extends HisBaseEntity {
     private Integer displayOrder;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.OrganizationClass;
+import com.openhis.common.enums.OrganizationType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,10 +40,10 @@ public class Organization extends HisBaseEntity {
     private Integer activeFlag;
 
     /** 机构类型枚举 */
-    private Integer typeEnum;
+    private OrganizationType typeEnum;
 
     /** 机构分类枚举 */
-    private Integer classEnum;
+    private OrganizationClass classEnum;
 
     /** 拼音码 */
     private String pyStr;
@@ -59,4 +61,4 @@ public class Organization extends HisBaseEntity {
     private Integer displayOrder;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.AdministrativeGender;
+import com.openhis.common.enums.MaritalStatus;
+import com.openhis.common.enums.OccupationType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -44,7 +47,7 @@ public class Patient extends HisBaseEntity {
     private String busNo;
 
     /** 性别编码 */
-    private Integer genderEnum;
+    private AdministrativeGender genderEnum;
 
     /** 生日 */
     private Date birthDate;
@@ -53,10 +56,10 @@ public class Patient extends HisBaseEntity {
     private Date deceasedDate;
 
     /** 婚姻状态 */
-    private Integer maritalStatusEnum;
+    private MaritalStatus maritalStatusEnum;
 
     /** 职业编码 */
-    private Integer prfsEnum;
+    private OccupationType prfsEnum;
 
     /** 电话 */
     private String phone;
@@ -122,4 +125,4 @@ public class Patient extends HisBaseEntity {
     private Long organizationId;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java

@@ -35,7 +35,7 @@ public class PatientIdentifier extends HisBaseEntity {
     private String identifierNo;
 
     /** 标识状态枚举 */
-    private Integer stateEnum;
+    private IdentifierUse stateEnum;
 
     /** 有效时间Start */
     private Date startTime;
@@ -44,4 +44,4 @@ public class PatientIdentifier extends HisBaseEntity {
     private Date endTime;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.AdministrativeGender;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,7 +39,7 @@ public class Practitioner extends HisBaseEntity {
     private String nameJson;
 
     /** 性别编码 */
-    private Integer genderEnum;
+    private AdministrativeGender genderEnum;
 
     /** 生日 */
     private Date birthDate;
@@ -83,4 +84,4 @@ public class Practitioner extends HisBaseEntity {
     private Long userId;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java

@@ -58,5 +58,4 @@ public class Supplier extends HisBaseEntity {
     /** 机构编号 */
     private Long orgId;
 
-
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/ChargeItemServiceImpl.java

@@ -29,7 +29,7 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
     @Override
     public boolean saveChargeItem(ChargeItem chargeItem) {
         // 假设此处有业务相关处理
-        if (chargeItem.getCode() == null) {
+        if (chargeItem.getBusNo() == null) {
             return false;
         }
         return chargeItemMapper.insert(chargeItem) > 0;

openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java

@@ -8,6 +8,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.ConditionCategory;
+import com.openhis.common.enums.ConditionClinicalStatus;
+import com.openhis.common.enums.ConditionSeverity;
+import com.openhis.common.enums.ConditionVerificationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -29,16 +33,16 @@ public class Condition extends HisBaseEntity {
     private Long id;
 
     /** 验证状态 */
-    private Integer verificationStatusEnum;
+    private ConditionVerificationStatus verificationStatusEnum;
 
     /** 临床特征 */
-    private Integer clinicalStatusEnum;
+    private ConditionClinicalStatus clinicalStatusEnum;
 
     /** 分类 */
-    private Integer categoryEnum;
+    private ConditionCategory categoryEnum;
 
     /** 严重程度 */
-    private Integer severityEnum;
+    private ConditionSeverity severityEnum;
 
     /** 疾病或诊断编码 */
     private String busNo;
@@ -89,4 +93,4 @@ public class Condition extends HisBaseEntity {
     private String ybNo;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.ConditionDefinitionSource;
+import com.openhis.common.enums.PublicationStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -29,7 +31,7 @@ public class ConditionDefinition extends HisBaseEntity {
     private Long id;
 
     /** 所属分类 */
-    private Integer sourceEnum;
+    private ConditionDefinitionSource sourceEnum;
 
     /** 编码 */
     private String condition_code;
@@ -59,7 +61,7 @@ public class ConditionDefinition extends HisBaseEntity {
     private Integer ybMatchFlag;
 
     /** 状态 */
-    private Integer statusEnum;
+    private PublicationStatus statusEnum;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.EventStatus;
+import com.openhis.common.enums.ProcedureCategory;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -35,13 +37,13 @@ public class Procedure extends HisBaseEntity {
     private Long baseMedReqId;
 
     /** 当前状态 */
-    private Integer statusEnum;
+    private EventStatus statusEnum;
 
     /** 当前状态原因 */
     private String statusReasonText;
 
     /** 分类 */
-    private Integer categoryEnum;
+    private ProcedureCategory categoryEnum;
 
     /** 手术编码 */
     private String procedureCode;
@@ -98,4 +100,4 @@ public class Procedure extends HisBaseEntity {
     private String followUpJson;
 
 
-}
+}

openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.core.common.core.domain.HisBaseEntity;
+import com.openhis.common.enums.ClaimUse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -41,7 +42,7 @@ public class Claim extends HisBaseEntity {
     private String subtypeCode;
 
     /** 用途 */
-    private Integer useEnum;
+    private ClaimUse useEnum;
 
     /** 索赔指向 */
     private Integer insurerEnum;
@@ -62,4 +63,4 @@ public class Claim extends HisBaseEntity {
     private Date billablePeriodEnd;
 
 
-}
+}