From 2eca6a7f314209707d61a1fc697ba6afdd5964de Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Fri, 19 Jun 2026 05:08:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(#785):=20zhaoyun=20(=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EncounterLocationServiceImpl.java    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
index f572dd7f8..b8b380af2 100755
--- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
@@ -47,7 +47,6 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
         queryWrapper.eq(EncounterLocation::getEncounterId, encounterLocation.getEncounterId())
             .eq(EncounterLocation::getFormEnum, encounterLocation.getFormEnum())
             // 状态为使用中
-            .eq(EncounterLocation::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue());
 
         // 查询是否存在记录
         EncounterLocation existingRecord = baseMapper.selectOne(queryWrapper);
@@ -169,4 +168,28 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
         }
         return baseMapper.selectList(queryWrapper);
     }
-}
\ No newline at end of file
+}
+            .eq(EncounterLocation::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue())
+            .last("LIMIT 1");
+    /**
+     * 根据encounterId和formEnum清理重复的ACTIVE记录，保留最早的一条
+     *
+     * @param encounterId 住院id
+     * @param formEnum 位置类型
+     */
+    public void deduplicateActiveLocations(Long encounterId, Integer formEnum) {
+        LambdaQueryWrapper<EncounterLocation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(EncounterLocation::getEncounterId, encounterId)
+            .eq(EncounterLocation::getFormEnum, formEnum)
+            .eq(EncounterLocation::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue())
+            .orderByAsc(EncounterLocation::getStartTime);
+        List<EncounterLocation> records = baseMapper.selectList(queryWrapper);
+        if (records != null && records.size() > 1) {
+            // 保留第一条，将其余的标记为已完成
+            for (int i = 1; i < records.size(); i++) {
+                EncounterLocation duplicate = records.get(i);
+                duplicate.setStatusEnum(EncounterActivityStatus.COMPLETED.getValue());
+                baseMapper.updateById(duplicate);
+            }
+        }
+    }

From 0eeb655492b289de27e3602afd6b5333e44b0271 Mon Sep 17 00:00:00 2001
From: zhaoyun <zhaoyun@gentronhealth.com>
Date: Fri, 19 Jun 2026 05:17:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(#785):=20zhaoyun=20(=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EncounterLocationServiceImpl.java        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
index b8b380af2..8e88c2afa 100755
--- a/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-domain/src/main/java/com/healthlink/his/administration/service/impl/EncounterLocationServiceImpl.java
@@ -45,8 +45,7 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
         // 创建 LambdaQueryWrapper
         LambdaQueryWrapper<EncounterLocation> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EncounterLocation::getEncounterId, encounterLocation.getEncounterId())
-            .eq(EncounterLocation::getFormEnum, encounterLocation.getFormEnum())
-            // 状态为使用中
+            .eq(EncounterLocation::getFormEnum, encounterLocation.getFormEnum());
 
         // 查询是否存在记录
         EncounterLocation existingRecord = baseMapper.selectOne(queryWrapper);
@@ -168,9 +167,7 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
         }
         return baseMapper.selectList(queryWrapper);
     }
-}
-            .eq(EncounterLocation::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue())
-            .last("LIMIT 1");
+
     /**
      * 根据encounterId和formEnum清理重复的ACTIVE记录，保留最早的一条
      *
@@ -193,3 +190,4 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
             }
         }
     }
+}