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

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 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,10 +5,8 @@ import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.AccountBillingStatus;
import com.openhis.common.enums.AccountStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -66,4 +64,7 @@ public class Account extends HisBaseEntity {
/** 是否为就诊登记使用 */
private Integer encounterFlag;
/** 险种类型 */
private String insutype;
}

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

@@ -160,4 +160,19 @@ public class ChargeItem extends HisBaseEntity {
/** 发放ID */
private Long dispenseId;
<<<<<<< HEAD
=======
/**
* 系统优惠价格
*/
private BigDecimal systemDiscountPrice;
/**
* 人为二次调价
*/
private BigDecimal manualAdjustedPrice;
>>>>>>> v1.3
}

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

@@ -6,9 +6,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.PublicationStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -67,4 +66,9 @@ 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,14 +1,11 @@
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;
@@ -70,7 +67,7 @@ public class Device extends HisBaseEntity {
private String partNumber;
/** 器材种类 */
private DeviceCategory categoryEnum;
private Integer categoryEnum;
/** 器材类型 */
private String typeCode;
@@ -93,5 +90,4 @@ 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.openhis.common.enums.DeviceCategory;
import com.openhis.common.enums.PublicationStatus;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -27,6 +27,7 @@ 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 Normal file
View File

@@ -0,0 +1,113 @@
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 Normal file
View File

@@ -0,0 +1,55 @@
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,4 +60,9 @@ 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,13 +6,9 @@ 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;
@@ -132,9 +128,4 @@ 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 Normal file
View File

@@ -0,0 +1,75 @@
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,4 +61,10 @@ 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 Normal file
View File

@@ -0,0 +1,145 @@
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 Normal file
View File

@@ -0,0 +1,36 @@
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 Normal file
View File

@@ -0,0 +1,47 @@
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,10 +5,14 @@ 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接口
@@ -34,4 +38,22 @@ 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 Normal file
View File

@@ -0,0 +1,17 @@
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> {
}

30
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/mapper/LocationMapper.java
View File

@@ -20,12 +20,17 @@ import com.openhis.administration.dto.PatientBedInfoDto;
public interface LocationMapper extends BaseMapper<Location> {
/**
* Desc: 根据区域id数组查询 区域表
<<<<<<< HEAD
=======
*
>>>>>>> v1.3
* @param locationIds
* @Author raymond
* @Date 07:46 2025/10/28
* @return java.util.List<com.openhis.administration.dto.LocationDataDto>
**/
List<LocationDataDto> searchLocationDataByIds(@Param("locationIds") List<Long> locationIds);
<<<<<<< HEAD
/**
* Desc: 根据病区bus_no 查询病床
* @param busNo
@@ -35,5 +40,30 @@ public interface LocationMapper extends BaseMapper<Location> {
* @return java.util.List<com.openhis.administration.dto.LocationDataDto>
**/
List<PatientBedInfoDto> searchLocationDataByBusNo(@Param("busNo") String busNo, @Param("formEnum") Integer formEnum, @Param("statusEnum") Integer statusEnum);
=======
>>>>>>> v1.3
/**
* Desc: 根据病区bus_no 查询病床
*
* @param busNo
* @param formEnum
* @Author raymond
* @Date 14:01 2025/10/28
* @return java.util.List<com.openhis.administration.dto.LocationDataDto>
**/
List<PatientBedInfoDto> searchLocationDataByBusNo(@Param("busNo") String busNo, @Param("formEnum") Integer formEnum,
@Param("statusEnum") Integer statusEnum);
/**
* 判断是否存在相同名字
*
* @param name 名字
* @param busNo 病区号/病房号/病床号
* @param locId 病区ID/病房ID/病床ID
* @param delFlag 删除标志
* @return true/false
*/
boolean isExistName(@Param("name") String name, @Param("busNo") String busNo, @Param("locId") Long locId,
@Param("delFlag") String delFlag);
}

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

@@ -0,0 +1,17 @@
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 Normal file
View File

@@ -0,0 +1,17 @@
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,6 +7,7 @@ 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接口
@@ -28,4 +29,14 @@ 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,10 +2,13 @@ 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接口
@@ -124,4 +127,36 @@ 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 Normal file
View File

@@ -0,0 +1,14 @@
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> {
}

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

@@ -20,6 +20,7 @@ public interface IInvoiceService extends IService<Invoice> {
* @return
*/
Long addInvoice(Invoice invoice);
<<<<<<< HEAD
/**
* 分页查询发票列表（带用户角色权限过滤）
@@ -30,4 +31,14 @@ public interface IInvoiceService extends IService<Invoice> {
* @return 发票列表
*/
IPage<Invoice> selectInvoicePage(Page<Invoice> page, boolean isAdmin, Long userId);
=======
/**
* 根据付款单ID查询发票
*
* @param id 付款单ID
* @return
*/
Invoice getByPaymentId(Long id);
>>>>>>> v1.3
}

32
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/ILocationService.java
View File

@@ -2,10 +2,15 @@ package com.openhis.administration.service;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.Location;
import com.openhis.administration.dto.LocationDataDto;
<<<<<<< HEAD
import org.apache.ibatis.annotations.Param;
=======
>>>>>>> v1.3
/**
* 位置管理Service接口
@@ -36,7 +41,6 @@ public interface ILocationService extends IService<Location> {
*/
List<Location> getWarehouseList();
/**
* 获取药房药库列表
*
@@ -88,9 +92,10 @@ public interface ILocationService extends IService<Location> {
* 根据科室ID集合，查询对应信息
*
* @param ids 科室ID集合
* @param status 状态列表
* @return 科室信息列表
*/
List<Location> getLocationList(List<Long> ids);
List<Location> getLocationList(List<Long> ids, List<Integer> status);
/**
* 根据locationId，更新状态
@@ -103,6 +108,10 @@ public interface ILocationService extends IService<Location> {
/**
* Desc: 根据区域id数组查询 区域表
<<<<<<< HEAD
=======
*
>>>>>>> v1.3
* @param locationIds
* @Author raymond
* @Date 07:46 2025/10/28
@@ -110,4 +119,23 @@ public interface ILocationService extends IService<Location> {
**/
List<LocationDataDto> searchLocationDataByIds(@Param("locationIds") List<Long> locationIds);
<<<<<<< HEAD
=======
/**
* 获取所有位置信息
*
* @return 所有位置信息列表
*/
List<Location> getLocationList();
/**
* 判断是否存在相同名字
*
* @param name 名字
* @param busNo 病区号/病房号/病床号
* @param locId 病区ID/病房ID/病床ID
* @return true/false
*/
boolean isExistName(String name, String busNo, Long locId);
>>>>>>> v1.3
}

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

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

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

