版本更新

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

@@ -0,0 +1,69 @@
+package com.openhis.administration.domain;
+
+import java.math.BigDecimal;
+
+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;
+
+/**
+ * 就诊账户管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_account")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Account extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+
+    /** 结账状态枚举 */
+    private Integer billingStatusEnum;
+
+    // 2025.04.10 经确认此处原有的【1 CASH 个人现金账户 | 2 医保账户】改为【01医保电子凭证 | 02 居民身份证 | 03 社会保障卡 | 04 个人现金账户】
+    /** 账户类型编码 */
+    private String typeCode;
+
+    /** 编码 */
+    private String no;
+
+    /** 名称 */
+    private String name;
+
+    /** 患者id */
+    private Long patientId;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 账户余额 */
+    private BigDecimal balanceAmount;
+
+    /** 医保区域编码 */
+    private String ybAreaNo;
+
+    /** 合同编码 */
+    private String contractNo;
+
+    /** 欠费限制额度 */
+    private BigDecimal limitAccount;
+
+    /** 是否为就诊登记使用 */
+    private Integer encounterFlag;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java

@@ -0,0 +1,70 @@
+package com.openhis.administration.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 用户管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("sys_user")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class BizUser extends HisBaseEntity {
+
+    /** 用户ID */
+    // @TableId(type = IdType.ASSIGN_ID)
+    private Long userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 用户账号 */
+    private String userName;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 用户类型 */
+    private String userType;
+
+    /** 用户邮箱 */
+    private String email;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 用户性别 */
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 密码 */
+    private String password;
+
+    /** 帐号状态（0正常 1停用） */
+    private String status;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /** 最后登录IP */
+    private String loginIp;
+
+    /** 最后登录时间 */
+    private Date loginDate;
+
+    /** 备注 */
+    private String remark;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java

@@ -0,0 +1,27 @@
+package com.openhis.administration.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 用户角色Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("sys_user_role")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class BizUserRole {
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 角色ID */
+    private Long roleId;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BodyStructure.java

@@ -0,0 +1,46 @@
+package com.openhis.administration.domain;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 身体部位管理Entity实体
+ *
+ * @author liuhr
+ * @date 2025-07-22
+ */
+@Data
+@TableName("adm_body_structure")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class BodyStructure extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 部位名称 */
+    private String name;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+}

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

@@ -0,0 +1,155 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 费用项管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_charge_item")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ChargeItem extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /**
+     * 账单生成来源
+     */
+    private Integer generateSourceEnum;
+
+    /** 层级 */
+    private String busNo;
+
+    /** 处方号 */
+    private String prescriptionNo;
+
+    /** 患者ID */
+    private Long patientId;
+
+    /** 类别 */
+    private Integer contextEnum;
+
+    /** 就诊ID */
+    private Long encounterId;
+
+    /** 发生时间 */
+    private Date occurrenceTime;
+
+    /** 执行人Id */
+    private Long performerId;
+
+    /** 执行科室 */
+    private Long performingOrgId;
+
+    /** 开立科室 */
+    private Long requestingOrgId;
+
+    /** 成本科室 */
+    private Long costOrgId;
+
+    /** 数量 */
+    private Integer quantityValue;
+
+    /** 单位 */
+    private String quantityUnit;
+
+    /** 单价 */
+    private BigDecimal unitPrice;
+
+    /** 总价 */
+    private BigDecimal totalPrice;
+
+    /** 费用定价ID */
+    private Long definitionId;
+
+    /** 定价子表主键 */
+    private Long defDetailId;
+
+    /** 原价 */
+    private BigDecimal baseAmount;
+
+    /** 折后价格 */
+    private BigDecimal discountAmount;
+
+    /** 附加价格 */
+    private BigDecimal surchargeAmount;
+
+    /** 改价原因 */
+    private String overrideReasonCode;
+
+    /** 改价原因文本 */
+    private String overrideReasonText;
+
+    /** 开立人ID */
+    private Long entererId;
+
+    /** 开立时间 */
+    private Date enteredDate;
+
+    /** 医疗服务所在表 */
+    private String serviceTable;
+
+    /** 医疗服务ID */
+    private Long serviceId;
+
+    /** 产品所在表 */
+    private String productTable;
+
+    /** 产品ID */
+    private Long productId;
+
+    /** 索赔结果 */
+    private Integer claimStateEnum;
+
+    /** 打印次数 */
+    private Integer printCount;
+
+    /** 关联账户ID */
+    private Long accountId;
+
+    /** 机构 */
+    private Long orgId;
+
+    /** 退费ID */
+    private Long refundId;
+
+    /**
+     * 子项json
+     */
+    private String childrenJson;
+
+    /**
+     * 诊断id
+     */
+    private Long conditionId;
+
+    /**
+     * 就诊诊断id
+     */
+    private Long encounterDiagnosisId;
+
+    /**
+     * 中医标识
+     */
+    private Integer tcmFlag;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefDetail.java

@@ -0,0 +1,53 @@
+package com.openhis.administration.domain;
+
+import java.math.BigDecimal;
+
+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.ActPriority;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 费用定价管理子Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_charge_item_def_detail")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ChargeItemDefDetail extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 费用定价主键ID */
+    private Long definitionId;
+
+    /** 条件规则 */
+    private Long conditionRuleId;
+
+    /** 条件 */
+    private String conditionCode;
+
+    /** 命中值 */
+    private String conditionValue;
+
+    /** 优先级 */
+    private Integer priority;
+
+    /** 价格 */
+    private BigDecimal amount;
+
+    public ChargeItemDefDetail() {
+        // 默认优先级：常规
+        this.priority = ActPriority.ROUTINE.getValue();
+    }
+}

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

