From b00841f3bfae404c88a3be6fa2a6851b4ab1e4a8 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 4 Sep 2024 17:44:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOriginController.java    |  1 -
 .../collect/IoCollectOrderService.java        | 28 +++----------------
 .../collect/IoCollectOriginService.java       |  6 +++-
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
index d5ad7e79b..54ecbcbbb 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
@@ -3,7 +3,6 @@ package com.glxp.api.controller.collect;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.service.collect.IoCollectOriginService;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
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 906ff794c..ff77d0898 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -209,7 +209,7 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
      */
     public void importOrder() {
         importUdi();
-        importPrescribe();
+        importPrescribe(null);
     }
 
     public void clearOrder() {
@@ -349,19 +349,15 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     }
 
 
-    public void importPrescribe() {
+    public void importPrescribe(List<BasicSkPrescribeEntity> basicSkPrescribeEntities) {
         //下载处方
-        List<BasicSkPrescribeEntity> basicSkPrescribeEntities = basicSkPrescribeService.list();
+        if (CollUtil.isNotEmpty(basicSkPrescribeEntities))
+            basicSkPrescribeEntities = basicSkPrescribeService.list();
         List<SysWorkplaceResponse> allWorksList = new ArrayList<>();
-        List<IoCollectOrder> collectOrderList = new ArrayList<>();
         for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) {
-//            BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByFromCode(String.valueOf(basicSkPrescribeEntity.getAddr()));
-//            if (collectBustypeEntity == null)
-//                continue;
             if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) {
                 continue;
             }
-
             SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(basicSkPrescribeEntity.getAddr());
             if (sysWorkplaceDocumentEntity == null)
                 continue;
@@ -411,17 +407,12 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             if (collectOrder.getWorkPlaceCode() != null) {
                 collectOrder.setTagStatus(1);
             }
-//            collectOrderList.add(collectOrder);
             save(collectOrder);
             List<BasicSkPrescribeItemEntity> basicSkPrescribeItemEntities = basicSkPrescirbeDetailService.findByPrescribeNum(basicSkPrescribeEntity.getCode());
             List<IoCollectOrderBiz> collectOrderBizs = new ArrayList<>();
             for (BasicSkPrescribeItemEntity bizEntity : basicSkPrescribeItemEntities) {
                 UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(bizEntity.getRelId() + "");
-
                 double doubleValue = Double.parseDouble(bizEntity.getMeasureCount());
-
-                // 将double转换为int，这将截断小数部分
-                int intValue = (int) doubleValue;
                 IoCollectOrderBiz collectOrderBiz = IoCollectOrderBiz.builder().orderIdFk(collectOrder.getBillNo())
                         .relId(bizEntity.getRelId())
                         .thrCode(bizEntity.getItemCode())
@@ -451,17 +442,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             }
 
         }
-//        if (CollUtil.isNotEmpty(collectOrderList)) {
-//            saveBatch(collectOrderList);
-//        }
-//        Map<Long, SysWorkplaceResponse> sysWorkplaceMap = new HashMap<>();
-//        for (SysWorkplaceResponse sysWorkplace : allWorksList) {
-//            sysWorkplaceMap.put(sysWorkplace.getId(), sysWorkplace);
-//        }
-//        for (SysWorkplaceResponse value : sysWorkplaceMap.values()) {
-//            splitFifoCodeService.preAllotInv(value.getWorkplaceId());
-//        }
-
     }
 
     @Transactional(rollbackFor = Exception.class)
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
index 0bbfeb3e3..e55bd7979 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
@@ -34,6 +34,8 @@ public class IoCollectOriginService {
     BasicSkPrescribeService basicSkPrescribeService;
     @Resource
     BasicSkPrescirbeDetailService basicSkPrescirbeDetailService;
+    @Resource
+    IoCollectOrderService collectOrderService;
 
     public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
 
@@ -68,9 +70,11 @@ public class IoCollectOriginService {
                     basicSkPrescribeEntities.add(basicSkPrescribeEntity);
                     basicSkPrescribeService.saveOrUpdate(basicSkPrescribeEntity);
                 });
+                collectOrderService.importPrescribe(basicSkPrescribeEntities);
+                return ResultVOUtils.success("下载成功");
             }
         }
+        return ResultVOUtils.error("下载失败");
 
-        return ResultVOUtils.success("下载成功");
     }
 }