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

fix(#640): 组合临床医嘱 updateGroupId 按实际所属表分别更新

Browse Source 
根因：原代码把所有 requestId 都当 MedicationRequest 处理，
诊疗医嘱(ID属于wor_service_request)被错误INSERT到药品表，
medication_id NOT NULL约束失败。

修复：拆组时三表都清group_id；组合时依次查药品→诊疗→耗材表，
找到所属表后精准更新group_id(group_no)。
This commit is contained in:
华佗
2026-06-02 09:00:08 +08:00
parent 80e186496b
commit 710a215597
1 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2388,21 +2388,52 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
.map(UpdateGroupDto::getRequestId).collect(Collectors.toList());
if (!idsToSetNull.isEmpty()) {
// 创建更新条件
UpdateWrapper<MedicationRequest> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("group_id", null).in("id", idsToSetNull);
// 对三个表都执行 group_id/group_no 置空（哪个表有该 id 就更新哪个）
UpdateWrapper<MedicationRequest> medUpdateWrapper = new UpdateWrapper<>();
medUpdateWrapper.set("group_id", null).in("id", idsToSetNull);
iMedicationRequestService.update(medUpdateWrapper);
// 执行更新
iMedicationRequestService.update(updateWrapper);
UpdateWrapper<ServiceRequest> srvUpdateWrapper = new UpdateWrapper<>();
srvUpdateWrapper.set("group_id", null).in("id", idsToSetNull);
iServiceRequestService.update(srvUpdateWrapper);
// DeviceRequest 使用 group_no（String 类型）
UpdateWrapper<DeviceRequest> devUpdateWrapper = new UpdateWrapper<>();
devUpdateWrapper.set("group_no", null).in("id", idsToSetNull);
iDeviceRequestService.update(devUpdateWrapper);
}
// 处理非null的情况
List<MedicationRequest> medicationRequestList = groupList.stream().filter(dto -> dto.getGroupId() != null)
.map(dto -> new MedicationRequest().setId(dto.getRequestId()).setGroupId(dto.getGroupId()))
.collect(Collectors.toList());
if (!medicationRequestList.isEmpty()) {
iMedicationRequestService.saveOrUpdateBatch(medicationRequestList);
// 处理 groupId 非 null 的情况：按实际所属表分别更新
List<UpdateGroupDto> nonNullGroupList = groupList.stream()
.filter(dto -> dto.getGroupId() != null).collect(Collectors.toList());
if (!nonNullGroupList.isEmpty()) {
for (UpdateGroupDto dto : nonNullGroupList) {
Long reqId = dto.getRequestId();
Long grpId = dto.getGroupId();
// 先尝试药品表（med_medication_request → group_id）
MedicationRequest medReq = iMedicationRequestService.getById(reqId);
if (medReq != null) {
UpdateWrapper<MedicationRequest> uw = new UpdateWrapper<>();
uw.set("group_id", grpId).eq("id", reqId);
iMedicationRequestService.update(uw);
continue;
}
// 再尝试诊疗表（wor_service_request → group_id）
ServiceRequest srvReq = iServiceRequestService.getById(reqId);
if (srvReq != null) {
UpdateWrapper<ServiceRequest> uw = new UpdateWrapper<>();
uw.set("group_id", grpId).eq("id", reqId);
iServiceRequestService.update(uw);
continue;
}
// 最后尝试耗材表（wor_device_request → group_no, String 类型）
DeviceRequest devReq = iDeviceRequestService.getById(reqId);
if (devReq != null) {
UpdateWrapper<DeviceRequest> uw = new UpdateWrapper<>();
uw.set("group_no", grpId != null ? grpId.toString() : null).eq("id", reqId);
iDeviceRequestService.update(uw);
}
}
}
}