@@ -0,0 +1,70 @@
+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.PublicationStatus;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 费用定价管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_charge_item_definition")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ChargeItemDefinition extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 名称 */
+    private String chargeName;
+
+    /** 标题 */
+    private String title;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /** 机构ID */
+    private Long orgId;
+
+    /** 描述 */
+    private String description;
+
+    /** 代码 */
+    private String instanceTable;
+
+    /** 关联项目 */
+    private Long instanceId;
+
+    /** 有效时间开始 */
+    private Date effectiveStart;
+
+    /** 有效时间结束 */
+    private Date effectiveEnd;
+
+    /** 财务类别 */
+    private String typeCode;
+
+    /** 医保类别 */
+    private String ybType;
+
+    /** 是否使用详细价格规则 */
+    private Integer conditionFlag;
+
+    /** 基础价格 */
+    private BigDecimal price;
+}

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

@@ -0,0 +1,97 @@
+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.DeviceCategory;
+import com.openhis.common.enums.DeviceSafety;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 器材基本信息管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_device")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Device extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 器材编码 */
+    private String busNo;
+
+    /** 器材定义编号 */
+    private Long deviceDefId;
+
+    /** 器材状态 */
+    private Integer statusEnum;
+
+    /** 器材可用状态 */
+    private Integer availabilityEnum;
+
+    /** 厂家 */
+    private String manufacturer;
+
+    /** 生产日期 */
+    private Date manufactureDate;
+
+    /** 到期日期 */
+    private Date expirationDate;
+
+    /** 批号 */
+    private String lotNumber;
+
+    /** 厂家序列号 */
+    private String serialNumber;
+
+    /** 器材名称 */
+    private String name;
+
+    /** 器材别名 */
+    private String alias;
+
+    /** 制造商编号 */
+    private String modelNumber;
+
+    /** 零件编号 */
+    private String partNumber;
+
+    /** 器材种类 */
+    private DeviceCategory categoryEnum;
+
+    /** 器材类型 */
+    private String typeCode;
+
+    /** 器材版本 */
+    private String version;
+
+    /** 器材规格 */
+    private String deviceSpecifications;
+
+    /** 归属科室 */
+    private Long orgId;
+
+    /** 所在位置 */
+    private Long locationId;
+
+    /** 负责人/科室 */
+    private String support;
+
+    /** 器材安全 */
+    private DeviceSafety safetyEnum;
+
+
+}

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

