wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

168 入科分配床位填写的住院医生、主治医生、责任护士字段的内容双击查看未显示。

Browse Source
This commit is contained in:
Ranyunqiao
2026-03-12 16:58:39 +08:00
parent e8850e85fc
commit 066cfaba46
3 changed files with 105 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/EncounterParticipantServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.openhis.administration.mapper.EncounterParticipantMapper;
import com.openhis.administration.service.IEncounterParticipantService;
import com.openhis.common.enums.EncounterActivityStatus;
import com.openhis.common.enums.ParticipantType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -22,6 +23,7 @@ import java.util.List;
* @author system
* @date 2025-02-20
*/
@Slf4j
@Service
public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterParticipantMapper, EncounterParticipant>
implements IEncounterParticipantService {
@@ -58,9 +60,12 @@ public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterPartic
@Override
public void creatEncounterParticipants(Long encounterId, Date startTime, Long practitionerId, String typeCode) {
EncounterParticipant encounterParticipant = new EncounterParticipant();
encounterParticipant.setEncounterId(encounterId).setStartTime(startTime).setPractitionerId(practitionerId)
.setTypeCode(typeCode);
baseMapper.insert(encounterParticipant);
encounterParticipant.setEncounterId(encounterId)
.setStartTime(startTime)
.setPractitionerId(practitionerId)
.setTypeCode(typeCode)
.setStatusEnum(EncounterActivityStatus.ACTIVE.getValue());
int result = baseMapper.insert(encounterParticipant);
}
/**
@@ -72,12 +77,15 @@ public class EncounterParticipantServiceImpl extends ServiceImpl<EncounterPartic
@Override
public Integer updateEncounterParticipantsStatus(Long encounterId) {
// 更新状态为已完成
return baseMapper.update(null,
Integer result = baseMapper.update(null,
new LambdaUpdateWrapper<EncounterParticipant>()
.set(EncounterParticipant::getStatusEnum, EncounterActivityStatus.COMPLETED.getValue())
.eq(EncounterParticipant::getEncounterId, encounterId).in(EncounterParticipant::getTypeCode,
.eq(EncounterParticipant::getEncounterId, encounterId)
.eq(EncounterParticipant::getStatusEnum, EncounterActivityStatus.ACTIVE.getValue())
.in(EncounterParticipant::getTypeCode,
ParticipantType.ATTENDING_DOCTOR.getCode(), ParticipantType.CHIEF_DOCTOR.getCode(),
ParticipantType.PRIMARY_NURSE.getCode(), ParticipantType.ADMITTING_DOCTOR.getCode()));
return result;
}
/*