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

Revert "```"

Browse Source 
This reverts commit abc0674531.
This commit is contained in:
chenqi
2025-12-26 22:21:21 +08:00
parent ae6c486114
commit 3115e38cc4
920 changed files with 14452 additions and 107025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,10 @@ 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.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;
@@ -64,7 +66,4 @@ public class Account extends HisBaseEntity {
/** 是否为就诊登记使用 */
private Integer encounterFlag;
/** 险种类型 */
private String insutype;
}

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

@@ -6,8 +6,9 @@ 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.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -66,9 +67,4 @@ public class ChargeItemDefinition extends HisBaseEntity {
/** 基础价格 */
private BigDecimal price;
/**
* 物价编码
*/
private String priceCode;
}

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

@@ -1,11 +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.DeviceCategory;
import com.openhis.common.enums.DeviceSafety;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -67,7 +70,7 @@ public class Device extends HisBaseEntity {
private String partNumber;
/** 器材种类 */
private Integer categoryEnum;
private DeviceCategory categoryEnum;
/** 器材类型 */
private String typeCode;
@@ -90,4 +93,5 @@ public class Device extends HisBaseEntity {
/** 器材安全 */
private DeviceSafety safetyEnum;
}

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

@@ -6,8 +6,8 @@ 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.DeviceCategory;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -27,7 +27,6 @@ public class DeviceDefinition extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 编码 */

113
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Instrument.java
View File

@@ -1,113 +0,0 @@
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.annotation.JsonFormat;
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-09-19
*/
@Data
@TableName("adm_instrument")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class Instrument extends HisBaseEntity {
/** 仪器的唯一标识符，使用自增序列 */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 仪器编号，唯一且不能为空 */
private String instrumentCode;
/** 仪器名称，必填项 */
private String instrumentName;
/** 仪器主编号 */
private String instrumentMainCode;
/** 仪器类型，选择项 */
private Integer instrumentTypeEnum;
/** 仪器型号 */
private String instrumentModel;
/** 生产厂家 */
private String manufacturer;
/** 仪器序列号 */
private String serialNumber;
/** 购买公司 */
private String purchasingCompany;
/** 联系人员 */
private String contactPerson;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 购买日期 */
private Date purchaseDate;
/** 原价格 */
private BigDecimal originalPrice;
/** 成交价格 */
private BigDecimal transactionPrice;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 安装日期 */
private Date installationDate;
/** 安装人员 */
private String installationPerson;
/** 维护人员 */
private String maintenancePerson;
/** 使用科室 */
private Long orgId;
/** 鉴定人员 */
private String identificationPerson;
/** 记录温度，选择项 */
private String recordedTemperature;
/** 仪器附件 */
private String accessories;
/** 仪器状态 */
private Integer instrumentStatusEnum;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 报损日期 */
private Date damageReportDate;
/** 可复查仪器 是否 */
private Integer recheckableInstrumentEnum;
/** 使用状态，是否 */
private Integer usageStatusEnum;
/** 停用原因 */
private String decommissionReason;
/** 备注 */
private String remarks;
}

55
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/ObservationDefinition.java
View File

@@ -1,55 +0,0 @@
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-09-23
*/
@Data
@TableName("adm_observation_definition")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ObservationDefinition extends HisBaseEntity {
/** $column.columnComment */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 观测名称，用于标识观测的具体名称 */
private String name;
/** 观测代码，用于唯一标识一个观测项 */
private String code;
/** 观测类型，例如：实验室、临床症状等 */
private Integer observationTypeEnum;
/** 参考范围，例如：3.0-6.0 mg/dL，用于指示正常范围 */
private String referenceRange;
/** 观测仪器id */
private Long instrumentId;
/** 状态 */
private Integer statusEnum;
/** 删除状态） */
private String deleteFlag;
}

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

@@ -60,9 +60,4 @@ public class OrganizationLocation extends HisBaseEntity {
/** 显示顺序 */
private Integer displayOrder;
/**
* 项目编码 | 药品:1 耗材:2
*/
private String itemCode;
}

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

@@ -6,9 +6,13 @@ 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;
@@ -128,4 +132,9 @@ public class Patient extends HisBaseEntity {
/** 机构Id */
private Long organizationId;
public Patient() {
// 活动标识：启用
this.activeFlag = PublicationStatus.ACTIVE.getValue();
}
}

75
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/SpecimenDefinition.java
View File

@@ -1,75 +0,0 @@
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-09-05
*/
@Data
@TableName("adm_specimen_definition")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class SpecimenDefinition extends HisBaseEntity {
/** $column.columnComment */
@JsonSerialize(using = ToStringSerializer.class)
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 样本类型 */
private Integer specimenTypeEnum;
/** 样本名称 */
private String specimenName;
/** 自定义码 */
private String customCode;
/** 类型顺序 */
private Integer typeOrder;
/** 外部代码 */
private String externalCode;
/** 序号 */
private Integer serialNumber;
/** 全网型 */
private String globalType;
/** 拼音 */
private String pyStr;
/** 五笔 */
private String wbStr;
/** 样本类 */
private String specimenClass;
/** 扩展类型 */
private String extendedType;
/** WHONET代码 */
private String whonetCode;
/** 状态 */
private Integer statusEnum;
}

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

@@ -61,10 +61,4 @@ public class ChargeItemDefInfo extends ChargeItem {
/** 基础价格 */
private BigDecimal price;
/** 基础价格 */
private BigDecimal manualAdjustedPrice;
/** 基础价格 */
private BigDecimal systemDiscountPrice;
}

145
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailDto.java
View File

@@ -1,145 +0,0 @@
package com.openhis.administration.dto;
import java.math.BigDecimal;
import java.util.Date;
import com.core.common.annotation.Excel;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 费用明细Dto
*
* @author swb
* @date 2025-12-16
*/
@Data
@Accessors(chain = true)
public class CostDetailDto {
/**
* 项目名称
*/
@Excel(name = "项目名称", sort = 2)
private String chargeName;
/**
* 费用类型
*/
private Integer chargeItemEnum;
@Excel(name = "费用类型", sort = 3)
private String chargeItemEnum_enumText;
/**
* 单价
*/
@Excel(name = "单价", sort = 4, scale = 2)
private BigDecimal unitPrice;
/**
* 数量
*/
@Excel(name = "数量", sort = 5, scale = 0)
private BigDecimal quantityValue;
/**
* 金额
*/
@Excel(name = "金额", sort = 6, scale = 2)
private BigDecimal totalPrice;
/**
* 执行科室
*/
private Long orgId;
@Excel(name = "执行科室", sort = 7)
private String orgName;
/**
* 执行人
*/
@Excel(name = "执行人", sort = 8)
private String practitioner;
/**
* 执行日期
*/
@Excel(name = "执行日期", sort = 9, dateFormat = "yyyy-MM-dd")
private Date recordedTime;
/**
* 医保类型
*/
private Integer chrgitmLv;
@Excel(name = "医保类型", sort = 10)
private String chrgitmLv_enumText;
/**
* 备注
*/
@Excel(name = "备注", sort = 11)
private String remark;
/**
* 住院患者id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/**
* 患者id
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long patientId;
/**
* 患者姓名
*/
private String patientName;
/**
* 生日
*/
private Date birthDate;
/**
* 年龄
*/
private String age;
/**
* 性别
*/
private Integer genderEnum;
private String genderEnum_enumText;
/**
* 诊断
*/
private String conditionNames;
/**
* 住院医生
*/
private String admittingDoctorName;
/**
* 余额
*/
private BigDecimal balanceAmount;
/**
* 住院号
*/
private String BusNo;
/**
* 床位名称
*/
private String bedName;
/**
* 费别
*/
private String contractName;
}

36
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/CostDetailSearchParam.java
View File

@@ -1,36 +0,0 @@
package com.openhis.administration.dto;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 费用明细查询条件
*
* @author swb
* @date 2025-12-15
*/
@Data
@Accessors(chain = true)
public class CostDetailSearchParam {
/**
* 就诊ID列表
*/
@JsonSerialize(using = ToStringSerializer.class)
private List<Long> encounterIds;
/**
* 科室ID
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 费用类型ID
*/
private String chargeItemEnum;
}

47
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/dto/TracePatientInfoDto.java
View File

@@ -1,47 +0,0 @@
package com.openhis.administration.dto;
import java.util.Date;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 药品追溯患者信息Dto
*
* @author swb
* @date 2025-12-15
*/
@Data
@Accessors(chain = true)
public class TracePatientInfoDto {
/**
* 姓名
*/
private String name;
/**
* 性别
*/
private Integer genderEnum;
private String genderEnum_enumText;
/**
* 生日
*/
private Date birthDate;
/**
* 年龄
*/
private String age;
/**
* 手机号
*/
private String phone;
/**
* 挂号时间
*/
private Date registerTime;
}

22
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ChargeItemMapper.java
View File

@@ -5,14 +5,10 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.administration.dto.ChargeItemBaseInfoDto;
import com.openhis.administration.dto.ChargeItemDefInfo;
import com.openhis.administration.dto.CostDetailDto;
import com.openhis.administration.dto.CostDetailSearchParam;
/**
* 费用项管理Mapper接口
@@ -38,22 +34,4 @@ public interface ChargeItemMapper extends BaseMapper<ChargeItem> {
* @return 集合
*/
List<ChargeItemDefInfo> getChargeItemDefInfoByIds(@Param("chargeItemIds") List<Long> chargeItemIds);
/**
* 查询费用明细
*
* @param queryWrapper 查询条件
* @param billable 待结算
* @param billed 已收费
* @param refunded 已退费
* @param active 使用中
* @param bed 床位
* @param admittingDoctor 住院医生
* @param personalCashAccount 个人现金账户
* @return 费用明细分页列表
*/
List<CostDetailDto> getCostDetails(@Param(Constants.WRAPPER) QueryWrapper<CostDetailSearchParam> queryWrapper,
@Param("billable") Integer billable, @Param("billed") Integer billed, @Param("refunded") Integer refunded,
@Param("active") Integer active, @Param("bed") Integer bed, @Param("admittingDoctor") String admittingDoctor,
@Param("personalCashAccount") String personalCashAccount);
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/InstrumentMapper.java
View File

@@ -1,17 +0,0 @@
package com.openhis.administration.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.administration.domain.Instrument;
/**
* 存储各类仪器的信息，包括设备基本信息、状态、维护记录等Mapper接口
*
* @author system
* @date 2025-09-19
*/
@Repository
public interface InstrumentMapper extends BaseMapper<Instrument> {
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/ObservationDefinitionMapper.java
View File

@@ -1,17 +0,0 @@
package com.openhis.administration.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.administration.domain.ObservationDefinition;
/**
* 观测定义Mapper接口
*
* @author system
* @date 2025-09-23
*/
@Repository
public interface ObservationDefinitionMapper extends BaseMapper<ObservationDefinition> {
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/SpecimenDefinitionMapper.java
View File

@@ -1,17 +0,0 @@
package com.openhis.administration.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.administration.domain.SpecimenDefinition;
/**
* 样本定义Mapper接口
*
* @author system
* @date 2025-09-05
*/
@Repository
public interface SpecimenDefinitionMapper extends BaseMapper<SpecimenDefinition> {
}

11
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/TraceNoManageMapper.java
View File

@@ -7,7 +7,6 @@ import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.administration.domain.TraceNoManage;
import com.openhis.administration.dto.TracePatientInfoDto;
/**
* 【追溯码管理】Mapper接口
@@ -29,14 +28,4 @@ public interface TraceNoManageMapper extends BaseMapper<TraceNoManage> {
*/
List<TraceNoManage> getItemTraceNoInfo(@Param("itemTable") String itemTable, @Param("itemId") Long itemId,
@Param("locationId") Long locationId, @Param("lotNumber") String lotNumber);
/**
* 追溯患者信息
*
* @param medId 药品定义ID
* @param dispenseStatus 药品发放状态
* @return 患者信息列表
*/
List<TracePatientInfoDto> tracePatient(@Param("medId") Long medId, @Param("dispenseStatus") Integer dispenseStatus,
@Param("traceNo") String traceNo);
}

35
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java
View File

@@ -2,13 +2,10 @@ package com.openhis.administration.service;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.administration.dto.ChargeItemBaseInfoDto;
import com.openhis.administration.dto.ChargeItemDefInfo;
import com.openhis.administration.dto.CostDetailDto;
import com.openhis.administration.dto.CostDetailSearchParam;
/**
* 费用项管理Service接口
@@ -127,36 +124,4 @@ public interface IChargeItemService extends IService<ChargeItem> {
*/
void updatePlannedChargeStatus(List<Long> procedureIdList);
/**
* 根据encounterId查询收费项
*
* @param id
* @return
*/
List<ChargeItem> getChargeItemByEncounterId(Long id);
/**
* 根据encounterId查询收费项
*
* @param id
* @return
*/
List<ChargeItem> getChargeItemByEncounterId(Long id, String tableName, List<Long> serviceId);
/**
* 查询费用明细
*
* @param queryWrapper 查询条件
* @param billable 待结算
* @param billed 已收费
* @param refunded 已退费
* @param active 使用中
* @param bed 床位
* @param admittingDoctor 住院医生
* @param personalCashAccount 个人现金账户
* @return 费用明细分页列表
*/
List<CostDetailDto> getCostDetails(QueryWrapper<CostDetailSearchParam> queryWrapper, Integer billable,
Integer billed, Integer refunded, Integer active, Integer bed, String admittingDoctor,
String personalCashAccount);
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IInstrumentService.java
View File

@@ -1,14 +0,0 @@
package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.Instrument;
/**
* 存储各类仪器的信息，包括设备基本信息、状态、维护记录等Service接口
*
* @author system
* @date 2025-09-19
*/
public interface IInstrumentService extends IService<Instrument> {
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IObservationDefinitionService.java
View File

@@ -1,14 +0,0 @@
package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.ObservationDefinition;
/**
* 观测定义Service接口
*
* @author system
* @date 2025-09-23
*/
public interface IObservationDefinitionService extends IService<ObservationDefinition> {
}

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientIdentifierService.java
View File

@@ -3,8 +3,6 @@ package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.PatientIdentifier;
import java.util.List;
/**
* 患者标识管理Service接口
*
@@ -18,7 +16,7 @@ public interface IPatientIdentifierService extends IService<PatientIdentifier> {
*
* @param patientId 患者Id
*/
List<PatientIdentifier> selectByPatientId(Long patientId);
PatientIdentifier selectByPatientId(Long patientId);
/**
* 查询病人标识

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
View File

@@ -1,7 +1,9 @@
package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.Encounter;
import com.openhis.administration.domain.Patient;
import com.openhis.administration.domain.PatientIdentifier;
/**
* 患者管理Service接口
@@ -25,4 +27,19 @@ public interface IPatientService extends IService<Patient> {
*/
boolean savePatient(Patient patient);
/**
* 添加病人
*
* @param patient 患者实体
*/
boolean addPatient(Patient patient);
/**
* 更新病人
*
* @param patient 患者实体
*/
boolean updatePatient(Patient patient);
}

16
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ISpecimenDefinitionService.java
View File

@@ -1,16 +0,0 @@
package com.openhis.administration.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.SpecimenDefinition;
import javax.servlet.http.HttpServletRequest;
/**
* 样本定义Service接口
*
* @author system
* @date 2025-09-05
*/
public interface ISpecimenDefinitionService extends IService<SpecimenDefinition> {
}

8
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterLocationServiceImpl.java
View File

@@ -9,10 +9,10 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.openhis.administration.domain.EncounterLocation;
import com.openhis.administration.mapper.EncounterLocationMapper;
import com.openhis.administration.service.IEncounterLocationService;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.EncounterActivityStatus;
import com.openhis.common.enums.LocationForm;
@@ -73,7 +73,7 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
public void creatEncounterLocation(Long encounterId, Date startTime, Long locationId, Integer locationForm) {
EncounterLocation encounterLocation = new EncounterLocation();
encounterLocation.setEncounterId(encounterId).setStartTime(startTime).setLocationId(locationId)
.setFormEnum(locationForm).setStatusEnum(EncounterActivityStatus.ACTIVE.getValue());
.setFormEnum(locationForm);
baseMapper.insert(encounterLocation);
}
@@ -150,11 +150,11 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
.eq(EncounterLocation::getDeleteFlag, DelFlag.NO.getCode());
if (locationForm != null) {
queryWrapper.eq(EncounterLocation::getFormEnum, locationForm.getValue());
queryWrapper.eq(EncounterLocation::getFormEnum, locationForm.getCode());
}
if (encounterActivityStatus != null) {
queryWrapper.eq(EncounterLocation::getStatusEnum, encounterActivityStatus.getValue());
queryWrapper.eq(EncounterLocation::getStatusEnum, encounterActivityStatus.getCode());
}
return baseMapper.selectList(queryWrapper);
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
View File

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.EncounterParticipant;
import com.openhis.administration.mapper.EncounterParticipantMapper;
import com.openhis.administration.service.IEncounterParticipantService;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.EncounterActivityStatus;
import com.openhis.common.enums.ParticipantType;

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InstrumentServiceImpl.java
View File

@@ -1,19 +0,0 @@
package com.openhis.administration.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.Instrument;
import com.openhis.administration.mapper.InstrumentMapper;
import com.openhis.administration.service.IInstrumentService;
/**
* 存储各类仪器的信息，包括设备基本信息、状态、维护记录等Service业务层处理
*
* @author system
* @date 2025-09-19
*/
@Service
public class InstrumentServiceImpl extends ServiceImpl<InstrumentMapper, Instrument> implements IInstrumentService {
}

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/ObservationDefinitionServiceImpl.java
View File

@@ -1,19 +0,0 @@
package com.openhis.administration.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.ObservationDefinition;
import com.openhis.administration.mapper.ObservationDefinitionMapper;
import com.openhis.administration.service.IObservationDefinitionService;
/**
* 观测定义Service业务层处理
*
* @author system
* @date 2025-09-23
*/
@Service
public class ObservationDefinitionServiceImpl extends ServiceImpl<ObservationDefinitionMapper, ObservationDefinition> implements IObservationDefinitionService {
}

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientIdentifierServiceImpl.java
View File

@@ -10,8 +10,6 @@ import com.openhis.administration.domain.PatientIdentifier;
import com.openhis.administration.mapper.PatientIdentifierMapper;
import com.openhis.administration.service.IPatientIdentifierService;
import java.util.List;
/**
* 患者标识管理Service业务层处理
*
@@ -31,11 +29,12 @@ public class PatientIdentifierServiceImpl extends ServiceImpl<PatientIdentifierM
* @param patientId 患者Id
*/
@Override
public List<PatientIdentifier> selectByPatientId(Long patientId) {
public PatientIdentifier selectByPatientId(Long patientId) {
// 构造查询条件
LambdaQueryWrapper<PatientIdentifier> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PatientIdentifier::getPatientId, patientId);
return baseMapper.selectList(queryWrapper);
return baseMapper.selectOne(queryWrapper);
}

47
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
View File

@@ -123,4 +123,51 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
return patientExists;
}
/**
* 添加病人
*
* @param patient 患者实体
*/
@Override
public boolean addPatient(Patient patient) {
Long organizationId = SecurityUtils.getLoginUser().getHospitalId();
// 设置机构ID
patient.setOrganizationId(organizationId);
// 设置拼音首拼
patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName()));
// 设置五笔首拼
patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
// 不存在重复的证件号，新增患者
if (patient.getIdCard() == null || patient.getIdCard().isEmpty() ||idCardExists(patient) == null) {
// 添加患者
return baseMapper.insert(patient) > 0;
}
return false;
}
/**
* 更新病人
*
* @param patient 患者实体
*/
@Override
public boolean updatePatient(Patient patient) {
Patient patientExists = idCardExists(patient);
Long organizationId = SecurityUtils.getLoginUser().getHospitalId();
// 设置机构ID
patient.setOrganizationId(organizationId);
// 设置拼音首拼
patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName()));
// 设置五笔首拼
patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName()));
// 根据证件号查询，不存在重复的证件号
if (patientExists == null) {
// 患者修改了证件号码且不重复，更新患者
return baseMapper.updateById(patient) > 0;
} else if (patientExists.getId().compareTo(patient.getId()) == 0) {
// 患者未修改证件号码，更新患者
return baseMapper.updateById(patient) > 0;
}
return false;
}
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java
View File

