From f9855df25d03fee3818e8ec24f0ecc730905a112 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 23 Jan 2025 15:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=BA=93=E5=AD=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/collect/IoCollectOrderBiz.java    | 1 +
 .../glxp/api/service/collect/down/YPCF002Download.java    | 8 ++------
 .../com/glxp/api/service/inout/IoSplitFifoInvService.java | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java
index c0b5ceb56..3bc57242f 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBiz.java
@@ -58,6 +58,7 @@ public class IoCollectOrderBiz implements Serializable {
     private String ybbm;
 
 
+
     /**
      * 医保编码
      */
diff --git a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
index 72ebef9f9..0b516c11e 100644
--- a/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
+++ b/src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java
@@ -9,8 +9,6 @@ import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.collect.IoCollectOrderService;
 import com.glxp.api.util.IntUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.jfree.util.Log;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -20,7 +18,6 @@ import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-@Slf4j
 public class YPCF002Download implements IDownload {
     @Resource
     private ErpBasicClient erpBasicClient;
@@ -49,7 +46,7 @@ public class YPCF002Download implements IDownload {
             try {
                 getSickPrescribeRequest.setPage(page);
                 BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);
-                log.error(baseResponse.getCode()+"---"+baseResponse.getData());
+
                 // TODO: 2024/9/11 添加一张中间表（io_collect_order_origin）原始表做为转换
 
                 if (baseResponse.getCode() == 20000) {
@@ -67,8 +64,7 @@ public class YPCF002Download implements IDownload {
                     return ResultVOUtils.error(500, "下载第三方系统产品信息异常");
                 }
             } catch (Exception e) {
-                log.error("下载第三方系统产品信息异常 fail" + ExceptionUtils.getStackTrace(e));
-//                e.printStackTrace();
+                e.printStackTrace();
                 return ResultVOUtils.error(500, e.getMessage());
 
             }
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index becc34af7..429e7b7c4 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -325,8 +325,8 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
         List<IoSplitInvResponse> ioSplitInvResponses = this.baseMapper.filterKcyjList(ioSplitFifoInvRequest);
         if (CollUtil.isNotEmpty(ioSplitInvResponses)) {
             ioSplitInvResponses.forEach(t -> {
-                if (t.getQueueEnableRemind()) {
-                    int count = t.getReCount() - t.getQueueRemindCount();
+                if (IntUtil.value(t.getQueueEnableRemind())) {
+                    int count = IntUtil.value(t.getReCount()) - IntUtil.value(t.getQueueRemindCount());
                     if (count > 0) {
                         t.setRemindState(1);
                     } else {