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

bug 349 350 351 354 356 357

Browse Source
This commit is contained in:
Ranyunqiao
2026-04-13 12:10:22 +08:00
parent 13e83e0c82
commit 49eed7c784
10 changed files with 227 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,8 +581,33 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
.collect(Collectors.groupingBy(Practitioner::getOrgId));
// 构建树形结构
// 过滤条件：科室分类只要包含"门诊(编码1)"或"住院(编码2)"其一，即可显示
List<DepartmentTreeDto> treeList = new ArrayList<>();
for (Organization dept : deptList) {
// 过滤科室：只显示包含门诊(1)或住院(2)分类的科室
String classEnum = dept.getClassEnum();
boolean needShow = false;
if (classEnum != null && !classEnum.isEmpty()) {
// 拆分分类编码，检查是否包含 1 或 2
String[] codes = classEnum.split(",");
for (String code : codes) {
code = code.trim();
if ("1".equals(code) || "2".equals(code)) {
needShow = true;
break;
}
}
} else {
// 如果没有分类，默认显示
needShow = true;
}
if (!needShow) {
// 既不包含门诊也不包含住院，跳过
continue;
}
DepartmentTreeDto treeDto = new DepartmentTreeDto();
treeDto.setId(dept.getId());
treeDto.setLabel(dept.getName());
@@ -599,11 +624,10 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
})
.collect(Collectors.toList());
treeDto.setChildren(children);
} else {
treeDto.setChildren(new ArrayList<>());
// 只添加有医生的科室
treeList.add(treeDto);
}
treeList.add(treeDto);
// 没有医生的科室不添加到列表中
}
@@ -1340,9 +1364,13 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
throw new IllegalArgumentException("会诊申请不存在");
}
// 只有已提交状态才能确认
if (request.getConsultationStatus() != ConsultationStatusEnum.SUBMITTED.getCode()) {
throw new IllegalArgumentException("只有已提交状态的会诊申请才能确认");
// 会诊必须处于已提交或已确认状态才能确认
// - 已提交(10)：还没有医生确认
// - 已确认(20)：已有部分医生确认，允许其他医生继续确认（每个医生独立确认，类似已读）
// - 已签名(30)或已完成(40)：不能再确认
if (request.getConsultationStatus() != null &&
request.getConsultationStatus() >= ConsultationStatusEnum.SIGNED.getCode()) {
throw new IllegalArgumentException("会诊已签名或完成，无法再确认");
}
// 2. 获取当前登录医生信息
@@ -1360,26 +1388,20 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
throw new IllegalArgumentException("您不在被邀请的医生列表中");
}
log.info("会诊确认检查：currentPhysicianId={}, invitedId={}, invitedStatus={}, CONFIRMED.code={}",
currentPhysicianId, invited.getId(), invited.getInvitedStatus(), ConsultationStatusEnum.CONFIRMED.getCode());
if (invited.getInvitedStatus() != null && invited.getInvitedStatus() >= ConsultationStatusEnum.CONFIRMED.getCode()) {
throw new IllegalArgumentException("您已经确认过了，无需重复确认");
}
// 4. 更新邀请记录（存储会诊意见）
// 格式：科室-会诊确认参加医师：意见内容
// 兼容：若前端未填写“会诊确认参加医师”，则回退为当前医生姓名
String confirmingPhysicianText =
StringUtils.hasText(dto.getConfirmingPhysician()) ? dto.getConfirmingPhysician().trim() : currentPhysicianName;
String formattedOpinion = String.format("%s-%s：%s",
currentDeptName,
confirmingPhysicianText,
dto.getConsultationOpinion());
// 直接存储用户输入的原始意见内容，不添加医师姓名前缀
invited.setInvitedStatus(ConsultationStatusEnum.CONFIRMED.getCode()); // 已确认
invited.setConfirmOpinion(formattedOpinion);
invited.setConfirmOpinion(dto.getConsultationOpinion()); // 直接存储原始意见，不添加前缀
invited.setConfirmTime(new Date());
consultationInvitedMapper.updateById(invited);
log.info("医生 {} 确认会诊，意见：{}", currentPhysicianName, formattedOpinion);
log.info("医生 {} 确认会诊", currentPhysicianName);
// 5. 更新会诊申请的确认计数
Integer confirmedCount = (request.getConfirmedCount() == null ? 0 : request.getConfirmedCount()) + 1;