@@ -2,7 +2,7 @@ package com.openhis.administration.service.impl;
import java.util.List;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.DelFlag;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

23
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/SpecimenDefinitionServiceImpl.java
View File

@@ -1,23 +0,0 @@
package com.openhis.administration.service.impl;
import com.core.common.core.domain.R;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.SpecimenDefinition;
import com.openhis.administration.mapper.SpecimenDefinitionMapper;
import com.openhis.administration.service.ISpecimenDefinitionService;
import javax.servlet.http.HttpServletRequest;
/**
* 样本定义Service业务层处理
*
* @author system
* @date 2025-09-05
*/
@Service
public class SpecimenDefinitionServiceImpl extends ServiceImpl<SpecimenDefinitionMapper, SpecimenDefinition> implements ISpecimenDefinitionService {
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/domain/AllergyIntolerance.java
View File

@@ -71,7 +71,7 @@ public class AllergyIntolerance extends HisBaseEntity {
private Date recordedDate;
/** 最后反应发生日期 */
private Date lastReactionOccurrence;
private Date lastReactionOccurrence ;
/** 曝光路线 */
private String exposureRoute;
@@ -82,19 +82,4 @@ public class AllergyIntolerance extends HisBaseEntity {
/** 删除状态 */
private String deleteFlag;
/**
* 药品定义id
*/
private Long medicationId;
/**
* 批次号
*/
private String lotNumber;
/**
* 就诊id
*/
private Long encounterId;
}

16
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IAllergyIntoleranceService.java
View File

@@ -1,6 +1,7 @@
package com.openhis.clinical.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.Encounter;
import com.openhis.clinical.domain.AllergyIntolerance;
/**
@@ -11,4 +12,19 @@ import com.openhis.clinical.domain.AllergyIntolerance;
*/
public interface IAllergyIntoleranceService extends IService<AllergyIntolerance> {
/**
* 更新或者保存过敏与不耐受
*
* @param allergyIntolerance 过敏与不耐受实体
*/
boolean saveOrUpdateAllergyIntolerance(AllergyIntolerance allergyIntolerance);
/**
* 根据药品请求id,获取皮试结果
*
* @param serviceRequestId 药品请求id
* @return 皮试结果
*/
Integer getPsResultByRequestId(Long serviceRequestId);
}

5
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IProcedureService.java
View File

@@ -36,15 +36,14 @@ public interface IProcedureService extends IService<Procedure> {
* @param eventStatus 执行状态
* @param procedureCategory 执行种类
* @param locationId 执行位置
* @param expectedDate 预计执行时间
* @param exeDate 执行时间
* @param groupId 组号
* @param refundId 取消执行id
* @return 执行id
*/
Long addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date expectedDate, Date exeDate,
Long groupId, Long refundId);
EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date exeDate, Long groupId,
Long refundId);
/**
* 添加药品执行记录

56
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/AllergyIntoleranceServiceImpl.java
View File

@@ -1,11 +1,16 @@
package com.openhis.clinical.service.impl;
import com.openhis.common.enums.ClinicalStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.clinical.domain.AllergyIntolerance;
import com.openhis.clinical.mapper.AllergyIntoleranceMapper;
import com.openhis.clinical.service.IAllergyIntoleranceService;
import com.openhis.common.enums.VerificationStatus;
import com.openhis.workflow.mapper.ServiceRequestMapper;
/**
* 过敏与不耐受Service业务层处理
@@ -17,4 +22,55 @@ import com.openhis.clinical.service.IAllergyIntoleranceService;
public class AllergyIntoleranceServiceImpl extends ServiceImpl<AllergyIntoleranceMapper, AllergyIntolerance>
implements IAllergyIntoleranceService {
@Autowired
ServiceRequestMapper serviceRequestMapper;
/**
* 更新或者保存过敏与不耐受
*
* @param allergyIntolerance 过敏与不耐受实体
*/
@Override
public boolean saveOrUpdateAllergyIntolerance(AllergyIntolerance allergyIntolerance) {
// 创建 LambdaQueryWrapper
LambdaQueryWrapper<AllergyIntolerance> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AllergyIntolerance::getId, allergyIntolerance.getId()).eq(AllergyIntolerance::getPatientId,
allergyIntolerance.getPatientId());
// 查询是否存在记录
AllergyIntolerance existingEncounter = baseMapper.selectOne(queryWrapper);
if (existingEncounter != null) {
// 如果记录存在，更新记录
allergyIntolerance.setId(existingEncounter.getId()); // 设置主键
return baseMapper.updateById(allergyIntolerance) > 0;
} else {
// 如果记录不存在，插入新记录
return baseMapper.insert(allergyIntolerance) > 0;
}
}
/**
* 根据药品请求id,获取皮试结果
*
* @param serviceRequestId 服务请求id
* @return 皮试结果
*/
@Override
public Integer getPsResultByRequestId(Long serviceRequestId) {
// 创建 LambdaQueryWrapper
LambdaQueryWrapper<AllergyIntolerance> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(AllergyIntolerance::getRequestId, serviceRequestId)
// 皮试结果是已确认的
.eq(AllergyIntolerance::getVerificationStatusEnum, VerificationStatus.CONFIRMED)
.eq(AllergyIntolerance::getDeleteFlag, '0');
// 根据服务请求id,获取皮试结果
AllergyIntolerance allergyIntolerance = baseMapper.selectOne(queryWrapper);
if (allergyIntolerance == null) {
//没查到默认返回 未知
return ClinicalStatus.UNKNOWN.getValue();
}
return allergyIntolerance.getVerificationStatusEnum();
}
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
View File