@@ -0,0 +1,131 @@
+package com.openhis.administration.domain;
+
+import java.math.BigDecimal;
+
+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.DeviceCategory;
+import com.openhis.common.enums.PublicationStatus;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 器材定义管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_device_definition")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DeviceDefinition extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 器材名称 */
+    private String name;
+
+    /** 器材名称拼音 */
+    private String pyStr;
+
+    /** 器材五笔拼音 */
+    private String wbStr;
+
+    /** 器材分类 */
+    private String categoryCode;
+
+    /** 器材种类 */
+    private String typeCode;
+
+    /** 包装单位 */
+    private String unitCode;
+
+    /** 包装规格 */
+    private String size;
+
+    /** 最小库存警戒数量(常规单位) */
+    private BigDecimal itemMinQuantity;
+
+    /** 最大库存警戒数量(常规单位) */
+    private BigDecimal itemMaxQuantity;
+
+    /** 拆零比 */
+    private BigDecimal partPercent;
+
+    /** 最小使用单位 */
+    private String minUnitCode;
+
+    /** 所属科室 */
+    private Long orgId;
+
+    /** 所在位置 */
+    private Long locationId;
+
+    /** 产品型号 */
+    private String modelNumber;
+
+    /** 高值器材标志 */
+    private Integer hvcmFlag;
+
+    /** 销售单位 */
+    private String salesUnitCode;
+
+    /** 批准文号 */
+    private String approvalNumber;
+
+    /** 医保标记 */
+    private Integer ybFlag;
+
+    /** 医保编码 */
+    private String ybNo;
+
+    /** 医药机构目录编码 */
+    private String ybOrgNo;
+
+    /** 医保对码标记 */
+    private Integer ybMatchFlag;
+
+    /** 医保等级 */
+    private Integer chrgitmLv;
+
+    /** 状态 */
+    private Integer statusEnum;
+
+    /** 生产厂家 */
+    private Long manufacturerId;
+
+    /** 生产厂家 */
+    private String manufacturerText;
+
+    /** 供应商 */
+    private Long supplyId;
+
+    /** 说明 */
+    private String description;
+
+    /** 适用范围 */
+    private String jurisdiction;
+
+    /** 器材版本 */
+    private String version;
+
+    /** 主要成分 */
+    private String substanceText;
+
+    /** 过敏标记 */
+    private Integer allergenFlag;
+
+    /** 处方标志 */
+    private Integer rxFlag;
+
+}

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

@@ -0,0 +1,148 @@
+package com.openhis.administration.domain;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 就诊管理Entity实体
+ *
+ * @author system
+ */
+@Data
+@TableName("adm_encounter")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Encounter extends HisBaseEntity {
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 患者ID
+     */
+    private Long patientId;
+
+    /**
+     * 群组ID
+     */
+    private Long groupId;
+
+    /**
+     * 就诊编码
+     */
+    private String busNo;
+
+    /**
+     * 状态编码
+     */
+    private Integer statusEnum;
+
+    /**
+     * 类别编码
+     */
+    private Integer classEnum;
+
+    /**
+     * 类别医保编码
+     */
+    private Integer ybClassEnum;
+
+    /**
+     * 类别医保文本
+     */
+    private String ybClassText;
+
+    /**
+     * 类别编码补充
+     */
+    private String classJson;
+
+    /**
+     * 优先级编码
+     */
+    private Integer priorityEnum;
+
+    /**
+     * 分类编码
+     */
+    private Integer typeEnum;
+
+    /**
+     * 服务ID
+     */
+    private Long serviceTypeId;
+
+    /**
+     * 就诊对象状态
+     */
+    private Integer subjectStatusEnum;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 接诊时间
+     */
+    private Date receptionTime;
+
+    /**
+     * 机构id
+     */
+    private Long organizationId;
+
+    /**
+     * 就诊序号
+     */
+    private Integer displayOrder;
+
+    /**
+     * 初复诊
+     */
+    private Integer firstEnum;
+
+    /**
+     * 入院类型
+     */
+    private String admitSourceCode;
+
+    /**
+     * 入院方式
+     */
+    private String inWayCode;
+
+    /**
+     * 出院方式
+     */
+    private String outWayCode;
+
+    /**
+     * 门诊就诊id
+     */
+    private Long ambEncounterId;
+
+    /**
+     * 登记员id
+     */
+    private Long registrarId;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java

@@ -0,0 +1,70 @@
+package com.openhis.administration.domain;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 就诊诊断管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_encounter_diagnosis")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class EncounterDiagnosis extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 诊断_id */
+    private Long conditionId;
+
+    /** 住院患者疾病诊 */
+    private Integer iptDiseCrsp;
+
+    /** 住院患者疾病诊断类型代码 */
+    private Integer iptDiseTypeCode;
+
+    /** 入院疾病病情代码 */
+    private Integer admDiseCondCode;
+
+    /** 医疗类型 */
+    private String medTypeCode;// 2025/05/23 该字段改为med_type 与医保同步
+
+    /** 主诊断标记 */
+    private Integer maindiseFlag;
+
+    /** 最高诊断依据标记 */
+    private Integer highDiseEvidFlag;
+
+    /** 诊断排序（医保文档要求数值型字符长度为2） */
+    private Integer diagSrtNo;
+
+    /**
+     * 中医证候组号
+     */
+    private String syndromeGroupNo;
+
+    /**
+     * 中医标识
+     */
+    private Integer tcmFlag;
+
+    /**
+     * 诊断描述
+     */
+    private String diagnosisDesc;
+
+}

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

