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

style(flowable): 优化流程相关代码的import顺序和代码结构

Browse Source
This commit is contained in:
chenqi
2025-12-30 15:11:32 +08:00
parent 54cde91aac
commit d1670b79a0
2528 changed files with 7710 additions and 10794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java
View File

@@ -1,18 +1,16 @@
package com.openhis.financial.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.ClaimUse;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 索赔管理Entity实体
*

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ClaimResponse.java
View File

@@ -1,17 +1,15 @@
package com.openhis.financial.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* 索赔响应管理Entity实体
*

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

@@ -1,12 +1,8 @@
package com.openhis.financial.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

6
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java
View File

@@ -1,17 +1,15 @@
package com.openhis.financial.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* 合同管理Entity实体
*

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentRecDetail.java
View File

@@ -1,17 +1,16 @@
package com.openhis.financial.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.Date;
/**
* 付款管理Entity实体
*

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

@@ -3,17 +3,16 @@
*/
package com.openhis.financial.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;
import java.math.BigDecimal;
/**
* 付款记录的快照（用于统计报表等使用）
*

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

@@ -1,18 +1,16 @@
package com.openhis.financial.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.Date;
/**
* 付款管理Entity实体
*

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimMapper.java
View File

@@ -1,9 +1,8 @@
package com.openhis.financial.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.Claim;
import org.springframework.stereotype.Repository;
/**
* 索赔管理Mapper接口

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ClaimResponseMapper.java
View File

@@ -1,9 +1,8 @@
package com.openhis.financial.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.ClaimResponse;
import org.springframework.stereotype.Repository;
/**
* 索赔响应管理Mapper接口

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ContractMapper.java
View File

@@ -1,9 +1,8 @@
package com.openhis.financial.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.Contract;
import org.springframework.stereotype.Repository;
/**
* 合同管理Mapper接口

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentNoticeMapper.java
View File

@@ -1,9 +1,8 @@
package com.openhis.financial.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.PaymentNotice;
import org.springframework.stereotype.Repository;
/**
* 合同管理Mapper接口

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

@@ -1,13 +1,12 @@
package com.openhis.financial.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.PaymentRecDetail;
import com.openhis.financial.model.PaymentRecDetailAccountResult;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 付款管理Mapper接口

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecStaticMapper.java
View File

@@ -3,10 +3,9 @@
*/
package com.openhis.financial.mapper;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.PaymentRecStatic;
import org.springframework.stereotype.Repository;
/**
* 付款管理Mapper接口

9
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentReconciliationMapper.java
View File

@@ -1,13 +1,12 @@
package com.openhis.financial.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.financial.model.PaymentReconciliationAccountDel;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 付款管理Mapper接口

1
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/ThreePartPayCallBackMapper.java
View File

@@ -1,7 +1,6 @@
package com.openhis.financial.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.openhis.financial.domain.ClaimResponse;
import com.openhis.financial.domain.ThreePartPayCallBack;
import org.springframework.stereotype.Repository;

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailAccountResult.java
View File

@@ -3,15 +3,14 @@
*/
package com.openhis.financial.model;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.Date;
/**
* 付款详情与账户信息实体
*

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentRecDetailDto.java
View File

@@ -1,8 +1,5 @@
package com.openhis.financial.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import liquibase.pro.packaged.D;
import lombok.Data;
import lombok.experimental.Accessors;

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PaymentReconciliationAccountDel.java
View File

@@ -1,14 +1,13 @@
package com.openhis.financial.model;
import java.math.BigDecimal;
import java.util.Date;
import com.core.common.core.domain.HisBaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.Date;
/**
* 付款管理Entity实体
*

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

@@ -1,10 +1,10 @@
package com.openhis.financial.model;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@Data
public class PaymentedItemModel {
/** 就诊id */

7
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResult.java
View File