@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.clinical.domain.ConditionDefinition;
import com.openhis.clinical.mapper.ConditionDefinitionMapper;
import com.openhis.clinical.service.IConditionDefinitionService;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.utils.HisQueryUtils;
import lombok.AllArgsConstructor;

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionServiceImpl.java
View File

@@ -4,7 +4,7 @@ import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.DelFlag;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

13
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ProcedureServiceImpl.java
View File

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.core.common.utils.DateUtils;
import com.core.common.utils.SecurityUtils;
import com.openhis.clinical.domain.Procedure;
@@ -17,6 +16,7 @@ import com.openhis.clinical.mapper.ProcedureMapper;
import com.openhis.clinical.service.IProcedurePerformerService;
import com.openhis.clinical.service.IProcedureService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.EventStatus;
import com.openhis.common.enums.ProcedureCategory;
import com.openhis.medication.domain.MedicationRequest;
@@ -60,16 +60,15 @@ public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure
* @param eventStatus 执行状态
* @param procedureCategory 执行种类
* @param locationId 执行位置
* @param expectedDate 预计执行时间
* @param exeDate 执行时间
* @param groupId 组号
* @param refundId 取消执行id
* @return 执行id
* @return 是否成功
*/
@Override
public Long addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date expectedDate, Date exeDate,
Long groupId, Long refundId) {
EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date exeDate, Long groupId,
Long refundId) {
Long orgId = SecurityUtils.getLoginUser().getOrgId();
Procedure procedure = new Procedure();
procedure
@@ -83,10 +82,8 @@ public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure
.setOrgId(orgId)
// 患者id
.setPatientId(patientId)
// 预计执行时间
.setOccurrenceTime(expectedDate)
// 执行时间
.setRecordedTime(exeDate)
.setOccurrenceTime(exeDate)
// 执行状态
.setStatusEnum(eventStatus.getValue())
// 执行种类

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocRecord.java
View File

@@ -55,8 +55,4 @@ public class DocRecord extends HisBaseEntity {
*/
private Integer isEdit;
/**
* 打印次数
*/
private Integer printCount = 0;
}

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatistics.java
View File

@@ -44,8 +44,6 @@ public class DocStatistics extends HisBaseEntity {
* 记录来源
*/
private String source;
/**
* 文书ID
*/
private Long definitionId;
}

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocStatisticsDefinition.java
View File

@@ -50,9 +50,5 @@ public class DocStatisticsDefinition extends HisBaseEntity {
/** 字典类型 */
private String dictType;
/**
* 类型代码 例 003:体温
*/
private String typeCode;
}

18
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/mapper/DocStatisticsMapper.java
View File

@@ -1,25 +1,11 @@
package com.openhis.document.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.DocStatistics;
import org.springframework.stereotype.Repository;
@Repository
public interface DocStatisticsMapper extends BaseMapper<DocStatistics> {
/**
* 根据病历ID、病人ID和体温单ID获取温度单信息
*
* @param encounterId 病历ID
* @param patientId 病人ID
* @param tempId 体温单ID
* @param source 来源
* @return 体温单信息
*/
List<DocStatistics> getTempList(@Param("encounterId") Long encounterId, @Param("patientId") Long patientId,
@Param("tempId") Long tempId, @Param("source") String source);
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
View File

@@ -24,5 +24,5 @@ public interface PaymentRecDetailMapper extends BaseMapper<PaymentRecDetail> {
* @param paymentIdList 集合
* @return 集合
*/
List<PaymentRecDetailAccountResult> getListByReconciliationIds(@Param("paymentIdList") List<Long> paymentIdList,@Param("kindEnum") Integer kindEnum);
List<PaymentRecDetailAccountResult> getListByReconciliationIds(@Param("paymentIdList") List<Long> paymentIdList);
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
View File

@@ -29,6 +29,6 @@ public interface IPaymentRecDetailService extends IService<PaymentRecDetail> {
* @param paymentIdList 集合
* @return 集合
*/
List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList,Integer kindEnum);
List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList);
}

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
View File

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.core.redis.RedisCache;
import com.core.common.enums.DelFlag;
import com.core.common.enums.DeleteFlag;
import com.core.common.utils.SecurityUtils;
import com.openhis.common.constant.YbCommonConstants;
import com.openhis.common.enums.Whether;
@@ -56,7 +56,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
@Override
public IPage<Contract> getTenantContractPage(Integer tenantId, Integer pageNum, Integer pageSize) {
return baseMapper.selectPage(new Page<>(pageNum, pageSize), new LambdaQueryWrapper<Contract>()
.eq(Contract::getTenantId, tenantId).eq(Contract::getDeleteFlag, DelFlag.NO.getCode()));
.eq(Contract::getTenantId, tenantId).eq(Contract::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
}
/**
@@ -99,7 +99,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
@Override
public void delTenantContract(Long id) {
baseMapper.update(new Contract(), new LambdaUpdateWrapper<Contract>().eq(Contract::getId, id)
.set(Contract::getDeleteFlag, DelFlag.YES.getCode()));
.set(Contract::getDeleteFlag, DeleteFlag.DELETED.getCode()));
}
/**

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
View File

@@ -41,7 +41,7 @@ public class PaymentRecDetailServiceImpl extends ServiceImpl<PaymentRecDetailMap
* @return 集合
*/
@Override
public List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList,Integer kindEnum) {
return baseMapper.getListByReconciliationIds(paymentIdList,kindEnum);
public List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList) {
return baseMapper.getListByReconciliationIds(paymentIdList);
}
}