@@ -0,0 +1,48 @@
+package com.openhis.administration.domain;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 就诊位置管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_encounter_location")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class EncounterLocation extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 位置ID */
+    private Long locationId;
+
+    /** 状态枚举 */
+    private Integer statusEnum;
+
+    /** 物理形式枚举 */
+    private Integer formEnum;
+
+    /** 开始时间 */
+    private Date startTime;
+
+    /** 结束时间 */
+    private Date endTime;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java

@@ -0,0 +1,48 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 就诊参与者管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_encounter_participant")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class EncounterParticipant extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 参与者类型 */
+    private String typeCode;
+
+    /** 开始时间 */
+    private Date startTime;
+
+    /** 结束时间 */
+    private Date endTime;
+
+    /** 参与者ID */
+    private Long practitionerId;
+
+    /** 状态 */
+    private Long statusEnum;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java

@@ -0,0 +1,47 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 就诊原因管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_encounter_reason")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class EncounterReason extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 就诊id */
+    private Long encounterId;
+
+    /** 原因编码 */
+    private String useCode;
+
+    /** 具体原因类型 */
+    private String valueTable;
+
+    /** 原因ID */
+    private Long valueId;
+
+    /** 原因描述 */
+    private String note;
+
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Frequency.java

@@ -0,0 +1,109 @@
+package com.openhis.administration.domain
+        ;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.core.common.core.domain.HisBaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 频次配置表，用于频次、周期和相关信息
+ * @TableName adm_frequency
+ */
+@Data
+@TableName(value ="adm_frequency")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Frequency extends HisBaseEntity {
+    /**
+     * 唯一标识符
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /**
+     * 频次代码，唯一标识与字典表对应
+     */
+    private String rateCode;
+
+    /**
+     * 频次名称
+     */
+    private String name;
+
+    /**
+     * 每天执行的次数
+     */
+    private Integer dayCount;
+
+    /**
+     * 每次执行之间的间隔（天数）
+     */
+    private Integer dayInterval;
+
+    /**
+     * 每天的具体执行时间点，逗号分隔
+     */
+    private String dayTimes;
+
+    /**
+     * 是否周期性每周执行，0 为否，1 为是
+     */
+    private Integer weekCycleFlag;
+
+    /**
+     * 每周执行的间隔，单位为周
+     */
+    private Integer weekInterval;
+
+    /**
+     * 每周执行的次数
+     */
+    private Integer weekTimes;
+
+    /**
+     * 是否为连续执行，0 为否，1 为是
+     */
+    private Integer continueFlag;
+
+    /**
+     * 执行总次数，记录任务累计执行次数
+     */
+    private Integer totalExecutionCount;
+
+    /**
+     * 任务执行周期长度
+     */
+    private Integer executionPeriod;
+
+    /**
+     * 任务执行周期的单位，如 day、week、month
+     */
+    private String executionPeriodUnit;
+
+    /**
+     * 第三方代码，外部系统使用
+     */
+    private String thirdCode;
+
+    /**
+     * 备注信息
+     */
+    private String memo;
+
+    /**
+     * 并发戳，用于版本控制和并发冲突检测
+     */
+    private Integer concurrencyStamp;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java

@@ -0,0 +1,66 @@
+package com.openhis.administration.domain;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 服务项目管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_healthcare_service")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class HealthcareService extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 活动标记 */
+    private Integer activeFlag;
+
+    /** 提供部门ID */
+    private Long offeredOrgId;
+
+    /** 服务分类 */
+    private String categoryCode;
+
+    /** 服务类型 */
+    private String typeCode;
+
+    /** 服务专业 */
+    private String specialtyCode;
+
+    /** 地点 */
+    private Long locationId;
+
+    /** 服务名称 */
+    private String name;
+
+    /** 说明 */
+    private String comment;
+
+    /** 额外细节 */
+    private String extraDetails;
+
+    /** 联系方式 */
+    private String contact;
+
+    /** 预约要求 */
+    private Integer appointmentRequiredFlag;
+
+    /** 医保编码 */
+    private String ybNo;
+
+}

