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
This commit is contained in:
chenqi
2026-03-31 14:00:36 +08:00
parent 3b8ef380ae 2334a27467
commit b7993885bb
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
if (StringUtils.hasText(dto.getConsultationId())) {
wrapper.like(ConsultationRequest::getConsultationId, dto.getConsultationId());
}
// 按创建时间倒序排列
wrapper.orderByDesc(ConsultationRequest::getConsultationRequestDate);
@@ -249,7 +249,7 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
if (StringUtils.hasText(dto.getConsultationId())) {
wrapper.like(ConsultationRequest::getConsultationId, dto.getConsultationId());
}
// 按创建时间倒序排列
wrapper.orderByDesc(ConsultationRequest::getConsultationRequestDate);
@@ -795,7 +795,6 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
confirmedAndSignedPhysicians.size(), signedPhysicians.size());
}
}
}
}
@@ -1318,9 +1317,9 @@ public class ConsultationAppServiceImpl implements IConsultationAppService {
// 4. 更新邀请记录（存储会诊意见）
// 格式：科室-医生：意见内容
String formattedOpinion = String.format("%s-%s：%s",
currentDeptName,
currentPhysicianName,
String formattedOpinion = String.format("%s-%s：%s",
currentDeptName,
currentPhysicianName,
dto.getConsultationOpinion());
invited.setInvitedStatus(ConsultationStatusEnum.CONFIRMED.getCode()); // 已确认