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

bug 443 522 523

Browse Source
This commit is contained in:
Ranyunqiao
2026-05-18 10:16:57 +08:00
committed by guanyu
parent af9b3bbc76
commit a89d91c5be
5 changed files with 97 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
View File

@@ -559,9 +559,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
if (adviceSaveList != null && !adviceSaveList.isEmpty()) {
for (int i = 0; i < adviceSaveList.size(); i++) {
AdviceSaveDto dto = adviceSaveList.get(i);
log.info("Request[{}]: requestId={}, dbOpType={}, adviceType={}, encounterId={}, patientId={}",
i, dto.getRequestId(), dto.getDbOpType(), dto.getAdviceType(),
dto.getEncounterId(), dto.getPatientId());
log.info("Request[{}]: requestId={}, dbOpType={}, adviceType={}, encounterId={}, patientId={}, categoryEnum={}, categoryEnum.class={}, categoryCode={}, categoryCode.class={}",
i, dto.getRequestId(), dto.getDbOpType(), dto.getAdviceType(),
dto.getEncounterId(), dto.getPatientId(),
dto.getCategoryEnum(), dto.getCategoryEnum() != null ? dto.getCategoryEnum().getClass().getName() : "NULL",
dto.getCategoryCode(), dto.getCategoryCode() != null ? dto.getCategoryCode().getClass().getName() : "NULL");
}
}
@@ -1562,7 +1564,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
// 🔧 BugFix #498: categoryEnum=22(检查) 走 ServiceRequest，不走 DeviceRequest
// 检查申请单的诊疗定义ID存在 activityId，不在 adviceDefinitionId
// deviceDefId 对应耗材定义ID，不能用诊疗定义ID填充
if (adviceSaveDto.getCategoryEnum() == 22) {
if (Integer.valueOf(22).equals(adviceSaveDto.getCategoryEnum())) {
log.info("handDevice skip - 检查申请单(categoryEnum=22) 走 ServiceRequest 路径，跳过 DeviceRequest 保存");
continue; // 跳过本次循环，不走耗材请求路径
} else if (adviceSaveDto.getAdviceDefinitionId() != null) {