From b8364c024b32e5f5e2c4282b8d784596692dd234 Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Wed, 8 Jan 2025 11:48:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B9=B6=E5=8F=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docus/demo/controller/SyncBasicDataController.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/docus/demo/controller/SyncBasicDataController.java b/src/main/java/com/docus/demo/controller/SyncBasicDataController.java
index 12dda3c..7b4024c 100644
--- a/src/main/java/com/docus/demo/controller/SyncBasicDataController.java
+++ b/src/main/java/com/docus/demo/controller/SyncBasicDataController.java
@@ -51,9 +51,10 @@ public class SyncBasicDataController {
             return CommonResult.failed("无效的请求参数！");
         }
         String blockKey="syncBasicData:"+ JSON.toJSONString(syncBasicDataDto);
-        if (SYNC_BASIC_DATA_BLOCK_MAP.putIfAbsent(blockKey, 0) != null) {
+        if (SYNC_BASIC_DATA_BLOCK_MAP.containsKey(blockKey)) {
             return CommonResult.failed("有正在同步的任务！");
         }
+        SYNC_BASIC_DATA_BLOCK_MAP.put(blockKey,0);
         try {
             return syncBasicDataService.syncBasicData(syncBasicDataDto);
         }catch (Exception ex){
@@ -68,9 +69,10 @@ public class SyncBasicDataController {
     public CommonResult<?> syncSingleBasicData(@RequestParam(name = "disDate") String disDate,@RequestParam(name = "inpatientNo") String inpatientNo){
         log.info("省厅-同步单个患者基础数据，disDate={},inpatientNo={}", disDate, inpatientNo);
         String blockKey="syncSingleBasicData:"+ inpatientNo+":"+disDate;
-        if (SYNC_BASIC_DATA_BLOCK_MAP.putIfAbsent(blockKey, 0) != null) {
+        if (SYNC_BASIC_DATA_BLOCK_MAP.containsKey(blockKey)) {
             return CommonResult.failed("有正在同步的任务！");
         }
+        SYNC_BASIC_DATA_BLOCK_MAP.put(blockKey,0);
         try {
             LocalDate localDate = LocalDate.parse(disDate);
             SyncBasicDataDto dto = new SyncBasicDataDto();
@@ -91,9 +93,10 @@ public class SyncBasicDataController {
     @GetMapping("/syncLastMonthBasicData")
     public CommonResult<?> syncLastMonthBasicData(){
         String blockKey="syncLastMonthBasicData";
-        if (SYNC_BASIC_DATA_BLOCK_MAP.putIfAbsent(blockKey, 0) != null) {
+        if (SYNC_BASIC_DATA_BLOCK_MAP.containsKey(blockKey)) {
             return CommonResult.failed("有正在同步的任务！");
         }
+        SYNC_BASIC_DATA_BLOCK_MAP.put(blockKey,0);
         try {
             LocalDate today = LocalDate.now();
             LocalDate firstDayOfLastMonth = today.minusMonths(1).with(TemporalAdjusters.firstDayOfMonth());