61
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefDeviceDef.java
View File

@@ -1,61 +0,0 @@
package com.openhis.lab.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-10-10
*/
@Data
@TableName("lab_activity_def_device_def")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ActivityDefDeviceDef extends HisBaseEntity {
/** $column.columnComment */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 测试定义ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long activityDefinitionId;
/** 耗材id */
@JsonSerialize(using = ToStringSerializer.class)
private Long deviceDefinitionId;
/** 耗材名称 */
private String deviceDefinitionName;
/** 仪器id */
@JsonSerialize(using = ToStringSerializer.class)
private Long instrumentId;
/** 仪器名称 */
private String instrumentName;
/** 耗材使用数量 */
private Integer deviceQuantity;
/** 删除状态 */
private String deleteFlag;
/** $column.columnComment */
private String activityDefinitionName;
}

55
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefObservationDef.java
View File

@@ -1,55 +0,0 @@
package com.openhis.lab.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-10-10
*/
@Data
@TableName("lab_activity_def_observation_def")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ActivityDefObservationDef extends HisBaseEntity {
/** $column.columnComment */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Integer id;
/** 活动定义ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long activityDefinitionId;
/** 活动名称 */
private String activityDefinitionName;
/** 观测定义ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long observationDefinitionId;
/** 观测指标名称（如ALT、AST等） */
private String observationName;
/** 观测编码（如ALT、AST等） */
private String observationCode;
/** 删除状态 */
private String deleteFlag;
}