@@ -1,9 +1,7 @@
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接口
@@ -27,19 +25,4 @@ 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 Normal file
View File

@@ -0,0 +1,16 @@
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> {
}

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

@@ -10,7 +10,11 @@ import com.openhis.administration.domain.ChargeItemDefDetail;
import com.openhis.administration.mapper.ChargeItemDefDetailAppMapper;
import com.openhis.administration.service.IChargeItemDefDetailService;
import com.openhis.common.enums.ConditionCode;
<<<<<<< HEAD
import com.openhis.common.enums.DelFlag;
=======
import com.core.common.enums.DelFlag;
>>>>>>> v1.3
/**
* 费用定价管理子Service业务层处理

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

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.enums.DelFlag;
import com.core.common.utils.DateUtils;
import com.openhis.administration.domain.ChargeItemDefDetail;
import com.openhis.administration.domain.ChargeItemDefinition;
@@ -20,7 +21,6 @@ import com.openhis.administration.service.IChargeItemDefDetailService;
import com.openhis.administration.service.IChargeItemDefinitionService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.ConditionCode;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.PublicationStatus;
import com.openhis.common.enums.Whether;
@@ -50,7 +50,7 @@ public class ChargeItemDefinitionServiceImpl extends ServiceImpl<ChargeItemDefin
Integer pageSize) {
LambdaQueryWrapper<ChargeItemDefinition> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ChargeItemDefinition::getDeleteFlag, DelFlag.NO.getValue());
queryWrapper.eq(ChargeItemDefinition::getDeleteFlag, DelFlag.NO.getCode());
// 拼接查询条件
if (chargeItemDefinition.getStatusEnum() != null) {
@@ -177,7 +177,11 @@ public class ChargeItemDefinitionServiceImpl extends ServiceImpl<ChargeItemDefin
@Override
public ChargeItemDefDetailPriceDto getDevicePriceByParam(String conditionCode, Long instanceId) {
<<<<<<< HEAD
return this.baseMapper.getDevicePriceByParam(conditionCode,instanceId);
=======
return this.baseMapper.getDevicePriceByParam(conditionCode, instanceId);
>>>>>>> v1.3
}
@Override

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

@@ -10,21 +10,32 @@ import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
<<<<<<< HEAD
import com.core.common.exception.ServiceException;
=======
import com.core.common.enums.DelFlag;
import com.core.common.exception.ServiceException;
import com.core.common.utils.AgeCalculatorUtil;
>>>>>>> v1.3
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.administration.domain.ChargeItemDefinition;
import com.openhis.administration.dto.ChargeItemBaseInfoDto;
import com.openhis.administration.dto.ChargeItemDefInfo;
<<<<<<< HEAD
=======
import com.openhis.administration.dto.CostDetailDto;
import com.openhis.administration.dto.CostDetailSearchParam;
>>>>>>> v1.3
import com.openhis.administration.mapper.ChargeItemDefinitionMapper;
import com.openhis.administration.mapper.ChargeItemMapper;
import com.openhis.administration.service.IChargeItemService;
import com.openhis.common.enums.ChargeItemContext;
import com.openhis.common.enums.ChargeItemStatus;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.*;
import com.openhis.common.utils.EnumUtils;
import lombok.AllArgsConstructor;
@@ -253,4 +264,61 @@ public class ChargeItemServiceImpl extends ServiceImpl<ChargeItemMapper, ChargeI
.eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
}
}
@Override
public List<ChargeItem> getChargeItemByEncounterId(Long id) {
return baseMapper.selectList(new LambdaUpdateWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, id)
.eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
}
@Override
public List<ChargeItem> getChargeItemByEncounterId(Long id, String tableName, List<Long> serviceId) {
return baseMapper.selectList(new LambdaUpdateWrapper<ChargeItem>().eq(ChargeItem::getEncounterId, id)
.in(ChargeItem::getEncounterId, serviceId).eq(ChargeItem::getDeleteFlag, DelFlag.NO.getCode()));
}
/**
* 查询费用明细
*
* @param queryWrapper 查询条件
* @param billable 待结算
* @param billed 已收费
* @param refunded 已退费
* @param active 使用中
* @param bed 床位
* @param admittingDoctor 住院医生
* @param personalCashAccount 个人现金账户
* @return 费用明细分页列表
*/
@Override
public List<CostDetailDto> getCostDetails(QueryWrapper<CostDetailSearchParam> queryWrapper, Integer billable,
Integer billed, Integer refunded, Integer active, Integer bed, String admittingDoctor,
String personalCashAccount) {
// 查询费用明细
List<CostDetailDto> costDetails = baseMapper.getCostDetails(queryWrapper, billable, billed, refunded, active,
bed, admittingDoctor, personalCashAccount);
// 翻译字段
costDetails.forEach(costDetail -> {
// 医保类型
if (costDetail.getChrgitmLv() != null) {
costDetail
.setChrgitmLv_enumText(EnumUtils.getInfoByValue(InsuranceLevel.class, costDetail.getChrgitmLv()));
}
// 性别枚举
if (costDetail.getGenderEnum() != null) {
costDetail.setGenderEnum_enumText(
EnumUtils.getInfoByValue(AdministrativeGender.class, costDetail.getGenderEnum()));
}
// 计算年龄
if (costDetail.getBirthDate() != null) {
costDetail.setAge(AgeCalculatorUtil.getAge(costDetail.getBirthDate()));
}
// 费用类型
if (costDetail.getChargeItemEnum() != null) {
costDetail
.setChargeItemEnum_enumText(ChargeItemEnum.getByValue(costDetail.getChargeItemEnum()).getInfo());
}
});
return costDetails;
}
}

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);
.setFormEnum(locationForm).setStatusEnum(EncounterActivityStatus.ACTIVE.getValue());
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.getCode());
queryWrapper.eq(EncounterLocation::getFormEnum, locationForm.getValue());
}
if (encounterActivityStatus != null) {
queryWrapper.eq(EncounterLocation::getStatusEnum, encounterActivityStatus.getCode());
queryWrapper.eq(EncounterLocation::getStatusEnum, encounterActivityStatus.getValue());
}
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.openhis.common.enums.DelFlag;
import com.core.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 Normal file
View File

