wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ChangePriceRecord.java Normal file
View File

@@ -0,0 +1,96 @@
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-10-31
*/
@Data
@TableName("adm_change_price_record")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ChangePriceRecord extends HisBaseEntity {
/** 本表id */
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 仓库位置 */
private Long locationId;
/** 改价申请人id */
private Long applicantId;
/** 目标枚举 药品、耗材、诊疗、挂号 */
private Integer itemCategoryEnum;
/** 药品ID、耗材ID、诊疗ID、挂号ID */
private Long itemId;
/** 原进货价 */
private BigDecimal originBuyingPrice;
/** 原新价格 */
private BigDecimal originRetailPrice;
/** 审批人ID */
private Long approverId;
/** 审批时间 */
private Date approvalTime;
/** 删除标识 默认 0 未删除 */
private String deleteFlag;
/** 当前品库存量 */
private BigDecimal itemQuantity;
/** 零售价盈负差*/
private BigDecimal differenceRetailPrice;
/**进货价盈负差*/
private BigDecimal differenceBuyingPrice;
/** 当前业务批次号 */
private String busNo;
/** 改价原因 */
private String description;
/** 改价申请时间 */
private Date applicantTime;
/** 业务表名药品、耗材、诊疗、挂号 */
private String itemTable;
/** 新进货价 */
private BigDecimal newBuyingPrice;
/** 新零售价 */
private BigDecimal newRetailPrice;
/** 物品计量单位 */
private String unitCode;
/** 审批状态 */
private Integer statusEnum;
/** 批次号 */
private String lotNumber;
/** 条件理由 */
private String reason;
}

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

@@ -154,4 +154,10 @@ public class ChargeItem extends HisBaseEntity {
/** 执行id */
private Long procedureId;
/** 发放所在表 */
private String dispenseTable;
/** 发放ID */
private Long dispenseId;
}

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

@@ -1,6 +1,7 @@
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;

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

@@ -6,6 +6,7 @@ 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;
@@ -27,6 +28,11 @@ public class HealthcareService extends HisBaseEntity {
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 编码
*/
private String busNo;
/** 活动标记 */
private Integer activeFlag;

90
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/PatientStudent.java Normal file
View File

@@ -0,0 +1,90 @@
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_student")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class PatientStudent extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 姓名 */
private String name;
/** 拼音码 */
private String pyStr;
/** 五笔码 */
private String wbStr;
/** 性别 */
private Integer gender;
/** 年龄 */
private Integer age;
/** 学号 */
private String studentId;
/** 身份证号 */
private String idNumber;
/** 电话 */
private String phone;
/** 学院 */
private String college;
/** 专业 */
private String major;
/** 学历层次（0预科生1本科生2硕士研究生3博士研究生） */
private Integer educationLevel;
/** 入校时间 */
private Date enrollmentDate;
/** 离校时间 */
private Date graduationDate;
/** 年级 */
private String grade;
/** 学习形式（1全日制2非全日制） */
private Integer studyMode;
/** 在校状态（0在校1休学2离校） */
private Integer studentStatus;
/** 体检结果（0未体检1体检不合格2体检合格） */
private Integer physicalExamResult;
/** 辅导员 */
private String counselor;
/** 辅导员电话 */
private String counselorPhone;
/** 患者ID */
private Long patientId;
}

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

@@ -1,16 +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.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;
@@ -90,7 +88,7 @@ public class Practitioner extends HisBaseEntity {
private Long userId;
/** 医生职称 */
private String drProfttlCode ;
private String drProfttlCode;
/** 证件类型 */
private String prscDrCertCode;
@@ -103,4 +101,7 @@ public class Practitioner extends HisBaseEntity {
/** 签名图片 */
private String signature;
/** pos机编号 */
private String posNo;
}