From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 0a0aa04..c6f2cf7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -406,20 +406,22 @@
         settleClaims.setOrigin(Constants.ONE);
         if(Objects.isNull(settleClaims)
                 || Objects.isNull(settleClaims.getExtData())
+                || Objects.isNull(settleClaims.getExtData().getBxName())
                 || Objects.isNull(settleClaims.getExtData().getMemberName())
                 || Objects.isNull(settleClaims.getExtData().getMemberIdcardType())
-                || Objects.isNull(settleClaims.getExtData().getMemberIdcard())){
+                || Objects.isNull(settleClaims.getExtData().getMemberIdcard())
+                || Objects.isNull(settleClaims.getStatus())
+        ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
-                &&(  Objects.isNull(settleClaims.getExtData().getBxName())
-                || Objects.isNull(settleClaims.getExtData().getReportDate())
-                || Objects.isNull(settleClaims.getExtData().getBxCode())
-                || Objects.isNull(settleClaims.getExtData().getBxEnddate())
-                || Objects.isNull(settleClaims.getExtData().getBxOrg())
-                || Objects.isNull(settleClaims.getInformantPhone()) )){
-            throw new BusinessException(ResponseStatus.BAD_REQUEST);
-        }
+//        if(!Constants.equalsObject(settleClaims.getStatus(),Constants.ZERO)
+//                &&( Objects.isNull(settleClaims.getExtData().getReportDate())
+//                || Objects.isNull(settleClaims.getExtData().getBxCode())
+//                || Objects.isNull(settleClaims.getExtData().getBxEnddate())
+//                || Objects.isNull(settleClaims.getExtData().getBxOrg())
+//                || Objects.isNull(settleClaims.getInformantPhone()) )){
+//            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+//        }
         if(!Constants.equalsInteger(loginUserInfo.getType(),Constants.ZERO)){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐞嗗憳鏃犳硶杩涜璇ユ搷浣�");
         }
@@ -1364,9 +1366,9 @@
                     ||Objects.isNull(settleClaimsDTO.getMedicalInsurance())
                     ||StringUtils.isBlank(settleClaimsDTO.getInformantName())
                     ||StringUtils.isBlank(settleClaimsDTO.getInformantPhone())
-                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
-                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
-                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
+//                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveUserName())
+//                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveBank())
+//                    ||StringUtils.isBlank(settleClaimsDTO.getReceiveAccount())
             ){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST);
             }

--
Gitblit v1.9.3