@@ -0,0 +1,19 @@
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 {
}

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

@@ -2,9 +2,13 @@ package com.openhis.administration.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
<<<<<<< HEAD
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.enums.DelFlag;
>>>>>>> v1.3
import com.core.common.utils.SecurityUtils;
import com.openhis.administration.domain.Invoice;
import com.openhis.administration.domain.Supplier;
@@ -48,6 +52,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
return invoice.getId();
}
<<<<<<< HEAD
/**
* 分页查询发票列表（带用户角色权限过滤）
*
@@ -69,5 +74,11 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
queryWrapper.orderByDesc(Invoice::getCreateTime);
return baseMapper.selectPage(page, queryWrapper);
=======
@Override
public Invoice getByPaymentId(Long id) {
return baseMapper.selectOne(new LambdaQueryWrapper<Invoice>().eq(Invoice::getReconciliationId, id)
.eq(Invoice::getDeleteFlag, DelFlag.NO.getCode()));
>>>>>>> v1.3
}
}

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

@@ -2,16 +2,22 @@ package com.openhis.administration.service.impl;
import java.util.List;
<<<<<<< HEAD
import com.openhis.administration.dto.LocationDataDto;
=======
import javax.annotation.Resource;
>>>>>>> v1.3
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.Location;
import com.openhis.administration.dto.LocationDataDto;
import com.openhis.administration.mapper.LocationMapper;
import com.openhis.administration.service.ILocationService;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.enums.LocationStatus;
@@ -49,6 +55,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
return baseMapper
.selectList(new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.CABINET.getValue()));
}
/**
* 获取仓库列表
*
@@ -56,8 +63,8 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
*/
@Override
public List<Location> getWarehouseList() {
return baseMapper
.selectList(new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.WAREHOUSE.getValue()));
return baseMapper.selectList(
new LambdaQueryWrapper<Location>().eq(Location::getFormEnum, LocationForm.WAREHOUSE.getValue()));
}
/**
@@ -151,10 +158,11 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
* 根据科室ID集合，查询对应信息
*
* @param ids 科室ID集合
* @param status 状态列表
* @return 科室信息列表
*/
@Override
public List<Location> getLocationList(List<Long> ids) {
public List<Location> getLocationList(List<Long> ids, List<Integer> status) {
// // 如果 ids 是空的，获取当前登录用户的 orgId
// if (ids == null || ids.isEmpty()) {
// Long orgId = SecurityUtils.getLoginUser().getOrgId();
@@ -166,7 +174,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
LambdaQueryWrapper<Location> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(Location::getId, Location::getName, Location::getFormEnum, Location::getBusNo)
.in(Location::getId, ids).eq(Location::getDeleteFlag, DelFlag.NO.getCode())
.eq(Location::getStatusEnum, LocationStatus.ACTIVE.getValue());
.in(Location::getStatusEnum, status);
return baseMapper.selectList(queryWrapper);
}
@@ -190,4 +198,30 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
return this.locationMapper.searchLocationDataByIds(locationIds);
}
<<<<<<< HEAD
=======
/**
* 获取所有位置信息
*
* @return 所有位置信息列表
*/
@Override
public List<Location> getLocationList() {
return baseMapper.selectList(new LambdaQueryWrapper<Location>());
}
/**
* 判断是否存在相同名字
*
* @param name 名字
* @param busNo 病区号/病房号/病床号
* @param locId 病区ID/病房ID/病床ID
* @return true/false
*/
@Override
public boolean isExistName(String name, String busNo, Long locId) {
return locationMapper.isExistName(name, busNo, locId, DelFlag.NO.getCode());
}
>>>>>>> v1.3
}

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

