From bf9770f55294f90ef0891e2b8a38309b9a37c6c6 Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Fri, 23 May 2025 14:16:37 +0800
Subject: [PATCH] dev

---
 .../service/social/SocialInventoryUploadService.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
index e85a16f..945cb5d 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/social/SocialInventoryUploadService.java
@@ -333,7 +333,7 @@ public class SocialInventoryUploadService extends BaseService {
     public boolean upload3503() {
         QueryWrapper<InventoryPurchaseLog> logQuery = new QueryWrapper<>();
         logQuery.in("upload_status", UploadStatusEnum.NoUpload.getStatus(), UploadStatusEnum.UploadFailed.getStatus());
-        logQuery.orderByAsc("id");
+        logQuery.orderByAsc("social_type");
         logQuery.last("limit 1");
         InventoryPurchaseLog curInventoryPurchaseLog = inventoryPurchaseLogMapper.selectOne(logQuery);
         if (curInventoryPurchaseLog == null) {
@@ -471,7 +471,7 @@ public class SocialInventoryUploadService extends BaseService {
             if (chargeOrder.getPayType().equals(RetailOrderPayTypeEnum.MEDICARE.getCode())) {
                 //医保支付
                 ChargeSocialPayLog payLog = chargeSocialPayLogMapper.selectOne(new QueryWrapper<ChargeSocialPayLog>().
-                        eq("retail_order_code", orderInventory.getChargeOrderCode()).last("limit 1"));
+                        eq("charge_order_code", orderInventory.getChargeOrderCode()).last("limit 1"));
                 im3505.setSetlId(payLog.getSetlId());
                 im3505.setMdtrtSn(payLog.getMdtrtId());
                 im3505.setPsnNo(payLog.getPsnNo());
@@ -495,7 +495,8 @@ public class SocialInventoryUploadService extends BaseService {
 
 
             List<Map<String, String>> drugtracinfo = new ArrayList<>();
-            List<String> TracCodgList = orderInventory.getTraceabilityCode() == null ? new ArrayList<>()
+            List<String> TracCodgList = orderInventory.getTraceabilityCode() == null||
+                    orderInventory.getTraceabilityCode().isEmpty() ? new ArrayList<>()
                     : Arrays.asList(orderInventory.getTraceabilityCode().split(","));
             for (String tracCodg : TracCodgList) {
                 Map<String, String> map =new HashMap<>();