@@ -1,13 +1,12 @@
package com.openhis.financial.model;
import java.math.BigDecimal;
import java.util.List;
import com.alibaba.fastjson2.annotation.JSONField;
import com.openhis.yb.dto.Clinic2206FundPaymentResult;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class PrePaymentResult {

5
openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/model/PrePaymentResultModel.java
View File

@@ -1,14 +1,9 @@
package com.openhis.financial.model;
import com.openhis.financial.domain.PaymentRecDetail;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.financial.mapper.PaymentReconciliationMapper;
import com.openhis.yb.dto.Clinic2206FundPaymentResult;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data

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

@@ -1,9 +1,9 @@
package com.openhis.financial.model;
import java.math.BigDecimal;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class StudentPaymentItemModel extends PaymentedItemModel {

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

@@ -1,11 +1,11 @@
package com.openhis.financial.service;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.financial.domain.Contract;
import java.util.List;
/**
* 合同管理Service接口
*

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

@@ -1,12 +1,12 @@
package com.openhis.financial.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.common.enums.PaymentResult;
import com.openhis.financial.domain.PaymentRecDetail;
import com.openhis.financial.model.PaymentRecDetailAccountResult;
import java.util.List;
/**
* 付款管理Service接口
*

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

@@ -3,14 +3,14 @@
*/
package com.openhis.financial.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.administration.dto.ChargeItemDefInfo;
import com.openhis.common.enums.PaymentStatisticalMethod;
import com.openhis.common.enums.PaymentType;
import com.openhis.financial.domain.PaymentRecStatic;
import java.util.List;
/**
* 付款管理Service接口
*

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

@@ -1,7 +1,5 @@
package com.openhis.financial.service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.common.enums.PaymentKind;
import com.openhis.common.enums.PaymentStatus;
@@ -14,6 +12,8 @@ import com.openhis.financial.model.PaymentedItemModel;
import com.openhis.financial.model.PrePaymentResult;
import com.openhis.yb.dto.PaymentInpatientDto;
import java.util.List;
/**
* 付款管理Service接口
*

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

@@ -1,11 +1,10 @@
package com.openhis.financial.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.financial.domain.ClaimResponse;
import com.openhis.financial.mapper.ClaimResponseMapper;
import com.openhis.financial.service.IClaimResponseService;
import org.springframework.stereotype.Service;
/**
* 索赔响应管理Service业务层处理

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

@@ -1,11 +1,10 @@
package com.openhis.financial.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.financial.domain.Claim;
import com.openhis.financial.mapper.ClaimMapper;
import com.openhis.financial.service.IClaimService;
import org.springframework.stereotype.Service;
/**
* 索赔管理Service业务层处理

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

@@ -1,13 +1,5 @@
package com.openhis.financial.service.impl;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
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.core.metadata.IPage;
@@ -21,6 +13,13 @@ import com.openhis.common.enums.Whether;
import com.openhis.financial.domain.Contract;
import com.openhis.financial.mapper.ContractMapper;
import com.openhis.financial.service.IContractService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
/**
* 合同管理Service业务层处理

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

@@ -1,11 +1,10 @@
package com.openhis.financial.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.financial.domain.PaymentNotice;
import com.openhis.financial.mapper.PaymentNoticeMapper;
import com.openhis.financial.service.IPaymentNoticeService;
import org.springframework.stereotype.Service;
/**
* 合同管理Service业务层处理

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

@@ -1,9 +1,5 @@
package com.openhis.financial.service.impl;
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.openhis.common.enums.PaymentResult;
@@ -11,6 +7,9 @@ import com.openhis.financial.domain.PaymentRecDetail;
import com.openhis.financial.mapper.PaymentRecDetailMapper;
import com.openhis.financial.model.PaymentRecDetailAccountResult;
import com.openhis.financial.service.IPaymentRecDetailService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 付款管理Service业务层处理

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

@@ -3,14 +3,6 @@
*/
package com.openhis.financial.service.impl;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.administration.dto.ChargeItemDefInfo;
@@ -19,6 +11,13 @@ import com.openhis.common.enums.PaymentType;
import com.openhis.financial.domain.PaymentRecStatic;
import com.openhis.financial.mapper.PaymentRecStaticMapper;
import com.openhis.financial.service.IPaymentRecStaticService;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 付款管理Service业务层处理

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

@@ -1,22 +1,9 @@
package com.openhis.financial.service.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
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.exception.ServiceException;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.SecurityUtils;
@@ -32,7 +19,6 @@ 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;
import com.core.common.enums.DelFlag;
import com.openhis.common.enums.ItemType;
import com.openhis.common.enums.PaymentKind;
import com.openhis.common.enums.PaymentStatus;
@@ -58,6 +44,18 @@ import com.openhis.yb.dto.PaymentInpatientDto;
import com.openhis.yb.dto.Yb2304OutputSetlInfo;
import com.openhis.yb.model.Clinic2207OrderModel;
import com.openhis.yb.service.YbManager;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 付款管理Service业务层处理

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

@@ -1,7 +1,5 @@
package com.openhis.financial.service.impl;
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;
@@ -9,6 +7,7 @@ import com.openhis.common.constant.YbCommonConstants;
import com.openhis.financial.domain.ThreePartPayCallBack;
import com.openhis.financial.mapper.ThreePartPayCallBackMapper;
import com.openhis.financial.service.ThreePartPayCallBackService;
import org.springframework.stereotype.Service;
@Service
public class ThreePartPayCallBackServiceImpl extends ServiceImpl<ThreePartPayCallBackMapper, ThreePartPayCallBack>