diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java index b8b9907b..7485cd07 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java @@ -123,6 +123,8 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer */ @Override public R receiveEncounter(Long encounterId) { + Integer tenantId = SecurityUtils.getLoginUser().getTenantId(); + String currentUsername = SecurityUtils.getUsername(); int update = encounterMapper.update(null, new LambdaUpdateWrapper().eq(Encounter::getId, encounterId) .set(Encounter::getReceptionTime, new Date()) @@ -140,6 +142,9 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer encounterParticipant.setTypeCode(ParticipantType.ADMITTER.getCode());// 接诊医生 encounterParticipant.setPractitionerId(SecurityUtils.getLoginUser().getPractitionerId()); encounterParticipant.setStatusEnum(EncounterActivityStatus.ACTIVE.getValue()); // 状态 + encounterParticipant.setTenantId(tenantId); + encounterParticipant.setCreateBy(currentUsername); + encounterParticipant.setCreateTime(new Date()); iEncounterParticipantService.save(encounterParticipant); return update > 0 ? R.ok() : R.fail(); } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java index 39423d35..ef8664ec 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java @@ -1,6 +1,7 @@ package com.openhis.administration.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; @@ -43,4 +44,9 @@ public class EncounterParticipant extends HisBaseEntity { /** 状态 */ private Integer statusEnum; + /** + * 租户ID(新增字段,和数据库的tenant_id对应) + */ + @TableField("tenant_id") // 显式映射数据库字段名,避免MyBatis-Plus自动转换出错 + private Integer tenantId; } \ No newline at end of file