@@ -0,0 +1,19 @@
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 {
}

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

@@ -2,15 +2,22 @@ package com.openhis.administration.service.impl;
import java.util.List;
<<<<<<< HEAD
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.dto.OrgDataDto;
import com.openhis.common.enums.DelFlag;
=======
import javax.annotation.Resource;
>>>>>>> v1.3
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.Organization;
import com.openhis.administration.dto.OrgDataDto;
import com.openhis.administration.mapper.OrganizationMapper;
import com.openhis.administration.service.IOrganizationService;
import com.openhis.common.enums.AccountStatus;
@@ -28,6 +35,10 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
implements IOrganizationService {
@Resource
private OrganizationMapper organizationMapper;
<<<<<<< HEAD
=======
>>>>>>> v1.3
/**
* 机构启用
*
@@ -64,8 +75,10 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
@Override
public List<Organization> getList(Integer organizationType, Integer organizationClass) {
return baseMapper.selectList(new LambdaQueryWrapper<Organization>()
.select(Organization::getId, Organization::getName).eq(Organization::getTypeEnum, organizationType)
.eq(organizationClass != null, Organization::getClassEnum, organizationClass));
.select(Organization::getId, Organization::getName, Organization::getDisplayOrder)
.eq(Organization::getTypeEnum, organizationType)
.eq(organizationClass != null, Organization::getClassEnum, organizationClass)
.orderByAsc(Organization::getDisplayOrder)); // 按 displayOrder 升序排序
}
/**
@@ -77,7 +90,12 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
@Override
public List<Organization> getOrganizationListById(List<Long> collect) {
return baseMapper.selectList(new LambdaQueryWrapper<Organization>().in(Organization::getId, collect)
.eq(Organization::getDeleteFlag, DelFlag.NO.getCode()));
.eq(Organization::getDeleteFlag, DelFlag.NO.getCode()));
}
@Override
public List<OrgDataDto> searchOrgDataByHealth() {
return this.organizationMapper.searchOrgDataByHealth();
}
@Override

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

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

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

@@ -123,51 +123,4 @@ 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;
}
}

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

@@ -12,7 +12,11 @@ import com.openhis.administration.domain.Patient;
import com.openhis.administration.domain.PatientStudent;
import com.openhis.administration.mapper.PatientStudentMapper;
import com.openhis.administration.service.IPatientStudentService;
<<<<<<< HEAD
import com.openhis.common.enums.DelFlag;
=======
import com.core.common.enums.DelFlag;
>>>>>>> v1.3
import com.openhis.common.enums.PhysicalExamResult;
/**

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.openhis.common.enums.DelFlag;
import com.core.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 Normal file
View File

@@ -0,0 +1,23 @@
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 {
}

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

@@ -10,7 +10,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.domain.Supplier;
import com.openhis.administration.mapper.SupplierMapper;
import com.openhis.administration.service.ISupplierService;
<<<<<<< HEAD
import com.openhis.common.enums.DelFlag;
=======
import com.core.common.enums.DelFlag;
>>>>>>> v1.3
import com.openhis.common.enums.SupplierType;
import com.openhis.common.enums.Whether;

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,4 +82,19 @@ 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,7 +1,6 @@
package com.openhis.clinical.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.domain.Encounter;
import com.openhis.clinical.domain.AllergyIntolerance;
/**
@@ -12,19 +11,4 @@ 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,14 +36,15 @@ 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 exeDate, Long groupId,
Long refundId);
EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date expectedDate, 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,16 +1,11 @@
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业务层处理
@@ -22,55 +17,4 @@ import com.openhis.workflow.mapper.ServiceRequestMapper;
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.openhis.common.enums.DelFlag;
import com.core.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.openhis.common.enums.DelFlag;
import com.core.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,6 +9,7 @@ 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;
@@ -16,7 +17,6 @@ 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,15 +60,16 @@ public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure
* @param eventStatus 执行状态
* @param procedureCategory 执行种类
* @param locationId 执行位置
* @param expectedDate 预计执行时间
* @param exeDate 执行时间
* @param groupId 组号
* @param refundId 取消执行id
* @return 是否成功
* @return 执行id
*/
@Override
public Long addProcedureRecord(Long encounterId, Long patientId, Long requestId, String requestTable,
EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date exeDate, Long groupId,
Long refundId) {
EventStatus eventStatus, ProcedureCategory procedureCategory, Long locationId, Date expectedDate, Date exeDate,
Long groupId, Long refundId) {
Long orgId = SecurityUtils.getLoginUser().getOrgId();
Procedure procedure = new Procedure();
procedure
@@ -82,8 +83,10 @@ public class ProcedureServiceImpl extends ServiceImpl<ProcedureMapper, Procedure
.setOrgId(orgId)
// 患者id
.setPatientId(patientId)
// 预计执行时间
.setOccurrenceTime(expectedDate)
// 执行时间
.setOccurrenceTime(exeDate)
.setRecordedTime(exeDate)
// 执行状态
.setStatusEnum(eventStatus.getValue())
// 执行种类

49
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/DocInventoryItemStatic.java
View File

@@ -31,8 +31,19 @@ public class DocInventoryItemStatic extends HisBaseEntity {
@TableId(type = IdType.ASSIGN_ID)
private Long id;
<<<<<<< HEAD
/** 物品类别 */
private String categoryCode;
=======
/** 备份单据编号 */
private String busNo;
/** 药品类别 */
private String medCategoryCode;
/** 耗材类别 */
private String devCategoryCode;
>>>>>>> v1.3
/** 名称 */
private String name;
@@ -49,9 +60,21 @@ public class DocInventoryItemStatic extends HisBaseEntity {
/** 最小单位 */
private String unitCode;
<<<<<<< HEAD
/** 当前库存数量(最小单位数量) */
private BigDecimal quantity;
=======
/** 库存数量 */
private BigDecimal quantity;
/** 包装单位数量（整数部分） */
private BigDecimal number;
/** 包装单位数量（余数部分） */
private BigDecimal remainder;
>>>>>>> v1.3
/** 产品批号 */
private String lotNumber;
@@ -85,8 +108,19 @@ public class DocInventoryItemStatic extends HisBaseEntity {
/** 销售单价(包装单位) */
private BigDecimal salePrice;
<<<<<<< HEAD
/** 项目编号 */
private String busNo;
=======
/** 总零售价 */
private BigDecimal totalSalePrice;
/** 总进价 */
private BigDecimal totalPrice;
/** 项目编号 */
private String itemNo;
>>>>>>> v1.3
/** 最小单位 */
private String minUnitCode;
@@ -117,4 +151,19 @@ public class DocInventoryItemStatic extends HisBaseEntity {
/** 药品五笔码 */
private String wbStr;
<<<<<<< HEAD
=======
/** 剩余过期天数 */
private Integer remainingDays;
/** 库存id */
private Long inventoryId;
/** 医保码 */
private String ybNo;
/** 批准文号 */
private String approvalNumber;
>>>>>>> v1.3
}

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

@@ -55,4 +55,8 @@ 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,6 +44,8 @@ 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,5 +50,9 @@ public class DocStatisticsDefinition extends HisBaseEntity {
/** 字典类型 */
private String dictType;
/**
* 类型代码 例 003:体温
*/
private String typeCode;
}

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

@@ -1,11 +1,25 @@
package com.openhis.document.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.document.domain.DocDefinition;
import com.openhis.document.domain.DocStatistics;
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.DocStatistics;
@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);
}

20
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/IDocInventoryItemStaticService.java
View File

@@ -3,6 +3,11 @@
*/
package com.openhis.document.service;
<<<<<<< HEAD
=======
import java.util.List;
>>>>>>> v1.3
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.document.domain.DocInventoryItemStatic;
@@ -12,4 +17,19 @@ import com.openhis.document.domain.DocInventoryItemStatic;
* @author zwh
* @date 2025-11-04
*/
<<<<<<< HEAD
public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {}
=======
public interface IDocInventoryItemStaticService extends IService<DocInventoryItemStatic> {
/**
* 获取物品的库存备份信息
*
* @param itemIdList 物品id
* @param busNo 备份单据号
* @param locationId 库房id
* @return 库存备份信息
*/
List<DocInventoryItemStatic> getInventoryItemStaticByItemId(List<Long> itemIdList, String busNo, Long locationId);
}
>>>>>>> v1.3

34
openhis-server-new/openhis-domain/src/main/java/com/openhis/document/service/impl/DocInventoryItemStaticServiceImpl.java
View File

@@ -3,9 +3,19 @@
*/
package com.openhis.document.service.impl;
<<<<<<< HEAD
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
=======
import java.util.List;
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;
>>>>>>> v1.3
import com.openhis.document.domain.DocInventoryItemStatic;
import com.openhis.document.mapper.DocInventoryItemStaticMapper;
import com.openhis.document.service.IDocInventoryItemStaticService;
@@ -18,4 +28,28 @@ import com.openhis.document.service.IDocInventoryItemStaticService;
*/
@Service
public class DocInventoryItemStaticServiceImpl extends ServiceImpl<DocInventoryItemStaticMapper, DocInventoryItemStatic>
<<<<<<< HEAD
implements IDocInventoryItemStaticService {}
=======
implements IDocInventoryItemStaticService {
/**
* 根据物品id获取物品的库存备份信息
*
* @param itemIdList 物品id
* @return 库存备份信息
*/
@Override
public List<DocInventoryItemStatic> getInventoryItemStaticByItemId(List<Long> itemIdList, String busNo,
Long locationId) {
LambdaQueryWrapper<DocInventoryItemStatic> queryWrapper = new LambdaQueryWrapper<>();
if (itemIdList != null && !itemIdList.isEmpty()) {
queryWrapper.in(DocInventoryItemStatic::getItemId, itemIdList);
}
queryWrapper.eq(DocInventoryItemStatic::getBusNo, busNo)
.eq(DocInventoryItemStatic::getDeleteFlag, DelFlag.NO.getCode())
.eq(DocInventoryItemStatic::getLocationId, locationId).orderByDesc(DocInventoryItemStatic::getCreateTime);
return baseMapper.selectList(queryWrapper);
}
}
>>>>>>> v1.3

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
View File

@@ -102,10 +102,14 @@ public class PaymentReconciliation extends HisBaseEntity {
private String ybSettleIds;// 记录医保结算id
/** 医保清算标志 */
<<<<<<< HEAD
private Integer ybClearFlag;//默认值0 未清算
/** 退号/退费原因 */
@TableField("refund_reason")
private String refundReason;
=======
private Integer ybClearFlag;// 默认值0 未清算
>>>>>>> v1.3
}

95
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java
View File

@@ -3,6 +3,12 @@ package com.openhis.financial.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
<<<<<<< HEAD
=======
import com.core.common.core.domain.HisBaseEntity;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
>>>>>>> v1.3
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -11,15 +17,26 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
<<<<<<< HEAD
* 第三方支付回调实体（下方备注信息以中银支付为模板）
=======
* 第三方支付回调实体（下方备注信息以中银支付为模板,其中会产生冗余字段或者重复字段，这些字段均以第三方平台返回内容为主）
>>>>>>> v1.3
*/
@Data
@TableName("fin_three_part_pay_call_back")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
<<<<<<< HEAD
public class ThreePartPayCallBack {
@TableId(type = IdType.ASSIGN_ID)
=======
public class ThreePartPayCallBack extends HisBaseEntity {
@TableId(type = IdType.ASSIGN_ID)
@JsonSerialize(using = ToStringSerializer.class)
>>>>>>> v1.3
private BigDecimal id;
/**
@@ -130,15 +147,93 @@ public class ThreePartPayCallBack {
/**
* 付款主键ID
*/
<<<<<<< HEAD
=======
@JsonSerialize(using = ToStringSerializer.class)
>>>>>>> v1.3
private Long paymentId;
/**
* 前台UI序号
*/
<<<<<<< HEAD
private Long index;
=======
private Long payIndex;
>>>>>>> v1.3
/**
* 时间戳（中银建议）
*/
<<<<<<< HEAD
private Long time;
=======
private Long payTime;
/**
* 交易日
*/
private String settleDate;
/**
* 交易时间
*/
private String settleTime;
/**
* 清算时间
*/
private String clearDate;
/**
* 校验数据
*/
private String secretKey;
/**
* 卡类型
*/
private String cardType;
/**
* 第三方优惠说明
*/
private String otherMsg;
/**
* 第三方平台
*/
private String otherPlatform;
/**
* 支付方式
*/
private String payMethod;
/**
* 查询结果
*/
private String queryResult;
/**
* 查询结果
*/
private String queryResultMsg;
/**
* 请求执行结果
*/
private String executeResult;
/**
* 支付结果
*/
private String payResult;
/**
* 卡号
*/
private String accountNo;
/**
* 凭证号
*/
private String receiptNo;
/**
* 错误信息
*/
private String errMsg;
/**
* 批次号
*/
private String lotNo;
>>>>>>> v1.3
}

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);
List<PaymentRecDetailAccountResult> getListByReconciliationIds(@Param("paymentIdList") List<Long> paymentIdList,@Param("kindEnum") Integer kindEnum);
}

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);
List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList,Integer kindEnum);
}

