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

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChangePriceService.java
View File

@@ -3,8 +3,6 @@ package com.openhis.web.paymentmanage.appservice;
import com.github.pagehelper.PageInfo;
import com.openhis.web.paymentmanage.dto.ChangePriceListDto;
import java.util.List;
/**
* Desc:
* @Author raymond

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IChargeBillService.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.paymentmanage.appservice;
import java.util.Map;
import com.core.common.core.domain.R;
import com.openhis.web.paymentmanage.dto.ChargeSummaryDto;
import java.util.Map;
public interface IChargeBillService {
/**
* 小票信息

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IEleInvoiceService.java
View File

@@ -5,12 +5,6 @@ package com.openhis.web.paymentmanage.appservice;
import com.core.common.core.domain.R;
import com.openhis.administration.domain.Invoice;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
/**
* 电子发票接口Service

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/IPaymentRecService.java
View File

@@ -3,20 +3,22 @@
*/
package com.openhis.web.paymentmanage.appservice;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.core.common.core.domain.R;
import com.openhis.web.chargemanage.dto.OutpatientRegistrationAddParam;
import com.openhis.web.chargemanage.dto.OutpatientRegistrationSettleParam;
import com.openhis.web.paymentmanage.dto.*;
import com.openhis.web.paymentmanage.dto.CancelPaymentDto;
import com.openhis.web.paymentmanage.dto.InpatientPreSettleResultDto;
import com.openhis.web.paymentmanage.dto.NenuBpcPayDto;
import com.openhis.web.paymentmanage.dto.PaymentVO;
import com.openhis.yb.dto.PaymentDetailDto;
import com.openhis.yb.dto.PaymentDto;
import com.openhis.yb.dto.PaymentInpatientDto;
import com.openhis.yb.dto.PrePaymentDto;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* 付款应用层Service
*

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ChangePriceImpl.java
View File

@@ -1,6 +1,5 @@
package com.openhis.web.paymentmanage.appservice.impl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.openhis.medication.domain.MedicationDefinition;
import com.openhis.web.paymentmanage.appservice.IChangePriceService;

59
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/EleInvoiceServiceImpl.java
View File

@@ -3,36 +3,6 @@
*/
package com.openhis.web.paymentmanage.appservice.impl;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
@@ -66,8 +36,35 @@ import com.openhis.web.paymentmanage.mapper.EleInvoiceMapper;
import com.openhis.yb.domain.ClinicReg;
import com.openhis.yb.service.IClinicSettleService;
import com.openhis.yb.service.IRegService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* 电子发票接口Service

38
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
View File