openhis-server-new/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-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java

@@ -0,0 +1,82 @@
+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.InvoiceStatus;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 发票管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_invoice")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Invoice extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 患者ID */
+    private Long patientId;
+
+    /** 付款ID */
+    private Long reconciliationId;
+
+    /** 状态 */
+    private InvoiceStatus statusEnum;
+
+    /** 类别 */
+    private String typeCode;
+
+    /** 取消原因 */
+    private String cancelledReason;
+
+    /** 收费项 */
+    private String chargeItemIds;
+
+    /** 发票净额总记 */
+    private BigDecimal totalNet;
+
+    /** 发票总计金额 */
+    private BigDecimal totalGross;
+
+    /** 付款详情 */
+    private String paymentTerms;
+
+    /** 发票编号 */
+    private String busNo;
+
+    /** 开票员 */
+    private Long invoicingStaffId;
+    /** 电子票据代码 */
+    private String billBatchCode;
+    /** 电子票据号码 */
+    private String billNo;
+    /** 电子校验码 */
+    private String random;
+    /** 电子票据生成时间 */
+    private String billCreateTime;
+    /** 电子票据二维码图片数据 */
+    private String billQrCode;
+    /** 电子票据H5页面URL */
+    private String pictureUrl;
+    /** 电子票据外网H5页面URL */
+    private String pictureNetUrl;
+    /** 微信插卡URL */
+    private String wxCardUrl;
+    /** 票据营业日期 */
+    private Date billBusDate;
+}

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

@@ -0,0 +1,72 @@
+package com.openhis.administration.domain;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.enums.LocationMode;
+import com.openhis.common.enums.LocationOperational;
+import com.openhis.common.enums.LocationStatus;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 位置管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_location")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Location extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 名称 */
+    private String name;
+
+    /** 状态编码 */
+    private Integer statusEnum;
+
+    /** 操作状态 */
+    private Integer operationalEnum;
+
+    /** 模式编码 */
+    // private LocationMode modeEnum;
+    private Integer modeEnum;
+
+    /** 功能编码 */
+    private String typeJson;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 物理形式枚举 */
+    private Integer formEnum;
+
+    /** 机构编码 */
+    private Long organizationId;
+
+    /** 显示顺序 */
+    private Integer displayOrder;
+
+    public Location() {
+        this.statusEnum = LocationStatus.ACTIVE.getValue();
+        this.modeEnum = LocationMode.INSTANCE.getValue();
+    }
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrgContrast.java

@@ -0,0 +1,38 @@
+package com.openhis.administration.domain;
+
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【对照表】Entity实体
+ *
+ * @author system
+ * @date 2025-04-25
+ */
+@Data
+@TableName("org_contrast")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class OrgContrast extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 字典编码 */
+    private Long dictCode;
+
+    /** 项目代码 */
+    private String code;
+
+    /** 类型 */
+    private Integer typeEnum;
+
+}

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