5
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java
View File

@@ -4,4 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.financial.domain.ThreePartPayCallBack;
public interface ThreePartPayCallBackService extends IService<ThreePartPayCallBack> {
<<<<<<< HEAD
=======
ThreePartPayCallBack getByPayment(Long paymentId);
>>>>>>> v1.3
}

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.DeleteFlag;
import com.core.common.enums.DelFlag;
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, DeleteFlag.NOT_DELETED.getCode()));
.eq(Contract::getTenantId, tenantId).eq(Contract::getDeleteFlag, DelFlag.NO.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, DeleteFlag.DELETED.getCode()));
.set(Contract::getDeleteFlag, DelFlag.YES.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) {
return baseMapper.getListByReconciliationIds(paymentIdList);
public List<PaymentRecDetailAccountResult> getListByReconciliationIds(List<Long> paymentIdList,Integer kindEnum) {
return baseMapper.getListByReconciliationIds(paymentIdList,kindEnum);
}
}

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

@@ -32,7 +32,11 @@ import com.openhis.administration.service.impl.PatientServiceImpl;
import com.openhis.administration.service.impl.PatientStudentServiceImpl;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.YbCommonConstants;
<<<<<<< HEAD
import com.openhis.common.enums.DelFlag;
=======
import com.core.common.enums.DelFlag;
>>>>>>> v1.3
import com.openhis.common.enums.ItemType;
import com.openhis.common.enums.PaymentKind;
import com.openhis.common.enums.PaymentStatus;

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

