From 9f46579a9d768b1101d8c778ef7bbd81476baa73 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 22 Oct 2024 09:19:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=A0=81=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBackupService.java  | 28 ++++---------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index edb12a79a..6758578df 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -118,42 +118,24 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         for (CollectOrderBizResponse collectOrderBiz : list) {
             CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
             BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
-            //拆零
+            //查询自动赋码的code
             for (IoCollectOrderCodeAuto collectOrderCodeAuto : splitCodes) {
                 if (IntUtil.value(collectOrderCodeAuto.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) {
                     collectOrderBizResponse.setSplitUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getSplitUdiCode()) + "," + collectOrderCodeAuto.getUdiCode());
                 }
             }
-            if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) {
-                collectOrderBizResponse.setSplitUdiCode(collectOrderBizResponse.getSplitUdiCode().substring(1));
-            }
-//            //整取
-//            for (IoCollectOrderCodeAuto collectOrderCodeAuto : unSplitCodes) {
-//                if (IntUtil.value(collectOrderCodeAuto.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) {
-//                    collectOrderBizResponse.setUnSplitUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getUnSplitUdiCode()) + "," + collectOrderCodeAuto.getUdiCode());
-//                }
-//            }
-            if (StrUtil.isNotEmpty(collectOrderBizResponse.getUnSplitUdiCode())) {
-                collectOrderBizResponse.setUnSplitUdiCode(collectOrderBizResponse.getUnSplitUdiCode().substring(1));
-            }
-            //手动
+            //查询手动赋码的code
             for (IoCollectOrderCodeMan collectOrderCodeMan : manList) {
                 if (IntUtil.value(collectOrderCodeMan.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) {
                     collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + collectOrderCodeMan.getUdiCode());
                 }
             }
-            if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
-                collectOrderBizResponse.setScanUdiCode(collectOrderBizResponse.getScanUdiCode().substring(1));
-            }
-
             if (StrUtil.isNotEmpty(collectOrderBizResponse.getReplaceCode())) {
                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getReplaceCode());
             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode());
             } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) {
                 collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getSplitUdiCode());
-            } else if (StrUtil.isNotEmpty(collectOrderBizResponse.getUnSplitUdiCode())) {
-                collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getUnSplitUdiCode());
             }
 
             collectOrderBizResponses.add(collectOrderBizResponse);
@@ -215,7 +197,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             orderEntity.setAuditTime(new Date());
             orderService.update(orderEntity);
             //推送自助平台
-            spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
+            spGetHttpClient.updateCheckStatus(orderEntity, collectOrder.getCreateUser());
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) {
             //todo  根据单据类型上传医保或者第三方系统
             PostCollectOrderRequest orderRequest = new PostCollectOrderRequest();
@@ -282,7 +264,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
 
 
     @Transactional(rollbackFor = Exception.class)
-        public Boolean orderUpload(String billNo) {
+    public Boolean orderUpload(String billNo) {
         IoCollectOrderBackup updateOrder = new IoCollectOrderBackup();
         updateOrder.setBillNo(billNo);
         try {
@@ -294,7 +276,7 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
         }
         //更新状态
         this.updateByBillNo(updateOrder);
-        if (updateOrder.getUploadStatus() == 3){
+        if (updateOrder.getUploadStatus() == 3) {
             return false;
         }
         return true;