From 32514ebd7b8cadbc43eac0c944b01b3d9626b4fa Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Thu, 18 Jun 2026 15:21:53 +0800
Subject: [PATCH] =?UTF-8?q?792=20=E3=80=90=E4=BD=8F=E9=99=A2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=8A=A4=E5=A3=AB=E5=B7=A5=E4=BD=9C=E7=AB=99?=
 =?UTF-8?q?=E3=80=91=E5=9C=A8=E5=85=A5=E5=87=BA=E8=BD=AC=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=9A=84=E5=BA=8A=E4=BD=8D10=E5=8F=B7=E5=BA=8A=E4=BD=8D?=
 =?UTF-8?q?=E5=92=8C11=E5=8F=B7=E5=BA=8A=E4=BD=8D=E6=9C=892=E4=B8=AA?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inhospitalnursestation/ATDManageAppMapper.xml    | 11 ++++++-----
 .../service/impl/EncounterLocationServiceImpl.java   | 12 ++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
index c1b7e729e..c553a6032 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -168,11 +168,12 @@
                     ON ward.bus_no = SPLIT_PART(bed.bus_no,'.',1)
                         AND ward.form_enum = #{ward}
                         AND ward.delete_flag = '0'
-               LEFT JOIN adm_encounter_location aelb
-                    ON bed.id = aelb.location_id
-                        AND aelb.delete_flag = '0'
-                        AND aelb.status_enum = #{active}
-                        AND bed.form_enum = #{bed}
+               LEFT JOIN ( SELECT DISTINCT ON (location_id) location_id, encounter_id
+                            FROM adm_encounter_location
+                            WHERE delete_flag = '0'
+                              AND status_enum = #{active}
+                            ORDER BY location_id, id DESC
+               ) aelb ON bed.id = aelb.location_id
                LEFT JOIN adm_encounter ae
                     ON aelb.encounter_id = ae.id
                         AND ae.delete_flag = '0'
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 cf8655656..f572dd7f8 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
@@ -70,6 +70,18 @@ public class EncounterLocationServiceImpl extends ServiceImpl<EncounterLocationM
      * @param locationForm 位置类型
      */
     public void creatEncounterLocation(Long encounterId, Date startTime, Long locationId, Integer locationForm) {
+        // 床位级别（form_enum=8）：先将该床位上其他活跃记录置为已完成，防止同一床位出现多条活跃记录
+        // 病区/病房级别允许多患者共存，不做去重处理
+        if (locationForm != null && locationForm.equals(LocationForm.BED.getValue())) {
+            LambdaUpdateWrapper<EncounterLocation> deactivateWrapper = new LambdaUpdateWrapper<>();
+            deactivateWrapper.set(EncounterLocation::getStatusEnum, EncounterActivityStatus.COMPLETED.getValue())
+                .eq(EncounterLocation::getLocationId, locationId)
+                .eq(EncounterLocation::getFormEnum, locationForm)
+                .eq(EncounterLocation::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue())
+                .eq(EncounterLocation::getDeleteFlag, DelFlag.NO.getCode());
+            baseMapper.update(null, deactivateWrapper);
+        }
+
         EncounterLocation encounterLocation = new EncounterLocation();
         encounterLocation.setEncounterId(encounterId).setStartTime(startTime).setLocationId(locationId)
             .setFormEnum(locationForm).setStatusEnum(EncounterActivityStatus.ACTIVE.getValue());