@@ -1,5 +1,6 @@
package com.openhis.financial.service.impl;
<<<<<<< HEAD
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.financial.domain.ThreePartPayCallBack;
import com.openhis.financial.mapper.ThreePartPayCallBackMapper;
@@ -8,4 +9,25 @@ import org.springframework.stereotype.Service;
@Service
public class ThreePartPayCallBackServiceImpl extends ServiceImpl<ThreePartPayCallBackMapper, ThreePartPayCallBack> implements ThreePartPayCallBackService {
=======
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.openhis.common.constant.YbCommonConstants;
import com.openhis.financial.domain.ThreePartPayCallBack;
import com.openhis.financial.mapper.ThreePartPayCallBackMapper;
import com.openhis.financial.service.ThreePartPayCallBackService;
@Service
public class ThreePartPayCallBackServiceImpl extends ServiceImpl<ThreePartPayCallBackMapper, ThreePartPayCallBack>
implements ThreePartPayCallBackService {
@Override
public ThreePartPayCallBack getByPayment(Long paymentId) {
return baseMapper
.selectOne(new LambdaQueryWrapper<ThreePartPayCallBack>().eq(ThreePartPayCallBack::getPaymentId, paymentId)
.eq(ThreePartPayCallBack::getDeleteFlag, DelFlag.NO.getCode()).last(YbCommonConstants.sqlConst.LIMIT1));
}
>>>>>>> v1.3
}

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

@@ -0,0 +1,61 @@
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 Normal file
View File

@@ -0,0 +1,55 @@
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 Normal file
View File

@@ -0,0 +1,59 @@
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 Normal file
View File

@@ -0,0 +1,60 @@
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 Normal file
View File

@@ -0,0 +1,68 @@
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 Normal file
View File

@@ -0,0 +1,17 @@
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 Normal file
View File

@@ -0,0 +1,17 @@
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 Normal file
View File

@@ -0,0 +1,17 @@
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 Normal file
View File

@@ -0,0 +1,17 @@
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 Normal file
View File

@@ -0,0 +1,18 @@
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 Normal file
View File

@@ -0,0 +1,14 @@
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 Normal file
View File

@@ -0,0 +1,14 @@
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 Normal file
View File

@@ -0,0 +1,14 @@
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 Normal file
View File

@@ -0,0 +1,14 @@
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 Normal file
View File

@@ -0,0 +1,14 @@
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 Normal file
View File

@@ -0,0 +1,19 @@
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 Normal file
View File

@@ -0,0 +1,19 @@
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 Normal file
View File

@@ -0,0 +1,19 @@
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 Normal file
View File

@@ -0,0 +1,19 @@
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 Normal file
View File

@@ -0,0 +1,19 @@
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 {
}

10
openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java
View File

@@ -3,6 +3,7 @@ package com.openhis.medication.domain;
import java.math.BigDecimal;
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;
@@ -173,4 +174,13 @@ public class MedicationDefinition extends HisBaseEntity {
*/
private String dosageInstruction;
<<<<<<< HEAD
=======
/**
* 药品69码
*/
@TableField("drug_69_code")
private String drug69Code;
>>>>>>> v1.3
}

10
openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java
View File

@@ -14,8 +14,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
/**
* 药品信息详情
*
@@ -220,4 +218,12 @@ public class MedicationDetail extends HisBaseEntity {
*/
private String dosageInstruction;
<<<<<<< HEAD
=======
/**
* 药品69码
*/
private String drug69Code;
>>>>>>> v1.3
}

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

