From 086a0c2354e782a33dbc40e3e62630b7d81039c3 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Thu, 5 Dec 2024 17:15:51 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=80=89=E5=85=A5=E8=8D=AF=E5=93=81b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/basic/UdiRelevanceController.java   | 6 +++---
 .../java/com/glxp/api/service/basic/UdiContrastService.java | 6 +++---
 .../com/glxp/api/service/collect/IoCollectOrderService.java | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 66b6a81f8..60a4af1b8 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -249,9 +249,9 @@ public class UdiRelevanceController extends BaseController {
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(filterUdiRelRequest.getId());
         FilterUdiRelRequest tempRequest = new FilterUdiRelRequest();
         tempRequest.setUuid(udiRelevanceEntity.getUuid());
-        if (filterUdiRelRequest.getProductsType() == 2) {
-            tempRequest.setNameCode(filterUdiRelRequest.getNameCode());
-        }
+//        if (filterUdiRelRequest.getProductsType() == 2) {
+//            tempRequest.setNameCode(filterUdiRelRequest.getNameCode());
+//        }
         List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(tempRequest);
         List<UdiRelevanceResponse> udiRelevanceResponses = new ArrayList<>();
         if (CollUtil.isNotEmpty(udiInfoEntities)) {
diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
index 85b0df315..df8582fab 100644
--- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
+++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java
@@ -354,9 +354,9 @@ public class UdiContrastService {
                     udiProductEntity.setPrepnUnit(ybDrug.getRealityMedicinemodel());
 
 
-                } else {
-
-
+                }
+                if (StrUtil.isEmpty(udiProductEntity.getZczbhhzbapzbh()) || StrUtil.isEmpty(udiProductEntity.getCpmctymc())) {
+                    return;
                 }
                 List<ThirdAliDrug> thirdAliDrugList = thirdAliDrugService.list(
                         new QueryWrapper<ThirdAliDrug>()
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index cc0e240eb..c5db04ad2 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -839,6 +839,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
         ioCollectOrderBackupService.save(ioCollectOrderBackup);
 
+        //todo 备份码表
+
         //删除原来单据
         IoCollectOrder finalCollectOrder = collectOrder;
         ThreadUtil.execAsync(() -> {