@@ -0,0 +1,80 @@
+package com.openhis.administration.domain;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.enums.OrganizationClass;
+import com.openhis.common.enums.OrganizationType;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 机构管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_organization")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Organization extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 编码 */
+    private String busNo;
+
+    /** 名称 */
+    private String name;
+
+    /** 活动标识 */
+    private Integer activeFlag;
+
+    /** 机构类型枚举 */
+    private Integer typeEnum;
+
+    /** 机构分类枚举 */
+    private Integer classEnum;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 医保码 */
+    private String ybNo;
+
+    /** 医保名称 */
+    private String ybName;
+
+    /** 科别 */
+    private String caty;
+
+    /** 显示顺序 */
+    private Integer displayOrder;
+
+    /** 医疗服务机构标识 */
+    private String medinsId;
+
+    /** 医疗机构行政区划编码 */
+    private String medinsAdmdvs;
+
+    /** 医疗服务机构类型 */
+    private String medinsType;
+
+    /** 医疗机构等级 */
+    private String medinsLv;
+
+    /** 默认挂号医生 */
+    private Long defDoctorId;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/OrganizationLocation.java

@@ -0,0 +1,63 @@
+package com.openhis.administration.domain;
+
+import java.sql.Time;
+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.annotation.Dict;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 机构位置关系管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-22
+ */
+@Data
+@TableName("adm_organization_location")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class OrganizationLocation extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 机构编码 */
+    @Dict(dictTable = "adm_organization", dictCode = "id", dictText = "name")
+    private Long organizationId;
+
+    /** 默认发药药房 */
+    @Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
+    private Long defLocationId;
+
+    /** 发放类别 */
+    @Dict(dictCode = "distribution_category_code")
+    private String distributionCategoryCode;
+
+    /**
+     * 诊疗定义id
+     */
+    private Long activityDefinitionId;
+
+    /**
+     * 诊疗类型
+     */
+    private String activityCategoryCode;
+
+    /** 开始时间 */
+    private Time startTime;
+
+    /** 结束时间 */
+    private Time endTime;
+
+    /** 显示顺序 */
+    private Integer displayOrder;
+
+}

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

@@ -0,0 +1,140 @@
+package com.openhis.administration.domain;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.enums.ActPriority;
+import com.openhis.common.enums.PublicationStatus;
+import com.openhis.common.enums.SupplyCategory;
+import com.openhis.common.enums.SupplyStatus;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 患者管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_patient")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Patient extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 活动标记 */
+    private Integer activeFlag;
+
+    /** 临时标识 */
+    private Integer tempFlag;
+
+    /** 患者姓名 */
+    private String name;
+
+    /** 患者其他名称 */
+    private String nameJson;
+
+    /** 患者院内编码/病历号 */
+    private String busNo;
+
+    /** 性别编码 */
+    private Integer genderEnum;
+
+    /** 生日 */
+    private Date birthDate;
+
+    /** 死亡时间 */
+    private Date deceasedDate;
+
+    /**
+     * 死亡原因
+     */
+    private String deceasedReason;
+
+    /** 婚姻状态 */
+    private Integer maritalStatusEnum;
+
+    /** 职业编码 */
+    private Integer prfsEnum;
+
+    /** 电话 */
+    private String phone;
+
+    /** 地址 */
+    private String address;
+
+    /** 地址省 */
+    private String addressProvince;
+
+    /** 地址市 */
+    private String addressCity;
+
+    /** 地址区 */
+    private String addressDistrict;
+
+    /** 地址街道 */
+    private String addressStreet;
+
+    /** 患者其他地址 */
+    private String addressJson;
+
+    /** 民族 */
+    private String nationalityCode;
+
+    /** 身份证号 */
+    private String idCard;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 血型ABO */
+    private Integer bloodAbo;
+
+    /** 血型RH */
+    private Integer bloodRh;
+
+    /** 工作单位 */
+    private String workCompany;
+
+    /** 籍贯 */
+    private String nativePlace;
+
+    /** 国家编码 */
+    private String countryCode;
+
+    /** 联系人 */
+    private String linkName;
+
+    /** 联系人关系 */
+    private Integer linkRelationCode;
+
+    /** 联系人电话 */
+    private String linkTelcom;
+
+    /** 其他联系人 */
+    private String linkJsons;
+
+    /** 机构Id */
+    private Long organizationId;
+
+    public Patient() {
+        // 活动标识：启用
+        this.activeFlag = PublicationStatus.ACTIVE.getValue();
+    }
+
+}

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

@@ -0,0 +1,48 @@
+package com.openhis.administration.domain;
+
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 患者标识管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_patient_identifier")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class PatientIdentifier extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 患者ID */
+    private Long patientId;
+
+    /** 标识类型编码 */
+    private String typeCode;
+
+    /** 标识号 */
+    private String identifierNo;
+
+    /** 标识状态枚举 */
+    private Integer stateEnum;
+
+    /** 有效时间Start */
+    private Date startTime;
+
+    /** 有效时间end */
+    private Date endTime;
+
+}

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