@@ -13,11 +13,11 @@ 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.core.common.utils.AssignSeqUtil;
import com.core.common.utils.DateUtils;
import com.openhis.common.enums.AssignSeqEnum;
import com.openhis.common.enums.DbOpType;
import com.openhis.common.enums.DelFlag;
import com.openhis.common.enums.DispenseStatus;
import com.openhis.medication.domain.MedicationDispense;
import com.openhis.medication.domain.MedicationRequest;
@@ -97,12 +97,23 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
// 设置限制发药时间
medicationDispense.setLimitTime(limitTime);
<<<<<<< HEAD
if (DbOpType.INSERT.getCode().equals(dbOpType)) {
baseMapper.insert(medicationDispense);
} else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
baseMapper.update(medicationDispense, new LambdaUpdateWrapper<MedicationDispense>()
.eq(MedicationDispense::getMedReqId, medicationRequest.getId()));
}
=======
baseMapper.insert(medicationDispense);
// if (DbOpType.INSERT.getCode().equals(dbOpType)) {
// baseMapper.insert(medicationDispense);
// } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
// baseMapper.update(medicationDispense, new LambdaUpdateWrapper<MedicationDispense>()
// .eq(MedicationDispense::getMedReqId, medicationRequest.getId()));
// }
>>>>>>> v1.3
return medicationDispense.getId();
}
@@ -325,6 +336,11 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
public List<MedicationDispense> getMedDispenseBySummaryNo(List<String> summaryNoList) {
return baseMapper
.selectList(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getSummaryNo, summaryNoList)
<<<<<<< HEAD
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
=======
.eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())
.eq(MedicationDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue()));
>>>>>>> v1.3
}
}

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.openhis.common.enums.DelFlag;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.RequestStatus;
import com.openhis.medication.domain.MedicationRequest;
import com.openhis.medication.mapper.MedicationRequestMapper;

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