59
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/ActivityDefSpecimenDef.java
View File

@@ -1,59 +0,0 @@
package com.openhis.lab.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-10-10
*/
@Data
@TableName("lab_activity_def_specimen_def")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ActivityDefSpecimenDef extends HisBaseEntity {
/** $column.columnComment */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Integer id;
/** 测试定义ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long activityDefinitionId;
/** $column.columnComment */
private String activityDefinitionName;
/** 测试定义ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long specimenDefinitionId;
/** 样本量 */
private Integer specimenVolume;
/** 样本名称 */
private String specimenName;
/** 样本量单位 */
private String specimenUnit;
/** 采样方法 */
private String samplingMethod;
/** 删除状态，N为未删除，Y为已删除 */
private String deleteFlag;
}

60
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Observation.java
View File

@@ -1,60 +0,0 @@
package com.openhis.lab.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-10-10
*/
@Data
@TableName("lab_observation")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class Observation extends HisBaseEntity {
/** 观察记录的唯一标识符 */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 患者ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long patientId;
/** 就诊ID */
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/** 关联的样本ID */
private Long specimenId;
/** 观察定义ID */
private Long observationDefinitionId;
/** 观察结果，可能是文本描述或数值 */
private String observationResult;
/** 观察的日期和时间 */
private Date observationDate;
/** 执行观察的技术员ID */
private Long technicianId;
/** 删除状态，默认为未删除 */
private String deleteFlag;
}

68
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/Specimen.java
View File