@@ -0,0 +1,103 @@
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.openhis.common.enums.AdministrativeGender;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 医疗参与者管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_practitioner")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Practitioner extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 活动标记 */
+    private Integer activeFlag;
+
+    /** 姓名 */
+    private String name;
+
+    /** 其他名称 */
+    private String nameJson;
+
+    /** 性别编码 */
+    private Integer genderEnum;
+
+    /** 生日 */
+    private Date birthDate;
+
+    /** 死亡时间 */
+    private Date deceasedDate;
+
+    /** 电话 */
+    private String phone;
+
+    /** 地址 */
+    private String address;
+
+    /** 地址省 */
+    private String addressProvince;
+
+    /** 地址市 */
+    private String addressCity;
+
+    /** 地址区 */
+    private String addressDistrict;
+
+    /** 地址街道 */
+    private String addressStreet;
+
+    /** 患者其他地址 */
+    private String addressJson;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 患者院内编码/病历号 */
+    private String busNo;
+
+    /** 医保码 */
+    private String ybNo;
+
+    /** 机构id */
+    private Long orgId;
+
+    /** 系统用户id */
+    private Long userId;
+
+    /** 医生职称 */
+    private String drProfttlCode ;
+
+    /** 证件类型 */
+    private String prscDrCertCode;
+
+    /** 职业证件编号 */
+    private String pharPracCertNo;
+
+    /** 开票点编码 */
+    private String kpdCode;
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PractitionerRole.java

@@ -0,0 +1,61 @@
+package com.openhis.administration.domain;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 岗位管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_practitioner_role")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class PractitionerRole extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 名称 */
+    private String name;
+
+    /** 角色编码 */
+    private String roleCode;
+
+    /** 活动标识 */
+    private Integer activeFlag;
+
+    /** 参与者Id */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long practitionerId;
+
+    /** 机构 */
+    private Long orgId;
+
+    /** 位置ID */
+    private Long locationId;
+
+    /** 服务id */
+    private Long healthcareServiceId;
+
+    /** 专业编码枚举 */
+    private Integer specialtyEnum;
+
+    /** 岗位类型 */
+    private String typeCode;
+
+    /** 有效时间 */
+    private String availabilityJson;
+
+}

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

@@ -0,0 +1,64 @@
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 供应商管理Entity实体
+ *
+ * @author system
+ * @date 2025-02-20
+ */
+@Data
+@TableName("adm_supplier")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class Supplier extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    /** 编号 */
+    private String busNo;
+
+    /** 名称 */
+    private String name;
+
+    /** 类型 */
+    private Integer typeEnum;
+
+    /** 地址 */
+    private String address;
+
+    /** 拼音码 */
+    private String pyStr;
+
+    /** 五笔码 */
+    private String wbStr;
+
+    /** 联系人电话 */
+    private String phone;
+
+    /** 联系人邮箱 */
+    private String email;
+
+    /** 活动标识 */
+    private Integer activeFlag;
+
+    /** 机构编号 */
+    private Long orgId;
+
+}

openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/TraceNoManage.java

@@ -0,0 +1,61 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 【追溯码管理】Entity实体
+ *
+ * @author system
+ * @date 2025-07-07
+ */
+@Data
+@TableName("adm_trace_no_manage")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class TraceNoManage extends HisBaseEntity {
+
+    /** ID */
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    /** 项目所属表 */
+    private String itemTable;
+
+    /** 项目id */
+    private Long itemId;
+
+    /** 仓库类型 */
+    private Integer locationTypeEnum;
+
+    /** 仓库 */
+    private Long locationId;
+
+    /** 仓位 */
+    private Long locationStoreId;
+
+    /** 产品批号 */
+    private String lotNumber;
+
+    /** 追溯码 */
+    private String traceNo;
+
+    /** 追溯码状态 */
+    private Integer statusEnum;
+
+    /** 追溯码单位 */
+    private String unitCode;
+
+    /** 操作类型 */
+    private Integer operationType;
+
+}