1、退库优化

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1496,10 +1496,10 @@ public class CtqyyClient extends CommonHttpClient {
 
             udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType());
             if (udiwmsBasicSkPrescribeRequest.getBusType().equals("YPCFTF003")) {
-                udiwmsBasicSkPrescribeRequest.setIN_HOSP("1");
+                udiwmsBasicSkPrescribeRequest.setIN_HOSP("2");
 
             } else {
-                udiwmsBasicSkPrescribeRequest.setIN_HOSP("2");
+                udiwmsBasicSkPrescribeRequest.setIN_HOSP("1");
 
             }
             //拉取处方退货时，改成拉取v_ypzs_pres_info_return
@@ -2080,10 +2080,11 @@ public class CtqyyClient extends CommonHttpClient {
 
                 //区分住院、门诊处方
                 if (IntUtil.value(presInfoEntity.getIO_TYPE()) == 1) {
-                    ioCollectOrder.setBusType("YPCFTF003");
+                    ioCollectOrder.setBusType("YPCFTF002");
+
 //                    ioCollectOrder.setBillNo(presInfoEntity.getSTOOUT_NO());
                 } else {
-                    ioCollectOrder.setBusType("YPCFTF002");
+                    ioCollectOrder.setBusType("YPCFTF003");
 
                 }
                 ioCollectOrder.setBillNo(presInfoEntity.getAPPLY_NO());

src/main/java/com/glxp/mipsdl/service/yb/YbClient.java

@@ -28,6 +28,7 @@ import javax.annotation.Resource;
 import java.net.ConnectException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -108,13 +109,33 @@ public class YbClient {
             respStr = e.getMessage();
             return ResultVOUtils.error(500,"【" + apiNo + "】上传医保失败"+e.getMessage());
         }finally {
-            YbUploadingLog ybUploadingLog = new YbUploadingLog();
-            ybUploadingLog.setYbParam(reqStr);
-            ybUploadingLog.setYbReturn(respStr);
-            ybUploadingLog.setBillNo(billNo);
-            ybUploadingLog.setApiNo(apiNo);
-            ybUploadingLog.setUpdateTime(new Date());
-            ybUploadingLogMapper.insert(ybUploadingLog);
+
+            // 构建查询条件，按更新时间降序排序
+            QueryWrapper<YbUploadingLog> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("billNo", billNo)
+                    .orderByDesc("updateTime");
+            // 查询最新的一条记录
+            List<YbUploadingLog> logList = ybUploadingLogMapper.selectList(queryWrapper);
+            YbUploadingLog latestLog = logList.isEmpty() ? null : logList.get(0);
+
+            if (latestLog != null) {
+                // 存在记录，更新
+                latestLog.setYbParam(reqStr);
+                latestLog.setYbReturn(respStr);
+                latestLog.setApiNo(apiNo);
+                latestLog.setUpdateTime(new Date());
+                ybUploadingLogMapper.updateById(latestLog);
+            } else {
+                // 不存在记录，新增
+                YbUploadingLog newLog = new YbUploadingLog();
+                newLog.setYbParam(reqStr);
+                newLog.setYbReturn(respStr);
+                newLog.setBillNo(billNo);
+                newLog.setApiNo(apiNo);
+                newLog.setUpdateTime(new Date());
+                ybUploadingLogMapper.insert(newLog);
+            }
+
         }
     }