提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java
@@ -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
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/ThreePartPayCallBack.java
@@ -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
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/mapper/PaymentRecDetailMapper.java
@@ -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);
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/IPaymentRecDetailService.java
@@ -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);

 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/ThreePartPayCallBackService.java
@@ -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
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ContractServiceImpl.java
@@ -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()));
    }

    /**
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentRecDetailServiceImpl.java
@@ -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);
    }
 }
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/PaymentReconciliationServiceImpl.java
@@ -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;
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/service/impl/ThreePartPayCallBackServiceImpl.java
@@ -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
 }