@@ -3,25 +3,6 @@
*/
package com.openhis.web.paymentmanage.appservice.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -42,7 +23,6 @@ import com.openhis.administration.service.impl.PatientStudentServiceImpl;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.*;
import com.openhis.common.enums.PaymentOutcome;
import com.openhis.common.enums.ybenums.YbMdtrtCertType;
import com.openhis.common.enums.ybenums.YbPayment;
import com.openhis.common.enums.ybenums.YbPsnSetlWay;
@@ -88,8 +68,24 @@ import com.openhis.yb.service.IClinicSettleService;
import com.openhis.yb.service.IInpatientSettleService;
import com.openhis.yb.service.IRegService;
import com.openhis.yb.service.YbManager;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
/**
* 付款应用层Service

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartPayServiceImpl.java
View File

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.common.constant.Constants;
import com.core.common.core.domain.R;
import com.core.common.enums.TenantOptionDict;
import com.core.common.exception.ServiceException;
@@ -15,7 +14,6 @@ import com.core.web.util.TenantOptionUtil;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.service.IPractitionerService;
import com.openhis.common.constant.CommonConstants;
import com.openhis.common.enums.PaymentStatus;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.financial.domain.ThreePartPayCallBack;
@@ -23,11 +21,8 @@ import com.openhis.financial.service.IPaymentRecDetailService;
import com.openhis.financial.service.IPaymentReconciliationService;
import com.openhis.financial.service.ThreePartPayCallBackService;
import com.openhis.web.paymentmanage.appservice.ThreePartPayService;
import com.openhis.web.paymentmanage.dto.PaymentVO;
import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo;
import com.openhis.web.paymentmanage.mapper.PaymentMapper;
import com.openhis.yb.dto.BaseInfo;
import com.openhis.yb.dto.BaseParam;
import com.openhis.yb.dto.PaymentDetailDto;
import com.openhis.yb.dto.ThreePartPayDto;
import lombok.extern.slf4j.Slf4j;
@@ -53,7 +48,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.function.Consumer;
@Component
@Slf4j

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/ThreePartSimpleFieldMappingService.java
View File

@@ -5,10 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.openhis.web.paymentmanage.util.ReverseMappingProperties;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ChargeBillController.java
View File

@@ -1,14 +1,12 @@
package com.openhis.web.paymentmanage.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.core.common.annotation.Anonymous;
import com.core.common.core.domain.R;
import com.openhis.web.paymentmanage.appservice.IChargeBillService;
import com.openhis.web.paymentmanage.dto.ChargeSummaryDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 报表

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/EleInvoiceController.java
View File

@@ -4,7 +4,6 @@ import com.core.common.core.domain.R;
import com.core.common.exception.ServiceException;
import com.openhis.administration.domain.Invoice;
import com.openhis.common.enums.ybenums.YbEncounterClass;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.web.paymentmanage.appservice.IChargeBillService;
import com.openhis.web.paymentmanage.appservice.IEleInvoiceService;
import com.openhis.web.paymentmanage.dto.InvoiceWriteOffDto;

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentContractController.java
View File

@@ -3,17 +3,15 @@
*/
package com.openhis.web.paymentmanage.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.core.common.core.domain.R;
import com.openhis.financial.domain.Contract;
import com.openhis.financial.service.IContractService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
/**
* 付款合同管理

17
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/PaymentReconciliationController.java
View File

@@ -3,15 +3,6 @@
*/
package com.openhis.web.paymentmanage.controller;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.core.common.core.domain.R;
import com.core.common.enums.TenantOptionDict;
import com.core.web.util.TenantOptionUtil;
@@ -27,9 +18,15 @@ import com.openhis.web.paymentmanage.dto.NenuBpcPayDto;
import com.openhis.yb.dto.PaymentDto;
import com.openhis.yb.dto.PaymentInpatientDto;
import com.openhis.yb.dto.PrePaymentDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.Map;
/**
* 付款管理

18
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/controller/ThreePartPayController.java
View File

@@ -1,21 +1,7 @@
package com.openhis.web.paymentmanage.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.core.domain.R;
import com.core.common.enums.TenantOptionDict;
import com.core.common.utils.SecurityUtils;
import com.core.web.util.TenantOptionUtil;
import com.openhis.administration.domain.Practitioner;
import com.openhis.administration.service.IPractitionerService;
import com.openhis.administration.service.impl.PractitionerServiceImpl;
import com.openhis.financial.domain.PaymentRecDetail;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.financial.service.IPaymentRecDetailService;
import com.openhis.financial.service.IPaymentReconciliationService;
import com.openhis.web.paymentmanage.appservice.ThreePartPayService;
import com.openhis.yb.dto.PaymentDetailDto;
import com.openhis.yb.dto.PaymentDto;
import com.openhis.yb.dto.ThreePartPayDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -23,10 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.security.Security;
import java.util.HashMap;
import java.util.Map;
/**
* 第三方支付管理

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelPaymentDto.java
View File

@@ -3,15 +3,13 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.util.List;
import javax.validation.constraints.NotEmpty;
import com.openhis.yb.dto.PaymentDetailDto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty;
import java.util.List;
/**
* 退费入参
*

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/CancelRegPaymentDto.java
View File

@@ -1,18 +1,16 @@
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import java.util.List;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.yb.dto.PaymentDetailDto;
import lombok.Data;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
@Data
@Accessors(chain = true)
public class CancelRegPaymentDto {

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeItemDetailVO.java
View File

@@ -1,6 +1,5 @@
package com.openhis.web.paymentmanage.dto;
import com.openhis.administration.domain.ChargeItem;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ChargeSummaryDto.java
View File

@@ -1,7 +1,6 @@
package com.openhis.web.paymentmanage.dto;
import lombok.Data;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2206OrderResultDto.java
View File

@@ -8,7 +8,6 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.util.List;
/**
* 预结算结果集

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/Clinic2207OrderResultDto.java
View File

@@ -1,7 +1,6 @@
package com.openhis.web.paymentmanage.dto;
import com.openhis.yb.dto.Clinic2207OrderResult;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceChargeDetailDto.java
View File

@@ -3,9 +3,6 @@
*/
package com.openhis.web.paymentmanage.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceListDetailDto.java
View File

