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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java
This commit is contained in:
chenqi
2026-03-30 14:51:48 +08:00
parent 2288162ad7 518d8385e6
commit 7dc98dcf84
7 changed files with 268 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java
View File

@@ -725,45 +725,69 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
dto.setInvitedList(invitedDtoList);
// 🎯 如果会诊已完成或已签名，填充会诊记录信息（从会诊确认表中获取）
if (entity.getConsultationStatus() != null &&
(entity.getConsultationStatus() == ConsultationStatusEnum.SIGNED.getCode() ||
entity.getConsultationStatus() == ConsultationStatusEnum.COMPLETED.getCode())) {
// 🎯 如果会诊已确认、已签名或已完成，填充会诊记录信息（从会诊确认表中获取）
// 会诊状态：20=已确认，30=已签名，40=已完成
if (entity.getConsultationStatus() != null &&
entity.getConsultationStatus() >= ConsultationStatusEnum.CONFIRMED.getCode()) {
// 查询会诊确认记录
LambdaQueryWrapper<ConsultationConfirmation> confirmWrapper = new LambdaQueryWrapper<>();
confirmWrapper.eq(ConsultationConfirmation::getConsultationRequestId, entity.getId());
ConsultationConfirmation confirmation = consultationConfirmationMapper.selectOne(confirmWrapper);
// 查询所有已签名的医生（invited_status = 3）
List<ConsultationInvited> signedPhysicians = invitedList.stream()
.filter(inv -> inv.getInvitedStatus() != null && inv.getInvitedStatus() >= 3)
// 查询所有已确认和已签名的医生（invited_status >= 20）
List<ConsultationInvited> confirmedAndSignedPhysicians = invitedList.stream()
.filter(inv -> inv.getInvitedStatus() != null && inv.getInvitedStatus() >= ConsultationStatusEnum.CONFIRMED.getCode())
.collect(Collectors.toList());
// 查询所有已签名的医生（invited_status >= 30）
List<ConsultationInvited> signedPhysicians = invitedList.stream()
.filter(inv -> inv.getInvitedStatus() != null && inv.getInvitedStatus() >= ConsultationStatusEnum.SIGNED.getCode())
.collect(Collectors.toList());
if (confirmation != null) {
// 1. 会诊确认参加医师：从确认表的confirming_physicians字段取值
// 1. 会诊确认参加医师：优先从确认表的confirming_physicians字段取值
if (StringUtils.hasText(confirmation.getConfirmingPhysicians())) {
dto.setInvitedPhysiciansText(confirmation.getConfirmingPhysicians());
log.info("从会诊确认表获取confirmingPhysicians: {}", confirmation.getConfirmingPhysicians());
} else if (!confirmedAndSignedPhysicians.isEmpty()) {
// 备用：从invitedList拼接
String invitedPhysiciansText = confirmedAndSignedPhysicians.stream()
.map(inv -> inv.getInvitedDepartmentName() + "-" + inv.getInvitedPhysicianName())
.collect(Collectors.joining("。"));
dto.setInvitedPhysiciansText(invitedPhysiciansText);
}
// 2. 会诊意见：从确认表取值
// 2. 会诊意见：优先从确认表取值
if (StringUtils.hasText(confirmation.getConsultationOpinion())) {
dto.setConsultationOpinion(confirmation.getConsultationOpinion());
} else if (!confirmedAndSignedPhysicians.isEmpty()) {
// 备用：从invitedList汇总
String consultationOpinion = confirmedAndSignedPhysicians.stream()
.filter(inv -> StringUtils.hasText(inv.getConfirmOpinion()))
.map(ConsultationInvited::getConfirmOpinion)
.collect(Collectors.joining("\n"));
dto.setConsultationOpinion(consultationOpinion);
}
// 3. 签名医生信息：从确认表取值
// 3. 签名医生、签名时间：从确认表取值
dto.setSignPhysician(confirmation.getSignature());
dto.setSignTime(confirmation.getSignatureDate());
}
// 4. 所属医生、代表科室：使用第一个签名的医生（向后兼容）
if (!signedPhysicians.isEmpty()) {
ConsultationInvited firstSigned = signedPhysicians.get(0);
dto.setAttendingPhysician(firstSigned.getInvitedPhysicianName());
dto.setRepresentDepartment(firstSigned.getInvitedDepartmentName());
log.info("填充会诊记录信息，已签名医生数：{}", signedPhysicians.size());
// 4. 所属医生、代表科室：使用第一个确认的医生（向后兼容）
if (!confirmedAndSignedPhysicians.isEmpty()) {
ConsultationInvited firstConfirmed = confirmedAndSignedPhysicians.get(0);
dto.setAttendingPhysician(firstConfirmed.getInvitedPhysicianName());
dto.setRepresentDepartment(firstConfirmed.getInvitedDepartmentName());
log.info("填充会诊记录信息，已确认和已签名医生数：{}，已签名医生数：{}",
confirmedAndSignedPhysicians.size(), signedPhysicians.size());
}
}
log.info("填充会诊记录信息，已确认和已签名医生数：{}，已签名医生数：{}",
confirmedAndSignedPhysicians.size(), signedPhysicians.size());
}
}
}

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionPackageDetail.java
View File

@@ -79,6 +79,7 @@ public class InspectionPackageDetail {
private LocalDateTime updateTime;
/** 删除标志（false-正常，true-删除） */
@TableField(value = "del_flag", fill = FieldFill.INSERT)
@TableLogic(value = "false", delval = "true")
private Boolean delFlag;
private Boolean delFlag = false;
}