@@ -1,68 +0,0 @@
package com.openhis.lab.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
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-10-10
*/
@Data
@TableName("lab_specimen")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class Specimen extends HisBaseEntity {
/** 样本的唯一标识符 */
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 与该样本相关的患者ID */
private Long patientId;
/** 与该样本相关的ENCounterID */
@JsonSerialize(using = ToStringSerializer.class)
private Long encounterId;
/** 与该样本相关的申请服务id */
@JsonSerialize(using = ToStringSerializer.class)
private Long serviceId;
/** 样本定义ID，对应 adm_specimen_definition 表的 id */
private Long specimenDefinitionId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
/* 样本的采集日期和时间 */
private Date collectionDate;
// private String chargeName; // 项目名称
// private String specimenName; // 样本名称
// private String doctorName; // 开单医生
private Integer specimenVolume; //样本量
private String specimenUnit; //样本单位
/** 样本接收日期 */
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Date receivedDate;
/** 采集状态，默认为待采集 */
private Integer collectionStatusEnum;
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefDeviceDefMapper.java
View File

@@ -1,17 +0,0 @@
package com.openhis.lab.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.lab.domain.ActivityDefDeviceDef;
/**
* 耗材和设备定义Mapper接口
*
* @author system
* @date 2025-10-10
*/
@Repository
public interface ActivityDefDeviceDefMapper extends BaseMapper<ActivityDefDeviceDef> {
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefObservationDefMapper.java
View File

@@ -1,17 +0,0 @@
package com.openhis.lab.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.lab.domain.ActivityDefObservationDef;
/**
* 观测指标定义Mapper接口
*
* @author system
* @date 2025-10-10
*/
@Repository
public interface ActivityDefObservationDefMapper extends BaseMapper<ActivityDefObservationDef> {
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ActivityDefSpecimenDefMapper.java
View File

@@ -1,17 +0,0 @@
package com.openhis.lab.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.lab.domain.ActivityDefSpecimenDef;
/**
* 样本定义Mapper接口
*
* @author system
* @date 2025-10-10
*/
@Repository
public interface ActivityDefSpecimenDefMapper extends BaseMapper<ActivityDefSpecimenDef> {
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/ObservationMapper.java
View File

@@ -1,17 +0,0 @@
package com.openhis.lab.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.lab.domain.Observation;
/**
* 【请填写功能名称】Mapper接口
*
* @author system
* @date 2025-10-10
*/
@Repository
public interface ObservationMapper extends BaseMapper<Observation> {
}

18
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/mapper/SpecimenMapper.java
View File

@@ -1,18 +0,0 @@
package com.openhis.lab.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.lab.domain.Specimen;
/**
* 【请填写功能名称】Mapper接口
*
* @author system
* @date 2025-10-10
*/
@Mapper
public interface SpecimenMapper extends BaseMapper<Specimen> {
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefDeviceDefService.java
View File

@@ -1,14 +0,0 @@
package com.openhis.lab.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.lab.domain.ActivityDefDeviceDef;
/**
* 耗材和设备定义Service接口
*
* @author system
* @date 2025-10-10
*/
public interface IActivityDefDeviceDefService extends IService<ActivityDefDeviceDef> {
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefObservationDefService.java
View File

@@ -1,14 +0,0 @@
package com.openhis.lab.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.lab.domain.ActivityDefObservationDef;
/**
* 观测指标定义Service接口
*
* @author system
* @date 2025-10-10
*/
public interface IActivityDefObservationDefService extends IService<ActivityDefObservationDef> {
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IActivityDefSpecimenDefService.java
View File

@@ -1,14 +0,0 @@
package com.openhis.lab.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.lab.domain.ActivityDefSpecimenDef;
/**
* 样本定义Service接口
*
* @author system
* @date 2025-10-10
*/
public interface IActivityDefSpecimenDefService extends IService<ActivityDefSpecimenDef> {
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/IObservationService.java
View File

@@ -1,14 +0,0 @@
package com.openhis.lab.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.lab.domain.Observation;
/**
* 【请填写功能名称】Service接口
*
* @author system
* @date 2025-10-10
*/
public interface IObservationService extends IService<Observation> {
}

14
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/ISpecimenService.java
View File

@@ -1,14 +0,0 @@
package com.openhis.lab.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.lab.domain.Specimen;
/**
* Service接口
*
* @author system
* @date 2025-10-10
*/
public interface ISpecimenService extends IService<Specimen> {
}

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefDeviceDefServiceImpl.java
View File

@@ -1,19 +0,0 @@
package com.openhis.lab.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.lab.domain.ActivityDefDeviceDef;
import com.openhis.lab.mapper.ActivityDefDeviceDefMapper;
import com.openhis.lab.service.IActivityDefDeviceDefService;
/**
* 耗材和设备定义Service业务层处理
*
* @author system
* @date 2025-10-10
*/
@Service
public class ActivityDefDeviceDefServiceImpl extends ServiceImpl<ActivityDefDeviceDefMapper, ActivityDefDeviceDef> implements IActivityDefDeviceDefService {
}

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefObservationDefServiceImpl.java
View File

@@ -1,19 +0,0 @@
package com.openhis.lab.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.lab.domain.ActivityDefObservationDef;
import com.openhis.lab.mapper.ActivityDefObservationDefMapper;
import com.openhis.lab.service.IActivityDefObservationDefService;
/**
* 观测指标定义Service业务层处理
*
* @author system
* @date 2025-10-10
*/
@Service
public class ActivityDefObservationDefServiceImpl extends ServiceImpl<ActivityDefObservationDefMapper, ActivityDefObservationDef> implements IActivityDefObservationDefService {
}

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ActivityDefSpecimenDefServiceImpl.java
View File

@@ -1,19 +0,0 @@
package com.openhis.lab.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.lab.domain.ActivityDefSpecimenDef;
import com.openhis.lab.mapper.ActivityDefSpecimenDefMapper;
import com.openhis.lab.service.IActivityDefSpecimenDefService;
/**
* 样本定义Service业务层处理
*
* @author system
* @date 2025-10-10
*/
@Service
public class ActivityDefSpecimenDefServiceImpl extends ServiceImpl<ActivityDefSpecimenDefMapper, ActivityDefSpecimenDef> implements IActivityDefSpecimenDefService {
}

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/ObservationServiceImpl.java
View File

@@ -1,19 +0,0 @@
package com.openhis.lab.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.lab.domain.Observation;
import com.openhis.lab.mapper.ObservationMapper;
import com.openhis.lab.service.IObservationService;
/**
* 【请填写功能名称】Service业务层处理
*
* @author system
* @date 2025-10-10
*/
@Service
public class ObservationServiceImpl extends ServiceImpl<ObservationMapper, Observation> implements IObservationService {
}

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/service/impl/SpecimenServiceImpl.java
View File

@@ -1,19 +0,0 @@
package com.openhis.lab.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.lab.domain.Specimen;
import com.openhis.lab.mapper.SpecimenMapper;
import com.openhis.lab.service.ISpecimenService;
/**
* 【请填写功能名称】Service业务层处理
*
* @author system
* @date 2025-10-10
*/
@Service
public class SpecimenServiceImpl extends ServiceImpl<SpecimenMapper, Specimen> implements ISpecimenService {
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java
View File

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.RequestStatus;
import com.openhis.medication.domain.MedicationRequest;
import com.openhis.medication.mapper.MedicationRequestMapper;

58
openhis-server-new/openhis-domain/src/main/java/com/openhis/template/domain/EncounterAutoRoll.java
View File

@@ -1,58 +0,0 @@
package com.openhis.template.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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 住院就诊滚方绑定
*/
@Data
@TableName("tmp_encounter_auto_roll")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class EncounterAutoRoll extends HisBaseEntity {
/** ID */
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/** 状态 */
private Integer statusEnum;
/**
* 就诊id
*/
private Long encounterId;
/**
* 实例表名
*/
private String instanceTable;
/**
* 实例id
*/
private Long instanceId;
/** 数量 */
private BigDecimal quantity;
/**
* 参与者id
*/
private Long practitionerId;
/**
* 参与者科室id
*/
private Long organizationId;
}

18
openhis-server-new/openhis-domain/src/main/java/com/openhis/template/mapper/EncounterAutoRollMapper.java
View File

@@ -1,18 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.template.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.template.domain.EncounterAutoRoll;
/**
* 住院就诊滚方绑定
*
* @author zwh
* @date 2025-04-09
*/
@Repository
public interface EncounterAutoRollMapper extends BaseMapper<EncounterAutoRoll> {}

15
openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/IEncounterAutoRollService.java
View File

@@ -1,15 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.template.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.template.domain.EncounterAutoRoll;
/**
* 住院就诊滚方绑定
*
* @author zwh
* @date 2025-04-09
*/
public interface IEncounterAutoRollService extends IService<EncounterAutoRoll> {}

21
openhis-server-new/openhis-domain/src/main/java/com/openhis/template/service/impl/EncounterAutoRollServiceImpl.java
View File

@@ -1,21 +0,0 @@
/*
* Copyright ©2023 CJB-CNIT Team. All rights reserved
*/
package com.openhis.template.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.template.domain.EncounterAutoRoll;
import com.openhis.template.mapper.EncounterAutoRollMapper;
import com.openhis.template.service.IEncounterAutoRollService;
/**
* 住院就诊滚方绑定
*
* @author zwh
* @date 2025-04-09
*/
@Service
public class EncounterAutoRollServiceImpl extends ServiceImpl<EncounterAutoRollMapper, EncounterAutoRoll>
implements IEncounterAutoRollService {}

8
openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/ISupplyRequestService.java
View File

@@ -25,14 +25,6 @@ public interface ISupplyRequestService extends IService<SupplyRequest> {
*/
List<SupplyRequest> getSupplyByBusNo(String busNo);
/**
* 通过单据号批量查询单据信息
*
* @param busNoList 单据号
* @return 单据信息
*/
List<SupplyRequest> getSupplyByBusNoBatch(List<String> busNoList);
/**
* 通过原始单据号查询单据信息
*

9
openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/InventoryItemServiceImpl.java
View File

@@ -12,10 +12,9 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.workflow.domain.InventoryItem;
import com.openhis.workflow.dto.AdjustPriceDto;
import com.openhis.workflow.mapper.InventoryItemMapper;
import com.openhis.workflow.service.IInventoryItemService;
@@ -71,7 +70,7 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
Integer tenantId) {
LambdaQueryWrapper<InventoryItem> queryWrapper = new LambdaQueryWrapper<InventoryItem>()
.eq(InventoryItem::getItemId, itemId).eq(InventoryItem::getLotNumber, lotNumber)
.eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getCode())
.eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue())
.eq(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue());
if (locationId != null) {
queryWrapper.eq(InventoryItem::getLocationId, locationId);
@@ -91,7 +90,7 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
public List<InventoryItem> selectInventoryByItemIdList(List<Long> itemIdList, Integer tenantId) {
LambdaQueryWrapper<InventoryItem> queryWrapper =
new LambdaQueryWrapper<InventoryItem>().in(InventoryItem::getItemId, itemIdList)
.eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getCode())
.eq(InventoryItem::getTenantId, tenantId).eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue())
.eq(InventoryItem::getInventoryStatusEnum, PublicationStatus.ACTIVE.getValue());
// 查询取库房信息
return baseMapper.selectList(queryWrapper);
@@ -105,7 +104,7 @@ public class InventoryItemServiceImpl extends ServiceImpl<InventoryItemMapper, I
@Override
public List<InventoryItem> selectAllInventory() {
LambdaQueryWrapper<InventoryItem> queryWrapper =
new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getDeleteFlag, DelFlag.NO.getCode());
new LambdaQueryWrapper<InventoryItem>().eq(InventoryItem::getDeleteFlag, DelFlag.NO.getValue());
// 查询取库房信息
return baseMapper.selectList(queryWrapper);
}

13
openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/SupplyRequestAutoServiceImpl.java
View File

@@ -1,11 +1,24 @@
package com.openhis.workflow.service.impl;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import com.openhis.workflow.domain.SupplyRequestAuto;
import com.openhis.workflow.mapper.SupplyRequestAutoMapper;
import com.openhis.workflow.service.ISupplyRequestAutoService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.utils.DateUtils;
import com.core.common.utils.SecurityUtils;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.SupplyStatus;
import com.openhis.workflow.domain.SupplyRequest;
import com.openhis.workflow.mapper.SupplyRequestMapper;
import com.openhis.workflow.service.ISupplyRequestService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java
View File

@@ -218,7 +218,7 @@ public class InpatientFeeDetail extends HisBaseEntity implements Serializable {
/**
* 关联就诊id
*/
private Long encounterId;
private String encounterId;
private String inputParam;

5
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java
View File

@@ -259,9 +259,4 @@ public class InpatientReg extends HisBaseEntity implements Serializable {
private String inputParam;
private String outputResult;
/**
* 状态
*/
private Integer status;
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/BaseInfo.java
View File

@@ -17,8 +17,6 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
public class BaseInfo {
/** 文件相对路径 */
private String filePath;
/******************医保机构信息******************/

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/FileResult.java
View File

@@ -34,13 +34,6 @@ public class FileResult {
@JSONField(serialize=false)
private byte[] fileData;
// 文件相对路径
private String filePath;
// 医药机构编号
private String fixmedinsCode;
// 文件数据
@JSONField(serialize=false)
private String errMsg;
}

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3511Param.java
View File

@@ -10,7 +10,6 @@ import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 【3511】
@@ -43,15 +42,13 @@ public class MedicalInventory3511Param {
/**
* 开始日期 类型：日期型，格式yyyy-MM-dd，必填项
*/
@JSONField(name = "begndate")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JSONField(name = "begndate", format = "yyyy-MM-dd")
private Date begndate;
/**
* 结束日期 类型：日期型，格式yyyy-MM-dd，必填项
*/
@JSONField(name = "enddate")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JSONField(name = "enddate", format = "yyyy-MM-dd")
private Date enddate;
/**

74
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Output.java
View File

@@ -1,74 +0,0 @@
package com.openhis.yb.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data;
@Data
public class MedicalInventory3512Output {
/**
* 定点医药机构编号
*/
@JSONField(name ="fixmedinsCode")
private String fixmedinsCode;
/**
* 医药机构目录编码
*/
@JSONField(name ="medinsListCodg")
private String medinsListCodg;
/**
* 定点医药机构批次流水号
*/
@JSONField(name ="fixmedinsBchno")
private String fixmedinsBchno;
/**
* 医疗目录编码
*/
@JSONField(name ="medListCodg")
private String medListCodg;
/**
* 医药机构目录名称
*/
@JSONField(name ="medinsListName")
private String medinsListName;
/**
* 药品追溯码
*/
@JSONField(name ="drugTracCodg")
private String drugTracCodg;
/**
* 有效标志
*/
@JSONField(name ="valiFlag")
private String valiFlag;
/**
* 经办人ID
*/
@JSONField(name ="opterId")
private String opterId;
/**
* 创建人姓名
*/
@JSONField(name ="crterName")
private String crterName;
/**
* 创建人ID
*/
@JSONField(name ="crterId")
private String crterId;
/**
* 经办机构编号
*/
@JSONField(name ="optinsNo")
private String optinsNo;
}

59
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3512Param.java
View File

@@ -1,59 +0,0 @@
package com.openhis.yb.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class MedicalInventory3512Param {
/**
* 定点医药机构编号
*/
@JSONField(name = "fixmedins_code")
private String fixmedinsCode;
/**
* 医药机构目录编码
*/
@JSONField(name ="medins_list_codg")
private String medinsListCodg;
/**
* 定点医药机构批次流水号
*/
@JSONField(name ="fixmedins_bchno")
private String fixmedinsBchno;
/**
* 开始日期
*/
@JSONField(name ="begndate")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date begndate;
/**
* 结束日期
*/
@JSONField(name ="enddate")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date enddate;
/**
* 医疗目录编码
*/
@JSONField(name ="med_list_codg")
private String medListCodg;
/**
* 药品追溯码
*/
@JSONField(name ="drug_trac_codg")
private String drugTracCodg;
}

158
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Output.java
View File

@@ -1,158 +0,0 @@
package com.openhis.yb.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class MedicalInventory3513Output {
/**
* 定点医药机构编号
*/
@JSONField(name ="fixmedinsCode")
private String fixmedinsCode;
/**
* 医疗目录编码
*/
@JSONField(name ="medListCodg")
private String medListCodg;
/**
* 医药机构目录编码
*/
@JSONField(name ="medinsListCodg")
private String medinsListCodg;
/**
* 医药机构目录名称
*/
@JSONField(name ="medinsListName")
private String medinsListName;
/**
* 定点医药机构批次流水号
*/
@JSONField(name ="fixmedinsBchno")
private String fixmedinsBchno;
/**
* 就诊ID
*/
@JSONField(name ="mdtrtId")
private String mdtrtId;
/**
* 就诊结算类型
*/
@JSONField(name ="mdtrtSetlType")
private String mdtrtSetlType;
/**
* 记账流水号
*/
@JSONField(name ="bkkpSn")
private String bkkpSn;
/**
* 药品追溯码
*/
@JSONField(name ="drugTracCodg")
private String drugTracCodg;
/**
* 人员编号
*/
@JSONField(name ="psnNo")
private String psnNo;
/**
* 人员证件类型
*/
@JSONField(name ="psnCertType")
private String psnCertType;
/**
* 证件号码
*/
@JSONField(name ="certno")
private String certno;
/**
* 人员姓名
*/
@JSONField(name ="psnName")
private String psnName;
/**
* 备注
*/
@JSONField(name ="memo")
private String memo;
/**
* 拆零标志
*/
@JSONField(name ="trdnFlag")
private String trdnFlag;
/**
* 数据更新时间
*/
@JSONField(name ="updtTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updtTime;
/**
* 经办人姓名
*/
@JSONField(name ="opterName")
private String opterName;
/**
* 数据唯一记录号
*/
@JSONField(name ="rid")
private String rid;
/**
* 数据创建时间
*/
@JSONField(name ="crteTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date crteTime;
/**
* 经办时间
*/
@JSONField(name ="optTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date optTime;
/**
* 经办人ID
*/
@JSONField(name ="opterId")
private String opterId;
/**
* 创建人姓名
*/
@JSONField(name ="crterName")
private String crterName;
/**
* 创建人ID
*/
@JSONField(name ="crterId")
private String crterId;
/**
* 经办机构编号
*/
@JSONField(name ="optinsNo")
private String optinsNo;
}

86
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/MedicalInventory3513Param.java
View File

@@ -1,86 +0,0 @@
package com.openhis.yb.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class MedicalInventory3513Param {
/**
* 定点医药机构编号
*/
@JSONField(name ="fixmedins_code")
private String fixmedinsCode;
/**
* 医药机构目录编码
*/
@JSONField(name ="medins_list_codg")
private String medinsListCodg;
/**
* 定点医药机构批次流水号
*/
@JSONField(name ="fixmedins_bchno")
private String fixmedinsBchno;
/**
* 开始日期
*/
@JSONField(name ="begndate")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date begndate;
/**
* 结束日期
*/
@JSONField(name ="enddate")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date enddate;
/**
* 医疗目录编码
*/
@JSONField(name ="med_list_codg")
private String medListCodg;
/**
* 就诊ID
*/
@JSONField(name ="mdtrt_id")
private String mdtrtId;
/**
* 人员编号
*/
@JSONField(name ="psn_no")
private String psnNo;
/**
* 人员证件类型
*/
@JSONField(name ="psn_cert_type")
private String psnCertType;
/**
* 证件号码
*/
@JSONField(name ="certno")
private String certno;
/**
* 人员姓名
*/
@JSONField(name ="psn_name")
private String psnName;
/**
* 药品追溯码
*/
@JSONField(name ="drug_trac_codg")
private String drugTracCodg;
}

19
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/PatientInfoDto.java
View File

@@ -1,7 +1,6 @@
package com.openhis.yb.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -51,24 +50,6 @@ public class PatientInfoDto {
/** 五笔码 */
private String wbStr;
//出生日期
private Date brdy;
//年龄
private Double age;
//参保地医保区划
private String insuplcAdmdvs;
//险种类型
private String insutype;
//余额
private String balc;
//人员类别
@TableField(exist = false)
private String psnType;
//人员参保状态
@TableField(exist = false)
private String psnInsuStas;
/** 机构Id */
private Long organizationId;

33
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2302InpatientParam.java
View File

@@ -1,33 +0,0 @@
package com.openhis.yb.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class Yb2302InpatientParam {
/**
* 费用明细流水号
* 单次就诊内唯一
*/
@JsonProperty("feedetl_sn")
private String feedetlSn;
/**
* 人员编号
* 退单时传入被退单的费用明细流水号
*/
@JsonProperty("psn_no")
private String psnNo;
/**
* 就诊ID
*/
@JsonProperty("mdtrt_id")
private String mdtrtId;
/**
* 字段扩展
*/
@JsonProperty("exp_content")
private String expContent;
}

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2401InputInpatientDiseInfo.java
View File

@@ -4,8 +4,6 @@
package com.openhis.yb.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
@@ -15,8 +13,6 @@ import java.util.Date;
* @author SunJQ
* @date 2025-07-29
*/
@Data
@Accessors(chain = true)
public class Yb2401InputInpatientDiseInfo {
/**
* 人员编号

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2402InputParam.java
View File

@@ -18,9 +18,9 @@ public class Yb2402InputParam {
/**
* 出院诊断
*/
List<Yb2402InputInpatientDiseInfo> diseinfo;
List<Yb2402InputInpatientDiseInfo> yb2402InputInpatientDiseInfo;
/**
* 出院信息
*/
Yb2402InputInpatientDscgInfo dscginfo;
Yb2402InputInpatientDscgInfo yb2402InputInpatientDscgInfo;
}

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2404InputInpatient.java
View File

@@ -33,10 +33,4 @@ public class Yb2404InputInpatient {
*/
@JSONField(name = "exp_content")
private String expContent;
/**
* 字段扩展
*/
@JSONField(name = "insuplc_admdvs")
private String insuplcAdmdvs;
}

20
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb2601InputParam.java
View File

@@ -1,20 +0,0 @@
package com.openhis.yb.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data;
@Data
public class Yb2601InputParam {
@JSONField(name = "psn_no")
private String psnNo;
@JSONField(name = "oinfno")
private String oinfno;
@JSONField(name = "omsgid")
private String omsgid;
@JSONField(name = "insuplc_admdvs")
private String insuplcAdmdvs;
}

46
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputData.java
View File

@@ -1,46 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.List;
@Data
@Accessors(chain = true)
public class Yb4101AInputData {
/**
* 结算清单信息
*/
Yb4101AInputSetlinfo setlinfo;
/**
* 门诊慢特病诊断信息
*/
List<Yb4101AInputOpspdiseinfo> opspdiseinfo;
/**
* 住院诊断信息
*/
List<Yb4101AInputDiseinfo> diseinfo;
/**
* 手术操作信息
*/
List<Yb4101AInputOprninfo> oprninfo;
/**
* 住院ICU信息
*/
List<Yb4101AInputIcuinfo> icuinfo;
/**
* 住院血Press信息
*/
List<Yb4101AInputBldinfo> bldinfo;
/**
* 住院项目信息
*/
List<Yb4101AInputIteminfo> iteminfo;
}

61
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputIteminfo.java
View File

@@ -1,61 +0,0 @@
package com.openhis.yb.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.experimental.Accessors;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import java.util.Date;
/**
* 【4101A】收费项目信息（节点标识：iteminfo）
*
* @author Thanking
*/
@Data
@Accessors(chain = true)
public class Yb4101AInputIteminfo {
/**
* 医疗收费项目
*/
@NotBlank
@Length(max = 6)
@JSONField(name = "med_chrgitm")
private String medChrgitm;
/**
* 金额
*/
@NotBlank
@JSONField(name = "amt")
private String amt;
/**
* 甲类费用合计
*/
@JSONField(name = "claa_sumfee")
private String claaSumfee;
/**
* 乙类金额
*/
@JSONField(name = "clab_amt")
private Date clabAmt;
/**
* 全自费金额
*/
@Length(max = 6)
@JSONField(name = "fulamt_ownpay_amt")
private String fulamtOwnpayAmt;
/**
* 其他金额
*/
@JSONField(name = "oth_amt")
private String othAmt;
}

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101AInputOprninfo.java
View File

@@ -45,13 +45,6 @@ public class Yb4101AInputOprninfo {
@JSONField(name = "oprn_oprt_code")
private String oprnOprtCode;
/**
* 手术操作代码
*/
@JSONField(name = "oprn_oprt_begntime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date oprnOprtDate;
/**
* 麻醉方式：参照麻醉-方法代码
*/

46
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputData.java
View File

@@ -1,46 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
import java.util.List;
@Data
public class Yb4101InputData {
/**
* 住院结算信息
*/
Yb4101InputSetlinfo setlinfo;
/**
* 重症监护信息
*/
List<Yb4101InputIcuinfo> icuinfo;
/**
* 手术操作信息
*/
List<Yb4101InputOprninfo> oprninfo;
/**
* 收费项目信息
*/
List<Yb4101InputIteminfo> iteminfo;
/**
* 住院诊断信息
*/
List<Yb4101InputDiseinfo> diseinfo;
/**
* 门诊慢特病诊断信息
*/
List<Yb4101InputOpspdiseinfo> opspdiseinfo;
/**
* 基金支付信息
*/
List<Yb4101InputPayinfo> payinfo;
}

21
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputDiseinfo.java
View File

@@ -1,21 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
@Data
public class Yb4101InputDiseinfo {
/** 诊断类别 */
private String diagType;
/** 诊断代码 */
private String diagCode;
/** 诊断名称 */
private String diagName;
/** 入院病情类型 */
private String admCondType;
/** 主诊断标志 */
private String maindiagFlag;
}

22
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIcuinfo.java
View File

@@ -1,22 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
import java.util.Date;
@Data
public class Yb4101InputIcuinfo {
/** 重症监护病房类型 */
private String scsCutdWardType;
/** 重症监护进入时间 */
private Date scsCutdInpoolTime;
/** 重症监护退出时间 */
private Date scsCutdExitTime;
/** 重症监护合计时长 - 格式：天数/小时数/分钟数，例：1/13/24 */
private String scsCutdSumDura;
}

24
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputIteminfo.java
View File

@@ -1,24 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class Yb4101InputIteminfo {
/** 医疗收费项目 - 参照医疗收费项目类别 */
private String medChrgitm;
/** 金额 */
private BigDecimal amt;
/** 甲类费用合计 */
private BigDecimal claaSumfee;
/** 乙类金额 */
private BigDecimal clabAmt;
/** 全自费金额 */
private BigDecimal fulamtOwnpayAmt;
}

37
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOprninfo.java
View File

@@ -1,37 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
import java.util.Date;
@Data
public class Yb4101InputOprninfo {
/** 手术操作类别 */
private String oprnOprtType;
/** 手术操作名称 */
private String oprnOprtName;
/** 手术操作代码 */
private String oprnOprtCode;
/** 手术操作日期 */
private Date oprnOprtDate;
/** 麻醉方式 - 参照麻醉-方法代码 */
private String anstWay;
/** 术者医师姓名 */
private String operDrName;
/** 术者医师代码 */
private String operDrCode;
/** 麻醉医师姓名 */
private String anstDrName;
/** 麻醉医师代码 */
private String anstDrCode;
}

22
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputOpspdiseinfo.java
View File

@@ -1,22 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
@Data
public class Yb4101InputOpspdiseinfo {
/** 诊断名称 - 与结算时慢特病种保持一致 */
private String diagName;
/** 诊断代码 - 与结算时慢特病种保持一致 */
private String diagCode;
/** 手术操作名称 */
private String oprnOprtName;
/** 手术操作代码 */
private String oprnOprtCode;
/** 主诊断标志 */
private String maindiagFlag;
}

17
openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/dto/Yb4101InputPayinfo.java
View File

@@ -1,17 +0,0 @@
package com.openhis.yb.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class Yb4101InputPayinfo {
/**
* 基金支付类别
*/
private String fundPayType;
/**
* 基金支付金额
*/
private BigDecimal fundPayamt;
}

Some files were not shown because too many files have changed in this diff Show More