@@ -2,8 +2,11 @@ package com.openhis.medication.service.impl;
import java.util.List;
<<<<<<< HEAD
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
=======
>>>>>>> v1.3
import com.openhis.medication.dto.AdjustPriceMedListDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -12,7 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.utils.bean.BeanUtils;
import com.openhis.common.enums.DelFlag;
import com.core.common.enums.DelFlag;
import com.openhis.medication.domain.Medication;
import com.openhis.medication.domain.MedicationDetail;
import com.openhis.medication.mapper.MedicationMapper;
@@ -46,7 +49,7 @@ public class MedicationServiceImpl extends ServiceImpl<MedicationMapper, Medicat
if (!medicationIdList.isEmpty()) {
// 查询药品相关信息列表并返回
return baseMapper.selectList(new LambdaQueryWrapper<Medication>()
.eq(Medication::getDeleteFlag, DelFlag.NO.getValue()).in(Medication::getId, medicationIdList));
.eq(Medication::getDeleteFlag, DelFlag.NO.getCode()).in(Medication::getId, medicationIdList));
}
return null;
}

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

@@ -12,8 +12,12 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
<<<<<<< HEAD
import com.core.common.enums.DeleteFlag;
import com.openhis.common.enums.DelFlag;
=======
import com.core.common.enums.DelFlag;
>>>>>>> v1.3
import com.openhis.common.enums.GfRatioType;
import com.openhis.common.enums.ItemType;
import com.openhis.common.enums.ybenums.YbChrgitmLv;
@@ -87,7 +91,11 @@ public class GfRatioServiceImpl extends ServiceImpl<GfRatioMapper, GfRatio> impl
// 查询DB中的所有大项比例
List<GfRatio> gfRatioList =
this.list(new LambdaQueryWrapper<GfRatio>().eq(GfRatio::getRatioType, GfRatioType.TYPE_RATIO.getValue())
<<<<<<< HEAD
.eq(GfRatio::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode()));
=======
.eq(GfRatio::getDeleteFlag, DelFlag.NO.getCode()));
>>>>>>> v1.3
// 做成医保分项+医保等级拼接的Map
Map<String, GfRatio> gfRatioMap =
gfRatioList.stream().collect(Collectors.toMap(e -> e.getYbClass() + e.getYbLv(), Function.identity()));

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

@@ -0,0 +1,58 @@
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 Normal file
View File

@@ -0,0 +1,18 @@
/*
* 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 Normal file
View File

@@ -0,0 +1,15 @@
/*
* 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 Normal file
View File

@@ -0,0 +1,21 @@
/*
* 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 {}

33
openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IActivityDefinitionService.java
View File

@@ -43,18 +43,51 @@ public interface IActivityDefinitionService extends IService<ActivityDefinition>
/**
* Desc: 根据 项目id数组 加载 诊疗数据集合
<<<<<<< HEAD
=======
*
>>>>>>> v1.3
* @param itemIds
* @Author raymond
* @Date 12:20 2025/10/18
* @return java.util.List<com.openhis.workflow.domain.ActivityDefinition>
**/
List<ActivityDto> searchActivityDefinitionByIds(@Param("itemIds") List<Long> itemIds);
<<<<<<< HEAD
/**
* Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
=======
/**
* Desc: 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有
*
>>>>>>> v1.3
* @param keyWord
* @Author raymond
* @Date 07:53 2025/10/22
* @return java.util.List<com.openhis.medication.dto.AdjustPriceMedListDto>
**/
List<AdjustPriceMedListDto> searchActivityListByKeyWord(String keyWord);
<<<<<<< HEAD
=======
/**
* 查询某一类的服务
*
* @param productIdList id集合
* @param activityDefCategory 类型
* @return 查询结果
*/
List<ActivityDefinition> getListByIds(List<Long> productIdList, Integer activityDefCategory);
/**
* 查询某一类的服务
*
* @param productIdList id集合
* @param typeEnum 类型
* @return 查询结果
*/
List<ActivityDefinition> getListByTypeEnum(List<Long> productIdList, Integer typeEnum);
>>>>>>> v1.3
}

26
openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java
View File

@@ -38,6 +38,21 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
*/
Long generateDeviceDispense(DeviceRequest deviceRequest, Long procedureId, Long locationId,
Date plannedDispenseTime);
<<<<<<< HEAD
=======
/**
* 医嘱执行生成耗材发放,状态为已发放
*
* @param deviceRequest 耗材医嘱请求
* @param procedureId 执行记录id
* @param locationId 发放器材房
* @param plannedDispenseTime 预定发药时间
* @return 发放id
*/
Long generateIssuedDeviceDispense(DeviceRequest deviceRequest, Long procedureId, Long locationId,
Date plannedDispenseTime);
>>>>>>> v1.3
/**
* 删除器材发放信息
@@ -128,4 +143,15 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
* @param medDispenseId 发放id列表
*/
void updateDispenseStatusSummarized(List<Long> medDispenseId, String busNo);
<<<<<<< HEAD
=======
/**
* 通过请求id获取耗材发放信息
*
* @param requestIdList 请求id
* @return 发放信息
*/
List<DeviceDispense> selectByRequestIdList(List<Long> requestIdList);
>>>>>>> v1.3
}

11
openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IServiceRequestService.java
View File

@@ -118,4 +118,15 @@ public interface IServiceRequestService extends IService<ServiceRequest> {
* @return 请求信息列表
*/
List<ServiceRequest> getServiceRequestByActivityId(Long activityId);
<<<<<<< HEAD
=======
/**
* 查询诊疗对应的服务申请
*
* @param encounterId 就诊id
* @return 请求信息列表
*/
List<ServiceRequest> getServiceRequestListByEncounterId(Long encounterId);
>>>>>>> v1.3
}

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