@@ -3,8 +3,6 @@
*/
package com.openhis.web.paymentmanage.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import lombok.experimental.Accessors;

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoicePaymentInfoDto.java
View File

@@ -3,12 +3,10 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
import lombok.experimental.Accessors;
import org.apache.poi.hpsf.Decimal;
import java.math.BigDecimal;
/**
* 付款信息

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/EleInvoiceResultDto.java
View File

@@ -3,14 +3,12 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import com.openhis.common.annotation.Dict;
import com.openhis.common.enums.InvoiceStatus;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* 返回信息
*

9
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleDto.java
View File

@@ -3,17 +3,16 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
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;
/**
* TODO:请概括描述当前类的主要用途和注意事项
*

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InpatientPreSettleResultDto.java
View File

@@ -3,13 +3,12 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.util.List;
import com.openhis.financial.domain.PaymentReconciliation;
import com.openhis.financial.model.PaymentRecDetailDto;
import lombok.Data;
import java.util.List;
/**
* 住院预结算回显数据
*

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/InvoiceBaseInfoDto.java
View File

@@ -3,16 +3,15 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import java.util.Date;
import com.alibaba.fastjson2.annotation.JSONField;
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;
/**
* 电子发票基础信息查询实体
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/NenuBpcPayDto.java
View File

@@ -3,11 +3,11 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import lombok.Data;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
* 师大Bpc支付入参
*

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/OrgIncomeDto.java
View File

@@ -1,10 +1,10 @@
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
@Getter
@Setter
public class OrgIncomeDto {

7
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/PaymentVO.java
View File

@@ -3,15 +3,14 @@
*/
package com.openhis.web.paymentmanage.dto;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.common.annotation.Dict;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 映射对象
*

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ReportVo.java
View File

@@ -1,12 +1,10 @@
package com.openhis.web.paymentmanage.dto;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class ReportVo {

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/dto/ThreePartCallBackVo.java
View File

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.openhis.financial.domain.ThreePartPayCallBack;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ThreePartCallBackVo extends ThreePartPayCallBack {

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChangePriceMapper.java
View File

@@ -1,7 +1,6 @@
package com.openhis.web.paymentmanage.mapper;
import com.openhis.medication.domain.MedicationDefinition;
import com.openhis.web.paymentmanage.dto.ChangePriceListDto;
import org.springframework.stereotype.Component;
import java.util.List;

1
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/ChargeBillMapper.java
View File

@@ -1,6 +1,5 @@
package com.openhis.web.paymentmanage.mapper;
import com.openhis.web.paymentmanage.dto.ChargeItemDetailVO;
import com.openhis.web.paymentmanage.dto.ChargeItemExtendInfoDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Component;

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/EleInvoiceMapper.java
View File

@@ -3,15 +3,14 @@
*/
package com.openhis.web.paymentmanage.mapper;
import java.util.List;
import com.openhis.web.paymentmanage.dto.EleInvoiceChargeDetailDto;
import com.openhis.web.paymentmanage.dto.EleInvoiceListDetailDto;
import com.openhis.web.paymentmanage.dto.EleInvoicePatientInfoDto;
import com.openhis.web.paymentmanage.dto.EleInvoicePaymentInfoDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 电子发票
*

11
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/mapper/PaymentMapper.java
View File

@@ -3,12 +3,6 @@
*/
package com.openhis.web.paymentmanage.mapper;
import java.util.List;
import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -16,7 +10,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.openhis.web.paymentmanage.dto.ChargeItemDto;
import com.openhis.web.paymentmanage.dto.DispenseQuantityDto;
import com.openhis.web.paymentmanage.dto.PaymentVO;
import com.openhis.web.paymentmanage.dto.ThreePartCallBackVo;
import com.openhis.yb.dto.PaymentDetailDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 付款Dao