Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -0,0 +1,127 @@
|
||||
package com.openhis.check.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.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 检查申请主表
|
||||
* <p>
|
||||
* 继承 {@link HisBaseEntity} 获得：
|
||||
* <ul>
|
||||
* <li>createBy / createTime（INSERT 自动填充）</li>
|
||||
* <li>updateBy / updateTime（UPDATE 自动填充）</li>
|
||||
* <li>tenantId（INSERT 自动填充）</li>
|
||||
* <li>deleteFlag + {@code @TableLogic} 逻辑删除（0=未删，1=已删）</li>
|
||||
* </ul>
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName(value = "exam_apply", autoResultMap = true)
|
||||
public class ExamApply extends HisBaseEntity {
|
||||
|
||||
/** 数据库自增ID，用于与门诊医嘱表(wor_service_request.based_on_id)关联 */
|
||||
private Long id;
|
||||
|
||||
/** 申请单号 (EXYYYYMMDD####)，业务主键 */
|
||||
@TableId(type = IdType.INPUT)
|
||||
private String applyNo;
|
||||
|
||||
/** 患者主索引 EMPI */
|
||||
private String patientId;
|
||||
|
||||
/** 门诊就诊流水号 */
|
||||
private String visitNo;
|
||||
|
||||
/** 申请科室代码 */
|
||||
private String applyDeptCode;
|
||||
|
||||
/** 执行科室代码 */
|
||||
private String performDeptCode;
|
||||
|
||||
/** 申请医生工号 */
|
||||
private String applyDocCode;
|
||||
|
||||
/** 申请时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime applyTime;
|
||||
|
||||
/** 就诊卡号 */
|
||||
private String medicalrecordNumber;
|
||||
|
||||
/** 费用性质（自费医疗/医保报销） */
|
||||
private String natureofCost;
|
||||
|
||||
/** 诊断描述 */
|
||||
private String clinicDesc;
|
||||
|
||||
/** 禁忌症 */
|
||||
private String contraindication;
|
||||
|
||||
/** 病史摘要 */
|
||||
private String medicalHistorySummary;
|
||||
|
||||
/** 体格检查 */
|
||||
private String purposeofInspection;
|
||||
|
||||
/** 申检部位 */
|
||||
private String inspectionArea;
|
||||
|
||||
/** 检查方法 */
|
||||
private String inspectionMethod;
|
||||
|
||||
/** 备注 */
|
||||
private String applyRemark;
|
||||
|
||||
/** 检查大类代码（如 CT / ECG / GI） */
|
||||
private String examTypeCode;
|
||||
|
||||
/** 临床诊断 */
|
||||
private String clinicalDiag;
|
||||
|
||||
/** 检查目的 */
|
||||
private String purposeDesc;
|
||||
|
||||
/** 加急标志 0=普通 1=加急 */
|
||||
private Integer isUrgent;
|
||||
|
||||
/** 妊娠状态 0=未知 1=未孕 2=可能孕 3=孕妇 */
|
||||
private Integer pregnancyState;
|
||||
|
||||
/** 过敏史 */
|
||||
private String allergyDesc;
|
||||
|
||||
/**
|
||||
* 申请单状态
|
||||
* 0=已开单 1=已收费 2=已预约 3=已签到 4=部分报告 5=已完告 6=作废
|
||||
*/
|
||||
private Integer applyStatus;
|
||||
|
||||
/** 是否已收费 0=否 1=是 */
|
||||
private Integer isCharged;
|
||||
|
||||
/** 是否已退费 0=否 1=是 */
|
||||
private Integer isRefunded;
|
||||
|
||||
/** 是否已执行 0=否 1=是 */
|
||||
private Integer isExecuted;
|
||||
|
||||
/** 操作员工号（向后兼容保留） */
|
||||
private String operatorId;
|
||||
|
||||
/**
|
||||
* 总金额（非数据库字段，由明细项目计算得出）
|
||||
*/
|
||||
@TableField(exist = false)
|
||||
private BigDecimal totalAmount;
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.openhis.check.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 检查申请明细表
|
||||
*/
|
||||
@Data
|
||||
@Accessors(chain = true)
|
||||
@TableName(value = "exam_apply_item", autoResultMap = true)
|
||||
public class ExamApplyItem implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 明细ID */
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long itemId;
|
||||
|
||||
/** 申请单号 */
|
||||
private String applyNo;
|
||||
|
||||
/** 项目序号 */
|
||||
private Integer itemSeq;
|
||||
|
||||
/** 项目代码 (院内收费项目) */
|
||||
private String itemCode;
|
||||
|
||||
/** 项目名称 */
|
||||
private String itemName;
|
||||
|
||||
/** 国家项目代码 */
|
||||
private String nationalItemCode;
|
||||
|
||||
/** 检查部位代码 */
|
||||
private String bodyPartCode;
|
||||
|
||||
/** 检查方法代码 */
|
||||
private String examMethodCode;
|
||||
|
||||
/** 对比剂药品 */
|
||||
private String contrastDrug;
|
||||
|
||||
/** 对比剂剂量 */
|
||||
private String contrastDose;
|
||||
|
||||
/** 执行科室代码 */
|
||||
private String performDeptCode;
|
||||
|
||||
/** 预约号 */
|
||||
private String appointmentNo;
|
||||
|
||||
/** 项目单价 */
|
||||
private BigDecimal itemFee;
|
||||
|
||||
/** 行状态 0 已开单 1 已收费 ... */
|
||||
private Integer itemStatus;
|
||||
|
||||
/** 检查备注 */
|
||||
private String remark;
|
||||
|
||||
/** 关联的门诊医嘱ID (wor_service_request.id) */
|
||||
private Long serviceRequestId;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.openhis.check.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.openhis.check.domain.ExamApplyItem;
|
||||
|
||||
/**
|
||||
* 检查申请明细表 Mapper 接口
|
||||
*/
|
||||
public interface ExamApplyItemMapper extends BaseMapper<ExamApplyItem> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.openhis.check.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.openhis.check.domain.ExamApply;
|
||||
|
||||
/**
|
||||
* 检查申请主表 Mapper 接口
|
||||
*/
|
||||
public interface ExamApplyMapper extends BaseMapper<ExamApply> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.openhis.check.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.openhis.check.domain.ExamApplyItem;
|
||||
|
||||
/**
|
||||
* 检查申请明细表 服务层接口
|
||||
*/
|
||||
public interface IExamApplyItemService extends IService<ExamApplyItem> {
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.openhis.check.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.openhis.check.domain.ExamApply;
|
||||
|
||||
/**
|
||||
* 检查申请主表 服务层接口
|
||||
*/
|
||||
public interface IExamApplyService extends IService<ExamApply> {
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.openhis.check.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.openhis.check.domain.ExamApplyItem;
|
||||
import com.openhis.check.mapper.ExamApplyItemMapper;
|
||||
import com.openhis.check.service.IExamApplyItemService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* 检查申请明细表 服务层实现类
|
||||
*/
|
||||
@Service
|
||||
public class ExamApplyItemServiceImpl extends ServiceImpl<ExamApplyItemMapper, ExamApplyItem>
|
||||
implements IExamApplyItemService {
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.openhis.check.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.openhis.check.domain.ExamApply;
|
||||
import com.openhis.check.mapper.ExamApplyMapper;
|
||||
import com.openhis.check.service.IExamApplyService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* 检查申请主表 服务层实现类
|
||||
*/
|
||||
@Service
|
||||
public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply> implements IExamApplyService {
|
||||
}
|
||||
@@ -45,6 +45,9 @@ public class ConditionDefinition extends HisBaseEntity {
|
||||
/** 类型 */
|
||||
private String typeCode;
|
||||
|
||||
/** 报表类型 */
|
||||
private String reportTypeCode;
|
||||
|
||||
/** 描述 */
|
||||
private String description;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user